sas Sat Mar 10 15:21:50 2001 EDT Modified files: /php4/ext/ircg ircg_scanner.c ircg_scanner.re Log: Disable the speed-up role for now. Needs to be improved.
Index: php4/ext/ircg/ircg_scanner.c diff -u php4/ext/ircg/ircg_scanner.c:1.7 php4/ext/ircg/ircg_scanner.c:1.8 --- php4/ext/ircg/ircg_scanner.c:1.7 Thu Mar 8 11:29:33 2001 +++ php4/ext/ircg/ircg_scanner.c Sat Mar 10 15:21:49 2001 @@ -1,4 +1,4 @@ -/* Generated by re2c 0.5 on Thu Mar 8 20:32:13 2001 */ +/* Generated by re2c 0.5 on Sun Mar 11 00:24:46 2001 */ #line 1 "/home/sas/src/php4/ext/ircg/ircg_scanner.re" /* +----------------------------------------------------------------------+ @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: ircg_scanner.c,v 1.7 2001/03/08 19:29:33 sas Exp $ */ +/* $Id: ircg_scanner.c,v 1.8 2001/03/10 23:21:49 sas Exp $ */ #include <ext/standard/php_smart_str.h> #include <stdio.h> @@ -199,69 +199,60 @@ YYCTYPE yych; unsigned int yyaccept; static unsigned char yybm[] = { - 0, 64, 0, 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, 0, - 64, 64, 64, 64, 64, 64, 0, 64, - 64, 64, 64, 64, 64, 64, 64, 0, - 192, 192, 192, 192, 192, 192, 192, 192, - 192, 192, 64, 64, 0, 64, 0, 64, - 64, 192, 192, 192, 192, 192, 192, 192, - 192, 192, 192, 192, 192, 192, 192, 192, - 192, 192, 192, 192, 192, 192, 192, 192, - 192, 192, 192, 64, 64, 64, 64, 64, - 64, 192, 192, 192, 192, 192, 192, 192, - 192, 192, 192, 192, 192, 192, 192, 192, - 192, 192, 192, 192, 192, 192, 192, 192, - 192, 192, 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, 64, 64, - 64, 64, 64, 64, 64, 64, 64, 64, - 64, 64, 64, 64, 64, 64, 64, 64, - 64, 64, 64, 64, 64, 64, 64, 64, - 64, 64, 64, 64, 64, 64, 64, 64, - 64, 64, 64, 64, 64, 64, 64, 64, - 64, 64, 64, 64, 64, 64, 64, 64, - 64, 64, 64, 64, 64, 64, 64, 64, - 64, 64, 64, 64, 64, 64, 64, 64, - 64, 64, 64, 64, 64, 64, 64, 64, - 64, 64, 64, 64, 64, 64, 64, 64, - 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, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 128, 128, 128, 128, 128, 128, 128, 128, + 128, 128, 0, 0, 0, 0, 0, 0, + 0, 128, 128, 128, 128, 128, 128, 128, + 128, 128, 128, 128, 128, 128, 128, 128, + 128, 128, 128, 128, 128, 128, 128, 128, + 128, 128, 128, 0, 0, 0, 0, 0, + 0, 128, 128, 128, 128, 128, 128, 128, + 128, 128, 128, 128, 128, 128, 128, 128, + 128, 128, 128, 128, 128, 128, 128, 128, + 128, 128, 128, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, }; goto yy0; yy1: ++YYCURSOR; yy0: if((YYLIMIT - YYCURSOR) < 4) YYFILL(4); yych = *YYCURSOR; - if(yych <= '.'){ + if(yych <= '&'){ if(yych <= '\003'){ - if(yych <= '\000') goto yy19; + if(yych <= '\000') goto yy17; if(yych <= '\001') goto yy16; if(yych <= '\002') goto yy12; goto yy4; } else { - if(yych <= '\037'){ - if(yych <= '\036') goto yy16; - goto yy14; - } else { - if(yych == '&') goto yy10; - goto yy16; - } + if(yych == '\037') goto yy14; + if(yych <= '%') goto yy16; + goto yy10; } } else { if(yych <= '>'){ - if(yych <= ';'){ - if(yych <= '/') goto yy17; - goto yy16; - } else { - if(yych <= '<') goto yy6; - if(yych <= '=') goto yy16; - goto yy8; - } + if(yych == '<') goto yy6; + if(yych <= '=') goto yy16; + goto yy8; } else { if(yych <= 'Z'){ if(yych <= '@') goto yy16; @@ -271,10 +262,16 @@ } } } -yy2: yych = *++YYCURSOR; - if(yybm[0+yych] & 128) goto yy23; - if(yych == ':') goto yy25; - goto yy22; +yy2: yyaccept = 0; + yych = *(YYMARKER = ++YYCURSOR); + if(yych <= '@'){ + if(yych <= '/') goto yy3; + if(yych <= ':') goto yy20; + } else { + if(yych <= 'Z') goto yy20; + if(yych <= '`') goto yy3; + if(yych <= 'z') goto yy20; + } yy3: #line 214 { passthru(STD_ARGS); continue; } @@ -303,59 +300,30 @@ #line 213 { handle_underline(STD_ARGS, 0); continue; } yy16: yych = *++YYCURSOR; - goto yy22; + goto yy3; yy17: yych = *++YYCURSOR; yy18: #line 215 - { passthru(STD_ARGS); continue; } -yy19: yych = *++YYCURSOR; -yy20: -#line 216 { goto stop; } -yy21: ++YYCURSOR; +yy19: ++YYCURSOR; if(YYLIMIT == YYCURSOR) YYFILL(1); yych = *YYCURSOR; -yy22: if(yybm[0+yych] & 64) goto yy21; - goto yy3; -yy23: ++YYCURSOR; - if(YYLIMIT == YYCURSOR) YYFILL(1); - yych = *YYCURSOR; -yy24: if(yybm[0+yych] & 128) goto yy23; - if(yych <= '&'){ - if(yych <= '\003'){ - if(yych == '\001') goto yy21; - goto yy3; - } else { - if(yych == '\037') goto yy3; - if(yych <= '%') goto yy21; - goto yy3; - } - } else { - if(yych <= ';'){ - if(yych <= '.') goto yy21; - if(yych <= '/') goto yy3; - if(yych >= ';') goto yy21; - } else { - if(yych == '=') goto yy21; - if(yych <= '>') goto yy3; - goto yy21; - } - } -yy25: yyaccept = 0; - yych = *(YYMARKER = ++YYCURSOR); - if(yych != '/') goto yy22; -yy26: yych = *++YYCURSOR; - if(yych == '/') goto yy28; -yy27: YYCURSOR = YYMARKER; +yy20: if(yybm[0+yych] & 128) goto yy19; + if(yych == ':') goto yy22; +yy21: YYCURSOR = YYMARKER; switch(yyaccept){ case 0: goto yy3; } -yy28: yych = *++YYCURSOR; -yy29: +yy22: yych = *++YYCURSOR; + if(yych != '/') goto yy21; +yy23: yych = *++YYCURSOR; + if(yych != '/') goto yy21; +yy24: yych = *++YYCURSOR; +yy25: #line 207 { handle_scheme(STD_ARGS); STATE = STATE_URL; continue; } } -#line 217 +#line 216 break; @@ -400,43 +368,43 @@ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, }; - goto yy30; -yy31: ++YYCURSOR; -yy30: + goto yy26; +yy27: ++YYCURSOR; +yy26: if((YYLIMIT - YYCURSOR) < 2) YYFILL(2); yych = *YYCURSOR; if(yych <= '>'){ if(yych <= '"'){ - if(yych != '!') goto yy34; + if(yych != '!') goto yy30; } else { - if(yych == '<') goto yy34; - if(yych >= '>') goto yy34; + if(yych == '<') goto yy30; + if(yych >= '>') goto yy30; } } else { if(yych <= '`'){ - if(yych <= 'Z') goto yy32; - if(yych != '_') goto yy34; + if(yych <= 'Z') goto yy28; + if(yych != '_') goto yy30; } else { - if(yych <= 'z') goto yy32; - if(yych != '~') goto yy34; + if(yych <= 'z') goto yy28; + if(yych != '~') goto yy30; } } -yy32: yych = *++YYCURSOR; - goto yy37; -yy33: -#line 225 +yy28: yych = *++YYCURSOR; + goto yy33; +yy29: +#line 224 { handle_url(STD_ARGS); STATE = STATE_PLAIN; continue; } -yy34: yych = *++YYCURSOR; -yy35: -#line 226 +yy30: yych = *++YYCURSOR; +yy31: +#line 225 { passthru(STD_ARGS); STATE = STATE_PLAIN; continue; } -yy36: ++YYCURSOR; +yy32: ++YYCURSOR; if(YYLIMIT == YYCURSOR) YYFILL(1); yych = *YYCURSOR; -yy37: if(yybm[0+yych] & 128) goto yy36; - goto yy33; +yy33: if(yybm[0+yych] & 128) goto yy32; + goto yy29; } -#line 227 +#line 226 break; @@ -446,27 +414,27 @@ { YYCTYPE yych; unsigned int yyaccept; - goto yy38; -yy39: ++YYCURSOR; -yy38: + goto yy34; +yy35: ++YYCURSOR; +yy34: if((YYLIMIT - YYCURSOR) < 2) YYFILL(2); yych = *YYCURSOR; - if(yych <= '/') goto yy42; - if(yych >= ':') goto yy42; -yy40: yych = *++YYCURSOR; - if(yych <= '/') goto yy41; - if(yych <= '9') goto yy44; -yy41: -#line 234 + if(yych <= '/') goto yy38; + if(yych >= ':') goto yy38; +yy36: yych = *++YYCURSOR; + if(yych <= '/') goto yy37; + if(yych <= '9') goto yy40; +yy37: +#line 233 { handle_color_digit(STD_ARGS, 0); STATE = STATE_COLOR_COMMA; continue; } -yy42: yych = *++YYCURSOR; -yy43: -#line 235 +yy38: yych = *++YYCURSOR; +yy39: +#line 234 { finish_color_stuff(STD_ARGS); passthru(STD_ARGS); STATE = STATE_PLAIN; continue; } -yy44: yych = *++YYCURSOR; - goto yy41; +yy40: yych = *++YYCURSOR; + goto yy37; } -#line 236 +#line 235 break; @@ -476,22 +444,22 @@ { YYCTYPE yych; unsigned int yyaccept; - goto yy45; -yy46: ++YYCURSOR; -yy45: + goto yy41; +yy42: ++YYCURSOR; +yy41: if(YYLIMIT == YYCURSOR) YYFILL(1); yych = *YYCURSOR; - if(yych != ',') goto yy49; -yy47: yych = *++YYCURSOR; -yy48: -#line 243 + if(yych != ',') goto yy45; +yy43: yych = *++YYCURSOR; +yy44: +#line 242 { STATE = STATE_COLOR_BG; continue; } -yy49: yych = *++YYCURSOR; -yy50: -#line 244 +yy45: yych = *++YYCURSOR; +yy46: +#line 243 { YYCURSOR--; commit_color_stuff(STD_ARGS); STATE = STATE_PLAIN; continue; } } -#line 245 +#line 244 break; @@ -501,27 +469,27 @@ { YYCTYPE yych; unsigned int yyaccept; - goto yy51; -yy52: ++YYCURSOR; -yy51: + goto yy47; +yy48: ++YYCURSOR; +yy47: if((YYLIMIT - YYCURSOR) < 2) YYFILL(2); yych = *YYCURSOR; - if(yych <= '/') goto yy55; - if(yych >= ':') goto yy55; -yy53: yych = *++YYCURSOR; - if(yych <= '/') goto yy54; - if(yych <= '9') goto yy57; -yy54: -#line 252 + if(yych <= '/') goto yy51; + if(yych >= ':') goto yy51; +yy49: yych = *++YYCURSOR; + if(yych <= '/') goto yy50; + if(yych <= '9') goto yy53; +yy50: +#line 251 { handle_color_digit(STD_ARGS, 1); commit_color_stuff(STD_ARGS); STATE = STATE_PLAIN; continue; } -yy55: yych = *++YYCURSOR; -yy56: -#line 253 +yy51: yych = *++YYCURSOR; +yy52: +#line 252 { commit_color_stuff(STD_ARGS); STATE = STATE_PLAIN; continue; } -yy57: yych = *++YYCURSOR; - goto yy54; +yy53: yych = *++YYCURSOR; + goto yy50; } -#line 254 +#line 253 break; } Index: php4/ext/ircg/ircg_scanner.re diff -u php4/ext/ircg/ircg_scanner.re:1.8 php4/ext/ircg/ircg_scanner.re:1.9 --- php4/ext/ircg/ircg_scanner.re:1.8 Thu Mar 8 11:29:33 2001 +++ php4/ext/ircg/ircg_scanner.re Sat Mar 10 15:21:49 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: ircg_scanner.re,v 1.8 2001/03/08 19:29:33 sas Exp $ */ +/* $Id: ircg_scanner.re,v 1.9 2001/03/10 23:21:49 sas Exp $ */ #include <ext/standard/php_smart_str.h> #include <stdio.h> @@ -211,7 +211,6 @@ "&" { add_entity(STD_ARGS, "&"); continue; } bold { handle_bold(STD_ARGS, 0); continue; } underline { handle_underline(STD_ARGS, 0); continue; } - (anynoneof\([<>&/]|underline))+ { passthru(STD_ARGS); continue; } anynoneof { passthru(STD_ARGS); continue; } eof { goto stop; } */
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] To contact the list administrators, e-mail: [EMAIL PROTECTED]