Skip to content

Commit

Permalink
3.1.19 updates
Browse files Browse the repository at this point in the history
  • Loading branch information
@uwetews
uwetews committed Dec 15, 2014
1 parent 356f6e4 commit a4a689c
Show file tree
Hide file tree
Showing 8 changed files with 4,713 additions and 3,245 deletions.
18 changes: 8 additions & 10 deletions LexerGenerator/Parser.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -344,17 +344,15 @@ public function doFirstMatch($rules, $statename, $ruleindex)
$pattern .= '/' . $this->patternFlags;
fwrite($this->out, '
$tokenMap = ' . $tokenindex . ';
if (' . $this->counter . ' >= ($this->mbstring_overload ? mb_strlen(' . $this->input . ',\'latin1\'): strlen(' . $this->input . '))) {
if (' . $this->counter . ' >= strlen(' . $this->input . ')) {
return false; // end of input
}
');
fwrite($this->out, '$yy_global_pattern = "' .
$pattern . 'iS";' . "\n");
fwrite($this->out, '
do {
if ($this->mbstring_overload ? preg_match($yy_global_pattern, mb_substr(' . $this->input . ', ' .
$this->counter .
',2000000000,\'latin1\'), $yymatches) : preg_match($yy_global_pattern,' . $this->input . ', $yymatches, null, ' .
if (preg_match($yy_global_pattern,' . $this->input . ', $yymatches, null, ' .
$this->counter .
')) {
$yysubmatches = $yymatches;
Expand All @@ -376,7 +374,7 @@ public function doFirstMatch($rules, $statename, $ruleindex)
' . $this->value . ' = current($yymatches); // token value
$r = $this->{\'yy_r' . $ruleindex . '_\' . ' . $this->token . '}($yysubmatches);
if ($r === null) {
' . $this->counter . ' += ($this->mbstring_overload ? mb_strlen(' . $this->value . ',\'latin1\'): strlen(' . $this->value . '));
' . $this->counter . ' += strlen(' . $this->value . ');
' . $this->line . ' += substr_count(' . $this->value . ', "\n");
// accept this token
return true;
Expand All @@ -385,9 +383,9 @@ public function doFirstMatch($rules, $statename, $ruleindex)
// process this token in the new state
return $this->yylex();
} elseif ($r === false) {
' . $this->counter . ' += ($this->mbstring_overload ? mb_strlen(' . $this->value . ',\'latin1\'): strlen(' . $this->value . '));
' . $this->counter . ' += strlen(' . $this->value . ');
' . $this->line . ' += substr_count(' . $this->value . ', "\n");
if (' . $this->counter . ' >= ($this->mbstring_overload ? mb_strlen(' . $this->input . ',\'latin1\'): strlen(' . $this->input . '))) {
if (' . $this->counter . ' >= strlen(' . $this->input . ')) {
return false; // end of input
}
// skip this token
Expand Down Expand Up @@ -434,16 +432,16 @@ public function doFirstMatch($rules, $statename, $ruleindex)
// process this token in the new state
return $this->yylex();
} elseif ($r === false) {
' . $this->counter . ' += ($this->mbstring_overload ? mb_strlen(' . $this->value . ',\'latin1\'): strlen(' . $this->value . '));
' . $this->counter . ' += strlen(' . $this->value . ');
' . $this->line . ' += substr_count(' . $this->value . ', "\n");
if (' . $this->counter . ' >= ($this->mbstring_overload ? mb_strlen(' . $this->input . ',\'latin1\'): strlen(' . $this->input . '))) {
if (' . $this->counter . ' >= strlen(' . $this->input . ')) {
return false; // end of input
}
// skip this token
continue;
} else {
// accept
' . $this->counter . ' += ($this->mbstring_overload ? mb_strlen(' . $this->value . ',\'latin1\'): strlen(' . $this->value . '));
' . $this->counter . ' += strlen(' . $this->value . ');
' . $this->line . ' += substr_count(' . $this->value . ', "\n");
return true;
Expand Down
Loading

0 comments on commit a4a689c

Please sign in to comment.