Merge #397 - Performance improvement to use less the "nextToken()" function

williamdes · williamdes · commit fd9e59f2681a · 2023-01-06T09:09:51.000+04:00
Pull-request: #397 Signed-off-by: William Desportes <williamdes@wdes.fr>
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## [5.x.x] - YYYY-MM-DD
 
+* Performance improvement to use less the `nextToken()` function (#397)
+
 ## [5.6.0] - 2023-01-02
 
 * Add missing return types annotations
diff --git a/src/Components/AlterOperation.php b/src/Components/AlterOperation.php
@@ -349,12 +349,7 @@ public static function parse(Parser $parser, TokensList $list, array $options =
                     }
                 } elseif (! self::checkIfTokenQuotedSymbol($token)) {
                     if (! empty(Parser::$STATEMENT_PARSERS[$token->value])) {
-                        // We want to get the next non-comment and non-space token after $token
-                        // therefore, the first getNext call will start with the current $idx which's $token,
-                        // will return it and increase $idx by 1, which's not guaranteed to be non-comment
-                        // and non-space, that's why we're calling getNext again.
-
-                        $list->getNext();
+                        $list->idx++; // Ignore the current token
                         $nextToken = $list->getNext();
 
                         if ($token->value === 'SET' && $nextToken !== null && $nextToken->value === '(') {
@@ -387,12 +382,7 @@ public static function parse(Parser $parser, TokensList $list, array $options =
                 $ret->unknown[] = $token;
             } elseif ($state === 3) {
                 if ($partitionState === 0) {
-                        // We want to get the next non-comment and non-space token after $token
-                        // therefore, the first getNext call will start with the current $idx which's $token,
-                        // will return it and increase $idx by 1, which's not guaranteed to be non-comment
-                        // and non-space, that's why we're calling getNext again.
-
-                        $list->getNext();
+                        $list->idx++; // Ignore the current token
                         $nextToken = $list->getNext();
                     if (
                         ($token->type === Token::TYPE_KEYWORD)
diff --git a/src/Statements/ExplainStatement.php b/src/Statements/ExplainStatement.php
@@ -134,13 +134,13 @@ public function parse(Parser $parser, TokensList $list)
                 $state = 2;
             } elseif ($state === 2) {
                 $currIdx = $list->idx;
-                $currToken = $list->getNext();
+                $list->idx++; // Ignore the current token
                 $nextToken = $list->getNext();
                 $list->idx = $currIdx;
 
                 if ($token->keyword === 'FOR' && $nextToken->keyword === 'CONNECTION') {
-                    $forToken = $list->getNext(); // FOR
-                    $connectionToken = $list->getNext(); // CONNECTION
+                    $list->idx++; // Ignore the current token
+                    $list->getNext(); // CONNECTION
                     $nextToken = $list->getNext(); // Identifier
                     $this->connectionId = $nextToken->value;
                     break;
diff --git a/src/Statements/WithStatement.php b/src/Statements/WithStatement.php
@@ -142,11 +142,7 @@ public function parse(Parser $parser, TokensList $list)
             } elseif ($state === 3) {
                 $idxBeforeGetNext = $list->idx;
 
-                // We want to get the next non-comment and non-space token after $token
-                // therefore, the first getNext call will start with the current $idx which's $token,
-                // will return it and increase $idx by 1, which's not guaranteed to be non-comment
-                // and non-space, that's why we're calling getNext again.
-                $list->getNext();
+                $list->idx++; // Ignore the current token
                 $nextKeyword = $list->getNext();
 
                 if (! ($token->value === '(' && ($nextKeyword && $nextKeyword->value === 'SELECT'))) {
