diff --git a/ext/pdo/pdo_sql_parser.c b/ext/pdo/pdo_sql_parser.c
index d6115d965bd..3b91ec148e2 100644
--- a/ext/pdo/pdo_sql_parser.c
+++ b/ext/pdo/pdo_sql_parser.c
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.9.8 on Mon Jul 18 19:08:15 2005 */
+/* Generated by re2c 0.9.9 on Sun Sep  4 02:48:16 2005 */
 #line 1 "pdo_sql_parser.re"
 /*
   +----------------------------------------------------------------------+
@@ -51,41 +51,41 @@ static int scan(Scanner *s)
 
 	{
 	static unsigned char yybm[] = {
-	  0, 161, 161, 161, 161, 161, 161, 161, 
-	161, 161, 161, 161, 161, 161, 161, 161, 
-	161, 161, 161, 161, 161, 161, 161, 161, 
-	161, 161, 161, 161, 161, 161, 161, 161, 
-	161, 161,   2, 161, 161, 161, 161, 202, 
-	161, 161, 161, 161, 161, 161, 161, 161, 
-	165, 165, 165, 165, 165, 165, 165, 165, 
-	165, 165, 242, 161, 161, 161, 161, 242, 
-	161, 165, 165, 165, 165, 165, 165, 165, 
-	165, 165, 165, 165, 165, 165, 165, 165, 
-	165, 165, 165, 165, 165, 165, 165, 165, 
-	165, 165, 165, 161,   1, 161, 161, 165, 
-	161, 165, 165, 165, 165, 165, 165, 165, 
-	165, 165, 165, 165, 165, 165, 165, 165, 
-	165, 165, 165, 165, 165, 165, 165, 165, 
-	165, 165, 165, 161, 161, 161, 161, 161, 
-	161, 161, 161, 161, 161, 161, 161, 161, 
-	161, 161, 161, 161, 161, 161, 161, 161, 
-	161, 161, 161, 161, 161, 161, 161, 161, 
-	161, 161, 161, 161, 161, 161, 161, 161, 
-	161, 161, 161, 161, 161, 161, 161, 161, 
-	161, 161, 161, 161, 161, 161, 161, 161, 
-	161, 161, 161, 161, 161, 161, 161, 161, 
-	161, 161, 161, 161, 161, 161, 161, 161, 
-	161, 161, 161, 161, 161, 161, 161, 161, 
-	161, 161, 161, 161, 161, 161, 161, 161, 
-	161, 161, 161, 161, 161, 161, 161, 161, 
-	161, 161, 161, 161, 161, 161, 161, 161, 
-	161, 161, 161, 161, 161, 161, 161, 161, 
-	161, 161, 161, 161, 161, 161, 161, 161, 
-	161, 161, 161, 161, 161, 161, 161, 161, 
-	161, 161, 161, 161, 161, 161, 161, 161, 
+	  0, 162, 162, 162, 162, 162, 162, 162, 
+	162, 162, 162, 162, 162, 162, 162, 162, 
+	162, 162, 162, 162, 162, 162, 162, 162, 
+	162, 162, 162, 162, 162, 162, 162, 162, 
+	162, 162,  52, 162, 162, 162, 162, 196, 
+	162, 162, 162, 162, 162, 162, 162, 162, 
+	170, 170, 170, 170, 170, 170, 170, 170, 
+	170, 170, 244, 162, 162, 162, 162, 244, 
+	162, 170, 170, 170, 170, 170, 170, 170, 
+	170, 170, 170, 170, 170, 170, 170, 170, 
+	170, 170, 170, 170, 170, 170, 170, 170, 
+	170, 170, 170, 162,   2, 162, 162, 170, 
+	162, 170, 170, 170, 170, 170, 170, 170, 
+	170, 170, 170, 170, 170, 170, 170, 170, 
+	170, 170, 170, 170, 170, 170, 170, 170, 
+	170, 170, 170, 162, 162, 162, 162, 162, 
+	162, 162, 162, 162, 162, 162, 162, 162, 
+	162, 162, 162, 162, 162, 162, 162, 162, 
+	162, 162, 162, 162, 162, 162, 162, 162, 
+	162, 162, 162, 162, 162, 162, 162, 162, 
+	162, 162, 162, 162, 162, 162, 162, 162, 
+	162, 162, 162, 162, 162, 162, 162, 162, 
+	162, 162, 162, 162, 162, 162, 162, 162, 
+	162, 162, 162, 162, 162, 162, 162, 162, 
+	162, 162, 162, 162, 162, 162, 162, 162, 
+	162, 162, 162, 162, 162, 162, 162, 162, 
+	162, 162, 162, 162, 162, 162, 162, 162, 
+	162, 162, 162, 162, 162, 162, 162, 162, 
+	162, 162, 162, 162, 162, 162, 162, 162, 
+	162, 162, 162, 162, 162, 162, 162, 162, 
+	162, 162, 162, 162, 162, 162, 162, 162, 
+	162, 162, 162, 162, 162, 162, 162, 162, 
 	};
 
-#line 89 "<stdout>"
+#line 89 "pdo_sql_parser.c"
 {
 	YYCTYPE yych;
 	unsigned int yyaccept;
@@ -94,7 +94,7 @@ static int scan(Scanner *s)
 yy0:
 	if((YYLIMIT - YYCURSOR) < 3) YYFILL(3);
 	yych = *YYCURSOR;
-	if(yybm[0+yych] & 1) {
+	if(yybm[0+yych] & 2) {
 		goto yy8;
 	}
 	if(yych <= 0x00)	goto yy11;
@@ -105,31 +105,25 @@ yy0:
 yy2:	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yybm[0+yych] & 64) {
-		goto yy32;
+		goto yy30;
 	}
 	if(yych <= 0x00)	goto yy3;
-	if(yych == '"')	goto yy30;
-	goto yy35;
+	if(yych == '"')	goto yy28;
+	goto yy33;
 yy3:
 #line 63 "pdo_sql_parser.re"
 { RET(PDO_PARSER_TEXT); }
-#line 117 "<stdout>"
+#line 117 "pdo_sql_parser.c"
 yy4:	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
-	if(yybm[0+yych] & 8) {
+	if(yybm[0+yych] & 16) {
 		goto yy19;
 	}
-	if(yych <= '9'){
-		if(yych <= 0x00)	goto yy3;
-		if(yych == '"')	goto yy13;
-		goto yy25;
-	} else {
-		if(yych <= ':')	goto yy22;
-		if(yych == '?')	goto yy22;
-		goto yy25;
-	}
+	if(yych <= 0x00)	goto yy3;
+	if(yych == '\'')	goto yy21;
+	goto yy24;
 yy5:	yych = *++YYCURSOR;
-	if(yybm[0+yych] & 2) {
+	if(yybm[0+yych] & 4) {
 		goto yy13;
 	}
 	if(yych <= 'Z'){
@@ -148,7 +142,7 @@ yy5:	yych = *++YYCURSOR;
 		}
 	}
 yy6:	++YYCURSOR;
-	if(yybm[0+(yych = *YYCURSOR)] & 2) {
+	if(yybm[0+(yych = *YYCURSOR)] & 4) {
 		yych = *YYCURSOR;
 		goto yy13;
 	}
@@ -156,181 +150,141 @@ yy6:	++YYCURSOR;
 yy7:
 #line 62 "pdo_sql_parser.re"
 { RET(PDO_PARSER_BIND_POS); }
-#line 160 "<stdout>"
+#line 154 "pdo_sql_parser.c"
 yy8:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
 	goto yy9;
-yy9:	if(yybm[0+yych] & 1) {
+yy9:	if(yybm[0+yych] & 2) {
 		goto yy8;
 	}
 	goto yy10;
 yy10:
 #line 64 "pdo_sql_parser.re"
 { RET(PDO_PARSER_TEXT); }
-#line 172 "<stdout>"
+#line 166 "pdo_sql_parser.c"
 yy11:	++YYCURSOR;
 	goto yy12;
 yy12:
 #line 65 "pdo_sql_parser.re"
 { RET(PDO_PARSER_EOI); }
-#line 178 "<stdout>"
+#line 172 "pdo_sql_parser.c"
 yy13:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
 	goto yy14;
-yy14:	if(yybm[0+yych] & 2) {
+yy14:	if(yybm[0+yych] & 4) {
 		goto yy13;
 	}
 	goto yy15;
 yy15:
 #line 60 "pdo_sql_parser.re"
 { RET(PDO_PARSER_TEXT); }
-#line 190 "<stdout>"
+#line 184 "pdo_sql_parser.c"
 yy16:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
 	goto yy17;
-yy17:	if(yybm[0+yych] & 4) {
+yy17:	if(yybm[0+yych] & 8) {
 		goto yy16;
 	}
 	goto yy18;
 yy18:
 #line 61 "pdo_sql_parser.re"
 { RET(PDO_PARSER_BIND); }
-#line 202 "<stdout>"
+#line 196 "pdo_sql_parser.c"
 yy19:	yyaccept = 1;
-	YYMARKER = ++YYCURSOR;
-	if(YYLIMIT == YYCURSOR) YYFILL(1);
-	yych = *YYCURSOR;
-	goto yy20;
-yy20:	if(yybm[0+yych] & 8) {
-		goto yy19;
-	}
-	if(yych <= ':'){
-		if(yych <= '!'){
-			if(yych >= 0x01)	goto yy24;
-			goto yy21;
-		} else {
-			if(yych <= '"')	goto yy13;
-			if(yych <= '9')	goto yy24;
-			goto yy22;
-		}
-	} else {
-		if(yych <= '?'){
-			if(yych <= '>')	goto yy24;
-			goto yy22;
-		} else {
-			if(yych == '\\')	goto yy27;
-			goto yy24;
-		}
-	}
-yy21:
-#line 59 "pdo_sql_parser.re"
-{ RET(PDO_PARSER_TEXT); }
-#line 232 "<stdout>"
-yy22:	yyaccept = 2;
-	YYMARKER = ++YYCURSOR;
-	if(YYLIMIT == YYCURSOR) YYFILL(1);
-	yych = *YYCURSOR;
-	goto yy23;
-yy23:	if(yybm[0+yych] & 8) {
-		goto yy19;
-	}
-	if(yych <= ':'){
-		if(yych <= '!'){
-			if(yych <= 0x00)	goto yy15;
-			goto yy24;
-		} else {
-			if(yych <= '"')	goto yy13;
-			if(yych >= ':')	goto yy22;
-			goto yy24;
-		}
-	} else {
-		if(yych <= '?'){
-			if(yych >= '?')	goto yy22;
-			goto yy24;
-		} else {
-			if(yych == '\\')	goto yy27;
-			goto yy24;
-		}
-	}
-yy24:	++YYCURSOR;
-	if(YYLIMIT == YYCURSOR) YYFILL(1);
-	yych = *YYCURSOR;
-	goto yy25;
-yy25:	if(yybm[0+yych] & 32) {
-		goto yy24;
-	}
-	if(yych <= '&')	goto yy26;
-	if(yych <= '\'')	goto yy28;
-	goto yy27;
-yy26:	YYCURSOR = YYMARKER;
-	switch(yyaccept){
-	case 1:	goto yy21;
-	case 2:	goto yy15;
-	case 0:	goto yy3;
-	}
-yy27:	++YYCURSOR;
-	if(YYLIMIT == YYCURSOR) YYFILL(1);
-	yych = *YYCURSOR;
-	if(yych == '\'')	goto yy24;
-	goto yy26;
-yy28:	yyaccept = 1;
-	YYMARKER = ++YYCURSOR;
-	if(YYLIMIT == YYCURSOR) YYFILL(1);
-	yych = *YYCURSOR;
-	goto yy29;
-yy29:	if(yybm[0+yych] & 32) {
-		goto yy24;
-	}
-	if(yych <= '&')	goto yy21;
-	if(yych <= '\'')	goto yy28;
-	goto yy27;
-yy30:	++YYCURSOR;
-	if(yybm[0+(yych = *YYCURSOR)] & 2) {
-		yych = *YYCURSOR;
-		goto yy13;
-	}
-	goto yy31;
-yy31:
-#line 58 "pdo_sql_parser.re"
-{ RET(PDO_PARSER_TEXT); }
-#line 300 "<stdout>"
-yy32:	yyaccept = 2;
 	YYMARKER = ++YYCURSOR;
 	if((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
 	yych = *YYCURSOR;
-	goto yy33;
-yy33:	if(yybm[0+yych] & 64) {
-		goto yy32;
+	goto yy20;
+yy20:	if(yybm[0+yych] & 16) {
+		goto yy19;
+	}
+	if(yych <= '\''){
+		if(yych <= 0x00)	goto yy15;
+		if(yych <= '&')	goto yy23;
+		goto yy21;
+	} else {
+		if(yych == '\\')	goto yy26;
+		goto yy23;
+	}
+yy21:	++YYCURSOR;
+	if(yybm[0+(yych = *YYCURSOR)] & 4) {
+		yych = *YYCURSOR;
+		goto yy13;
+	}
+	goto yy22;
+yy22:
+#line 59 "pdo_sql_parser.re"
+{ RET(PDO_PARSER_TEXT); }
+#line 222 "pdo_sql_parser.c"
+yy23:	++YYCURSOR;
+	if(YYLIMIT == YYCURSOR) YYFILL(1);
+	yych = *YYCURSOR;
+	goto yy24;
+yy24:	if(yybm[0+yych] & 32) {
+		goto yy23;
+	}
+	if(yych <= 0x00)	goto yy25;
+	if(yych <= '[')	goto yy27;
+	goto yy26;
+yy25:	YYCURSOR = YYMARKER;
+	switch(yyaccept){
+	case 1:	goto yy15;
+	case 0:	goto yy3;
+	}
+yy26:	++YYCURSOR;
+	if(YYLIMIT == YYCURSOR) YYFILL(1);
+	yych = *YYCURSOR;
+	if(yych == '\'')	goto yy23;
+	goto yy25;
+yy27:	yych = *++YYCURSOR;
+	goto yy22;
+yy28:	++YYCURSOR;
+	if(yybm[0+(yych = *YYCURSOR)] & 4) {
+		yych = *YYCURSOR;
+		goto yy13;
+	}
+	goto yy29;
+yy29:
+#line 58 "pdo_sql_parser.re"
+{ RET(PDO_PARSER_TEXT); }
+#line 254 "pdo_sql_parser.c"
+yy30:	yyaccept = 1;
+	YYMARKER = ++YYCURSOR;
+	if((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
+	yych = *YYCURSOR;
+	goto yy31;
+yy31:	if(yybm[0+yych] & 64) {
+		goto yy30;
 	}
 	if(yych <= '"'){
 		if(yych <= 0x00)	goto yy15;
-		if(yych >= '"')	goto yy30;
-		goto yy34;
+		if(yych >= '"')	goto yy28;
+		goto yy32;
 	} else {
-		if(yych == '\\')	goto yy36;
-		goto yy34;
+		if(yych == '\\')	goto yy34;
+		goto yy32;
 	}
+yy32:	++YYCURSOR;
+	if(YYLIMIT == YYCURSOR) YYFILL(1);
+	yych = *YYCURSOR;
+	goto yy33;
+yy33:	if(yybm[0+yych] & 128) {
+		goto yy32;
+	}
+	if(yych <= 0x00)	goto yy25;
+	if(yych <= '[')	goto yy35;
+	goto yy34;
 yy34:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	goto yy35;
-yy35:	if(yybm[0+yych] & 128) {
-		goto yy34;
-	}
-	if(yych <= 0x00)	goto yy26;
-	if(yych <= '[')	goto yy37;
-	goto yy36;
-yy36:	++YYCURSOR;
-	if(YYLIMIT == YYCURSOR) YYFILL(1);
+	if(yych == '"')	goto yy32;
+	goto yy25;
+yy35:	++YYCURSOR;
 	yych = *YYCURSOR;
-	if(yych == '"')	goto yy34;
-	goto yy26;
-yy37:	++YYCURSOR;
-	yych = *YYCURSOR;
-	goto yy31;
+	goto yy29;
 }
 }
 #line 66 "pdo_sql_parser.re"