cvs: /php4/ext/standard Makefile.am url_scanner.c
| From: | Sascha Schumann | Date: | Thu, 23 Sep 1999 14:09:42 +0000 |
| Subject: | cvs: /php4/ext/standard Makefile.am url_scanner.c | ||
| Groups: | php.version4 | ||
| Request: | Send a blank email to php-version4+get-4824@lists.php.net to get a copy of this message | ||
sas Thu Sep 23 10:09:42 1999 EDT
Modified files:
/php4/ext/standard Makefile.am url_scanner.c
Log:
re2c's bit vectors appear to be not binary clean. Revert to
standard mode for the moment.
Index: php4/ext/standard/Makefile.am
diff -u php4/ext/standard/Makefile.am:1.13 php4/ext/standard/Makefile.am:1.14
--- php4/ext/standard/Makefile.am:1.13 Tue Sep 21 08:24:41 1999
+++ php4/ext/standard/Makefile.am Thu Sep 23 10:09:42 1999
@@ -11,7 +11,7 @@
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 $@
Index: php4/ext/standard/url_scanner.c
diff -u php4/ext/standard/url_scanner.c:1.6 php4/ext/standard/url_scanner.c:1.7
--- php4/ext/standard/url_scanner.c:1.6 Mon Sep 20 17:17:26 1999
+++ php4/ext/standard/url_scanner.c Thu Sep 23 10:09:42 1999
@@ -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 |
@@ -17,7 +17,7 @@
| Author: Sascha Schumann <sascha@schumann.cx> |
+----------------------------------------------------------------------+
*/
-/* $Id: url_scanner.c,v 1.6 1999/09/20 21:17:26 sas Exp $ */
+/* $Id: url_scanner.c,v 1.7 1999/09/23 14:09:42 sas Exp $ */
#include <sys/types.h>
#include <stdio.h>
@@ -134,47 +134,13 @@
{
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 @@
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 @@
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 @@
{
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 @@
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
{