pdo_mysql: "--" should be followed by a whitespace character

This required changing how YYFILL works, with no apparent regressions

Author: mbeccati

ext/pdo/pdo_sql_parser.h

@@ -30,4 +30,4 @@
 #define YYCURSOR        cursor
 #define YYLIMIT         s->end
 #define YYMARKER        s->ptr
-#define YYFILL(n)		{ RET(PDO_PARSER_EOI); }
+#define YYFILL(n)		{ if (YYLIMIT - 1 <= YYCURSOR) RET(PDO_PARSER_EOI); }

ext/pdo/pdo_sql_parser.re

@@ -27,7 +27,7 @@ static int default_scanner(pdo_scanner_t *s)
 	/*!re2c
 	BINDCHR		= [:][a-zA-Z0-9_]+;
 	QUESTION	= [?];
-	COMMENTS	= ("/*"([^*]+|[*]+[^/*])*[*]*"*/"|"--"[^\r\n]*);
+	COMMENTS	= ("/*"([^*]+|[*]+[^/*])*[*]*"*/"|"--".*);
 	SPECIALS	= [:?"'/-];
 	MULTICHAR	= ([:]{2,}|[?]{2,});
 	ANYNOEOF	= [\001-\377];

ext/pdo_mysql/mysql_sql_parser.re

@@ -28,7 +28,7 @@ int pdo_mysql_scanner(pdo_scanner_t *s)
 	/*!re2c
 	BINDCHR		= [:][a-zA-Z0-9_]+;
 	QUESTION	= [?];
-	COMMENTS	= ("/*"([^*]+|[*]+[^/*])*[*]*"*/"|("--"|[#])[^\r\n]*);
+	COMMENTS	= ("/*"([^*]+|[*]+[^/*])*[*]*"*/"|(("--"[ \t\v\f\r])|[#]).*);
 	SPECIALS	= [:?"'`/#-];
 	MULTICHAR	= ([:]{2,}|[?]{2,});
 	ANYNOEOF	= [\001-\377];

ext/pdo_mysql/tests/pdo_mysql_parser.phpt

@@ -29,30 +29,40 @@ $queries = [
 foreach ($queries as $k => $query) {
     $stmt = $db->prepare($query);
     $stmt->execute();
-    var_dump($stmt->fetch(PDO::FETCH_NUM) === [0 => 1]);
+    var_dump($query, $stmt->fetch(PDO::FETCH_NUM) === [0 => 1]);
 }
 
 // One parameter
 $queries = [
     "SELECT * FROM {$table} WHERE 1 = ?",
+    "SELECT * FROM {$table} WHERE 1 = --?",
     "SELECT * FROM {$table} WHERE \"?\" IN (?, '?')",
     "SELECT * FROM {$table} WHERE `a``?` = ?",
 ];
 
 foreach ($queries as $k => $query) {
     $stmt = $db->prepare($query);
     $stmt->execute([1]);
-    var_dump($stmt->fetch(PDO::FETCH_NUM) === [0 => 1]);
+    var_dump($query, $stmt->fetch(PDO::FETCH_NUM) === [0 => 1]);
 }
 
 $db->exec("DROP TABLE pdo_mysql_parser");
 
 ?>
 --EXPECT--
+string(30) "SELECT * FROM pdo_mysql_parser"
 bool(true)
+string(35) "SELECT * FROM pdo_mysql_parser -- ?"
 bool(true)
+string(34) "SELECT * FROM pdo_mysql_parser # ?"
 bool(true)
+string(38) "SELECT * FROM pdo_mysql_parser /* ? */"
 bool(true)
+string(42) "SELECT * FROM pdo_mysql_parser WHERE 1 = ?"
 bool(true)
+string(44) "SELECT * FROM pdo_mysql_parser WHERE 1 = --?"
 bool(true)
+string(52) "SELECT * FROM pdo_mysql_parser WHERE "?" IN (?, '?')"
+bool(true)
+string(47) "SELECT * FROM pdo_mysql_parser WHERE `a``?` = ?"
 bool(true)