Revert "TokenIterator: fixes, sync with nette/tokenizer"

This reverts commit 472dc6b.
nette · Jan 25, 2022 · e8dfa7a · e8dfa7a
1 parent 0fd885f
commit e8dfa7a
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 18 deletions.
diff --git a/src/Latte/Compiler/TokenIterator.php b/src/Latte/Compiler/TokenIterator.php
@@ -209,6 +209,9 @@ protected function scan(
 		$pos = $this->position + ($prev ? -1 : 1);
 		do {
 			if (!isset($this->tokens[$pos])) {
+				if (!$wanted && $advance && !$prev && $pos <= count($this->tokens)) {
+					$this->next();
+				}
 				return $res;
 			}
 

diff --git a/tests/Latte/TokenIterator.join.phpt b/tests/Latte/TokenIterator.join.phpt
@@ -72,17 +72,17 @@ test('', function () {
 
 	$traverser->position = 2;
 	Assert::null($traverser->nextValue());
-	Assert::same(2, $traverser->position);
+	Assert::same(3, $traverser->position);
 
 	$traverser->position = 2;
 	Assert::null($traverser->nextValue());
 	Assert::null($traverser->nextValue(T_STRING, T_DNUMBER, T_WHITESPACE));
-	Assert::same(2, $traverser->position);
+	Assert::same(3, $traverser->position);
 
 	$traverser->position = 2;
 	Assert::same('', $traverser->joinAll());
 	Assert::same('', $traverser->joinAll(T_STRING, T_DNUMBER, T_WHITESPACE));
-	Assert::same(2, $traverser->position);
+	Assert::same(3, $traverser->position);
 
 	$traverser->position = 2;
 	Assert::same('', $traverser->joinUntil(T_STRING, T_DNUMBER, T_WHITESPACE));

diff --git a/tests/Latte/TokenIterator.traversing.phpt b/tests/Latte/TokenIterator.traversing.phpt
@@ -105,17 +105,17 @@ test('', function () {
 	$traverser->position = 2;
 	Assert::null($traverser->nextToken());
 	Assert::null($traverser->nextToken());
-	Assert::same(2, $traverser->position);
+	Assert::same(3, $traverser->position);
 
 	$traverser->position = 2;
 	Assert::null($traverser->nextToken());
 	Assert::null($traverser->nextToken(T_STRING, T_DNUMBER, T_WHITESPACE));
-	Assert::same(2, $traverser->position);
+	Assert::same(3, $traverser->position);
 
 	$traverser->position = 2;
 	Assert::same([], $traverser->nextAll());
 	Assert::same([], $traverser->nextAll(T_STRING, T_DNUMBER, T_WHITESPACE));
-	Assert::same(2, $traverser->position);
+	Assert::same(3, $traverser->position);
 
 	$traverser->position = 2;
 	Assert::same([], $traverser->nextUntil(T_STRING, T_DNUMBER, T_WHITESPACE));
@@ -143,16 +143,4 @@ test('', function () {
 	Assert::same(-1, $traverser->position);
 	Assert::same('say', $traverser->consumeValue(T_STRING));
 	Assert::same(0, $traverser->position);
-
-	$traverser->position = 3;
-	Assert::exception(function () use ($traverser) {
-		$traverser->consumeValue();
-	}, Latte\CompileException::class, 'Unexpected end.');
-	Assert::same(3, $traverser->position);
-
-	$traverser->position = 3;
-	Assert::exception(function () use ($traverser) {
-		$traverser->consumeValue(T_STRING, T_DNUMBER, T_WHITESPACE);
-	}, Latte\CompileException::class, 'Unexpected end.');
-	Assert::same(3, $traverser->position);
 });