- Regenerated with re2c 0.9.6 (fixes severe bugs)

diff --git a/ext/standard/url_scanner_ex.c b/ext/standard/url_scanner_ex.c
index 68c870383793763c1af5a050afeecece1b6820dc..4569dfaa475fe30e516cce938adc43f3b6b8e571 100644 (file)
--- a/ext/standard/url_scanner_ex.c
+++ b/ext/standard/url_scanner_ex.c
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.9.4 on Mon Apr  4 01:01:25 2005 */
+/* Generated by re2c 0.9.6 on Fri Apr 15 01:37:31 2005 */
 #line 1 "/usr/src/php/php5/ext/standard/url_scanner_ex.re"
 /*
   +----------------------------------------------------------------------+
@@ -149,11 +149,13 @@ scan:
        128, 128, 128, 128, 128, 128, 128, 128, 
        };
        goto yy0;
-yy1:   ++YYCURSOR;
+       ++YYCURSOR;
 yy0:
        if(YYLIMIT == YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
-       if(yybm[0+yych] & 128)  goto yy8;
+       if(yybm[0+yych] & 128) {
+               goto yy8;
+       }
        if(yych <= '9') goto yy6;
        if(yych >= ';') goto yy4;
        goto yy2;
@@ -162,29 +164,31 @@ yy2:      ++YYCURSOR;
 yy3:
 #line 115 "/usr/src/php/php5/ext/standard/url_scanner_ex.re"
 { smart_str_append(dest, url); return; }
-#line 59 "<stdout>"
+#line 61 "<stdout>"
 yy4:   ++YYCURSOR;
        goto yy5;
 yy5:
 #line 116 "/usr/src/php/php5/ext/standard/url_scanner_ex.re"
 { sep = separator; goto scan; }
-#line 65 "<stdout>"
+#line 67 "<stdout>"
 yy6:   ++YYCURSOR;
        goto yy7;
 yy7:
 #line 117 "/usr/src/php/php5/ext/standard/url_scanner_ex.re"
 { bash = p - 1; goto done; }
-#line 71 "<stdout>"
+#line 73 "<stdout>"
 yy8:   ++YYCURSOR;
        if(YYLIMIT == YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
        goto yy9;
-yy9:   if(yybm[0+yych] & 128)  goto yy8;
+yy9:   if(yybm[0+yych] & 128) {
+               goto yy8;
+       }
        goto yy10;
 yy10:
 #line 118 "/usr/src/php/php5/ext/standard/url_scanner_ex.re"
 { goto scan; }
-#line 82 "<stdout>"
+#line 86 "<stdout>"
 }
 #line 119 "/usr/src/php/php5/ext/standard/url_scanner_ex.re"
 
@@ -355,7 +359,7 @@ state_plain_begin:
 state_plain:
        start = YYCURSOR;
 
-#line 86 "<stdout>"
+#line 90 "<stdout>"
 {
        YYCTYPE yych;
        unsigned int yyaccept;
@@ -394,28 +398,32 @@ state_plain:
        128, 128, 128, 128, 128, 128, 128, 128, 
        };
        goto yy11;
-yy12:  ++YYCURSOR;
+       ++YYCURSOR;
 yy11:
        if(YYLIMIT == YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
-       if(yybm[0+yych] & 128)  goto yy15;
+       if(yybm[0+yych] & 128) {
+               goto yy15;
+       }
        goto yy13;
 yy13:  ++YYCURSOR;
        goto yy14;
 yy14:
 #line 287 "/usr/src/php/php5/ext/standard/url_scanner_ex.re"
 { passthru(STD_ARGS); STATE = STATE_TAG; goto state_tag; }
-#line 136 "<stdout>"
+#line 142 "<stdout>"
 yy15:  ++YYCURSOR;
        if(YYLIMIT == YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
        goto yy16;
-yy16:  if(yybm[0+yych] & 128)  goto yy15;
+yy16:  if(yybm[0+yych] & 128) {
+               goto yy15;
+       }
        goto yy17;
 yy17:
 #line 288 "/usr/src/php/php5/ext/standard/url_scanner_ex.re"
 { passthru(STD_ARGS); goto state_plain; }
-#line 147 "<stdout>"
+#line 155 "<stdout>"
 }
 #line 289 "/usr/src/php/php5/ext/standard/url_scanner_ex.re"
 
@@ -423,7 +431,7 @@ yy17:
 state_tag:     
        start = YYCURSOR;
 
-#line 151 "<stdout>"
+#line 159 "<stdout>"
 {
        YYCTYPE yych;
        unsigned int yyaccept;
@@ -462,7 +470,7 @@ state_tag:
          0,   0,   0,   0,   0,   0,   0,   0, 
        };
        goto yy18;
-yy19:  ++YYCURSOR;
+       ++YYCURSOR;
 yy18:
        if((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
        yych = *YYCURSOR;
@@ -477,18 +485,20 @@ yy20:     ++YYCURSOR;
 yy21:
 #line 294 "/usr/src/php/php5/ext/standard/url_scanner_ex.re"
 { handle_tag(STD_ARGS); /* Sets STATE */; passthru(STD_ARGS); if (STATE == STATE_PLAIN) goto state_plain; else goto state_next_arg; }
-#line 204 "<stdout>"
+#line 212 "<stdout>"
 yy22:  ++YYCURSOR;
        goto yy23;
 yy23:
 #line 295 "/usr/src/php/php5/ext/standard/url_scanner_ex.re"
 { passthru(STD_ARGS); goto state_plain_begin; }
-#line 210 "<stdout>"
+#line 218 "<stdout>"
 yy24:  ++YYCURSOR;
        if(YYLIMIT == YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
        goto yy25;
-yy25:  if(yybm[0+yych] & 128)  goto yy24;
+yy25:  if(yybm[0+yych] & 128) {
+               goto yy24;
+       }
        goto yy21;
 }
 #line 296 "/usr/src/php/php5/ext/standard/url_scanner_ex.re"
@@ -500,7 +510,7 @@ state_next_arg_begin:
 state_next_arg:
        start = YYCURSOR;
 
-#line 221 "<stdout>"
+#line 231 "<stdout>"
 {
        YYCTYPE yych;
        unsigned int yyaccept;
@@ -539,7 +549,7 @@ state_next_arg:
          0,   0,   0,   0,   0,   0,   0,   0, 
        };
        goto yy26;
-yy27:  ++YYCURSOR;
+       ++YYCURSOR;
 yy26:
        if((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
        yych = *YYCURSOR;
@@ -567,31 +577,33 @@ yy28:     ++YYCURSOR;
 yy29:
 #line 304 "/usr/src/php/php5/ext/standard/url_scanner_ex.re"
 { passthru(STD_ARGS); handle_form(STD_ARGS); goto state_plain_begin; }
-#line 288 "<stdout>"
+#line 298 "<stdout>"
 yy30:  ++YYCURSOR;
        yych = *YYCURSOR;
        goto yy37;
 yy31:
 #line 305 "/usr/src/php/php5/ext/standard/url_scanner_ex.re"
 { passthru(STD_ARGS); goto state_next_arg; }
-#line 294 "<stdout>"
+#line 304 "<stdout>"
 yy32:  ++YYCURSOR;
        goto yy33;
 yy33:
 #line 306 "/usr/src/php/php5/ext/standard/url_scanner_ex.re"
 { --YYCURSOR; STATE = STATE_ARG; goto state_arg; }
-#line 300 "<stdout>"
+#line 310 "<stdout>"
 yy34:  ++YYCURSOR;
        goto yy35;
 yy35:
 #line 307 "/usr/src/php/php5/ext/standard/url_scanner_ex.re"
 { passthru(STD_ARGS); goto state_plain_begin; }
-#line 306 "<stdout>"
+#line 316 "<stdout>"
 yy36:  ++YYCURSOR;
        if(YYLIMIT == YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
        goto yy37;
-yy37:  if(yybm[0+yych] & 128)  goto yy36;
+yy37:  if(yybm[0+yych] & 128) {
+               goto yy36;
+       }
        goto yy31;
 }
 #line 308 "/usr/src/php/php5/ext/standard/url_scanner_ex.re"
@@ -600,7 +612,7 @@ yy37:       if(yybm[0+yych] & 128)  goto yy36;
 state_arg:
        start = YYCURSOR;
 
-#line 317 "<stdout>"
+#line 329 "<stdout>"
 {
        YYCTYPE yych;
        unsigned int yyaccept;
@@ -639,7 +651,7 @@ state_arg:
          0,   0,   0,   0,   0,   0,   0,   0, 
        };
        goto yy38;
-yy39:  ++YYCURSOR;
+       ++YYCURSOR;
 yy38:
        if((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
        yych = *YYCURSOR;
@@ -654,18 +666,20 @@ yy40:     ++YYCURSOR;
 yy41:
 #line 313 "/usr/src/php/php5/ext/standard/url_scanner_ex.re"
 { passthru(STD_ARGS); handle_arg(STD_ARGS); STATE = STATE_BEFORE_VAL; goto state_before_val; }
-#line 370 "<stdout>"
+#line 382 "<stdout>"
 yy42:  ++YYCURSOR;
        goto yy43;
 yy43:
 #line 314 "/usr/src/php/php5/ext/standard/url_scanner_ex.re"
 { passthru(STD_ARGS); STATE = STATE_NEXT_ARG; goto state_next_arg; }
-#line 376 "<stdout>"
+#line 388 "<stdout>"
 yy44:  ++YYCURSOR;
        if(YYLIMIT == YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
        goto yy45;
-yy45:  if(yybm[0+yych] & 128)  goto yy44;
+yy45:  if(yybm[0+yych] & 128) {
+               goto yy44;
+       }
        goto yy41;
 }
 #line 315 "/usr/src/php/php5/ext/standard/url_scanner_ex.re"
@@ -674,7 +688,7 @@ yy45:       if(yybm[0+yych] & 128)  goto yy44;
 state_before_val:
        start = YYCURSOR;
 
-#line 387 "<stdout>"
+#line 401 "<stdout>"
 {
        YYCTYPE yych;
        unsigned int yyaccept;
@@ -713,7 +727,7 @@ state_before_val:
          0,   0,   0,   0,   0,   0,   0,   0, 
        };
        goto yy46;
-yy47:  ++YYCURSOR;
+       ++YYCURSOR;
 yy46:
        if((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
        yych = *YYCURSOR;
@@ -728,21 +742,23 @@ yy48:     yyaccept = 0;
 yy49:
 #line 321 "/usr/src/php/php5/ext/standard/url_scanner_ex.re"
 { --YYCURSOR; goto state_next_arg_begin; }
-#line 441 "<stdout>"
+#line 455 "<stdout>"
 yy50:  ++YYCURSOR;
        yych = *YYCURSOR;
        goto yy54;
 yy51:
 #line 320 "/usr/src/php/php5/ext/standard/url_scanner_ex.re"
 { passthru(STD_ARGS); STATE = STATE_VAL; goto state_val; }
-#line 447 "<stdout>"
+#line 461 "<stdout>"
 yy52:  yych = *++YYCURSOR;
        goto yy49;
 yy53:  ++YYCURSOR;
        if(YYLIMIT == YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
        goto yy54;
-yy54:  if(yybm[0+yych] & 128)  goto yy53;
+yy54:  if(yybm[0+yych] & 128) {
+               goto yy53;
+       }
        goto yy51;
 yy55:  ++YYCURSOR;
        if(YYLIMIT == YYCURSOR) YYFILL(1);
@@ -763,7 +779,7 @@ yy57:       YYCURSOR = YYMARKER;
 state_val:
        start = YYCURSOR;
 
-#line 472 "<stdout>"
+#line 488 "<stdout>"
 {
        YYCTYPE yych;
        unsigned int yyaccept;
@@ -802,7 +818,7 @@ state_val:
        248, 248, 248, 248, 248, 248, 248, 248, 
        };
        goto yy58;
-yy59:  ++YYCURSOR;
+       ++YYCURSOR;
 yy58:
        if((YYLIMIT - YYCURSOR) < 3) YYFILL(3);
        yych = *YYCURSOR;
@@ -830,7 +846,7 @@ yy60:       yyaccept = 0;
 yy61:
 #line 330 "/usr/src/php/php5/ext/standard/url_scanner_ex.re"
 { handle_val(STD_ARGS, 0, '\0'); goto state_next_arg_begin; }
-#line 539 "<stdout>"
+#line 555 "<stdout>"
 yy62:  yyaccept = 0;
        yych = *(YYMARKER = ++YYCURSOR);
        goto yy69;
@@ -841,35 +857,43 @@ yy64:     ++YYCURSOR;
 yy65:
 #line 331 "/usr/src/php/php5/ext/standard/url_scanner_ex.re"
 { passthru(STD_ARGS); goto state_next_arg_begin; }
-#line 550 "<stdout>"
+#line 566 "<stdout>"
 yy66:  ++YYCURSOR;
        if(YYLIMIT == YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
        goto yy67;
-yy67:  if(yybm[0+yych] & 8)    goto yy66;
+yy67:  if(yybm[0+yych] & 8) {
+               goto yy66;
+       }
        goto yy61;
 yy68:  yyaccept = 0;
        YYMARKER = ++YYCURSOR;
-       if(YYLIMIT == YYCURSOR) YYFILL(1);
+       if((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
        yych = *YYCURSOR;
        goto yy69;
-yy69:  if(yybm[0+yych] & 16)   goto yy68;
+yy69:  if(yybm[0+yych] & 16) {
+               goto yy68;
+       }
        if(yych <= '&') goto yy72;
        if(yych >= '(') goto yy61;
        goto yy70;
 yy70:  ++YYCURSOR;
-       if(yybm[0+(yych = *YYCURSOR)] & 8)      yych = *YYCURSOR;
-       goto yy66;
+       if(yybm[0+(yych = *YYCURSOR)] & 8) {
+               yych = *YYCURSOR;
+               goto yy66;
+       }
        goto yy71;
 yy71:
 #line 329 "/usr/src/php/php5/ext/standard/url_scanner_ex.re"
 { handle_val(STD_ARGS, 1, '\''); goto state_next_arg_begin; }
-#line 573 "<stdout>"
+#line 595 "<stdout>"
 yy72:  ++YYCURSOR;
        if(YYLIMIT == YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
        goto yy73;
-yy73:  if(yybm[0+yych] & 32)   goto yy72;
+yy73:  if(yybm[0+yych] & 32) {
+               goto yy72;
+       }
        if(yych <= '=') goto yy75;
        goto yy74;
 yy74:  YYCURSOR = YYMARKER;
@@ -880,26 +904,32 @@ yy75:     yych = *++YYCURSOR;
        goto yy71;
 yy76:  yyaccept = 0;
        YYMARKER = ++YYCURSOR;
-       if(YYLIMIT == YYCURSOR) YYFILL(1);
+       if((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
        yych = *YYCURSOR;
        goto yy77;
-yy77:  if(yybm[0+yych] & 64)   goto yy76;
+yy77:  if(yybm[0+yych] & 64) {
+               goto yy76;
+       }
        if(yych <= '!') goto yy80;
        if(yych >= '#') goto yy61;
        goto yy78;
 yy78:  ++YYCURSOR;
-       if(yybm[0+(yych = *YYCURSOR)] & 8)      yych = *YYCURSOR;
-       goto yy66;
+       if(yybm[0+(yych = *YYCURSOR)] & 8) {
+               yych = *YYCURSOR;
+               goto yy66;
+       }
        goto yy79;
 yy79:
 #line 328 "/usr/src/php/php5/ext/standard/url_scanner_ex.re"
 { handle_val(STD_ARGS, 1, '"'); goto state_next_arg_begin; }
-#line 603 "<stdout>"
+#line 631 "<stdout>"
 yy80:  ++YYCURSOR;
        if(YYLIMIT == YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
        goto yy81;
-yy81:  if(yybm[0+yych] & 128)  goto yy80;
+yy81:  if(yybm[0+yych] & 128) {
+               goto yy80;
+       }
        if(yych >= '>') goto yy74;
        goto yy82;
 yy82:  ++YYCURSOR;

diff --git a/ext/standard/var_unserializer.c b/ext/standard/var_unserializer.c
index 5517f0a4ef5b66b26ac606748364c2bf0ba1bbea..1abe4eeec43d6101b791b254218e7e761383b9ba 100644 (file)
--- a/ext/standard/var_unserializer.c
+++ b/ext/standard/var_unserializer.c
@@ -1,5 +1,5 @@
-/* Generated by re2c 0.9.4 on Thu Mar 10 01:10:07 2005 */
-#line 1 "/usr/src/php-cvs/ext/standard/var_unserializer.re"
+/* Generated by re2c 0.9.6 on Fri Apr 15 01:37:39 2005 */
+#line 1 "/usr/src/php/php5/ext/standard/var_unserializer.re"
 /*
   +----------------------------------------------------------------------+
   | PHP Version 5                                                        |
@@ -147,7 +147,7 @@ PHPAPI void var_destroy(php_unserialize_data_t *var_hashx)
 #define YYMARKER marker
 
 
-#line 155 "/usr/src/php-cvs/ext/standard/var_unserializer.re"
+#line 155 "/usr/src/php/php5/ext/standard/var_unserializer.re"
 
 
 
@@ -393,7 +393,7 @@ PHPAPI int php_var_unserialize(UNSERIALIZE_PARAMETER)
          0,   0,   0,   0,   0,   0,   0,   0, 
        };
        goto yy0;
-yy1:   ++YYCURSOR;
+       ++YYCURSOR;
 yy0:
        if((YYLIMIT - YYCURSOR) < 7) YYFILL(7);
        yych = *YYCURSOR;
@@ -448,7 +448,7 @@ yy3:        yyaccept = 0;
        if(yych == ':') goto yy87;
        goto yy4;
 yy4:
-#line 625 "/usr/src/php-cvs/ext/standard/var_unserializer.re"
+#line 625 "/usr/src/php/php5/ext/standard/var_unserializer.re"
 { return 0; }
 #line 103 "<stdout>"
 yy5:   yyaccept = 0;
@@ -489,7 +489,7 @@ yy13:       yyaccept = 0;
 yy14:  ++YYCURSOR;
        goto yy15;
 yy15:
-#line 619 "/usr/src/php-cvs/ext/standard/var_unserializer.re"
+#line 619 "/usr/src/php/php5/ext/standard/var_unserializer.re"
 {
        /* this is the case where we have less data than planned */
        php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Unexpected end of serialized data");
@@ -499,17 +499,23 @@ yy15:
 yy16:  yych = *++YYCURSOR;
        goto yy4;
 yy17:  yych = *++YYCURSOR;
-       if(yybm[0+yych] & 128)  goto yy19;
+       if(yybm[0+yych] & 128) {
+               goto yy19;
+       }
        if(yych != '+') goto yy2;
        goto yy18;
 yy18:  yych = *++YYCURSOR;
-       if(yybm[0+yych] & 128)  goto yy19;
+       if(yybm[0+yych] & 128) {
+               goto yy19;
+       }
        goto yy2;
 yy19:  ++YYCURSOR;
-       if(YYLIMIT == YYCURSOR) YYFILL(1);
+       if((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
        yych = *YYCURSOR;
        goto yy20;
-yy20:  if(yybm[0+yych] & 128)  goto yy19;
+yy20:  if(yybm[0+yych] & 128) {
+               goto yy19;
+       }
        if(yych != ':') goto yy2;
        goto yy21;
 yy21:  yych = *++YYCURSOR;
@@ -518,7 +524,7 @@ yy21:       yych = *++YYCURSOR;
 yy22:  ++YYCURSOR;
        goto yy23;
 yy23:
-#line 507 "/usr/src/php-cvs/ext/standard/var_unserializer.re"
+#line 507 "/usr/src/php/php5/ext/standard/var_unserializer.re"
 {
        size_t len, len2, len3, maxlen;
        long elements;
@@ -630,7 +636,7 @@ yy23:
 
        return object_common2(UNSERIALIZE_PASSTHRU, elements);
 }
-#line 284 "<stdout>"
+#line 290 "<stdout>"
 yy24:  yych = *++YYCURSOR;
        if(yych <= ','){
                if(yych != '+') goto yy2;
@@ -646,7 +652,7 @@ yy25:       yych = *++YYCURSOR;
        if(yych >= ':') goto yy2;
        goto yy26;
 yy26:  ++YYCURSOR;
-       if(YYLIMIT == YYCURSOR) YYFILL(1);
+       if((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
        yych = *YYCURSOR;
        goto yy27;
 yy27:  if(yych <= '/') goto yy2;
@@ -659,7 +665,7 @@ yy28:       yych = *++YYCURSOR;
 yy29:  ++YYCURSOR;
        goto yy30;
 yy30:
-#line 499 "/usr/src/php-cvs/ext/standard/var_unserializer.re"
+#line 499 "/usr/src/php/php5/ext/standard/var_unserializer.re"
 {
 
        INIT_PZVAL(*rval);
@@ -667,7 +673,7 @@ yy30:
        return object_common2(UNSERIALIZE_PASSTHRU,
                        object_common1(UNSERIALIZE_PASSTHRU, ZEND_STANDARD_CLASS_DEF_PTR));
 }
-#line 322 "<stdout>"
+#line 328 "<stdout>"
 yy31:  yych = *++YYCURSOR;
        if(yych == '+') goto yy32;
        if(yych <= '/') goto yy2;
@@ -678,7 +684,7 @@ yy32:       yych = *++YYCURSOR;
        if(yych >= ':') goto yy2;
        goto yy33;
 yy33:  ++YYCURSOR;
-       if(YYLIMIT == YYCURSOR) YYFILL(1);
+       if((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
        yych = *YYCURSOR;
        goto yy34;
 yy34:  if(yych <= '/') goto yy2;
@@ -691,7 +697,7 @@ yy35:       yych = *++YYCURSOR;
 yy36:  ++YYCURSOR;
        goto yy37;
 yy37:
-#line 477 "/usr/src/php-cvs/ext/standard/var_unserializer.re"
+#line 477 "/usr/src/php/php5/ext/standard/var_unserializer.re"
 {
        long elements = parse_iv(start + 2);
        /* use iv() not uiv() in order to check data range */
@@ -713,7 +719,7 @@ yy37:
 
        return finish_nested_data(UNSERIALIZE_PASSTHRU);
 }
-#line 369 "<stdout>"
+#line 375 "<stdout>"
 yy38:  yych = *++YYCURSOR;
        if(yych == '+') goto yy39;
        if(yych <= '/') goto yy2;
@@ -724,7 +730,7 @@ yy39:       yych = *++YYCURSOR;
        if(yych >= ':') goto yy2;
        goto yy40;
 yy40:  ++YYCURSOR;
-       if(YYLIMIT == YYCURSOR) YYFILL(1);
+       if((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
        yych = *YYCURSOR;
        goto yy41;
 yy41:  if(yych <= '/') goto yy2;
@@ -737,7 +743,7 @@ yy42:       yych = *++YYCURSOR;
 yy43:  ++YYCURSOR;
        goto yy44;
 yy44:
-#line 449 "/usr/src/php-cvs/ext/standard/var_unserializer.re"
+#line 449 "/usr/src/php/php5/ext/standard/var_unserializer.re"
 {
        size_t len, maxlen;
        char *str;
@@ -765,7 +771,7 @@ yy44:
        ZVAL_STRINGL(*rval, str, len, 1);
        return 1;
 }
-#line 422 "<stdout>"
+#line 428 "<stdout>"
 yy45:  yych = *++YYCURSOR;
        if(yych <= '/'){
                if(yych <= ','){
@@ -807,7 +813,7 @@ yy49:       yych = *++YYCURSOR;
        if(yych >= ':') goto yy2;
        goto yy50;
 yy50:  ++YYCURSOR;
-       if(YYLIMIT == YYCURSOR) YYFILL(1);
+       if((YYLIMIT - YYCURSOR) < 4) YYFILL(4);
        yych = *YYCURSOR;
        goto yy51;
 yy51:  if(yych <= ':'){
@@ -834,7 +840,7 @@ yy52:       yych = *++YYCURSOR;
        if(yych >= ':') goto yy2;
        goto yy53;
 yy53:  ++YYCURSOR;
-       if(YYLIMIT == YYCURSOR) YYFILL(1);
+       if((YYLIMIT - YYCURSOR) < 4) YYFILL(4);
        yych = *YYCURSOR;
        goto yy54;
 yy54:  if(yych <= ';'){
@@ -854,14 +860,14 @@ yy54:     if(yych <= ';'){
 yy55:  ++YYCURSOR;
        goto yy56;
 yy56:
-#line 442 "/usr/src/php-cvs/ext/standard/var_unserializer.re"
+#line 442 "/usr/src/php/php5/ext/standard/var_unserializer.re"
 {
        *p = YYCURSOR;
        INIT_PZVAL(*rval);
        ZVAL_DOUBLE(*rval, zend_strtod((const char *)start + 2, NULL));
        return 1;
 }
-#line 520 "<stdout>"
+#line 526 "<stdout>"
 yy57:  yych = *++YYCURSOR;
        if(yych <= ','){
                if(yych != '+') goto yy2;
@@ -921,7 +927,7 @@ yy65:       yych = *++YYCURSOR;
 yy66:  ++YYCURSOR;
        goto yy67;
 yy67:
-#line 427 "/usr/src/php-cvs/ext/standard/var_unserializer.re"
+#line 427 "/usr/src/php/php5/ext/standard/var_unserializer.re"
 {
        *p = YYCURSOR;
        INIT_PZVAL(*rval);
@@ -936,7 +942,7 @@ yy67:
 
        return 1;
 }
-#line 597 "<stdout>"
+#line 603 "<stdout>"
 yy68:  yych = *++YYCURSOR;
        if(yych == 'N') goto yy65;
        goto yy2;
@@ -965,14 +971,14 @@ yy72:     if(yych <= '/') goto yy2;
 yy73:  ++YYCURSOR;
        goto yy74;
 yy74:
-#line 420 "/usr/src/php-cvs/ext/standard/var_unserializer.re"
+#line 420 "/usr/src/php/php5/ext/standard/var_unserializer.re"
 {
        *p = YYCURSOR;
        INIT_PZVAL(*rval);
        ZVAL_LONG(*rval, parse_iv(start + 2));
        return 1;
 }
-#line 634 "<stdout>"
+#line 640 "<stdout>"
 yy75:  yych = *++YYCURSOR;
        if(yych <= '/') goto yy2;
        if(yych >= '2') goto yy2;
@@ -983,25 +989,25 @@ yy76:     yych = *++YYCURSOR;
 yy77:  ++YYCURSOR;
        goto yy78;
 yy78:
-#line 413 "/usr/src/php-cvs/ext/standard/var_unserializer.re"
+#line 413 "/usr/src/php/php5/ext/standard/var_unserializer.re"
 {
        *p = YYCURSOR;
        INIT_PZVAL(*rval);
        ZVAL_BOOL(*rval, parse_iv(start + 2));
        return 1;
 }
-#line 652 "<stdout>"
+#line 658 "<stdout>"
 yy79:  ++YYCURSOR;
        goto yy80;
 yy80:
-#line 406 "/usr/src/php-cvs/ext/standard/var_unserializer.re"
+#line 406 "/usr/src/php/php5/ext/standard/var_unserializer.re"
 {
        *p = YYCURSOR;
        INIT_PZVAL(*rval);
        ZVAL_NULL(*rval);
        return 1;
 }
-#line 663 "<stdout>"
+#line 669 "<stdout>"
 yy81:  yych = *++YYCURSOR;
        if(yych <= ','){
                if(yych != '+') goto yy2;
@@ -1027,7 +1033,7 @@ yy84:     if(yych <= '/') goto yy2;
 yy85:  ++YYCURSOR;
        goto yy86;
 yy86:
-#line 383 "/usr/src/php-cvs/ext/standard/var_unserializer.re"
+#line 383 "/usr/src/php/php5/ext/standard/var_unserializer.re"
 {
        long id;
 
@@ -1050,7 +1056,7 @@ yy86:
        
        return 1;
 }
-#line 713 "<stdout>"
+#line 719 "<stdout>"
 yy87:  yych = *++YYCURSOR;
        if(yych <= ','){
                if(yych != '+') goto yy2;
@@ -1076,7 +1082,7 @@ yy90:     if(yych <= '/') goto yy2;
 yy91:  ++YYCURSOR;
        goto yy92;
 yy92:
-#line 362 "/usr/src/php-cvs/ext/standard/var_unserializer.re"
+#line 362 "/usr/src/php/php5/ext/standard/var_unserializer.re"
 {
        long id;
 
@@ -1097,9 +1103,9 @@ yy92:
        
        return 1;
 }
-#line 761 "<stdout>"
+#line 767 "<stdout>"
 }
-#line 627 "/usr/src/php-cvs/ext/standard/var_unserializer.re"
+#line 627 "/usr/src/php/php5/ext/standard/var_unserializer.re"
 
 
        return 0;