Fix forgotten statement on parseNumber to move from state 10 to state…

… 4, causing wrong lexing process.
phpmyadmin · Sep 3, 2024 · 77a8698 · 77a8698
1 parent 26e1b5d
commit 77a8698
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 28 deletions.
diff --git a/src/Lexer.php b/src/Lexer.php
@@ -948,8 +948,10 @@ public function parseNumber()
                 break;
             } elseif ($state === 10) {
                 $flags |= Token::FLAG_NUMBER_FLOAT;
-                if ($this->str[$this->last] < '0' || $this->str[$this->last] > '9') {
+                if ($this->str[$this->last] >= '0' && $this->str[$this->last] <= '9') {
                     // Just digits are valid characters.
+                    $state = 4;
+                } else {
                     break;
                 }
             }

diff --git a/tests/data/lexer/lexNumber.out b/tests/data/lexer/lexNumber.out
@@ -217,21 +217,12 @@
                 },
                 {
                     "@type": "PhpMyAdmin\\SqlParser\\Token",
-                    "token": ".",
-                    "value": ".",
-                    "keyword": null,
-                    "type": 2,
-                    "flags": 16,
-                    "position": 43
-                },
-                {
-                    "@type": "PhpMyAdmin\\SqlParser\\Token",
-                    "token": "15",
-                    "value": 15,
+                    "token": ".15",
+                    "value": 0.15,
                     "keyword": null,
                     "type": 6,
-                    "flags": 0,
-                    "position": 44
+                    "flags": 2,
+                    "position": 43
                 },
                 {
                     "@type": "PhpMyAdmin\\SqlParser\\Token",
@@ -442,21 +433,12 @@
                 },
                 {
                     "@type": "PhpMyAdmin\\SqlParser\\Token",
-                    "token": ".",
-                    "value": ".",
-                    "keyword": null,
-                    "type": 2,
-                    "flags": 16,
-                    "position": 99
-                },
-                {
-                    "@type": "PhpMyAdmin\\SqlParser\\Token",
-                    "token": "5e10",
-                    "value": 50000000000.0,
+                    "token": ".5e10",
+                    "value": 5000000000.0,
                     "keyword": null,
                     "type": 6,
-                    "flags": 4,
-                    "position": 100
+                    "flags": 6,
+                    "position": 99
                 },
                 {
                     "@type": "PhpMyAdmin\\SqlParser\\Token",
@@ -747,7 +729,7 @@
                     "position": null
                 }
             ],
-            "count": 82,
+            "count": 80,
             "idx": 0
         },
         "delimiter": ";",