sas Sat Mar 3 09:01:32 2001 EDT
Modified files:
/php4/ext/ircg ircg_scanner.c ircg_scanner.re
Log:
4-fold increase of ircg_mirc_color() with a single new rule.
Index: php4/ext/ircg/ircg_scanner.c
diff -u php4/ext/ircg/ircg_scanner.c:1.4 php4/ext/ircg/ircg_scanner.c:1.5
--- php4/ext/ircg/ircg_scanner.c:1.4 Sun Feb 25 22:07:00 2001
+++ php4/ext/ircg/ircg_scanner.c Sat Mar 3 09:01:31 2001
@@ -1,5 +1,5 @@
-/* Generated by re2c 0.5 on Sat Feb 17 00:00:51 2001 */
-#line 1 "/home/sas/src/php4/ext/ircg/ircg_scanner.re"
+/* Generated by re2c 0.5 on Sat Mar 3 16:35:30 2001 */
+#line 1 "/usr/home/sas/chat/php4/ext/ircg/ircg_scanner.re"
/*
+----------------------------------------------------------------------+
| PHP version 4.0 |
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: ircg_scanner.c,v 1.4 2001/02/26 06:07:00 andi Exp $ */
+/* $Id: ircg_scanner.c,v 1.5 2001/03/03 17:01:31 sas Exp $ */
#include <ext/standard/php_smart_str.h>
#include <stdio.h>
@@ -170,38 +170,38 @@
YYCTYPE yych;
unsigned int yyaccept;
static unsigned char yybm[] = {
- 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,
+ 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, 0,
+ 192, 192, 192, 192, 192, 192, 192, 192,
+ 192, 192, 64, 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, 192, 192, 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,
};
goto yy0;
yy1: ++YYCURSOR;
@@ -227,17 +227,11 @@
if(yych <= '`') goto yy12;
if(yych >= '{') goto yy12;
}
- }
-yy2: yyaccept = 0;
- yych = *(YYMARKER = ++YYCURSOR);
- if(yych <= '@'){
- if(yych <= '/') goto yy3;
- if(yych <= ':') goto yy16;
- } else {
- if(yych <= 'Z') goto yy16;
- if(yych <= '`') goto yy3;
- if(yych <= 'z') goto yy16;
}
+yy2: yych = *++YYCURSOR;
+ if(yybm[0+yych] & 128) goto yy17;
+ if(yych == ':') goto yy19;
+ goto yy16;
yy3:
#line 181
{ passthru(STD_ARGS); continue; }
@@ -258,30 +252,39 @@
#line 180
{ add_entity(STD_ARGS, "&"); continue; }
yy12: yych = *++YYCURSOR;
- goto yy3;
+ goto yy16;
yy13: yych = *++YYCURSOR;
yy14:
-#line 182
+#line 183
{ goto stop; }
yy15: ++YYCURSOR;
if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+yy16: if(yybm[0+yych] & 64) goto yy15;
+ goto yy3;
+yy17: ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
yych = *YYCURSOR;
-yy16: if(yybm[0+yych] & 128) goto yy15;
- if(yych == ':') goto yy18;
-yy17: YYCURSOR = YYMARKER;
+yy18: if(yybm[0+yych] & 128) goto yy17;
+ if(yych <= '\000') goto yy3;
+ if(yych <= '.') goto yy15;
+ if(yych <= '/') goto yy3;
+ if(yych >= ';') goto yy15;
+yy19: yyaccept = 0;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if(yych != '/') goto yy16;
+yy20: yych = *++YYCURSOR;
+ if(yych == '/') goto yy22;
+yy21: YYCURSOR = YYMARKER;
switch(yyaccept){
case 0: goto yy3;
}
-yy18: yych = *++YYCURSOR;
- if(yych != '/') goto yy17;
-yy19: yych = *++YYCURSOR;
- if(yych != '/') goto yy17;
-yy20: yych = *++YYCURSOR;
-yy21:
+yy22: yych = *++YYCURSOR;
+yy23:
#line 176
{ handle_scheme(STD_ARGS); STATE = STATE_URL; continue; }
}
-#line 183
+#line 184
break;
@@ -326,43 +329,43 @@
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
};
- goto yy22;
-yy23: ++YYCURSOR;
-yy22:
+ goto yy24;
+yy25: ++YYCURSOR;
+yy24:
if((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
yych = *YYCURSOR;
if(yych <= '>'){
if(yych <= '"'){
- if(yych != '!') goto yy26;
+ if(yych != '!') goto yy28;
} else {
- if(yych == '<') goto yy26;
- if(yych >= '>') goto yy26;
+ if(yych == '<') goto yy28;
+ if(yych >= '>') goto yy28;
}
} else {
if(yych <= '`'){
- if(yych <= 'Z') goto yy24;
- if(yych != '_') goto yy26;
+ if(yych <= 'Z') goto yy26;
+ if(yych != '_') goto yy28;
} else {
- if(yych <= 'z') goto yy24;
- if(yych != '~') goto yy26;
+ if(yych <= 'z') goto yy26;
+ if(yych != '~') goto yy28;
}
}
-yy24: yych = *++YYCURSOR;
- goto yy29;
-yy25:
-#line 191
- { handle_url(STD_ARGS); STATE = STATE_PLAIN; continue; }
yy26: yych = *++YYCURSOR;
+ goto yy31;
yy27:
#line 192
+ { handle_url(STD_ARGS); STATE = STATE_PLAIN; continue; }
+yy28: yych = *++YYCURSOR;
+yy29:
+#line 193
{ passthru(STD_ARGS); STATE = STATE_PLAIN; continue; }
-yy28: ++YYCURSOR;
+yy30: ++YYCURSOR;
if(YYLIMIT == YYCURSOR) YYFILL(1);
yych = *YYCURSOR;
-yy29: if(yybm[0+yych] & 128) goto yy28;
- goto yy25;
+yy31: if(yybm[0+yych] & 128) goto yy30;
+ goto yy27;
}
-#line 193
+#line 194
break;
@@ -372,27 +375,27 @@
{
YYCTYPE yych;
unsigned int yyaccept;
- goto yy30;
-yy31: ++YYCURSOR;
-yy30:
+ goto yy32;
+yy33: ++YYCURSOR;
+yy32:
if((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
yych = *YYCURSOR;
- if(yych <= '/') goto yy34;
- if(yych >= ':') goto yy34;
-yy32: yych = *++YYCURSOR;
- if(yych <= '/') goto yy33;
- if(yych <= '9') goto yy36;
-yy33:
-#line 200
- { handle_color_digit(STD_ARGS, 0); STATE = STATE_COLOR_COMMA; continue; }
+ if(yych <= '/') goto yy36;
+ if(yych >= ':') goto yy36;
yy34: yych = *++YYCURSOR;
+ if(yych <= '/') goto yy35;
+ if(yych <= '9') goto yy38;
yy35:
#line 201
- { finish_color_stuff(STD_ARGS); passthru(STD_ARGS); STATE = STATE_PLAIN;
continue; }
+ { handle_color_digit(STD_ARGS, 0); STATE = STATE_COLOR_COMMA; continue; }
yy36: yych = *++YYCURSOR;
- goto yy33;
-}
+yy37:
#line 202
+ { finish_color_stuff(STD_ARGS); passthru(STD_ARGS); STATE = STATE_PLAIN;
+continue; }
+yy38: yych = *++YYCURSOR;
+ goto yy35;
+}
+#line 203
break;
@@ -402,22 +405,22 @@
{
YYCTYPE yych;
unsigned int yyaccept;
- goto yy37;
-yy38: ++YYCURSOR;
-yy37:
+ goto yy39;
+yy40: ++YYCURSOR;
+yy39:
if(YYLIMIT == YYCURSOR) YYFILL(1);
yych = *YYCURSOR;
- if(yych != ',') goto yy41;
-yy39: yych = *++YYCURSOR;
-yy40:
-#line 209
- { STATE = STATE_COLOR_BG; continue; }
+ if(yych != ',') goto yy43;
yy41: yych = *++YYCURSOR;
yy42:
#line 210
+ { STATE = STATE_COLOR_BG; continue; }
+yy43: yych = *++YYCURSOR;
+yy44:
+#line 211
{ YYCURSOR--; commit_color_stuff(STD_ARGS); STATE = STATE_PLAIN; continue; }
}
-#line 211
+#line 212
break;
@@ -427,27 +430,27 @@
{
YYCTYPE yych;
unsigned int yyaccept;
- goto yy43;
-yy44: ++YYCURSOR;
-yy43:
+ goto yy45;
+yy46: ++YYCURSOR;
+yy45:
if((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
yych = *YYCURSOR;
- if(yych <= '/') goto yy47;
- if(yych >= ':') goto yy47;
-yy45: yych = *++YYCURSOR;
- if(yych <= '/') goto yy46;
- if(yych <= '9') goto yy49;
-yy46:
-#line 218
- { handle_color_digit(STD_ARGS, 1); commit_color_stuff(STD_ARGS); STATE =
STATE_PLAIN; continue; }
+ if(yych <= '/') goto yy49;
+ if(yych >= ':') goto yy49;
yy47: yych = *++YYCURSOR;
+ if(yych <= '/') goto yy48;
+ if(yych <= '9') goto yy51;
yy48:
#line 219
- { commit_color_stuff(STD_ARGS); STATE = STATE_PLAIN; continue; }
+ { handle_color_digit(STD_ARGS, 1); commit_color_stuff(STD_ARGS); STATE =
+STATE_PLAIN; continue; }
yy49: yych = *++YYCURSOR;
- goto yy46;
-}
+yy50:
#line 220
+ { commit_color_stuff(STD_ARGS); STATE = STATE_PLAIN; continue; }
+yy51: yych = *++YYCURSOR;
+ goto yy48;
+}
+#line 221
break;
}
Index: php4/ext/ircg/ircg_scanner.re
diff -u php4/ext/ircg/ircg_scanner.re:1.4 php4/ext/ircg/ircg_scanner.re:1.5
--- php4/ext/ircg/ircg_scanner.re:1.4 Sun Feb 25 22:07:00 2001
+++ php4/ext/ircg/ircg_scanner.re Sat Mar 3 09:01:31 2001
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: ircg_scanner.re,v 1.4 2001/02/26 06:07:00 andi Exp $ */
+/* $Id: ircg_scanner.re,v 1.5 2001/03/03 17:01:31 sas Exp $ */
#include <ext/standard/php_smart_str.h>
#include <stdio.h>
@@ -178,6 +178,7 @@
"<" { add_entity(STD_ARGS, "<"); continue; }
">" { add_entity(STD_ARGS, ">"); continue; }
"&" { add_entity(STD_ARGS, "&"); continue; }
+ (anynoneof\([<>&])) (anynoneof\[/])* { 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]
