sas Wed Jun 4 03:01:45 2003 EDT Modified files: (Branch: PHP_4_3) /php4/ext/ircg ircg_scanner.c Log: sync Index: php4/ext/ircg/ircg_scanner.c diff -u php4/ext/ircg/ircg_scanner.c:1.19.8.3 php4/ext/ircg/ircg_scanner.c:1.19.8.4 --- php4/ext/ircg/ircg_scanner.c:1.19.8.3 Tue Jun 3 10:16:43 2003 +++ php4/ext/ircg/ircg_scanner.c Wed Jun 4 03:01:45 2003 @@ -1,4 +1,4 @@ -/* Generated by re2c 0.5 on Tue Jun 3 16:16:33 2003 */ +/* Generated by re2c 0.5 on Wed Jun 4 09:00:32 2003 */ #line 1 "ircg_scanner.re" /* +----------------------------------------------------------------------+ @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: ircg_scanner.c,v 1.19.8.3 2003/06/03 14:16:43 sas Exp $ */ +/* $Id: ircg_scanner.c,v 1.19.8.4 2003/06/04 07:01:45 sas Exp $ */ #include <ext/standard/php_smart_str.h> #include <stdio.h> @@ -70,12 +70,9 @@ #define STD_PARA ircg_msg_scanner *ctx, const char *start, const char *YYCURSOR #define STD_ARGS ctx, start, YYCURSOR -#define passthru(na,nb,nc) do { \ - size_t __len = xp - start; \ - if (__len == 1) \ - smart_str_appendc_ex(mctx.result, start, 1); \ - else \ - smart_str_appendl_ex(mctx.result, start, __len, 1); \ +#define passthru() do { \ + size_t __len = xp - start; \ + smart_str_appendl_ex(mctx.result, start, __len, 1); \ } while (0) static inline void handle_scheme(STD_PARA) @@ -366,47 +363,47 @@ default: goto yy4; } yy4: -#line 249 - { passthru(STD_ARGS); goto state_plain; } +#line 246 + { passthru(); goto state_plain; } yy5: yych = *++YYCURSOR; yy6: -#line 239 +#line 236 { mctx.fg_code = mctx.bg_code = -1; goto state_color_fg; } yy7: yych = *++YYCURSOR; yy8: -#line 240 +#line 237 { mctx.fg_color[0] = mctx.bg_color[0] = 0; goto state_color_hex; } yy9: yych = *++YYCURSOR; yy10: -#line 241 +#line 238 { add_entity(STD_ARGS, "<"); goto state_plain; } yy11: yych = *++YYCURSOR; yy12: -#line 242 +#line 239 { add_entity(STD_ARGS, ">"); goto state_plain; } yy13: yych = *++YYCURSOR; yy14: -#line 243 +#line 240 { add_entity(STD_ARGS, "&"); goto state_plain; } yy15: yych = *++YYCURSOR; yy16: -#line 244 +#line 241 { add_entity(STD_ARGS, """); goto state_plain; } yy17: yych = *++YYCURSOR; yy18: -#line 245 +#line 242 { if (gen_br) smart_str_appendl_ex(ctx->result, "<br>", 4, 1); goto state_plain; } yy19: yych = *++YYCURSOR; yy20: -#line 246 +#line 243 { handle_bold(STD_ARGS, 0); goto state_plain; } yy21: yych = *++YYCURSOR; yy22: -#line 247 +#line 244 { handle_underline(STD_ARGS, 0); goto state_plain; } yy23: yych = *++YYCURSOR; yy24: -#line 248 +#line 245 { handle_italic(STD_ARGS, 0); goto state_plain; } yy25: yych = *++YYCURSOR; goto yy4; @@ -489,13 +486,13 @@ } yy30: yych = *++YYCURSOR; yy31: -#line 238 - { if (auto_links) { handle_scheme(STD_ARGS); goto state_url; } else { passthru(STD_ARGS); goto state_plain; } } +#line 235 + { if (auto_links) { handle_scheme(STD_ARGS); goto state_url; } else { passthru(); goto state_plain; } } } -#line 250 +#line 247 -statc_color_hex: +state_color_hex: start = YYCURSOR; { YYCTYPE yych; @@ -555,11 +552,11 @@ default: goto yy35; } yy35: -#line 257 - { finish_color_stuff(STD_ARGS); passthru(STD_ARGS); goto state_plain; } +#line 254 + { finish_color_stuff(STD_ARGS); passthru(); goto state_plain; } yy36: yych = *++YYCURSOR; yy37: -#line 256 +#line 253 { goto state_color_hex_bg; } yy38: yych = *++YYCURSOR; goto yy35; @@ -665,10 +662,10 @@ } yy44: yych = *++YYCURSOR; yy45: -#line 255 +#line 252 { handle_hex(STD_ARGS, 0); goto state_color_hex_bg; } } -#line 258 +#line 255 @@ -688,14 +685,14 @@ } yy48: yych = *++YYCURSOR; yy49: -#line 264 +#line 261 { goto state_color_hex_bg; } yy50: yych = *++YYCURSOR; yy51: -#line 265 +#line 262 { YYCURSOR--; commit_color_hex(STD_ARGS); goto state_plain; } } -#line 266 +#line 263 @@ -758,8 +755,8 @@ default: goto yy55; } yy55: -#line 273 - { commit_color_hex(STD_ARGS); passthru(STD_ARGS); goto state_plain; } +#line 270 + { commit_color_hex(STD_ARGS); passthru(); goto state_plain; } yy56: yych = *++YYCURSOR; goto yy55; yy57: yych = *++YYCURSOR; @@ -864,10 +861,10 @@ } yy62: yych = *++YYCURSOR; yy63: -#line 272 +#line 269 { handle_hex(STD_ARGS, 1); commit_color_hex(STD_ARGS); goto state_plain; } } -#line 274 +#line 271 state_url: @@ -963,12 +960,12 @@ yy66: yych = *++YYCURSOR; goto yy71; yy67: -#line 279 +#line 276 { handle_url(STD_ARGS); goto state_plain; } yy68: yych = *++YYCURSOR; yy69: -#line 280 - { passthru(STD_ARGS); goto state_plain; } +#line 277 + { passthru(); goto state_plain; } yy70: ++YYCURSOR; if(YYLIMIT == YYCURSOR) YYFILL(1); yych = *YYCURSOR; @@ -1053,7 +1050,7 @@ default: goto yy67; } } -#line 281 +#line 278 @@ -1096,20 +1093,20 @@ default: goto yy75; } yy75: -#line 287 +#line 284 { handle_color_digit(STD_ARGS, 0); goto state_color_comma; } yy76: yych = *++YYCURSOR; yy77: -#line 288 +#line 285 { goto state_color_bg; } yy78: yych = *++YYCURSOR; yy79: -#line 289 - { finish_color_stuff(STD_ARGS); passthru(STD_ARGS); goto state_plain; } +#line 286 + { finish_color_stuff(STD_ARGS); passthru(); goto state_plain; } yy80: yych = *++YYCURSOR; goto yy75; } -#line 290 +#line 287 @@ -1129,14 +1126,14 @@ } yy83: yych = *++YYCURSOR; yy84: -#line 296 +#line 293 { goto state_color_bg; } yy85: yych = *++YYCURSOR; yy86: -#line 297 +#line 294 { YYCURSOR--; commit_color_stuff(STD_ARGS); goto state_plain; } } -#line 298 +#line 295 @@ -1178,16 +1175,16 @@ default: goto yy90; } yy90: -#line 304 +#line 301 { handle_color_digit(STD_ARGS, 1); commit_color_stuff(STD_ARGS); goto state_plain; } yy91: yych = *++YYCURSOR; yy92: -#line 305 - { commit_color_stuff(STD_ARGS); passthru(STD_ARGS); goto state_plain; } +#line 302 + { commit_color_stuff(STD_ARGS); passthru(); goto state_plain; } yy93: yych = *++YYCURSOR; goto yy90; } -#line 306 +#line 303 stop:
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php