sas Fri Feb 16 14:59:58 2001 EDT
Modified files:
/php4/ext/ircg ircg_scanner.re ircg_scanner.c
Log:
Reverse the priority of the entity matches vs. anything. If it sees
a single entity, it should handle it immediately.
Index: php4/ext/ircg/ircg_scanner.re
diff -u php4/ext/ircg/ircg_scanner.re:1.2 php4/ext/ircg/ircg_scanner.re:1.3
--- php4/ext/ircg/ircg_scanner.re:1.2 Fri Feb 16 14:53:18 2001
+++ php4/ext/ircg/ircg_scanner.re Fri Feb 16 14:59:58 2001
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: ircg_scanner.re,v 1.2 2001/02/16 22:53:18 sas Exp $ */
+/* $Id: ircg_scanner.re,v 1.3 2001/02/16 22:59:58 sas Exp $ */
#include <ext/standard/php_smart_str.h>
#include <stdio.h>
@@ -175,10 +175,10 @@
/*!re2c
scheme "://" { handle_scheme(STD_ARGS); STATE = STATE_URL; continue; }
coloresc { mctx.fg_code = mctx.bg_code = -1; STATE =
STATE_COLOR_FG; continue; }
- anynoneof { passthru(STD_ARGS); continue; }
"<" { add_entity(STD_ARGS, "<"); continue; }
">" { add_entity(STD_ARGS, ">"); continue; }
"&" { add_entity(STD_ARGS, "&"); continue; }
+ anynoneof { passthru(STD_ARGS); continue; }
eof { goto stop; }
*/
Index: php4/ext/ircg/ircg_scanner.c
diff -u php4/ext/ircg/ircg_scanner.c:1.2 php4/ext/ircg/ircg_scanner.c:1.3
--- php4/ext/ircg/ircg_scanner.c:1.2 Fri Feb 16 14:53:18 2001
+++ php4/ext/ircg/ircg_scanner.c Fri Feb 16 14:59:58 2001
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.5 on Fri Feb 16 23:53:05 2001 */
+/* Generated by re2c 0.5 on Sat Feb 17 00:00:51 2001 */
#line 1 "/home/sas/src/php4/ext/ircg/ircg_scanner.re"
/*
+----------------------------------------------------------------------+
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: ircg_scanner.c,v 1.2 2001/02/16 22:53:18 sas Exp $ */
+/* $Id: ircg_scanner.c,v 1.3 2001/02/16 22:59:58 sas Exp $ */
#include <ext/standard/php_smart_str.h>
#include <stdio.h>
@@ -210,68 +210,74 @@
yych = *YYCURSOR;
if(yych <= '<'){
if(yych <= '\003'){
- if(yych <= '\000') goto yy10;
- if(yych <= '\002') goto yy6;
+ if(yych <= '\000') goto yy13;
+ if(yych <= '\002') goto yy12;
goto yy4;
} else {
- if(yych == '&') goto yy7;
- if(yych <= ';') goto yy6;
- goto yy8;
+ if(yych == '&') goto yy10;
+ if(yych <= ';') goto yy12;
+ goto yy6;
}
} else {
if(yych <= '@'){
- if(yych == '>') goto yy9;
- goto yy6;
+ if(yych == '>') goto yy8;
+ goto yy12;
} else {
if(yych <= 'Z') goto yy2;
- if(yych <= '`') goto yy6;
- if(yych >= '{') goto yy6;
+ if(yych <= '`') goto yy12;
+ if(yych >= '{') goto yy12;
}
}
yy2: yyaccept = 0;
yych = *(YYMARKER = ++YYCURSOR);
if(yych <= '@'){
if(yych <= '/') goto yy3;
- if(yych <= ':') goto yy13;
+ if(yych <= ':') goto yy16;
} else {
- if(yych <= 'Z') goto yy13;
+ if(yych <= 'Z') goto yy16;
if(yych <= '`') goto yy3;
- if(yych <= 'z') goto yy13;
+ if(yych <= 'z') goto yy16;
}
yy3:
-#line 178
+#line 181
{ passthru(STD_ARGS); continue; }
yy4: yych = *++YYCURSOR;
yy5:
#line 177
{ mctx.fg_code = mctx.bg_code = -1; STATE = STATE_COLOR_FG; continue; }
yy6: yych = *++YYCURSOR;
- goto yy3;
-yy7: yych = *++YYCURSOR;
- goto yy3;
+yy7:
+#line 178
+ { add_entity(STD_ARGS, "<"); continue; }
yy8: yych = *++YYCURSOR;
- goto yy3;
-yy9: yych = *++YYCURSOR;
- goto yy3;
+yy9:
+#line 179
+ { add_entity(STD_ARGS, ">"); continue; }
yy10: yych = *++YYCURSOR;
yy11:
+#line 180
+ { add_entity(STD_ARGS, "&"); continue; }
+yy12: yych = *++YYCURSOR;
+ goto yy3;
+yy13: yych = *++YYCURSOR;
+yy14:
#line 182
{ goto stop; }
-yy12: ++YYCURSOR;
+yy15: ++YYCURSOR;
if(YYLIMIT == YYCURSOR) YYFILL(1);
yych = *YYCURSOR;
-yy13: if(yybm[0+yych] & 128) goto yy12;
- if(yych == ':') goto yy15;
-yy14: YYCURSOR = YYMARKER;
+yy16: if(yybm[0+yych] & 128) goto yy15;
+ if(yych == ':') goto yy18;
+yy17: YYCURSOR = YYMARKER;
switch(yyaccept){
case 0: goto yy3;
}
-yy15: yych = *++YYCURSOR;
- if(yych != '/') goto yy14;
-yy16: yych = *++YYCURSOR;
- if(yych != '/') goto yy14;
-yy17: yych = *++YYCURSOR;
-yy18:
+yy18: yych = *++YYCURSOR;
+ if(yych != '/') goto yy17;
+yy19: yych = *++YYCURSOR;
+ if(yych != '/') goto yy17;
+yy20: yych = *++YYCURSOR;
+yy21:
#line 176
{ handle_scheme(STD_ARGS); STATE = STATE_URL; continue; }
}
@@ -320,41 +326,41 @@
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
};
- goto yy19;
-yy20: ++YYCURSOR;
-yy19:
+ goto yy22;
+yy23: ++YYCURSOR;
+yy22:
if((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
yych = *YYCURSOR;
if(yych <= '>'){
if(yych <= '"'){
- if(yych != '!') goto yy23;
+ if(yych != '!') goto yy26;
} else {
- if(yych == '<') goto yy23;
- if(yych >= '>') goto yy23;
+ if(yych == '<') goto yy26;
+ if(yych >= '>') goto yy26;
}
} else {
if(yych <= '`'){
- if(yych <= 'Z') goto yy21;
- if(yych != '_') goto yy23;
+ if(yych <= 'Z') goto yy24;
+ if(yych != '_') goto yy26;
} else {
- if(yych <= 'z') goto yy21;
- if(yych != '~') goto yy23;
+ if(yych <= 'z') goto yy24;
+ if(yych != '~') goto yy26;
}
}
-yy21: yych = *++YYCURSOR;
- goto yy26;
-yy22:
+yy24: yych = *++YYCURSOR;
+ goto yy29;
+yy25:
#line 191
{ handle_url(STD_ARGS); STATE = STATE_PLAIN; continue; }
-yy23: yych = *++YYCURSOR;
-yy24:
+yy26: yych = *++YYCURSOR;
+yy27:
#line 192
{ passthru(STD_ARGS); STATE = STATE_PLAIN; continue; }
-yy25: ++YYCURSOR;
+yy28: ++YYCURSOR;
if(YYLIMIT == YYCURSOR) YYFILL(1);
yych = *YYCURSOR;
-yy26: if(yybm[0+yych] & 128) goto yy25;
- goto yy22;
+yy29: if(yybm[0+yych] & 128) goto yy28;
+ goto yy25;
}
#line 193
@@ -366,25 +372,25 @@
{
YYCTYPE yych;
unsigned int yyaccept;
- goto yy27;
-yy28: ++YYCURSOR;
-yy27:
+ goto yy30;
+yy31: ++YYCURSOR;
+yy30:
if((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
yych = *YYCURSOR;
- if(yych <= '/') goto yy31;
- if(yych >= ':') goto yy31;
-yy29: yych = *++YYCURSOR;
- if(yych <= '/') goto yy30;
- if(yych <= '9') goto yy33;
-yy30:
+ 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; }
-yy31: yych = *++YYCURSOR;
-yy32:
+yy34: yych = *++YYCURSOR;
+yy35:
#line 201
{ finish_color_stuff(STD_ARGS); passthru(STD_ARGS); STATE = STATE_PLAIN;
continue; }
-yy33: yych = *++YYCURSOR;
- goto yy30;
+yy36: yych = *++YYCURSOR;
+ goto yy33;
}
#line 202
@@ -396,18 +402,18 @@
{
YYCTYPE yych;
unsigned int yyaccept;
- goto yy34;
-yy35: ++YYCURSOR;
-yy34:
+ goto yy37;
+yy38: ++YYCURSOR;
+yy37:
if(YYLIMIT == YYCURSOR) YYFILL(1);
yych = *YYCURSOR;
- if(yych != ',') goto yy38;
-yy36: yych = *++YYCURSOR;
-yy37:
+ if(yych != ',') goto yy41;
+yy39: yych = *++YYCURSOR;
+yy40:
#line 209
{ STATE = STATE_COLOR_BG; continue; }
-yy38: yych = *++YYCURSOR;
-yy39:
+yy41: yych = *++YYCURSOR;
+yy42:
#line 210
{ YYCURSOR--; commit_color_stuff(STD_ARGS); STATE = STATE_PLAIN; continue; }
}
@@ -421,25 +427,25 @@
{
YYCTYPE yych;
unsigned int yyaccept;
- goto yy40;
-yy41: ++YYCURSOR;
-yy40:
+ goto yy43;
+yy44: ++YYCURSOR;
+yy43:
if((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
yych = *YYCURSOR;
- if(yych <= '/') goto yy44;
- if(yych >= ':') goto yy44;
-yy42: yych = *++YYCURSOR;
- if(yych <= '/') goto yy43;
- if(yych <= '9') goto yy46;
-yy43:
+ 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; }
-yy44: yych = *++YYCURSOR;
-yy45:
+yy47: yych = *++YYCURSOR;
+yy48:
#line 219
{ commit_color_stuff(STD_ARGS); STATE = STATE_PLAIN; continue; }
-yy46: yych = *++YYCURSOR;
- goto yy43;
+yy49: yych = *++YYCURSOR;
+ goto yy46;
}
#line 220
--
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]
