|
@@ -76,7 +76,7 @@ discard block |
|
|
block discarded – undo |
|
76
|
76
|
/** |
|
77
|
77
|
* @var array |
|
78
|
78
|
*/ |
|
79
|
|
- private $terminals = [2 => "error", 4 => "STRING", 6 => "NUMBER", 8 => "NULL", 10 => "TRUE", 11 => "FALSE", 14 => "EOF", 17 => "{", 18 => "}", 21 => ":", 22 => ",", 23 => "[", 24 => "]",]; |
|
|
79
|
+ private $terminals = [2 => "error", 4 => "STRING", 6 => "NUMBER", 8 => "NULL", 10 => "TRUE", 11 => "FALSE", 14 => "EOF", 17 => "{", 18 => "}", 21 => ":", 22 => ",", 23 => "[", 24 => "]", ]; |
|
80
|
80
|
|
|
81
|
81
|
/** |
|
82
|
82
|
* @var array |
|
@@ -317,7 +317,7 @@ discard block |
|
|
block discarded – undo |
|
317
|
317
|
} |
|
318
|
318
|
|
|
319
|
319
|
$preErrorSymbol = $symbol; // save the lookahead token |
|
320
|
|
- $symbol = $terror; // insert generic error symbol as new lookahead |
|
|
320
|
+ $symbol = $terror; // insert generic error symbol as new lookahead |
|
321
|
321
|
$state = $this->stack[count($this->stack) - 1]; |
|
322
|
322
|
$action = isset($this->table[$state][$terror]) ? $this->table[$state][$terror] : false; |
|
323
|
323
|
$recovering = 3; // allow 3 real symbols to be shifted before reporting a new error |
|
@@ -502,7 +502,7 @@ discard block |
|
|
block discarded – undo |
|
502
|
502
|
case 17: |
|
503
|
503
|
if ($this->flags & self::PARSE_TO_ASSOC) { |
|
504
|
504
|
|
|
505
|
|
- $yVal->token =& $tokens[$len - 2]; |
|
|
505
|
+ $yVal->token = & $tokens[$len - 2]; |
|
506
|
506
|
$key = $tokens[$len][0]; |
|
507
|
507
|
|
|
508
|
508
|
if (($this->flags & self::DETECT_KEY_CONFLICTS) && isset($tokens[$len - 2][$key])) { |