iliaa Mon Nov 26 21:10:19 2007 UTC Modified files: /php-src/ext/pdo pdo_sql_parser.c pdo_sql_parser.re Log: MFB: 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.55&r2=1.56&diff_format=u Index: php-src/ext/pdo/pdo_sql_parser.c diff -u php-src/ext/pdo/pdo_sql_parser.c:1.55 php-src/ext/pdo/pdo_sql_parser.c:1.56 --- php-src/ext/pdo/pdo_sql_parser.c:1.55 Mon Oct 29 22:37:44 2007 +++ php-src/ext/pdo/pdo_sql_parser.c Mon Nov 26 21:10:18 2007 @@ -1,4 +1,4 @@ -/* Generated by re2c 0.11.0 on Mon Oct 29 18:37:31 2007 */ +/* Generated by re2c 0.11.0 on Mon Nov 26 16:10:00 2007 */ #line 1 "ext/pdo/pdo_sql_parser.re" /* +----------------------------------------------------------------------+ @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: pdo_sql_parser.c,v 1.55 2007/10/29 22:37:44 iliaa Exp $ */ +/* $Id: pdo_sql_parser.c,v 1.56 2007/11/26 21:10:18 iliaa Exp $ */ #include "php.h" #include "php_pdo_driver.h" @@ -94,7 +94,6 @@ case '\'': case ':': case '?': goto yy13; - case '-': case '0': case '1': case '2': @@ -172,7 +171,7 @@ yy7: #line 61 "ext/pdo/pdo_sql_parser.re" { RET(PDO_PARSER_BIND_POS); } -#line 176 "ext/pdo/pdo_sql_parser.c" +#line 175 "ext/pdo/pdo_sql_parser.c" yy8: ++YYCURSOR; if(YYLIMIT == YYCURSOR) YYFILL(1); @@ -188,12 +187,12 @@ yy10: #line 63 "ext/pdo/pdo_sql_parser.re" { RET(PDO_PARSER_TEXT); } -#line 192 "ext/pdo/pdo_sql_parser.c" +#line 191 "ext/pdo/pdo_sql_parser.c" yy11: ++YYCURSOR; #line 64 "ext/pdo/pdo_sql_parser.re" { RET(PDO_PARSER_EOI); } -#line 197 "ext/pdo/pdo_sql_parser.c" +#line 196 "ext/pdo/pdo_sql_parser.c" yy13: ++YYCURSOR; if(YYLIMIT == YYCURSOR) YYFILL(1); @@ -208,13 +207,12 @@ yy15: #line 59 "ext/pdo/pdo_sql_parser.re" { RET(PDO_PARSER_TEXT); } -#line 212 "ext/pdo/pdo_sql_parser.c" +#line 211 "ext/pdo/pdo_sql_parser.c" yy16: ++YYCURSOR; if(YYLIMIT == YYCURSOR) YYFILL(1); yych = *YYCURSOR; switch(yych) { - case '-': case '0': case '1': case '2': @@ -283,7 +281,7 @@ yy18: #line 60 "ext/pdo/pdo_sql_parser.re" { RET(PDO_PARSER_BIND); } -#line 287 "ext/pdo/pdo_sql_parser.c" +#line 285 "ext/pdo/pdo_sql_parser.c" yy19: if((YYLIMIT - YYCURSOR) < 2) YYFILL(2); yych = *YYCURSOR; @@ -306,7 +304,7 @@ yy22: #line 58 "ext/pdo/pdo_sql_parser.re" { RET(PDO_PARSER_TEXT); } -#line 310 "ext/pdo/pdo_sql_parser.c" +#line 308 "ext/pdo/pdo_sql_parser.c" yy23: ++YYCURSOR; if(YYLIMIT == YYCURSOR) YYFILL(1); @@ -330,7 +328,7 @@ yy27: #line 57 "ext/pdo/pdo_sql_parser.re" { RET(PDO_PARSER_TEXT); } -#line 334 "ext/pdo/pdo_sql_parser.c" +#line 332 "ext/pdo/pdo_sql_parser.c" yy28: if((YYLIMIT - YYCURSOR) < 2) YYFILL(2); yych = *YYCURSOR; http://cvs.php.net/viewvc.cgi/php-src/ext/pdo/pdo_sql_parser.re?r1=1.41&r2=1.42&diff_format=u Index: php-src/ext/pdo/pdo_sql_parser.re diff -u php-src/ext/pdo/pdo_sql_parser.re:1.41 php-src/ext/pdo/pdo_sql_parser.re:1.42 --- php-src/ext/pdo/pdo_sql_parser.re:1.41 Mon Oct 29 22:37:44 2007 +++ php-src/ext/pdo/pdo_sql_parser.re Mon Nov 26 21:10:18 2007 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: pdo_sql_parser.re,v 1.41 2007/10/29 22:37:44 iliaa Exp $ */ +/* $Id: pdo_sql_parser.re,v 1.42 2007/11/26 21:10:18 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 = [:?"']; EOF = [\000];
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php