revert

diff --git a/ext/standard/url_scanner_ex.c b/ext/standard/url_scanner_ex.c
index abf8d25020e39a2433a6bc99718e51720bf17aaf..7b17d3d7752a8086c115c193fa433d67c44750cd 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.7 on Sat Jun 11 20:58:17 2005 */
+/* Generated by re2c 0.9.6 on Sun Jun 12 02:51:22 2005 */
 #line 1 "/usr/src/php/php5/ext/standard/url_scanner_ex.re"
 /*
   +----------------------------------------------------------------------+
@@ -109,6 +109,11 @@ static inline void append_modified_url(smart_str *url, smart_str *dest, smart_st
        q = (p = url->c) + url->len;
 
 scan:
+
+#line 7 "<stdout>"
+{
+       YYCTYPE yych;
+       unsigned int yyaccept;
        static unsigned char yybm[] = {
        128, 128, 128, 128, 128, 128, 128, 128, 
        128, 128, 128, 128, 128, 128, 128, 128, 
@@ -143,10 +148,6 @@ scan:
        128, 128, 128, 128, 128, 128, 128, 128, 
        128, 128, 128, 128, 128, 128, 128, 128, 
        };
-
-#line 148 "<stdout>"
-{
-       YYCTYPE yych;
        goto yy0;
        ++YYCURSOR;
 yy0:
@@ -163,19 +164,19 @@ yy2:      ++YYCURSOR;
 yy3:
 #line 115 "/usr/src/php/php5/ext/standard/url_scanner_ex.re"
 { smart_str_append(dest, url); return; }
-#line 167 "<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 173 "<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 179 "<stdout>"
+#line 73 "<stdout>"
 yy8:   ++YYCURSOR;
        if(YYLIMIT == YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
@@ -187,7 +188,7 @@ yy9:        if(yybm[0+yych] & 128) {
 yy10:
 #line 118 "/usr/src/php/php5/ext/standard/url_scanner_ex.re"
 { goto scan; }
-#line 191 "<stdout>"
+#line 86 "<stdout>"
 }
 #line 119 "/usr/src/php/php5/ext/standard/url_scanner_ex.re"
 
@@ -357,6 +358,11 @@ state_plain_begin:
        
 state_plain:
        start = YYCURSOR;
+
+#line 90 "<stdout>"
+{
+       YYCTYPE yych;
+       unsigned int yyaccept;
        static unsigned char yybm[] = {
        128, 128, 128, 128, 128, 128, 128, 128, 
        128, 128, 128, 128, 128, 128, 128, 128, 
@@ -391,10 +397,6 @@ state_plain:
        128, 128, 128, 128, 128, 128, 128, 128, 
        128, 128, 128, 128, 128, 128, 128, 128, 
        };
-
-#line 396 "<stdout>"
-{
-       YYCTYPE yych;
        goto yy11;
        ++YYCURSOR;
 yy11:
@@ -409,7 +411,7 @@ yy13:       ++YYCURSOR;
 yy14:
 #line 287 "/usr/src/php/php5/ext/standard/url_scanner_ex.re"
 { passthru(STD_ARGS); STATE = STATE_TAG; goto state_tag; }
-#line 413 "<stdout>"
+#line 142 "<stdout>"
 yy15:  ++YYCURSOR;
        if(YYLIMIT == YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
@@ -421,13 +423,18 @@ yy16:     if(yybm[0+yych] & 128) {
 yy17:
 #line 288 "/usr/src/php/php5/ext/standard/url_scanner_ex.re"
 { passthru(STD_ARGS); goto state_plain; }
-#line 425 "<stdout>"
+#line 155 "<stdout>"
 }
 #line 289 "/usr/src/php/php5/ext/standard/url_scanner_ex.re"
 
 
 state_tag:     
        start = YYCURSOR;
+
+#line 159 "<stdout>"
+{
+       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, 
@@ -462,10 +469,6 @@ state_tag:
          0,   0,   0,   0,   0,   0,   0,   0, 
          0,   0,   0,   0,   0,   0,   0,   0, 
        };
-
-#line 467 "<stdout>"
-{
-       YYCTYPE yych;
        goto yy18;
        ++YYCURSOR;
 yy18:
@@ -482,13 +485,13 @@ 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 486 "<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 492 "<stdout>"
+#line 218 "<stdout>"
 yy24:  ++YYCURSOR;
        if(YYLIMIT == YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
@@ -506,6 +509,11 @@ state_next_arg_begin:
        
 state_next_arg:
        start = YYCURSOR;
+
+#line 231 "<stdout>"
+{
+       YYCTYPE yych;
+       unsigned int yyaccept;
        static unsigned char yybm[] = {
          0,   0,   0,   0,   0,   0,   0,   0, 
          0, 128, 128, 128,   0,   0,   0,   0, 
@@ -540,10 +548,6 @@ state_next_arg:
          0,   0,   0,   0,   0,   0,   0,   0, 
          0,   0,   0,   0,   0,   0,   0,   0, 
        };
-
-#line 545 "<stdout>"
-{
-       YYCTYPE yych;
        goto yy26;
        ++YYCURSOR;
 yy26:
@@ -573,26 +577,26 @@ 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 577 "<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 584 "<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 590 "<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 596 "<stdout>"
+#line 316 "<stdout>"
 yy36:  ++YYCURSOR;
        if(YYLIMIT == YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
@@ -607,6 +611,11 @@ yy37:      if(yybm[0+yych] & 128) {
 
 state_arg:
        start = YYCURSOR;
+
+#line 329 "<stdout>"
+{
+       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, 
@@ -641,10 +650,6 @@ state_arg:
          0,   0,   0,   0,   0,   0,   0,   0, 
          0,   0,   0,   0,   0,   0,   0,   0, 
        };
-
-#line 646 "<stdout>"
-{
-       YYCTYPE yych;
        goto yy38;
        ++YYCURSOR;
 yy38:
@@ -661,13 +666,13 @@ 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 665 "<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 671 "<stdout>"
+#line 388 "<stdout>"
 yy44:  ++YYCURSOR;
        if(YYLIMIT == YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
@@ -682,6 +687,11 @@ yy45:      if(yybm[0+yych] & 128) {
 
 state_before_val:
        start = YYCURSOR;
+
+#line 401 "<stdout>"
+{
+       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, 
@@ -716,11 +726,6 @@ state_before_val:
          0,   0,   0,   0,   0,   0,   0,   0, 
          0,   0,   0,   0,   0,   0,   0,   0, 
        };
-
-#line 721 "<stdout>"
-{
-       YYCTYPE yych;
-       unsigned int yyaccept;
        goto yy46;
        ++YYCURSOR;
 yy46:
@@ -737,14 +742,14 @@ yy48:     yyaccept = 0;
 yy49:
 #line 321 "/usr/src/php/php5/ext/standard/url_scanner_ex.re"
 { --YYCURSOR; goto state_next_arg_begin; }
-#line 741 "<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 748 "<stdout>"
+#line 461 "<stdout>"
 yy52:  yych = *++YYCURSOR;
        goto yy49;
 yy53:  ++YYCURSOR;
@@ -773,6 +778,11 @@ yy57:      YYCURSOR = YYMARKER;
 
 state_val:
        start = YYCURSOR;
+
+#line 488 "<stdout>"
+{
+       YYCTYPE yych;
+       unsigned int yyaccept;
        static unsigned char yybm[] = {
        248, 248, 248, 248, 248, 248, 248, 248, 
        248, 160, 160, 248, 248, 248, 248, 248, 
@@ -807,11 +817,6 @@ state_val:
        248, 248, 248, 248, 248, 248, 248, 248, 
        248, 248, 248, 248, 248, 248, 248, 248, 
        };
-
-#line 812 "<stdout>"
-{
-       YYCTYPE yych;
-       unsigned int yyaccept;
        goto yy58;
        ++YYCURSOR;
 yy58:
@@ -841,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 845 "<stdout>"
+#line 555 "<stdout>"
 yy62:  yyaccept = 0;
        yych = *(YYMARKER = ++YYCURSOR);
        goto yy69;
@@ -852,7 +857,7 @@ yy64:       ++YYCURSOR;
 yy65:
 #line 331 "/usr/src/php/php5/ext/standard/url_scanner_ex.re"
 { passthru(STD_ARGS); goto state_next_arg_begin; }
-#line 856 "<stdout>"
+#line 566 "<stdout>"
 yy66:  ++YYCURSOR;
        if(YYLIMIT == YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
@@ -881,7 +886,7 @@ yy70:       ++YYCURSOR;
 yy71:
 #line 329 "/usr/src/php/php5/ext/standard/url_scanner_ex.re"
 { handle_val(STD_ARGS, 1, '\''); goto state_next_arg_begin; }
-#line 885 "<stdout>"
+#line 595 "<stdout>"
 yy72:  ++YYCURSOR;
        if(YYLIMIT == YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
@@ -917,7 +922,7 @@ yy78:       ++YYCURSOR;
 yy79:
 #line 328 "/usr/src/php/php5/ext/standard/url_scanner_ex.re"
 { handle_val(STD_ARGS, 1, '"'); goto state_next_arg_begin; }
-#line 921 "<stdout>"
+#line 631 "<stdout>"
 yy80:  ++YYCURSOR;
        if(YYLIMIT == YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;

diff --git a/ext/standard/var_unserializer.c b/ext/standard/var_unserializer.c
index 39b6cf2ecc0d9f7cf6364e88939311cb9733967a..8ea8fcd7818bb938338750933c76877b0a9598ce 100644 (file)
--- a/ext/standard/var_unserializer.c
+++ b/ext/standard/var_unserializer.c
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.9.7 on Sat Jun 11 20:57:50 2005 */
+/* Generated by re2c 0.9.6 on Sun Jun 12 02:52:01 2005 */
 #line 1 "/usr/src/php/php5/ext/standard/var_unserializer.re"
 /*
   +----------------------------------------------------------------------+
@@ -354,6 +354,11 @@ PHPAPI int php_var_unserialize(UNSERIALIZE_PARAMETER)
 
        
        
+
+#line 7 "<stdout>"
+{
+       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, 
@@ -388,11 +393,6 @@ PHPAPI int php_var_unserialize(UNSERIALIZE_PARAMETER)
          0,   0,   0,   0,   0,   0,   0,   0, 
          0,   0,   0,   0,   0,   0,   0,   0, 
        };
-
-#line 393 "<stdout>"
-{
-       YYCTYPE yych;
-       unsigned int yyaccept;
        goto yy0;
        ++YYCURSOR;
 yy0:
@@ -451,7 +451,7 @@ yy3:        yyaccept = 0;
 yy4:
 #line 626 "/usr/src/php/php5/ext/standard/var_unserializer.re"
 { return 0; }
-#line 455 "<stdout>"
+#line 103 "<stdout>"
 yy5:   yyaccept = 0;
        yych = *(YYMARKER = ++YYCURSOR);
        if(yych == ':') goto yy81;
@@ -496,7 +496,7 @@ yy15:
        php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Unexpected end of serialized data");
        return 0; /* not sure if it should be 0 or 1 here? */
 }
-#line 500 "<stdout>"
+#line 148 "<stdout>"
 yy16:  yych = *++YYCURSOR;
        goto yy4;
 yy17:  yych = *++YYCURSOR;
@@ -637,7 +637,7 @@ yy23:
 
        return object_common2(UNSERIALIZE_PASSTHRU, elements);
 }
-#line 641 "<stdout>"
+#line 290 "<stdout>"
 yy24:  yych = *++YYCURSOR;
        if(yych <= ','){
                if(yych != '+') goto yy2;
@@ -674,7 +674,7 @@ yy30:
        return object_common2(UNSERIALIZE_PASSTHRU,
                        object_common1(UNSERIALIZE_PASSTHRU, ZEND_STANDARD_CLASS_DEF_PTR));
 }
-#line 678 "<stdout>"
+#line 328 "<stdout>"
 yy31:  yych = *++YYCURSOR;
        if(yych == '+') goto yy32;
        if(yych <= '/') goto yy2;
@@ -720,7 +720,7 @@ yy37:
 
        return finish_nested_data(UNSERIALIZE_PASSTHRU);
 }
-#line 724 "<stdout>"
+#line 375 "<stdout>"
 yy38:  yych = *++YYCURSOR;
        if(yych == '+') goto yy39;
        if(yych <= '/') goto yy2;
@@ -772,7 +772,7 @@ yy44:
        ZVAL_STRINGL(*rval, str, len, 1);
        return 1;
 }
-#line 776 "<stdout>"
+#line 428 "<stdout>"
 yy45:  yych = *++YYCURSOR;
        if(yych <= '/'){
                if(yych <= ','){
@@ -868,7 +868,7 @@ yy56:
        ZVAL_DOUBLE(*rval, zend_strtod((const char *)start + 2, NULL));
        return 1;
 }
-#line 872 "<stdout>"
+#line 526 "<stdout>"
 yy57:  yych = *++YYCURSOR;
        if(yych <= ','){
                if(yych != '+') goto yy2;
@@ -943,7 +943,7 @@ yy67:
 
        return 1;
 }
-#line 947 "<stdout>"
+#line 603 "<stdout>"
 yy68:  yych = *++YYCURSOR;
        if(yych == 'N') goto yy65;
        goto yy2;
@@ -979,7 +979,7 @@ yy74:
        ZVAL_LONG(*rval, parse_iv(start + 2));
        return 1;
 }
-#line 983 "<stdout>"
+#line 640 "<stdout>"
 yy75:  yych = *++YYCURSOR;
        if(yych <= '/') goto yy2;
        if(yych >= '2') goto yy2;
@@ -997,7 +997,7 @@ yy78:
        ZVAL_BOOL(*rval, parse_iv(start + 2));
        return 1;
 }
-#line 1001 "<stdout>"
+#line 658 "<stdout>"
 yy79:  ++YYCURSOR;
        goto yy80;
 yy80:
@@ -1008,7 +1008,7 @@ yy80:
        ZVAL_NULL(*rval);
        return 1;
 }
-#line 1012 "<stdout>"
+#line 669 "<stdout>"
 yy81:  yych = *++YYCURSOR;
        if(yych <= ','){
                if(yych != '+') goto yy2;
@@ -1057,7 +1057,7 @@ yy86:
        
        return 1;
 }
-#line 1061 "<stdout>"
+#line 719 "<stdout>"
 yy87:  yych = *++YYCURSOR;
        if(yych <= ','){
                if(yych != '+') goto yy2;
@@ -1104,7 +1104,7 @@ yy92:
        
        return 1;
 }
-#line 1108 "<stdout>"
+#line 767 "<stdout>"
 }
 #line 628 "/usr/src/php/php5/ext/standard/var_unserializer.re"