re2c's bit vectors appear to be not binary clean. Revert to

    standard mode for the moment.

2 files changed, 102 insertions, 97 deletions

diff --git a/ext/standard/Makefile.am b/ext/standard/Makefile.am
index 9e0d62bd46..2d04b692a4 100644
--- a/ext/standard/Makefile.am
+++ b/ext/standard/Makefile.am
@@ -11,7 +11,7 @@ libphpext_standard_a_SOURCES=\
 	parsedate.y lcg.c url_scanner.c metaphone.c
 
 $(srcdir)/url_scanner.c: $(srcdir)/url_scanner.re
-	-re2c -b $< > $@.new && mv $@.new $@
+	-re2c $< > $@.new && mv $@.new $@
 
 #number.o: number.c
 #	$(CC) $(CFLAGS) -w@WARNING_LEVEL@ -c $< -o $@
diff --git a/ext/standard/url_scanner.c b/ext/standard/url_scanner.c
index faf3d24c9a..07e3c16813 100644
--- a/ext/standard/url_scanner.c
+++ b/ext/standard/url_scanner.c
@@ -1,5 +1,5 @@
-/* Generated by re2c 0.5 on Mon Sep 20 15:47:10 1999 */
-#line 1 "url_scanner.re"
+/* Generated by re2c 0.5 on Thu Sep 23 16:06:02 1999 */
+#line 1 "../../../php4/ext/standard/url_scanner.re"
 /*
    +----------------------------------------------------------------------+
    | PHP version 4.0                                                      |
@@ -134,47 +134,13 @@ static void url_scanner(lexdata *state)
 {
 	YYCTYPE yych;
 	unsigned int yyaccept;
-	static unsigned char yybm[] = {
-	  0,  64,  64,  64,  64,  64,  64,  64, 
-	 64, 192,  64, 192, 192,  64,  64,  64, 
-	 64,  64,  64,  64,  64,  64,  64,  64, 
-	 64,  64,  64,  64,  64,  64,  64,  64, 
-	192,  64,  64,  64,  64,  64,  64,  64, 
-	 64,  64,  64,  64,  64,  64,  64,  64, 
-	 64,  64,  64,  64,  64,  64,  64,  64, 
-	 64,  64,  64,  64,   0,  64,  64,  64, 
-	 64,  64,  64,  64,  64,  64,  64,  64, 
-	 64,  64,  64,  64,  64,  64,  64,  64, 
-	 64,  64,  64,  64,  64,  64,  64,  64, 
-	 64,  64,  64,  64,  64,  64,  64,  64, 
-	 64,  64,  64,  64,  64,  64,  64,  64, 
-	 64,  64,  64,  64,  64,  64,  64,  64, 
-	 64,  64,  64,  64,  64,  64,  64,  64, 
-	 64,  64,  64,  64,  64,  64,  64,  64, 
-	 64,  64,  64,  64,  64,  64,  64,  64, 
-	 64,  64,  64,  64,  64,  64,  64,  64, 
-	 64,  64,  64,  64,  64,  64,  64,  64, 
-	 64,  64,  64,  64,  64,  64,  64,  64, 
-	 64,  64,  64,  64,  64,  64,  64,  64, 
-	 64,  64,  64,  64,  64,  64,  64,  64, 
-	 64,  64,  64,  64,  64,  64,  64,  64, 
-	 64,  64,  64,  64,  64,  64,  64,  64, 
-	 64,  64,  64,  64,  64,  64,  64,  64, 
-	 64,  64,  64,  64,  64,  64,  64,  64, 
-	 64,  64,  64,  64,  64,  64,  64,  64, 
-	 64,  64,  64,  64,  64,  64,  64,  64, 
-	 64,  64,  64,  64,  64,  64,  64,  64, 
-	 64,  64,  64,  64,  64,  64,  64,  64, 
-	 64,  64,  64,  64,  64,  64,  64,  64, 
-	 64,  64,  64,  64,  64,  64,  64,  64, 
-	};
 	goto yy0;
 yy1:	++YYCURSOR;
 yy0:
 	if((YYLIMIT - YYCURSOR) < 7) YYFILL(7);
 	yych = *YYCURSOR;
-	if(yybm[0+yych] & 64)	goto yy4;
 	if(yych <= '\000')	goto yy7;
+	if(yych != '<')	goto yy4;
 yy2:	yych = *++YYCURSOR;
 	if(yych <= 'F'){
 		if(yych == 'A')	goto yy9;
@@ -189,7 +155,8 @@ yy2:	yych = *++YYCURSOR;
 yy3:yy4:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-yy5:	if(yybm[0+yych] & 64)	goto yy4;
+yy5:	if(yych <= '\000')	goto yy6;
+	if(yych != '<')	goto yy4;
 yy6:
 #line 146
 	{ BEGIN(INITIAL); }
@@ -220,9 +187,23 @@ yy14:	yych = *++YYCURSOR;
 yy15:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-yy16:	if(yybm[0+yych] & 128)	goto yy15;
-	if(yych == 'S')	goto yy17;
-	if(yych != 's')	goto yy3;
+yy16:	if(yych <= '\037'){
+		if(yych <= '\t'){
+			if(yych <= '\b')	goto yy3;
+			goto yy15;
+		} else {
+			if(yych <= '\n')	goto yy3;
+			if(yych <= '\f')	goto yy15;
+			goto yy3;
+		}
+	} else {
+		if(yych <= 'S'){
+			if(yych <= ' ')	goto yy15;
+			if(yych <= 'R')	goto yy3;
+		} else {
+			if(yych != 's')	goto yy3;
+		}
+	}
 yy17:	yych = *++YYCURSOR;
 	if(yych == 'R')	goto yy18;
 	if(yych != 'r')	goto yy3;
@@ -320,69 +301,77 @@ yy33:
 {
 	YYCTYPE yych;
 	unsigned int yyaccept;
-	static unsigned char yybm[] = {
-	  0, 192, 192, 192, 192, 192, 192, 192, 
-	192,  32, 192,  32,  32, 192, 192, 192, 
-	192, 192, 192, 192, 192, 192, 192, 192, 
-	192, 192, 192, 192, 192, 192, 192, 192, 
-	 32, 192,   0,   0, 192, 192, 192, 192, 
-	192, 192, 192, 192, 192, 192, 192, 192, 
-	192, 192, 192, 192, 192, 192, 192, 192, 
-	192, 192, 128, 192, 192, 192,   0, 192, 
-	192, 192, 192, 192, 192, 192, 192, 192, 
-	192, 192, 192, 192, 192, 192, 192, 192, 
-	192, 192, 192, 192, 192, 192, 192, 192, 
-	192, 192, 192, 192, 192, 192, 192, 192, 
-	192, 192, 192, 192, 192, 192, 192, 192, 
-	192, 192, 192, 192, 192, 192, 192, 192, 
-	192, 192, 192, 192, 192, 192, 192, 192, 
-	192, 192, 192, 192, 192, 192, 192, 192, 
-	192, 192, 192, 192, 192, 192, 192, 192, 
-	192, 192, 192, 192, 192, 192, 192, 192, 
-	192, 192, 192, 192, 192, 192, 192, 192, 
-	192, 192, 192, 192, 192, 192, 192, 192, 
-	192, 192, 192, 192, 192, 192, 192, 192, 
-	192, 192, 192, 192, 192, 192, 192, 192, 
-	192, 192, 192, 192, 192, 192, 192, 192, 
-	192, 192, 192, 192, 192, 192, 192, 192, 
-	192, 192, 192, 192, 192, 192, 192, 192, 
-	192, 192, 192, 192, 192, 192, 192, 192, 
-	192, 192, 192, 192, 192, 192, 192, 192, 
-	192, 192, 192, 192, 192, 192, 192, 192, 
-	192, 192, 192, 192, 192, 192, 192, 192, 
-	192, 192, 192, 192, 192, 192, 192, 192, 
-	192, 192, 192, 192, 192, 192, 192, 192, 
-	192, 192, 192, 192, 192, 192, 192, 192, 
-	};
 	goto yy34;
 yy35:	++YYCURSOR;
 yy34:
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	if(yybm[0+yych] & 64)	goto yy39;
-	if(yych <= '\000')	goto yy36;
-	if(yych <= '"')	goto yy37;
-	if(yych <= '#')	goto yy36;
-	if(yych <= '=')	goto yy42;
+	if(yych <= ' '){
+		if(yych <= '\t'){
+			if(yych <= '\000')	goto yy36;
+			if(yych <= '\b')	goto yy39;
+			goto yy37;
+		} else {
+			if(yych <= '\n')	goto yy39;
+			if(yych <= '\f')	goto yy37;
+			if(yych <= '\037')	goto yy39;
+			goto yy37;
+		}
+	} else {
+		if(yych <= '9'){
+			if(yych <= '!')	goto yy39;
+			if(yych <= '"')	goto yy37;
+			if(yych >= '$')	goto yy39;
+		} else {
+			if(yych <= ':')	goto yy42;
+			if(yych != '>')	goto yy39;
+		}
+	}
 yy36:yy37:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-yy38:	if(yybm[0+yych] & 64)	goto yy39;
-	if(yych <= '\000')	goto yy36;
-	if(yych <= '!')	goto yy37;
-	if(yych == ':')	goto yy42;
-	goto yy36;
+yy38:	if(yych <= ' '){
+		if(yych <= '\t'){
+			if(yych <= '\000')	goto yy36;
+			if(yych >= '\t')	goto yy37;
+		} else {
+			if(yych <= '\n')	goto yy39;
+			if(yych <= '\f')	goto yy37;
+			if(yych >= ' ')	goto yy37;
+		}
+	} else {
+		if(yych <= '9'){
+			if(yych <= '!')	goto yy39;
+			if(yych <= '#')	goto yy36;
+		} else {
+			if(yych <= ':')	goto yy42;
+			if(yych == '>')	goto yy36;
+		}
+	}
 yy39:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-yy40:	if(yybm[0+yych] & 64)	goto yy39;
-	if(yych <= '"'){
-		if(yych <= '\000')	goto yy41;
-		if(yych <= '!')	goto yy48;
-		goto yy50;
+yy40:	if(yych <= ' '){
+		if(yych <= '\t'){
+			if(yych <= '\000')	goto yy41;
+			if(yych <= '\b')	goto yy39;
+			goto yy48;
+		} else {
+			if(yych <= '\n')	goto yy39;
+			if(yych <= '\f')	goto yy48;
+			if(yych <= '\037')	goto yy39;
+			goto yy48;
+		}
 	} else {
-		if(yych <= '#')	goto yy51;
-		if(yych <= '=')	goto yy42;
+		if(yych <= '9'){
+			if(yych <= '!')	goto yy39;
+			if(yych <= '"')	goto yy50;
+			if(yych <= '#')	goto yy51;
+			goto yy39;
+		} else {
+			if(yych <= ':')	goto yy42;
+			if(yych != '>')	goto yy39;
+		}
 	}
 yy41:
 #line 152
@@ -390,10 +379,26 @@ yy41:
 yy42:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-yy43:	if(yybm[0+yych] & 128)	goto yy42;
-	if(yych <= '\000')	goto yy44;
-	if(yych <= '!')	goto yy45;
-	if(yych <= '"')	goto yy47;
+yy43:	if(yych <= '\037'){
+		if(yych <= '\t'){
+			if(yych <= '\000')	goto yy44;
+			if(yych <= '\b')	goto yy42;
+			goto yy45;
+		} else {
+			if(yych <= '\n')	goto yy42;
+			if(yych <= '\f')	goto yy45;
+			goto yy42;
+		}
+	} else {
+		if(yych <= '"'){
+			if(yych <= ' ')	goto yy45;
+			if(yych <= '!')	goto yy42;
+			goto yy47;
+		} else {
+			if(yych <= '#')	goto yy44;
+			if(yych != '>')	goto yy42;
+		}
+	}
 yy44:
 #line 154
 	{