--- embedaddon/php/ext/pdo/pdo_sql_parser.re 2013/07/22 01:31:55 1.1.1.3 +++ embedaddon/php/ext/pdo/pdo_sql_parser.re 2013/10/14 08:02:24 1.1.1.4 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: pdo_sql_parser.re,v 1.1.1.3 2013/07/22 01:31:55 misho Exp $ */ +/* $Id: pdo_sql_parser.re,v 1.1.1.4 2013/10/14 08:02:24 misho Exp $ */ #include "php.h" #include "php_pdo_driver.h" @@ -50,14 +50,14 @@ static int scan(Scanner *s) QUESTION = [?]; COMMENTS = ("/*"([^*]+|[*]+[^/*])*[*]*"*/"|"--"[^\r\n]*); SPECIALS = [:?"']; - MULTICHAR = [:?]; + MULTICHAR = ([:]{2,}|[?]{2,}); ANYNOEOF = [\001-\377]; */ /*!re2c (["](([\\]ANYNOEOF)|ANYNOEOF\["\\])*["]) { RET(PDO_PARSER_TEXT); } (['](([\\]ANYNOEOF)|ANYNOEOF\['\\])*[']) { RET(PDO_PARSER_TEXT); } - MULTICHAR{2,} { RET(PDO_PARSER_TEXT); } + MULTICHAR { RET(PDO_PARSER_TEXT); } BINDCHR { RET(PDO_PARSER_BIND); } QUESTION { RET(PDO_PARSER_BIND_POS); } SPECIALS { SKIP_ONE(PDO_PARSER_TEXT); }