Lex system variables as symbols. Fixed #13.

udan11 · udan11 · commit a36dbf270118 · 2015-08-12T21:59:06.000+03:00
diff --git a/src/Lexer.php b/src/Lexer.php
@@ -799,7 +799,11 @@ public function parseSymbol()
             }
 
             if ($flags & Token::FLAG_SYMBOL_VARIABLE) {
-                ++$this->last;
+                if ($this->str[++$this->last] === '@') {
+                    // This is a system variable (e.g. `@@hostname`).
+                    $token .= $this->str[$this->last++];
+                    $flags |= Token::FLAG_SYMBOL_SYSTEM;
+                }
             } else {
                 $token = '';
             }
diff --git a/src/Token.php b/src/Token.php
@@ -157,6 +157,7 @@ class Token
     const FLAG_SYMBOL_VARIABLE          =  1;
     const FLAG_SYMBOL_BACKTICK          =  2;
     const FLAG_SYMBOL_USER              =  4;
+    const FLAG_SYMBOL_SYSTEM            =  8;
 
     /**
      * The token it its raw string representation.
@@ -256,7 +257,12 @@ public function extract()
             if ((isset($str[0])) && ($str[0] === '@')) {
                 // `mb_strlen($str)` must be used instead of `null` because
                 // in PHP 5.3- the `null` parameter isn't handled correctly.
-                $str = mb_substr($str, 1, mb_strlen($str), 'UTF-8');
+                $str = mb_substr(
+                    $str,
+                    ((!empty($str[1])) && ($str[1] === '@')) ? 2 : 1,
+                    mb_strlen($str),
+                    'UTF-8'
+                );
             }
             if ((isset($str[0])) && (($str[0] === '`')
                 || ($str[0] === '"') || ($str[0] === '\''))
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
@@ -66,7 +66,9 @@ public function getErrorsAsArray($obj)
      */
     public function getData($name)
     {
-        return unserialize(file_get_contents('tests/data/' . $name . '.out'));
+        $data = unserialize(file_get_contents('tests/data/' . $name . '.out'));
+        $data['query'] = file_get_contents('tests/data/' . $name . '.in');
+        return $data;
     }
 
     /**
diff --git a/tests/data/lexer/lexSymbol.in b/tests/data/lexer/lexSymbol.in
@@ -1,2 +1,2 @@
 SET @idx := 1;
-SELECT @idx, @`idx`, @'idx'
+SELECT @idx, @`idx`, @'idx', @@hostname
diff --git a/tests/data/lexer/lexSymbol.out b/tests/data/lexer/lexSymbol.out
@@ -1,4 +1,4 @@
-a:4:{s:5:"query";s:42:"SET @idx := 1;
-SELECT @idx, @`idx`, @'idx'";s:5:"lexer";O:15:"SqlParser\Lexer":8:{s:6:"strict";b:0;s:3:"str";s:42:"SET @idx := 1;
-SELECT @idx, @`idx`, @'idx'";s:3:"len";i:42;s:4:"last";i:42;s:4:"list";O:20:"SqlParser\TokensList":3:{s:6:"tokens";a:19:{i:0;O:15:"SqlParser\Token":5:{s:5:"token";s:3:"SET";s:5:"value";s:3:"SET";s:4:"type";i:1;s:5:"flags";i:11;s:8:"position";i:0;}i:1;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:3;}i:2;O:15:"SqlParser\Token":5:{s:5:"token";s:4:"@idx";s:5:"value";s:3:"idx";s:4:"type";i:8;s:5:"flags";i:1;s:8:"position";i:4;}i:3;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:8;}i:4;O:15:"SqlParser\Token":5:{s:5:"token";s:2:":=";s:5:"value";s:2:":=";s:4:"type";i:2;s:5:"flags";i:8;s:8:"position";i:9;}i:5;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:11;}i:6;O:15:"SqlParser\Token":5:{s:5:"token";s:1:"1";s:5:"value";i:1;s:4:"type";i:6;s:5:"flags";i:0;s:8:"position";i:12;}i:7;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:13;}i:8;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:14;}i:9;O:15:"SqlParser\Token":5:{s:5:"token";s:6:"SELECT";s:5:"value";s:6:"SELECT";s:4:"type";i:1;s:5:"flags";i:3;s:8:"position";i:15;}i:10;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:21;}i:11;O:15:"SqlParser\Token":5:{s:5:"token";s:4:"@idx";s:5:"value";s:3:"idx";s:4:"type";i:8;s:5:"flags";i:1;s:8:"position";i:22;}i:12;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:26;}i:13;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:27;}i:14;O:15:"SqlParser\Token":5:{s:5:"token";s:6:"@`idx`";s:5:"value";s:3:"idx";s:4:"type";i:8;s:5:"flags";i:1;s:8:"position";i:28;}i:15;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:34;}i:16;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:35;}i:17;O:15:"SqlParser\Token":5:{s:5:"token";s:6:"@'idx'";s:5:"value";s:3:"idx";s:4:"type";i:8;s:5:"flags";i:1;s:8:"position";i:36;}i:18;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:19;s:3:"idx";i:0;}s:9:"delimiter";s:1:";";s:12:"delimiterLen";i:1;s:6:"errors";a:0:{}}s:6:"parser";N;s:6:"errors";a:2:{s:5:"lexer";a:0:{}s:6:"parser";a:0:{}}}
+a:4:{s:5:"query";s:54:"SET @idx := 1;
+SELECT @idx, @`idx`, @'idx', @@hostname";s:5:"lexer";O:15:"SqlParser\Lexer":8:{s:6:"strict";b:0;s:3:"str";s:54:"SET @idx := 1;
+SELECT @idx, @`idx`, @'idx', @@hostname";s:3:"len";i:54;s:4:"last";i:54;s:4:"list";O:20:"SqlParser\TokensList":3:{s:6:"tokens";a:22:{i:0;O:15:"SqlParser\Token":5:{s:5:"token";s:3:"SET";s:5:"value";s:3:"SET";s:4:"type";i:1;s:5:"flags";i:11;s:8:"position";i:0;}i:1;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:3;}i:2;O:15:"SqlParser\Token":5:{s:5:"token";s:4:"@idx";s:5:"value";s:3:"idx";s:4:"type";i:8;s:5:"flags";i:1;s:8:"position";i:4;}i:3;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:8;}i:4;O:15:"SqlParser\Token":5:{s:5:"token";s:2:":=";s:5:"value";s:2:":=";s:4:"type";i:2;s:5:"flags";i:8;s:8:"position";i:9;}i:5;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:11;}i:6;O:15:"SqlParser\Token":5:{s:5:"token";s:1:"1";s:5:"value";i:1;s:4:"type";i:6;s:5:"flags";i:0;s:8:"position";i:12;}i:7;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:13;}i:8;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:14;}i:9;O:15:"SqlParser\Token":5:{s:5:"token";s:6:"SELECT";s:5:"value";s:6:"SELECT";s:4:"type";i:1;s:5:"flags";i:3;s:8:"position";i:15;}i:10;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:21;}i:11;O:15:"SqlParser\Token":5:{s:5:"token";s:4:"@idx";s:5:"value";s:3:"idx";s:4:"type";i:8;s:5:"flags";i:1;s:8:"position";i:22;}i:12;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:26;}i:13;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:27;}i:14;O:15:"SqlParser\Token":5:{s:5:"token";s:6:"@`idx`";s:5:"value";s:3:"idx";s:4:"type";i:8;s:5:"flags";i:1;s:8:"position";i:28;}i:15;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:34;}i:16;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:35;}i:17;O:15:"SqlParser\Token":5:{s:5:"token";s:6:"@'idx'";s:5:"value";s:3:"idx";s:4:"type";i:8;s:5:"flags";i:1;s:8:"position";i:36;}i:18;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:42;}i:19;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:43;}i:20;O:15:"SqlParser\Token":5:{s:5:"token";s:10:"@@hostname";s:5:"value";s:8:"hostname";s:4:"type";i:8;s:5:"flags";i:9;s:8:"position";i:44;}i:21;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:22;s:3:"idx";i:0;}s:9:"delimiter";s:1:";";s:12:"delimiterLen";i:1;s:6:"errors";a:0:{}}s:6:"parser";N;s:6:"errors";a:2:{s:5:"lexer";a:0:{}s:6:"parser";a:0:{}}}

Original file line number	Diff line number	Diff line change
`@@ -799,7 +799,11 @@ public function parseSymbol()`
`799`	`799`	`}`
`800`	`800`
`801`	`801`	`if ($flags & Token::FLAG_SYMBOL_VARIABLE) {`
`802`		`- ++$this->last;`
	`802`	`+ if ($this->str[++$this->last] === '@') {`
	`803`	+ // This is a system variable (e.g. `@@hostname`).
	`804`	`+ $token .= $this->str[$this->last++];`
	`805`	`+ $flags \|= Token::FLAG_SYMBOL_SYSTEM;`
	`806`	`+ }`
`803`	`807`	`} else {`
`804`	`808`	`$token = '';`
`805`	`809`	`}`
Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,9 @@ public function getErrorsAsArray($obj)`
`66`	`66`	`*/`
`67`	`67`	`public function getData($name)`
`68`	`68`	`{`
`69`		`- return unserialize(file_get_contents('tests/data/' . $name . '.out'));`
	`69`	`+ $data = unserialize(file_get_contents('tests/data/' . $name . '.out'));`
	`70`	`+ $data['query'] = file_get_contents('tests/data/' . $name . '.in');`
	`71`	`+ return $data;`
`70`	`72`	`}`
`71`	`73`
`72`	`74`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`SET @idx := 1;`
`2`		-SELECT @idx, @`idx`, @'idx'
	`2`	+SELECT @idx, @`idx`, @'idx', @@hostname