mirror_php/json-machine
1
0
Fork 0
mirror of https://github.com/halaxa/json-machine.git synced 2025-01-18 21:37:57 +01:00
Code Issues Releases Wiki Activity

Performance-wise position counting

Browse Source
This commit is contained in:
Filip Halaxa 2021-12-14 12:45:38 +01:00
parent 341c70ba32
commit 458af6f897
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Lexer.php
View File

@ -30,7 +30,7 @@ class Lexer implements \IteratorAggregate, PositionAware
$isEscaping = false;
$width = 0;
$trackingLineBreak = false;
$position = 0;
$position = 1;
$column = 0;
// Treat UTF-8 BOM bytes as whitespace
@ -51,7 +51,6 @@ class Lexer implements \IteratorAggregate, PositionAware
$bytesLength = strlen($bytes);
for ($i = 0; $i < $bytesLength; ++$i) {
$byte = $bytes[$i];
++$position;
if ($inString) {
$inString = ! ($byte === '"' && !$isEscaping);
$isEscaping = ($byte === '\\' && !$isEscaping);
@ -69,7 +68,7 @@ class Lexer implements \IteratorAggregate, PositionAware
if (isset($$byte)) {
++$column;
if ($tokenBuffer !== '') {
$this->position = $position;
$this->position = $position + $i;
$this->column = $column;
yield $tokenBuffer;
$column += $width;
@ -77,7 +76,7 @@ class Lexer implements \IteratorAggregate, PositionAware
$width = 0;
}
if ($$byte) { // is not whitespace
$this->position = $position;
$this->position = $position + $i;
$this->column = $column;
yield $byte;
// track line number and reset column for each newline
@ -94,6 +93,7 @@ class Lexer implements \IteratorAggregate, PositionAware
++$width;
}
}
$position += $i;
}
if ($tokenBuffer !== '') {
$this->position = $position;