iliaa Mon Nov 26 21:09:50 2007 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/pdo pdo_sql_parser.c pdo_sql_parser.re Log: Revert addition of - char support for bound param names http://cvs.php.net/viewvc.cgi/php-src/ext/pdo/pdo_sql_parser.c?r1=1.35.2.6.2.12.2.1&r2=1.35.2.6.2.12.2.2&diff_format=u Index: php-src/ext/pdo/pdo_sql_parser.c diff -u php-src/ext/pdo/pdo_sql_parser.c:1.35.2.6.2.12.2.1 php-src/ext/pdo/pdo_sql_parser.c:1.35.2.6.2.12.2.2 --- php-src/ext/pdo/pdo_sql_parser.c:1.35.2.6.2.12.2.1 Mon Oct 29 22:36:26 2007 +++ php-src/ext/pdo/pdo_sql_parser.c Mon Nov 26 21:09:50 2007 @@ -1,4 +1,4 @@ -/* Generated by re2c 0.11.0 on Mon Oct 29 18:26:12 2007 */ +/* Generated by re2c 0.11.0 on Mon Nov 26 15:18:37 2007 */ #line 1 "ext/pdo/pdo_sql_parser.re" /* +----------------------------------------------------------------------+ @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: pdo_sql_parser.c,v 1.35.2.6.2.12.2.1 2007/10/29 22:36:26 iliaa Exp $ */ +/* $Id: pdo_sql_parser.c,v 1.35.2.6.2.12.2.2 2007/11/26 21:09:50 iliaa Exp $ */ #include "php.h" #include "php_pdo_driver.h" @@ -78,7 +78,6 @@ yy5: yych = *++YYCURSOR; switch(yych) { - case '-': case '0': case '1': case '2': @@ -156,7 +155,7 @@ yy7: #line 62 "ext/pdo/pdo_sql_parser.re" { RET(PDO_PARSER_BIND_POS); } -#line 160 "ext/pdo/pdo_sql_parser.c" +#line 159 "ext/pdo/pdo_sql_parser.c" yy8: ++YYCURSOR; if(YYLIMIT == YYCURSOR) YYFILL(1); @@ -172,12 +171,12 @@ yy10: #line 64 "ext/pdo/pdo_sql_parser.re" { RET(PDO_PARSER_TEXT); } -#line 176 "ext/pdo/pdo_sql_parser.c" +#line 175 "ext/pdo/pdo_sql_parser.c" yy11: ++YYCURSOR; #line 65 "ext/pdo/pdo_sql_parser.re" { RET(PDO_PARSER_EOI); } -#line 181 "ext/pdo/pdo_sql_parser.c" +#line 180 "ext/pdo/pdo_sql_parser.c" yy13: ++YYCURSOR; if(YYLIMIT == YYCURSOR) YYFILL(1); @@ -190,13 +189,12 @@ yy15: #line 60 "ext/pdo/pdo_sql_parser.re" { RET(PDO_PARSER_TEXT); } -#line 194 "ext/pdo/pdo_sql_parser.c" +#line 193 "ext/pdo/pdo_sql_parser.c" yy16: ++YYCURSOR; if(YYLIMIT == YYCURSOR) YYFILL(1); yych = *YYCURSOR; switch(yych) { - case '-': case '0': case '1': case '2': @@ -265,7 +263,7 @@ yy18: #line 61 "ext/pdo/pdo_sql_parser.re" { RET(PDO_PARSER_BIND); } -#line 269 "ext/pdo/pdo_sql_parser.c" +#line 267 "ext/pdo/pdo_sql_parser.c" yy19: ++YYCURSOR; if(YYLIMIT == YYCURSOR) YYFILL(1); @@ -279,7 +277,7 @@ ++YYCURSOR; #line 59 "ext/pdo/pdo_sql_parser.re" { RET(PDO_PARSER_TEXT); } -#line 283 "ext/pdo/pdo_sql_parser.c" +#line 281 "ext/pdo/pdo_sql_parser.c" yy23: ++YYCURSOR; if(YYLIMIT == YYCURSOR) YYFILL(1); @@ -293,7 +291,7 @@ ++YYCURSOR; #line 58 "ext/pdo/pdo_sql_parser.re" { RET(PDO_PARSER_TEXT); } -#line 297 "ext/pdo/pdo_sql_parser.c" +#line 295 "ext/pdo/pdo_sql_parser.c" } #line 66 "ext/pdo/pdo_sql_parser.re" http://cvs.php.net/viewvc.cgi/php-src/ext/pdo/pdo_sql_parser.re?r1=1.28.2.4.2.9.2.1&r2=1.28.2.4.2.9.2.2&diff_format=u Index: php-src/ext/pdo/pdo_sql_parser.re diff -u php-src/ext/pdo/pdo_sql_parser.re:1.28.2.4.2.9.2.1 php-src/ext/pdo/pdo_sql_parser.re:1.28.2.4.2.9.2.2 --- php-src/ext/pdo/pdo_sql_parser.re:1.28.2.4.2.9.2.1 Mon Oct 29 22:36:26 2007 +++ php-src/ext/pdo/pdo_sql_parser.re Mon Nov 26 21:09:50 2007 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: pdo_sql_parser.re,v 1.28.2.4.2.9.2.1 2007/10/29 22:36:26 iliaa Exp $ */ +/* $Id: pdo_sql_parser.re,v 1.28.2.4.2.9.2.2 2007/11/26 21:09:50 iliaa Exp $ */ #include "php.h" #include "php_pdo_driver.h" @@ -46,7 +46,7 @@ s->tok = cursor; /*!re2c - BINDCHR = [:][a-zA-Z0-9_-]+; + BINDCHR = [:][a-zA-Z0-9_]+; QUESTION = [?]; SPECIALS = [:?"']; MULTICHAR = [:?];
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php