sas             Tue Jun 17 20:08:05 2003 EDT

  Modified files:              
    /php4/ext/ircg      ircg_scanner.c 
  Log:
  Sync
  
  
Index: php4/ext/ircg/ircg_scanner.c
diff -u php4/ext/ircg/ircg_scanner.c:1.29 php4/ext/ircg/ircg_scanner.c:1.30
--- php4/ext/ircg/ircg_scanner.c:1.29   Tue Jun 10 16:03:31 2003
+++ php4/ext/ircg/ircg_scanner.c        Tue Jun 17 20:08:05 2003
@@ -1,5 +1,5 @@
-/* Generated by re2c 0.5 on Tue Jun  3 16:29:05 2003 */
-#line 1 "ircg_scanner.re" 
+/* Generated by re2c 0.5 on Wed Jun 18 02:07:15 2003 */
+#line 1 "ircg_scanner.re"
 /*
    +----------------------------------------------------------------------+
    | PHP Version 4                                                        |
@@ -18,14 +18,15 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: ircg_scanner.c,v 1.29 2003/06/10 20:03:31 imajes Exp $ */
+/* $Id: ircg_scanner.c,v 1.30 2003/06/18 00:08:05 sas Exp $ */
 
-#include "php_ircg_alloc.h"
 
-#include "php_ircg_smart_str.h"
 #include <stdio.h>
 #include <string.h>
 
+#include "php_ircg_smart_str.h"
+#include "php_ircg_alloc.h"
+
 static const char *color_list[] = {
     "white",
     "black",
@@ -60,7 +61,7 @@
        smart_str *result;
 } ircg_msg_scanner;
 
-#line 78
+#line 79
 
 
 #define YYFILL(n) do { } while (0)
@@ -73,11 +74,7 @@
 #define STD_ARGS ctx, start, YYCURSOR
 
 #define PASSTHRU() 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); \
+       smart_str_appendl_ex(mctx.result, start, xp-start, 1); \
 } while (0)
 
 static inline void handle_scheme(STD_PARA)
@@ -376,51 +373,51 @@
        default:        goto yy4;
        }
 yy4:
-#line 260
+#line 257
        { PASSTHRU(); goto state_plain; }
 yy5:   yych = *++YYCURSOR;
 yy6:
-#line 249
+#line 246
        { mctx.fg_code = mctx.bg_code = -1; goto state_color_fg; }
 yy7:   yych = *++YYCURSOR;
 yy8:
-#line 250
+#line 247
        { ADD_CONST("&lt;"); goto state_plain; }
 yy9:   yych = *++YYCURSOR;
 yy10:
-#line 251
+#line 248
        { ADD_CONST("&gt;"); goto state_plain; }
 yy11:  yych = *++YYCURSOR;
 yy12:
-#line 252
+#line 249
        { ADD_CONST("&amp;"); goto state_plain; }
 yy13:  yych = *++YYCURSOR;
 yy14:
-#line 253
+#line 250
        { ADD_CONST("&quot;"); goto state_plain; }
 yy15:  yych = *++YYCURSOR;
 yy16:
-#line 254
+#line 251
        { if (gen_br) ADD_CONST("<br>"); goto state_plain; }
 yy17:  yych = *++YYCURSOR;
 yy18:
-#line 255
+#line 252
        { mctx.fg_color[0] = mctx.bg_color[0] = 0; goto state_color_hex; }
 yy19:  yych = *++YYCURSOR;
 yy20:
-#line 256
+#line 253
        { handle_bold(STD_ARGS, 0); goto state_plain; }
 yy21:  yych = *++YYCURSOR;
 yy22:
-#line 257
+#line 254
        { handle_underline(STD_ARGS, 0); goto state_plain; }
 yy23:  yych = *++YYCURSOR;
 yy24:
-#line 258
+#line 255
        { handle_italic(STD_ARGS, 0); goto state_plain; }
 yy25:  yych = *++YYCURSOR;
 yy26:
-#line 259
+#line 256
        { do_reset(STD_ARGS); goto state_plain; }
 yy27:  yych = *++YYCURSOR;
        goto yy4;
@@ -503,10 +500,10 @@
        }
 yy32:  yych = *++YYCURSOR;
 yy33:
-#line 248
+#line 245
        { if (auto_links) { handle_scheme(STD_ARGS); goto state_url; } else { 
PASSTHRU(); goto state_plain; } }
 }
-#line 261
+#line 258
 
 
 state_color_hex:
@@ -569,11 +566,11 @@
        default:        goto yy37;
        }
 yy37:
-#line 268
+#line 265
        { finish_color_stuff(STD_ARGS); PASSTHRU(); goto state_plain; }
 yy38:  yych = *++YYCURSOR;
 yy39:
-#line 267
+#line 264
        { goto state_color_hex_bg; }
 yy40:  yych = *++YYCURSOR;
        goto yy37;
@@ -679,10 +676,10 @@
        }
 yy46:  yych = *++YYCURSOR;
 yy47:
-#line 266
+#line 263
        { handle_hex(STD_ARGS, 0); goto state_color_hex_bg; }
 }
-#line 269
+#line 266
 
 
        
@@ -702,14 +699,14 @@
        }
 yy50:  yych = *++YYCURSOR;
 yy51:
-#line 275
+#line 272
        { goto state_color_hex_bg; }
 yy52:  yych = *++YYCURSOR;
 yy53:
-#line 276
+#line 273
        { YYCURSOR--; commit_color_hex(STD_ARGS); goto state_plain; }
 }
-#line 277
+#line 274
 
 
 
@@ -772,7 +769,7 @@
        default:        goto yy57;
        }
 yy57:
-#line 284
+#line 281
        { commit_color_hex(STD_ARGS); PASSTHRU(); goto state_plain; }
 yy58:  yych = *++YYCURSOR;
        goto yy57;
@@ -878,10 +875,10 @@
        }
 yy64:  yych = *++YYCURSOR;
 yy65:
-#line 283
+#line 280
        { handle_hex(STD_ARGS, 1); commit_color_hex(STD_ARGS); goto state_plain; }
 }
-#line 285
+#line 282
 
 
 state_url:
@@ -977,11 +974,11 @@
 yy68:  yych = *++YYCURSOR;
        goto yy73;
 yy69:
-#line 290
+#line 287
        { handle_url(STD_ARGS); goto state_plain; }
 yy70:  yych = *++YYCURSOR;
 yy71:
-#line 291
+#line 288
        { PASSTHRU(); goto state_plain; }
 yy72:  ++YYCURSOR;
        if(YYLIMIT == YYCURSOR) YYFILL(1);
@@ -1067,7 +1064,7 @@
        default:        goto yy69;
        }
 }
-#line 292
+#line 289
 
 
 
@@ -1110,20 +1107,20 @@
        default:        goto yy77;
        }
 yy77:
-#line 298
+#line 295
        { handle_color_digit(STD_ARGS, 0); goto state_color_comma; }
 yy78:  yych = *++YYCURSOR;
 yy79:
-#line 299
+#line 296
        { goto state_color_bg; }
 yy80:  yych = *++YYCURSOR;
 yy81:
-#line 300
+#line 297
        { finish_color_stuff(STD_ARGS); PASSTHRU(); goto state_plain; }
 yy82:  yych = *++YYCURSOR;
        goto yy77;
 }
-#line 301
+#line 298
 
 
        
@@ -1143,14 +1140,14 @@
        }
 yy85:  yych = *++YYCURSOR;
 yy86:
-#line 307
+#line 304
        { goto state_color_bg; }
 yy87:  yych = *++YYCURSOR;
 yy88:
-#line 308
+#line 305
        { YYCURSOR--; commit_color_stuff(STD_ARGS); goto state_plain; }
 }
-#line 309
+#line 306
 
        
 
@@ -1192,16 +1189,16 @@
        default:        goto yy92;
        }
 yy92:
-#line 315
+#line 312
        { handle_color_digit(STD_ARGS, 1); commit_color_stuff(STD_ARGS); goto 
state_plain; }
 yy93:  yych = *++YYCURSOR;
 yy94:
-#line 316
+#line 313
        { commit_color_stuff(STD_ARGS); PASSTHRU(); goto state_plain; }
 yy95:  yych = *++YYCURSOR;
        goto yy92;
 }
-#line 317
+#line 314
 
 
 stop:



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to