Fixed a bug that didn't parse comments properly.

udan11 · udan11 · commit c4f7b223db82 · 2015-08-05T11:49:39.000+03:00
getFirstStatement util doesn't ignore MySQL specific query anymore (between comments).
Misc coding style fixes.
Fixed tests.
diff --git a/src/Context.php b/src/Context.php
@@ -297,13 +297,13 @@ public static function isComment($str)
         $len = strlen($str);
         if ($str[0] === '#') {
             return Token::FLAG_COMMENT_BASH;
-        } elseif (($len > 1) && ((($str[0] === '/') && ($str[1] === '*'))
-            || (($str[0] === '*') && ($str[1] === '/')))
-        ) {
+        } elseif (($len > 1) && ($str[0] === '/') && ($str[1] === '*')) {
+            return (($len > 2) && ($str[2] == '!')) ?
+                Token::FLAG_COMMENT_MYSQL_CMD : Token::FLAG_COMMENT_C;
+        } elseif (($len > 1) && ($str[0] === '*') && ($str[1] === '/')) {
             return Token::FLAG_COMMENT_C;
         } elseif (($len > 2) && ($str[0] === '-')
-            && ($str[1] === '-') && ($str[2] !== "\n")
-            && (static::isWhitespace($str[2]))
+            && ($str[1] === '-') && (static::isWhitespace($str[2]))
         ) {
             return Token::FLAG_COMMENT_SQL;
         }
diff --git a/src/Lexer.php b/src/Lexer.php
@@ -506,7 +506,7 @@ public function parseComment()
                 while ((++$this->last < $this->len) && ($this->str[$this->last] !== "\n")) {
                     $token .= $this->str[$this->last];
                 }
-                $token .= $this->str[$this->last];
+                $token .= "\n";  // Adding the line ending.
                 return new Token($token, Token::TYPE_COMMENT, Token::FLAG_COMMENT_BASH);
             }
 
@@ -519,11 +519,14 @@ public function parseComment()
                         // It is a MySQL-specific command.
                         $flags |= Token::FLAG_COMMENT_MYSQL_CMD;
                     }
-                    while ((++$this->last < $this->len) &&
-                    (($this->str[$this->last - 1] !== '*') || ($this->str[$this->last] !== '/'))) {
+                    while ((++$this->last < $this->len)
+                        && (($this->str[$this->last - 1] !== '*') || ($this->str[$this->last] !== '/'))
+                    ) {
+                        $token .= $this->str[$this->last];
+                    }
+                    if ($this->last < $this->len) {
                         $token .= $this->str[$this->last];
                     }
-                    $token .= $this->str[$this->last];
                     return new Token($token, Token::TYPE_COMMENT, $flags);
                 }
             }
@@ -532,14 +535,12 @@ public function parseComment()
             if (++$this->last < $this->len) {
                 $token .= $this->str[$this->last];
                 if (Context::isComment($token)) {
+                    // Checking if this comment did not end already (```--\n```).
                     if ($this->str[$this->last] !== "\n") {
-                        // Checking if this comment did not end already (```--\n```).
                         while ((++$this->last < $this->len) && ($this->str[$this->last] !== "\n")) {
                             $token .= $this->str[$this->last];
                         }
-
-                        // Adding the line ending.
-                        $token .= "\n";
+                        $token .= "\n"; // Adding the line ending.
                     }
                     return new Token($token, Token::TYPE_COMMENT, Token::FLAG_COMMENT_SQL);
                 }
@@ -779,13 +780,17 @@ public function parseSymbol()
                 $token = '';
             }
 
-            if (($str = $this->parseString('`')) === null) {
-                if (($str = static::parseUnknown()) === null) {
-                    $this->error(
-                        __('Variable name was expected.'),
-                        $this->str[$this->last],
-                        $this->last
-                    );
+            $str = null;
+
+            if ($this->last < $this->len) {
+                if (($str = $this->parseString('`')) === null) {
+                    if (($str = static::parseUnknown()) === null) {
+                        $this->error(
+                            __('Variable name was expected.'),
+                            $this->str[$this->last],
+                            $this->last
+                        );
+                    }
                 }
             }
 
@@ -823,7 +828,7 @@ public function parseDelimiter()
         {
             $idx = 0;
 
-            while ($idx < $this->delimiterLen) {
+            while (($idx < $this->delimiterLen) && ($this->last + $idx < $this->len)) {
                 if ($this->delimiter[$idx] !== $this->str[$this->last + $idx]) {
                     return null;
                 }
diff --git a/src/Statement.php b/src/Statement.php
@@ -262,7 +262,7 @@ public function parse(Parser $parser, TokensList $list)
                     // this statement it means it is a new statement, but no
                     // delimiter was found between them.
                     $parser->error(
-                        __('A new statement was found, but no delimiter between them.'),
+                        __('A new statement was found, but no delimiter between it and the previous one.'),
                         $token
                     );
                     break;
diff --git a/src/Utils/Query.php b/src/Utils/Query.php
@@ -743,14 +743,16 @@ public static function getFirstStatement($query, $delimiter = null)
         for ($list->idx = 0; $list->idx < $list->count; ++$list->idx) {
             $token = $list->tokens[$list->idx];
 
-            if ($token->type === Token::TYPE_COMMENT) {
+            if (($token->type === Token::TYPE_COMMENT)
+                && (!($token->flags & Token::FLAG_COMMENT_MYSQL_CMD))
+            ) {
                 continue;
             }
 
             $statement .= $token->token;
 
-            if (($token->type === Token::TYPE_DELIMITER) && (!empty($token->value))) {
-                $delimiter = $token->value;
+            if (($token->type === Token::TYPE_DELIMITER) && (!empty($token->token))) {
+                $delimiter = $token->token;
                 $fullStatement = true;
                 break;
             }
@@ -766,7 +768,7 @@ public static function getFirstStatement($query, $delimiter = null)
         // remaining query.
         $query = '';
         for (++$list->idx; $list->idx < $list->count; ++$list->idx) {
-            $query .= $list->tokens[$list->idx]->value;
+            $query .= $list->tokens[$list->idx]->token;
         }
 
         return array(trim($statement), $query, $delimiter);
diff --git a/tests/Lexer/IsMethodsTest.php b/tests/Lexer/IsMethodsTest.php
@@ -64,13 +64,13 @@ public function testIsComment()
         $this->assertEquals(Token::FLAG_COMMENT_C, Context::isComment('*/'));
         $this->assertEquals(Token::FLAG_COMMENT_SQL, Context::isComment('-- '));
         $this->assertEquals(Token::FLAG_COMMENT_SQL, Context::isComment("--\t"));
+        $this->assertEquals(Token::FLAG_COMMENT_SQL, Context::isComment("--\n"));
 
         $this->assertEquals(Token::FLAG_COMMENT_BASH, Context::isComment('# a comment'));
         $this->assertEquals(Token::FLAG_COMMENT_C, Context::isComment('/*comment */'));
         $this->assertEquals(Token::FLAG_COMMENT_SQL, Context::isComment('-- my comment'));
 
-        $this->assertEquals(Context::isComment("--\n"), null);
-        $this->assertEquals(Context::isComment('--not a comment'), null);
+        $this->assertEquals(null, Context::isComment('--not a comment'));
     }
 
     public function testIsBool()
diff --git a/tests/Utils/QueryTest.php b/tests/Utils/QueryTest.php
@@ -359,7 +359,7 @@ public function testGetClause()
         $parser = new Parser(
             'SELECT c.city_id, c.country_id ' .
             'FROM `city` ' .
-            'WHERE city_id < 1 ' .
+            'WHERE city_id < 1 /* test */' .
             'ORDER BY city_id ASC ' .
             'LIMIT 0, 1 ' .
             'INTO OUTFILE "/dev/null"'
@@ -458,4 +458,43 @@ public function testRepalceClauses()
             )
         );
     }
+
+    public function testGetFirstStatement()
+    {
+        $query = 'USE saki';
+        $delimiter = null;
+        list($statement, $query, $delimiter) =
+            Query::getFirstStatement($query, $delimiter);
+        $this->assertEquals(null, $statement);
+        $this->assertEquals('USE saki', $query);
+
+        $query = 'USE sakila; ' .
+            '/*test comment*/' .
+            'SELECT * FROM actor; '.
+            'DELIMITER $$ ' .
+            'UPDATE actor SET last_name = "abc"$$' .
+            '/*!SELECT * FROM actor WHERE last_name = "abc"*/$$';
+        $delimiter = null;
+
+        list($statement, $query, $delimiter) =
+            Query::getFirstStatement($query, $delimiter);
+        $this->assertEquals('USE sakila;', $statement);
+
+        list($statement, $query, $delimiter) =
+            Query::getFirstStatement($query, $delimiter);
+        $this->assertEquals('SELECT * FROM actor;', $statement);
+
+        list($statement, $query, $delimiter) =
+            Query::getFirstStatement($query, $delimiter);
+        $this->assertEquals('DELIMITER $$', $statement);
+        $this->assertEquals('$$', $delimiter);
+
+        list($statement, $query, $delimiter) =
+            Query::getFirstStatement($query, $delimiter);
+        $this->assertEquals('UPDATE actor SET last_name = "abc"$$', $statement);
+
+        list($statement, $query, $delimiter) =
+            Query::getFirstStatement($query, $delimiter);
+        $this->assertEquals('/*!SELECT * FROM actor WHERE last_name = "abc"*/$$', $statement);
+    }
 }
diff --git a/tests/data/bugs/gh9.out b/tests/data/bugs/gh9.out
@@ -31,4 +31,4 @@ COMMIT;";s:3:"len";i:213;s:4:"last";i:213;s:4:"list";O:20:"SqlParser\TokensList"
 ";s:5:"value";s:1:" ";s:4:"type";i:3;s:5:"flags";i:0;s:8:"position";i:164;}i:55;O:15:"SqlParser\Token":5:{s:5:"token";s:5:"INDEX";s:5:"value";s:5:"INDEX";s:4:"type";i:1;s:5:"flags";i:19;s:8:"position";i:165;}i:56;O:15:"SqlParser\Token":5:{s:5:"token";s:1:" ";s:5:"value";s:1:" ";s:4:"type";i:3;s:5:"flags";i:0;s:8:"position";i:170;}i:57;O:15:"SqlParser\Token":5:{s:5:"token";s:1:"(";s:5:"value";s:1:"(";s:4:"type";i:2;s:5:"flags";i:16;s:8:"position";i:171;}i:58;O:15:"SqlParser\Token":5:{s:5:"token";s:1:" ";s:5:"value";s:1:" ";s:4:"type";i:3;s:5:"flags";i:0;s:8:"position";i:172;}i:59;O:15:"SqlParser\Token":5:{s:5:"token";s:10:"`position`";s:5:"value";s:8:"position";s:4:"type";i:8;s:5:"flags";i:2;s:8:"position";i:173;}i:60;O:15:"SqlParser\Token":5:{s:5:"token";s:1:" ";s:5:"value";s:1:" ";s:4:"type";i:3;s:5:"flags";i:0;s:8:"position";i:183;}i:61;O:15:"SqlParser\Token":5:{s:5:"token";s:1:")";s:5:"value";s:1:")";s:4:"type";i:2;s:5:"flags";i:16;s:8:"position";i:184;}i:62;O:15:"SqlParser\Token":5:{s:5:"token";s:1:"
 ";s:5:"value";s:1:" ";s:4:"type";i:3;s:5:"flags";i:0;s:8:"position";i:185;}i:63;O:15:"SqlParser\Token":5:{s:5:"token";s:1:")";s:5:"value";s:1:")";s:4:"type";i:2;s:5:"flags";i:16;s:8:"position";i:186;}i:64;O:15:"SqlParser\Token":5:{s:5:"token";s:1:" ";s:5:"value";s:1:" ";s:4:"type";i:3;s:5:"flags";i:0;s:8:"position";i:187;}i:65;O:15:"SqlParser\Token":5:{s:5:"token";s:6:"ENGINE";s:5:"value";s:6:"ENGINE";s:4:"type";i:1;s:5:"flags";i:1;s:8:"position";i:188;}i:66;O:15:"SqlParser\Token":5:{s:5:"token";s:1:" ";s:5:"value";s:1:" ";s:4:"type";i:3;s:5:"flags";i:0;s:8:"position";i:194;}i:67;O:15:"SqlParser\Token":5:{s:5:"token";s:1:"=";s:5:"value";s:1:"=";s:4:"type";i:2;s:5:"flags";i:2;s:8:"position";i:195;}i:68;O:15:"SqlParser\Token":5:{s:5:"token";s:1:" ";s:5:"value";s:1:" ";s:4:"type";i:3;s:5:"flags";i:0;s:8:"position";i:196;}i:69;O:15:"SqlParser\Token":5:{s:5:"token";s:6:"InnoDB";s:5:"value";s:6:"InnoDB";s:4:"type";i:0;s:5:"flags";i:0;s:8:"position";i:197;}i:70;O:15:"SqlParser\Token":5:{s:5:"token";s:1:";";s:5:"value";s:1:";";s:4:"type";i:9;s:5:"flags";i:0;s:8:"position";i:203;}i:71;O:15:"SqlParser\Token":5:{s:5:"token";s:2:"
 
-";s:5:"value";s:1:" ";s:4:"type";i:3;s:5:"flags";i:0;s:8:"position";i:204;}i:72;O:15:"SqlParser\Token":5:{s:5:"token";s:6:"COMMIT";s:5:"value";s:6:"COMMIT";s:4:"type";i:1;s:5:"flags";i:1;s:8:"position";i:206;}i:73;O:15:"SqlParser\Token":5:{s:5:"token";s:1:";";s:5:"value";s:1:";";s:4:"type";i:9;s:5:"flags";i:0;s:8:"position";i:212;}i:74;O:15:"SqlParser\Token":5:{s:5:"token";N;s:5:"value";N;s:4:"type";i:9;s:5:"flags";i:0;s:8:"position";N;}}s:5:"count";i:75;s:3:"idx";i:75;}s:9:"delimiter";s:1:";";s:12:"delimiterLen";i:1;s:6:"errors";a:0:{}}s:6:"parser";O:16:"SqlParser\Parser":4:{s:4:"list";r:8;s:6:"strict";b:0;s:6:"errors";a:0:{}s:10:"statements";a:3:{i:0;O:36:"SqlParser\Statements\SelectStatement":15:{s:4:"expr";a:1:{i:0;O:31:"SqlParser\Components\Expression":7:{s:8:"database";N;s:5:"table";N;s:6:"column";N;s:4:"expr";s:1:"*";s:5:"alias";N;s:8:"function";N;s:8:"subquery";N;}}s:4:"from";a:1:{i:0;O:31:"SqlParser\Components\Expression":7:{s:8:"database";N;s:5:"table";s:3:"foo";s:6:"column";N;s:4:"expr";s:3:"foo";s:5:"alias";N;s:8:"function";N;s:8:"subquery";N;}}s:9:"partition";N;s:5:"where";a:0:{}s:5:"group";N;s:6:"having";N;s:5:"order";N;s:5:"limit";N;s:9:"procedure";N;s:4:"into";N;s:4:"join";N;s:5:"union";a:0:{}s:7:"options";O:33:"SqlParser\Components\OptionsArray":1:{s:7:"options";a:0:{}}s:5:"first";i:0;s:4:"last";i:9;}i:1;O:36:"SqlParser\Statements\SelectStatement":15:{s:4:"expr";a:1:{i:0;O:31:"SqlParser\Components\Expression":7:{s:8:"database";N;s:5:"table";N;s:6:"column";N;s:4:"expr";s:1:"*";s:5:"alias";N;s:8:"function";N;s:8:"subquery";N;}}s:4:"from";a:1:{i:0;O:31:"SqlParser\Components\Expression":7:{s:8:"database";N;s:5:"table";s:3:"foo";s:6:"column";N;s:4:"expr";s:3:"foo";s:5:"alias";N;s:8:"function";N;s:8:"subquery";N;}}s:9:"partition";N;s:5:"where";a:0:{}s:5:"group";N;s:6:"having";N;s:5:"order";N;s:5:"limit";N;s:9:"procedure";N;s:4:"into";N;s:4:"join";N;s:5:"union";a:0:{}s:7:"options";O:33:"SqlParser\Components\OptionsArray":1:{s:7:"options";a:0:{}}s:5:"first";i:10;s:4:"last";i:19;}i:2;O:41:"SqlParser\Statements\TransactionStatement":6:{s:4:"type";i:1;s:10:"statements";a:1:{i:0;O:36:"SqlParser\Statements\CreateStatement":10:{s:4:"name";O:31:"SqlParser\Components\Expression":7:{s:8:"database";N;s:5:"table";s:2:"tb";s:6:"column";N;s:4:"expr";s:4:"`tb`";s:5:"alias";N;s:8:"function";N;s:8:"subquery";N;}s:13:"entityOptions";O:33:"SqlParser\Components\OptionsArray":1:{s:7:"options";a:0:{}}s:6:"fields";a:1:{i:0;O:36:"SqlParser\Components\FieldDefinition":6:{s:4:"name";s:3:"uid";s:12:"isConstraint";N;s:4:"type";O:29:"SqlParser\Components\DataType":3:{s:4:"name";s:3:"INT";s:10:"parameters";a:0:{}s:7:"options";O:33:"SqlParser\Components\OptionsArray":1:{s:7:"options";a:1:{i:4;s:8:"UNSIGNED";}}}s:3:"key";N;s:10:"references";N;s:7:"options";O:33:"SqlParser\Components\OptionsArray":1:{s:7:"options";a:1:{i:1;s:8:"NOT NULL";}}}}s:5:"table";N;s:6:"return";N;s:10:"parameters";N;s:4:"body";a:0:{}s:7:"options";O:33:"SqlParser\Components\OptionsArray":1:{s:7:"options";a:1:{i:6;s:5:"TABLE";}}s:5:"first";i:21;s:4:"last";i:37;}}s:3:"end";O:41:"SqlParser\Statements\TransactionStatement":6:{s:4:"type";i:2;s:10:"statements";N;s:3:"end";N;s:7:"options";O:33:"SqlParser\Components\OptionsArray":1:{s:7:"options";a:1:{i:1;s:6:"COMMIT";}}s:5:"first";i:72;s:4:"last";i:72;}s:7:"options";O:33:"SqlParser\Components\OptionsArray":1:{s:7:"options";a:1:{i:1;s:17:"START TRANSACTION";}}s:5:"first";i:20;s:4:"last";i:20;}}}s:6:"errors";a:2:{s:5:"lexer";a:0:{}s:6:"parser";a:5:{i:0;a:3:{i:0;s:42:"This type of clause was previously parsed.";i:1;r:70;i:2;i:0;}i:1;a:3:{i:0;s:57:"A new statement was found, but no delimiter between them.";i:1;r:130;i:2;i:0;}i:2;a:3:{i:0;s:42:"A comma or a closing bracket was expected.";i:1;r:238;i:2;i:0;}i:3;a:3:{i:0;s:34:"Unexpected beginning of statement.";i:1;r:238;i:2;i:0;}i:4;a:3:{i:0;s:28:"Unrecognized statement type.";i:1;r:250;i:2;i:0;}}}}
+";s:5:"value";s:1:" ";s:4:"type";i:3;s:5:"flags";i:0;s:8:"position";i:204;}i:72;O:15:"SqlParser\Token":5:{s:5:"token";s:6:"COMMIT";s:5:"value";s:6:"COMMIT";s:4:"type";i:1;s:5:"flags";i:1;s:8:"position";i:206;}i:73;O:15:"SqlParser\Token":5:{s:5:"token";s:1:";";s:5:"value";s:1:";";s:4:"type";i:9;s:5:"flags";i:0;s:8:"position";i:212;}i:74;O:15:"SqlParser\Token":5:{s:5:"token";N;s:5:"value";N;s:4:"type";i:9;s:5:"flags";i:0;s:8:"position";N;}}s:5:"count";i:75;s:3:"idx";i:75;}s:9:"delimiter";s:1:";";s:12:"delimiterLen";i:1;s:6:"errors";a:0:{}}s:6:"parser";O:16:"SqlParser\Parser":4:{s:4:"list";r:8;s:6:"strict";b:0;s:6:"errors";a:0:{}s:10:"statements";a:3:{i:0;O:36:"SqlParser\Statements\SelectStatement":15:{s:4:"expr";a:1:{i:0;O:31:"SqlParser\Components\Expression":7:{s:8:"database";N;s:5:"table";N;s:6:"column";N;s:4:"expr";s:1:"*";s:5:"alias";N;s:8:"function";N;s:8:"subquery";N;}}s:4:"from";a:1:{i:0;O:31:"SqlParser\Components\Expression":7:{s:8:"database";N;s:5:"table";s:3:"foo";s:6:"column";N;s:4:"expr";s:3:"foo";s:5:"alias";N;s:8:"function";N;s:8:"subquery";N;}}s:9:"partition";N;s:5:"where";a:0:{}s:5:"group";N;s:6:"having";N;s:5:"order";N;s:5:"limit";N;s:9:"procedure";N;s:4:"into";N;s:4:"join";N;s:5:"union";a:0:{}s:7:"options";O:33:"SqlParser\Components\OptionsArray":1:{s:7:"options";a:0:{}}s:5:"first";i:0;s:4:"last";i:9;}i:1;O:36:"SqlParser\Statements\SelectStatement":15:{s:4:"expr";a:1:{i:0;O:31:"SqlParser\Components\Expression":7:{s:8:"database";N;s:5:"table";N;s:6:"column";N;s:4:"expr";s:1:"*";s:5:"alias";N;s:8:"function";N;s:8:"subquery";N;}}s:4:"from";a:1:{i:0;O:31:"SqlParser\Components\Expression":7:{s:8:"database";N;s:5:"table";s:3:"foo";s:6:"column";N;s:4:"expr";s:3:"foo";s:5:"alias";N;s:8:"function";N;s:8:"subquery";N;}}s:9:"partition";N;s:5:"where";a:0:{}s:5:"group";N;s:6:"having";N;s:5:"order";N;s:5:"limit";N;s:9:"procedure";N;s:4:"into";N;s:4:"join";N;s:5:"union";a:0:{}s:7:"options";O:33:"SqlParser\Components\OptionsArray":1:{s:7:"options";a:0:{}}s:5:"first";i:10;s:4:"last";i:19;}i:2;O:41:"SqlParser\Statements\TransactionStatement":6:{s:4:"type";i:1;s:10:"statements";a:1:{i:0;O:36:"SqlParser\Statements\CreateStatement":10:{s:4:"name";O:31:"SqlParser\Components\Expression":7:{s:8:"database";N;s:5:"table";s:2:"tb";s:6:"column";N;s:4:"expr";s:4:"`tb`";s:5:"alias";N;s:8:"function";N;s:8:"subquery";N;}s:13:"entityOptions";O:33:"SqlParser\Components\OptionsArray":1:{s:7:"options";a:0:{}}s:6:"fields";a:1:{i:0;O:36:"SqlParser\Components\FieldDefinition":6:{s:4:"name";s:3:"uid";s:12:"isConstraint";N;s:4:"type";O:29:"SqlParser\Components\DataType":3:{s:4:"name";s:3:"INT";s:10:"parameters";a:0:{}s:7:"options";O:33:"SqlParser\Components\OptionsArray":1:{s:7:"options";a:1:{i:4;s:8:"UNSIGNED";}}}s:3:"key";N;s:10:"references";N;s:7:"options";O:33:"SqlParser\Components\OptionsArray":1:{s:7:"options";a:1:{i:1;s:8:"NOT NULL";}}}}s:5:"table";N;s:6:"return";N;s:10:"parameters";N;s:4:"body";a:0:{}s:7:"options";O:33:"SqlParser\Components\OptionsArray":1:{s:7:"options";a:1:{i:6;s:5:"TABLE";}}s:5:"first";i:21;s:4:"last";i:37;}}s:3:"end";O:41:"SqlParser\Statements\TransactionStatement":6:{s:4:"type";i:2;s:10:"statements";N;s:3:"end";N;s:7:"options";O:33:"SqlParser\Components\OptionsArray":1:{s:7:"options";a:1:{i:1;s:6:"COMMIT";}}s:5:"first";i:72;s:4:"last";i:72;}s:7:"options";O:33:"SqlParser\Components\OptionsArray":1:{s:7:"options";a:1:{i:1;s:17:"START TRANSACTION";}}s:5:"first";i:20;s:4:"last";i:20;}}}s:6:"errors";a:2:{s:5:"lexer";a:0:{}s:6:"parser";a:5:{i:0;a:3:{i:0;s:42:"This type of clause was previously parsed.";i:1;r:70;i:2;i:0;}i:1;a:3:{i:0;s:76:"A new statement was found, but no delimiter between it and the previous one.";i:1;r:130;i:2;i:0;}i:2;a:3:{i:0;s:42:"A comma or a closing bracket was expected.";i:1;r:238;i:2;i:0;}i:3;a:3:{i:0;s:34:"Unexpected beginning of statement.";i:1;r:238;i:2;i:0;}i:4;a:3:{i:0;s:28:"Unrecognized statement type.";i:1;r:250;i:2;i:0;}}}}
diff --git a/tests/data/lexer/lexComment.out b/tests/data/lexer/lexComment.out

Original file line number	Diff line number	Diff line change
`@@ -506,7 +506,7 @@ public function parseComment()`
`506`	`506`	`while ((++$this->last < $this->len) && ($this->str[$this->last] !== "\n")) {`
`507`	`507`	`$token .= $this->str[$this->last];`
`508`	`508`	`}`
`509`		`- $token .= $this->str[$this->last];`
	`509`	`+ $token .= "\n"; // Adding the line ending.`
`510`	`510`	`return new Token($token, Token::TYPE_COMMENT, Token::FLAG_COMMENT_BASH);`
`511`	`511`	`}`
`512`	`512`
`@@ -519,11 +519,14 @@ public function parseComment()`
`519`	`519`	`// It is a MySQL-specific command.`
`520`	`520`	`$flags \|= Token::FLAG_COMMENT_MYSQL_CMD;`
`521`	`521`	`}`
`522`		`- while ((++$this->last < $this->len) &&`
`523`		`- (($this->str[$this->last - 1] !== '*') \|\| ($this->str[$this->last] !== '/'))) {`
	`522`	`+ while ((++$this->last < $this->len)`
	`523`	`+ && (($this->str[$this->last - 1] !== '*') \|\| ($this->str[$this->last] !== '/'))`
	`524`	`+ ) {`
	`525`	`+ $token .= $this->str[$this->last];`
	`526`	`+ }`
	`527`	`+ if ($this->last < $this->len) {`
`524`	`528`	`$token .= $this->str[$this->last];`
`525`	`529`	`}`
`526`		`- $token .= $this->str[$this->last];`
`527`	`530`	`return new Token($token, Token::TYPE_COMMENT, $flags);`
`528`	`531`	`}`
`529`	`532`	`}`
`@@ -532,14 +535,12 @@ public function parseComment()`
`532`	`535`	`if (++$this->last < $this->len) {`
`533`	`536`	`$token .= $this->str[$this->last];`
`534`	`537`	`if (Context::isComment($token)) {`
	`538`	+ // Checking if this comment did not end already (```--\n```).
`535`	`539`	`if ($this->str[$this->last] !== "\n") {`
`536`		- // Checking if this comment did not end already (```--\n```).
`537`	`540`	`while ((++$this->last < $this->len) && ($this->str[$this->last] !== "\n")) {`
`538`	`541`	`$token .= $this->str[$this->last];`
`539`	`542`	`}`
`540`		`-`
`541`		`- // Adding the line ending.`
`542`		`- $token .= "\n";`
	`543`	`+ $token .= "\n"; // Adding the line ending.`
`543`	`544`	`}`
`544`	`545`	`return new Token($token, Token::TYPE_COMMENT, Token::FLAG_COMMENT_SQL);`
`545`	`546`	`}`
`@@ -779,13 +780,17 @@ public function parseSymbol()`
`779`	`780`	`$token = '';`
`780`	`781`	`}`
`781`	`782`
`782`		- if (($str = $this->parseString('`')) === null) {
`783`		`- if (($str = static::parseUnknown()) === null) {`
`784`		`- $this->error(`
`785`		`- __('Variable name was expected.'),`
`786`		`- $this->str[$this->last],`
`787`		`- $this->last`
`788`		`- );`
	`783`	`+ $str = null;`
	`784`	`+`
	`785`	`+ if ($this->last < $this->len) {`
	`786`	+ if (($str = $this->parseString('`')) === null) {
	`787`	`+ if (($str = static::parseUnknown()) === null) {`
	`788`	`+ $this->error(`
	`789`	`+ __('Variable name was expected.'),`
	`790`	`+ $this->str[$this->last],`
	`791`	`+ $this->last`
	`792`	`+ );`
	`793`	`+ }`
`789`	`794`	`}`
`790`	`795`	`}`
`791`	`796`
`@@ -823,7 +828,7 @@ public function parseDelimiter()`
`823`	`828`	`{`
`824`	`829`	`$idx = 0;`
`825`	`830`
`826`		`- while ($idx < $this->delimiterLen) {`
	`831`	`+ while (($idx < $this->delimiterLen) && ($this->last + $idx < $this->len)) {`
`827`	`832`	`if ($this->delimiter[$idx] !== $this->str[$this->last + $idx]) {`
`828`	`833`	`return null;`
`829`	`834`	`}`