MFB: Revert addition of - char support for bound param names

diff --git a/ext/pdo/pdo_sql_parser.c b/ext/pdo/pdo_sql_parser.c
index 345f21c3cf00ef005cd855f41e4c75b6b0d09316..5d3461868bea031b18968f09ccd67874bdd1919c 100644 (file)
--- a/ext/pdo/pdo_sql_parser.c
+++ b/ext/pdo/pdo_sql_parser.c
@@ -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"
 /*
   +----------------------------------------------------------------------+
@@ -94,7 +94,6 @@ yy5:
        case '\'':
        case ':':
        case '?':       goto yy13;
-       case '-':
        case '0':
        case '1':
        case '2':
@@ -172,7 +171,7 @@ yy6:
 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 @@ yy8:
 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 @@ yy13:
 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 @@ yy16:
 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 @@ yy21:
 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 @@ yy26:
 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;

diff --git a/ext/pdo/pdo_sql_parser.re b/ext/pdo/pdo_sql_parser.re
index b2b3bc0a7fe5e88fb6049bf807435a9efa68a8ec..b17bc01d7af9a546a580b19d68709b35e30986b0 100644 (file)
--- a/ext/pdo/pdo_sql_parser.re
+++ b/ext/pdo/pdo_sql_parser.re
@@ -46,7 +46,7 @@ static int scan(Scanner *s)
 
        s->tok = cursor;
        /*!re2c
-       BINDCHR         = [:][a-zA-Z0-9_-]+;
+       BINDCHR         = [:][a-zA-Z0-9_]+;
        QUESTION        = [?];
        SPECIALS        = [:?"'];
        EOF             = [\000];