From 467db930992497e37e632f3a6f87552d82eea373 Mon Sep 17 00:00:00 2001 From: foobar Date: Sat, 11 Jun 2005 18:00:37 +0000 Subject: [PATCH] regenerated with re2c 0.9.7 --- ext/standard/url_scanner_ex.c | 107 +++++++++++++++----------------- ext/standard/var_unserializer.c | 38 ++++++------ 2 files changed, 70 insertions(+), 75 deletions(-) diff --git a/ext/standard/url_scanner_ex.c b/ext/standard/url_scanner_ex.c index 4569dfaa47..abf8d25020 100644 --- a/ext/standard/url_scanner_ex.c +++ b/ext/standard/url_scanner_ex.c @@ -1,4 +1,4 @@ -/* Generated by re2c 0.9.6 on Fri Apr 15 01:37:31 2005 */ +/* Generated by re2c 0.9.7 on Sat Jun 11 20:58:17 2005 */ #line 1 "/usr/src/php/php5/ext/standard/url_scanner_ex.re" /* +----------------------------------------------------------------------+ @@ -109,11 +109,6 @@ static inline void append_modified_url(smart_str *url, smart_str *dest, smart_st q = (p = url->c) + url->len; scan: - -#line 7 "" -{ - 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, @@ -148,6 +143,10 @@ scan: 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, }; + +#line 148 "" +{ + YYCTYPE yych; goto yy0; ++YYCURSOR; yy0: @@ -164,19 +163,19 @@ yy2: ++YYCURSOR; yy3: #line 115 "/usr/src/php/php5/ext/standard/url_scanner_ex.re" { smart_str_append(dest, url); return; } -#line 61 "" +#line 167 "" yy4: ++YYCURSOR; goto yy5; yy5: #line 116 "/usr/src/php/php5/ext/standard/url_scanner_ex.re" { sep = separator; goto scan; } -#line 67 "" +#line 173 "" yy6: ++YYCURSOR; goto yy7; yy7: #line 117 "/usr/src/php/php5/ext/standard/url_scanner_ex.re" { bash = p - 1; goto done; } -#line 73 "" +#line 179 "" yy8: ++YYCURSOR; if(YYLIMIT == YYCURSOR) YYFILL(1); yych = *YYCURSOR; @@ -188,7 +187,7 @@ yy9: if(yybm[0+yych] & 128) { yy10: #line 118 "/usr/src/php/php5/ext/standard/url_scanner_ex.re" { goto scan; } -#line 86 "" +#line 191 "" } #line 119 "/usr/src/php/php5/ext/standard/url_scanner_ex.re" @@ -358,11 +357,6 @@ state_plain_begin: state_plain: start = YYCURSOR; - -#line 90 "" -{ - 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, @@ -397,6 +391,10 @@ state_plain: 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, }; + +#line 396 "" +{ + YYCTYPE yych; goto yy11; ++YYCURSOR; yy11: @@ -411,7 +409,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 142 "" +#line 413 "" yy15: ++YYCURSOR; if(YYLIMIT == YYCURSOR) YYFILL(1); yych = *YYCURSOR; @@ -423,18 +421,13 @@ 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 155 "" +#line 425 "" } #line 289 "/usr/src/php/php5/ext/standard/url_scanner_ex.re" state_tag: start = YYCURSOR; - -#line 159 "" -{ - 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, @@ -469,6 +462,10 @@ state_tag: 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, }; + +#line 467 "" +{ + YYCTYPE yych; goto yy18; ++YYCURSOR; yy18: @@ -485,13 +482,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 212 "" +#line 486 "" 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 218 "" +#line 492 "" yy24: ++YYCURSOR; if(YYLIMIT == YYCURSOR) YYFILL(1); yych = *YYCURSOR; @@ -509,11 +506,6 @@ state_next_arg_begin: state_next_arg: start = YYCURSOR; - -#line 231 "" -{ - 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, @@ -548,6 +540,10 @@ state_next_arg: 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, }; + +#line 545 "" +{ + YYCTYPE yych; goto yy26; ++YYCURSOR; yy26: @@ -577,26 +573,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 298 "" +#line 577 "" 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 304 "" +#line 584 "" 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 310 "" +#line 590 "" 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 316 "" +#line 596 "" yy36: ++YYCURSOR; if(YYLIMIT == YYCURSOR) YYFILL(1); yych = *YYCURSOR; @@ -611,11 +607,6 @@ yy37: if(yybm[0+yych] & 128) { state_arg: start = YYCURSOR; - -#line 329 "" -{ - 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, @@ -650,6 +641,10 @@ state_arg: 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, }; + +#line 646 "" +{ + YYCTYPE yych; goto yy38; ++YYCURSOR; yy38: @@ -666,13 +661,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 382 "" +#line 665 "" 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 388 "" +#line 671 "" yy44: ++YYCURSOR; if(YYLIMIT == YYCURSOR) YYFILL(1); yych = *YYCURSOR; @@ -687,11 +682,6 @@ yy45: if(yybm[0+yych] & 128) { state_before_val: start = YYCURSOR; - -#line 401 "" -{ - 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, @@ -726,6 +716,11 @@ state_before_val: 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, }; + +#line 721 "" +{ + YYCTYPE yych; + unsigned int yyaccept; goto yy46; ++YYCURSOR; yy46: @@ -742,14 +737,14 @@ yy48: yyaccept = 0; yy49: #line 321 "/usr/src/php/php5/ext/standard/url_scanner_ex.re" { --YYCURSOR; goto state_next_arg_begin; } -#line 455 "" +#line 741 "" 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 461 "" +#line 748 "" yy52: yych = *++YYCURSOR; goto yy49; yy53: ++YYCURSOR; @@ -778,11 +773,6 @@ yy57: YYCURSOR = YYMARKER; state_val: start = YYCURSOR; - -#line 488 "" -{ - 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, @@ -817,6 +807,11 @@ state_val: 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, }; + +#line 812 "" +{ + YYCTYPE yych; + unsigned int yyaccept; goto yy58; ++YYCURSOR; yy58: @@ -846,7 +841,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 555 "" +#line 845 "" yy62: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); goto yy69; @@ -857,7 +852,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 566 "" +#line 856 "" yy66: ++YYCURSOR; if(YYLIMIT == YYCURSOR) YYFILL(1); yych = *YYCURSOR; @@ -886,7 +881,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 595 "" +#line 885 "" yy72: ++YYCURSOR; if(YYLIMIT == YYCURSOR) YYFILL(1); yych = *YYCURSOR; @@ -922,7 +917,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 631 "" +#line 921 "" yy80: ++YYCURSOR; if(YYLIMIT == YYCURSOR) YYFILL(1); yych = *YYCURSOR; diff --git a/ext/standard/var_unserializer.c b/ext/standard/var_unserializer.c index 2b40d90bba..39b6cf2ecc 100644 --- a/ext/standard/var_unserializer.c +++ b/ext/standard/var_unserializer.c @@ -1,4 +1,4 @@ -/* Generated by re2c 0.9.6 on Thu Jun 2 08:48:59 2005 */ +/* Generated by re2c 0.9.7 on Sat Jun 11 20:57:50 2005 */ #line 1 "/usr/src/php/php5/ext/standard/var_unserializer.re" /* +----------------------------------------------------------------------+ @@ -354,11 +354,6 @@ PHPAPI int php_var_unserialize(UNSERIALIZE_PARAMETER) - -#line 7 "" -{ - 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, @@ -393,6 +388,11 @@ 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 "" +{ + 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 103 "" +#line 455 "" 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 148 "" +#line 500 "" yy16: yych = *++YYCURSOR; goto yy4; yy17: yych = *++YYCURSOR; @@ -637,7 +637,7 @@ yy23: return object_common2(UNSERIALIZE_PASSTHRU, elements); } -#line 290 "" +#line 641 "" 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 328 "" +#line 678 "" yy31: yych = *++YYCURSOR; if(yych == '+') goto yy32; if(yych <= '/') goto yy2; @@ -720,7 +720,7 @@ yy37: return finish_nested_data(UNSERIALIZE_PASSTHRU); } -#line 375 "" +#line 724 "" 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 428 "" +#line 776 "" 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 526 "" +#line 872 "" yy57: yych = *++YYCURSOR; if(yych <= ','){ if(yych != '+') goto yy2; @@ -943,7 +943,7 @@ yy67: return 1; } -#line 603 "" +#line 947 "" 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 640 "" +#line 983 "" 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 658 "" +#line 1001 "" yy79: ++YYCURSOR; goto yy80; yy80: @@ -1008,7 +1008,7 @@ yy80: ZVAL_NULL(*rval); return 1; } -#line 669 "" +#line 1012 "" yy81: yych = *++YYCURSOR; if(yych <= ','){ if(yych != '+') goto yy2; @@ -1057,7 +1057,7 @@ yy86: return 1; } -#line 719 "" +#line 1061 "" yy87: yych = *++YYCURSOR; if(yych <= ','){ if(yych != '+') goto yy2; @@ -1104,7 +1104,7 @@ yy92: return 1; } -#line 767 "" +#line 1108 "" } #line 628 "/usr/src/php/php5/ext/standard/var_unserializer.re" -- 2.50.1