diff --git a/src/Neon/Parser.php b/src/Neon/Parser.php index a6ab579..eb05b25 100644 --- a/src/Neon/Parser.php +++ b/src/Neon/Parser.php @@ -254,7 +254,7 @@ private function initLines(): void { $this->posToLine = []; $line = 1; - foreach ($this->tokens->getTokens() as $token) { + foreach ($this->tokens->tokens as $token) { $this->posToLine[] = $line; $line += substr_count($token->value, "\n"); } diff --git a/src/Neon/TokenStream.php b/src/Neon/TokenStream.php index 1454a5b..5bcaeb6 100644 --- a/src/Neon/TokenStream.php +++ b/src/Neon/TokenStream.php @@ -18,7 +18,7 @@ final class TokenStream public function __construct( /** @var Token[] */ - public array $tokens, + public /*readonly*/ array $tokens, ) { } @@ -35,13 +35,6 @@ public function seek(int $index): void } - /** @return Token[] */ - public function getTokens(): array - { - return $this->tokens; - } - - public function is(int|string ...$types): bool { while (in_array($this->tokens[$this->index]->type ?? null, [Token::Comment, Token::Whitespace], strict: true)) { diff --git a/tests/Neon/Parser.nodes.phpt b/tests/Neon/Parser.nodes.phpt index d7533f6..9eb9464 100644 --- a/tests/Neon/Parser.nodes.phpt +++ b/tests/Neon/Parser.nodes.phpt @@ -57,7 +57,7 @@ Assert::matchFile( $traverser = new Traverser; $traverser->traverse($node, function (Node $node) use ($stream) { @$node->code = ''; // dynamic property is deprecated - foreach (array_slice($stream->getTokens(), $node->startTokenPos, $node->endTokenPos - $node->startTokenPos + 1) as $token) { + foreach (array_slice($stream->tokens, $node->startTokenPos, $node->endTokenPos - $node->startTokenPos + 1) as $token) { $node->code .= $token->value; }