From: foobar Date: Mon, 5 Sep 2005 16:22:58 +0000 (+0000) Subject: touch X-Git-Tag: php-5.1.0RC2_PRE~1 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=27df9817273523bfe02692acabf6b1d3d9e9f634;p=php touch --- diff --git a/ext/standard/var_unserializer.c b/ext/standard/var_unserializer.c index ca20aa0411..833e83cf50 100644 --- a/ext/standard/var_unserializer.c +++ b/ext/standard/var_unserializer.c @@ -1,5 +1,5 @@ -/* Generated by re2c 0.9.8 on Wed Jun 29 02:16:55 2005 */ -#line 1 "/usr/src/php/php5/ext/standard/var_unserializer.re" +/* Generated by re2c 0.9.10 on Mon Sep 5 19:22:38 2005 */ +#line 1 "/usr/src/php/php_5_1/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/php5/ext/standard/var_unserializer.re" +#line 155 "/usr/src/php/php_5_1/ext/standard/var_unserializer.re" @@ -399,118 +399,90 @@ PHPAPI int php_var_unserialize(UNSERIALIZE_PARAMETER) yy0: if((YYLIMIT - YYCURSOR) < 7) YYFILL(7); yych = *YYCURSOR; - if(yych <= 'c'){ - if(yych <= 'O'){ - if(yych <= 'C'){ - if(yych <= 'B') goto yy16; - goto yy13; - } else { - if(yych <= 'M') goto yy16; - if(yych <= 'N') goto yy6; - goto yy13; - } - } else { - if(yych <= '`'){ - if(yych == 'R') goto yy3; - goto yy16; - } else { - if(yych <= 'a') goto yy11; - if(yych <= 'b') goto yy7; - goto yy16; - } - } - } else { - if(yych <= 'q'){ - if(yych <= 'i'){ - if(yych <= 'd') goto yy9; - if(yych <= 'h') goto yy16; - goto yy8; - } else { - if(yych == 'o') goto yy12; - goto yy16; - } - } else { - if(yych <= '|'){ - if(yych <= 'r') goto yy5; - if(yych <= 's') goto yy10; - goto yy16; - } else { - if(yych <= '}') goto yy14; - if(yych <= 0xBF) goto yy16; - goto yy2; - } - } - } -yy2: YYCURSOR = YYMARKER; - switch(yyaccept){ - case 0: goto yy4; + switch(yych){ + case 'C': case 'O': goto yy12; + case 'N': goto yy5; + case 'R': goto yy2; + case 'a': goto yy10; + case 'b': goto yy6; + case 'd': goto yy8; + case 'i': goto yy7; + case 'o': goto yy11; + case 'r': goto yy4; + case 's': goto yy9; + case '}': goto yy13; + default: goto yy15; } -yy3: yyaccept = 0; +yy2: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if(yych == ':') goto yy87; - goto yy4; -yy4: -#line 626 "/usr/src/php/php5/ext/standard/var_unserializer.re" + goto yy3; +yy3: +#line 626 "/usr/src/php/php_5_1/ext/standard/var_unserializer.re" { return 0; } -#line 456 "" -yy5: yyaccept = 0; +#line 424 "" +yy4: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if(yych == ':') goto yy81; - goto yy4; -yy6: yych = *++YYCURSOR; + goto yy3; +yy5: yych = *++YYCURSOR; if(yych == ';') goto yy79; - goto yy4; -yy7: yyaccept = 0; + goto yy3; +yy6: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if(yych == ':') goto yy75; - goto yy4; -yy8: yyaccept = 0; + goto yy3; +yy7: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if(yych == ':') goto yy69; - goto yy4; -yy9: yyaccept = 0; + goto yy3; +yy8: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if(yych == ':') goto yy45; - goto yy4; -yy10: yyaccept = 0; + goto yy3; +yy9: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if(yych == ':') goto yy38; - goto yy4; -yy11: yyaccept = 0; + goto yy3; +yy10: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if(yych == ':') goto yy31; - goto yy4; -yy12: yyaccept = 0; + goto yy3; +yy11: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if(yych == ':') goto yy24; - goto yy4; -yy13: yyaccept = 0; + goto yy3; +yy12: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); - if(yych == ':') goto yy17; - goto yy4; -yy14: ++YYCURSOR; - goto yy15; -yy15: -#line 620 "/usr/src/php/php5/ext/standard/var_unserializer.re" + if(yych == ':') goto yy16; + goto yy3; +yy13: ++YYCURSOR; + goto yy14; +yy14: +#line 620 "/usr/src/php/php_5_1/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"); return 0; /* not sure if it should be 0 or 1 here? */ } -#line 501 "" +#line 469 "" +yy15: yych = *++YYCURSOR; + goto yy3; yy16: yych = *++YYCURSOR; - goto yy4; -yy17: yych = *++YYCURSOR; if(yybm[0+yych] & 128) { goto yy19; } - if(yych != '+') goto yy2; - goto yy18; + if(yych == '+') goto yy18; + goto yy17; +yy17: YYCURSOR = YYMARKER; + switch(yyaccept){ + case 0: goto yy3; + } yy18: yych = *++YYCURSOR; if(yybm[0+yych] & 128) { goto yy19; } - goto yy2; + goto yy17; yy19: ++YYCURSOR; if((YYLIMIT - YYCURSOR) < 2) YYFILL(2); yych = *YYCURSOR; @@ -518,15 +490,15 @@ yy19: ++YYCURSOR; yy20: if(yybm[0+yych] & 128) { goto yy19; } - if(yych != ':') goto yy2; + if(yych != ':') goto yy17; goto yy21; yy21: yych = *++YYCURSOR; - if(yych != '"') goto yy2; + if(yych != '"') goto yy17; goto yy22; yy22: ++YYCURSOR; goto yy23; yy23: -#line 508 "/usr/src/php/php5/ext/standard/var_unserializer.re" +#line 508 "/usr/src/php/php_5_1/ext/standard/var_unserializer.re" { size_t len, len2, len3, maxlen; long elements; @@ -638,36 +610,36 @@ yy23: return object_common2(UNSERIALIZE_PASSTHRU, elements); } -#line 642 "" +#line 614 "" yy24: yych = *++YYCURSOR; if(yych <= ','){ - if(yych != '+') goto yy2; + if(yych != '+') goto yy17; goto yy25; } else { if(yych <= '-') goto yy25; - if(yych <= '/') goto yy2; + if(yych <= '/') goto yy17; if(yych <= '9') goto yy26; - goto yy2; + goto yy17; } yy25: yych = *++YYCURSOR; - if(yych <= '/') goto yy2; - if(yych >= ':') goto yy2; + if(yych <= '/') goto yy17; + if(yych >= ':') goto yy17; goto yy26; yy26: ++YYCURSOR; if((YYLIMIT - YYCURSOR) < 2) YYFILL(2); yych = *YYCURSOR; goto yy27; -yy27: if(yych <= '/') goto yy2; +yy27: if(yych <= '/') goto yy17; if(yych <= '9') goto yy26; - if(yych >= ';') goto yy2; + if(yych >= ';') goto yy17; goto yy28; yy28: yych = *++YYCURSOR; - if(yych != '"') goto yy2; + if(yych != '"') goto yy17; goto yy29; yy29: ++YYCURSOR; goto yy30; yy30: -#line 500 "/usr/src/php/php5/ext/standard/var_unserializer.re" +#line 500 "/usr/src/php/php_5_1/ext/standard/var_unserializer.re" { INIT_PZVAL(*rval); @@ -675,31 +647,31 @@ yy30: return object_common2(UNSERIALIZE_PASSTHRU, object_common1(UNSERIALIZE_PASSTHRU, ZEND_STANDARD_CLASS_DEF_PTR)); } -#line 679 "" +#line 651 "" yy31: yych = *++YYCURSOR; if(yych == '+') goto yy32; - if(yych <= '/') goto yy2; + if(yych <= '/') goto yy17; if(yych <= '9') goto yy33; - goto yy2; + goto yy17; yy32: yych = *++YYCURSOR; - if(yych <= '/') goto yy2; - if(yych >= ':') goto yy2; + if(yych <= '/') goto yy17; + if(yych >= ':') goto yy17; goto yy33; yy33: ++YYCURSOR; if((YYLIMIT - YYCURSOR) < 2) YYFILL(2); yych = *YYCURSOR; goto yy34; -yy34: if(yych <= '/') goto yy2; +yy34: if(yych <= '/') goto yy17; if(yych <= '9') goto yy33; - if(yych >= ';') goto yy2; + if(yych >= ';') goto yy17; goto yy35; yy35: yych = *++YYCURSOR; - if(yych != '{') goto yy2; + if(yych != '{') goto yy17; goto yy36; yy36: ++YYCURSOR; goto yy37; yy37: -#line 478 "/usr/src/php/php5/ext/standard/var_unserializer.re" +#line 478 "/usr/src/php/php_5_1/ext/standard/var_unserializer.re" { long elements = parse_iv(start + 2); /* use iv() not uiv() in order to check data range */ @@ -721,31 +693,31 @@ yy37: return finish_nested_data(UNSERIALIZE_PASSTHRU); } -#line 725 "" +#line 697 "" yy38: yych = *++YYCURSOR; if(yych == '+') goto yy39; - if(yych <= '/') goto yy2; + if(yych <= '/') goto yy17; if(yych <= '9') goto yy40; - goto yy2; + goto yy17; yy39: yych = *++YYCURSOR; - if(yych <= '/') goto yy2; - if(yych >= ':') goto yy2; + if(yych <= '/') goto yy17; + if(yych >= ':') goto yy17; goto yy40; yy40: ++YYCURSOR; if((YYLIMIT - YYCURSOR) < 2) YYFILL(2); yych = *YYCURSOR; goto yy41; -yy41: if(yych <= '/') goto yy2; +yy41: if(yych <= '/') goto yy17; if(yych <= '9') goto yy40; - if(yych >= ';') goto yy2; + if(yych >= ';') goto yy17; goto yy42; yy42: yych = *++YYCURSOR; - if(yych != '"') goto yy2; + if(yych != '"') goto yy17; goto yy43; yy43: ++YYCURSOR; goto yy44; yy44: -#line 450 "/usr/src/php/php5/ext/standard/var_unserializer.re" +#line 450 "/usr/src/php/php_5_1/ext/standard/var_unserializer.re" { size_t len, maxlen; char *str; @@ -773,46 +745,46 @@ yy44: ZVAL_STRINGL(*rval, str, len, 1); return 1; } -#line 777 "" +#line 749 "" yy45: yych = *++YYCURSOR; if(yych <= '/'){ if(yych <= ','){ if(yych == '+') goto yy49; - goto yy2; + goto yy17; } else { if(yych <= '-') goto yy47; if(yych <= '.') goto yy52; - goto yy2; + goto yy17; } } else { if(yych <= 'I'){ if(yych <= '9') goto yy50; - if(yych <= 'H') goto yy2; + if(yych <= 'H') goto yy17; goto yy48; } else { - if(yych != 'N') goto yy2; + if(yych != 'N') goto yy17; goto yy46; } } yy46: yych = *++YYCURSOR; if(yych == 'A') goto yy68; - goto yy2; + goto yy17; yy47: yych = *++YYCURSOR; if(yych <= '/'){ if(yych == '.') goto yy52; - goto yy2; + goto yy17; } else { if(yych <= '9') goto yy50; - if(yych != 'I') goto yy2; + if(yych != 'I') goto yy17; goto yy48; } yy48: yych = *++YYCURSOR; if(yych == 'N') goto yy64; - goto yy2; + goto yy17; yy49: yych = *++YYCURSOR; if(yych == '.') goto yy52; - if(yych <= '/') goto yy2; - if(yych >= ':') goto yy2; + if(yych <= '/') goto yy17; + if(yych >= ':') goto yy17; goto yy50; yy50: ++YYCURSOR; if((YYLIMIT - YYCURSOR) < 4) YYFILL(4); @@ -820,116 +792,116 @@ yy50: ++YYCURSOR; goto yy51; yy51: if(yych <= ':'){ if(yych <= '.'){ - if(yych <= '-') goto yy2; + if(yych <= '-') goto yy17; goto yy62; } else { - if(yych <= '/') goto yy2; + if(yych <= '/') goto yy17; if(yych <= '9') goto yy50; - goto yy2; + goto yy17; } } else { if(yych <= 'E'){ if(yych <= ';') goto yy55; - if(yych <= 'D') goto yy2; + if(yych <= 'D') goto yy17; goto yy57; } else { if(yych == 'e') goto yy57; - goto yy2; + goto yy17; } } yy52: yych = *++YYCURSOR; - if(yych <= '/') goto yy2; - if(yych >= ':') goto yy2; + if(yych <= '/') goto yy17; + if(yych >= ':') goto yy17; goto yy53; yy53: ++YYCURSOR; if((YYLIMIT - YYCURSOR) < 4) YYFILL(4); yych = *YYCURSOR; goto yy54; yy54: if(yych <= ';'){ - if(yych <= '/') goto yy2; + if(yych <= '/') goto yy17; if(yych <= '9') goto yy53; - if(yych <= ':') goto yy2; + if(yych <= ':') goto yy17; goto yy55; } else { if(yych <= 'E'){ - if(yych <= 'D') goto yy2; + if(yych <= 'D') goto yy17; goto yy57; } else { if(yych == 'e') goto yy57; - goto yy2; + goto yy17; } } yy55: ++YYCURSOR; goto yy56; yy56: -#line 443 "/usr/src/php/php5/ext/standard/var_unserializer.re" +#line 443 "/usr/src/php/php_5_1/ext/standard/var_unserializer.re" { *p = YYCURSOR; INIT_PZVAL(*rval); ZVAL_DOUBLE(*rval, zend_strtod((const char *)start + 2, NULL)); return 1; } -#line 873 "" +#line 845 "" yy57: yych = *++YYCURSOR; if(yych <= ','){ - if(yych != '+') goto yy2; + if(yych != '+') goto yy17; goto yy58; } else { if(yych <= '-') goto yy58; - if(yych <= '/') goto yy2; + if(yych <= '/') goto yy17; if(yych <= '9') goto yy59; - goto yy2; + goto yy17; } yy58: yych = *++YYCURSOR; if(yych <= ','){ if(yych == '+') goto yy61; - goto yy2; + goto yy17; } else { if(yych <= '-') goto yy61; - if(yych <= '/') goto yy2; - if(yych >= ':') goto yy2; + if(yych <= '/') goto yy17; + if(yych >= ':') goto yy17; goto yy59; } yy59: ++YYCURSOR; if(YYLIMIT == YYCURSOR) YYFILL(1); yych = *YYCURSOR; goto yy60; -yy60: if(yych <= '/') goto yy2; +yy60: if(yych <= '/') goto yy17; if(yych <= '9') goto yy59; if(yych == ';') goto yy55; - goto yy2; + goto yy17; yy61: yych = *++YYCURSOR; - if(yych <= '/') goto yy2; + if(yych <= '/') goto yy17; if(yych <= '9') goto yy59; - goto yy2; + goto yy17; yy62: ++YYCURSOR; if((YYLIMIT - YYCURSOR) < 4) YYFILL(4); yych = *YYCURSOR; goto yy63; yy63: if(yych <= ';'){ - if(yych <= '/') goto yy2; + if(yych <= '/') goto yy17; if(yych <= '9') goto yy62; - if(yych <= ':') goto yy2; + if(yych <= ':') goto yy17; goto yy55; } else { if(yych <= 'E'){ - if(yych <= 'D') goto yy2; + if(yych <= 'D') goto yy17; goto yy57; } else { if(yych == 'e') goto yy57; - goto yy2; + goto yy17; } } yy64: yych = *++YYCURSOR; - if(yych != 'F') goto yy2; + if(yych != 'F') goto yy17; goto yy65; yy65: yych = *++YYCURSOR; - if(yych != ';') goto yy2; + if(yych != ';') goto yy17; goto yy66; yy66: ++YYCURSOR; goto yy67; yy67: -#line 428 "/usr/src/php/php5/ext/standard/var_unserializer.re" +#line 428 "/usr/src/php/php_5_1/ext/standard/var_unserializer.re" { *p = YYCURSOR; INIT_PZVAL(*rval); @@ -944,98 +916,98 @@ yy67: return 1; } -#line 948 "" +#line 920 "" yy68: yych = *++YYCURSOR; if(yych == 'N') goto yy65; - goto yy2; + goto yy17; yy69: yych = *++YYCURSOR; if(yych <= ','){ - if(yych != '+') goto yy2; + if(yych != '+') goto yy17; goto yy70; } else { if(yych <= '-') goto yy70; - if(yych <= '/') goto yy2; + if(yych <= '/') goto yy17; if(yych <= '9') goto yy71; - goto yy2; + goto yy17; } yy70: yych = *++YYCURSOR; - if(yych <= '/') goto yy2; - if(yych >= ':') goto yy2; + if(yych <= '/') goto yy17; + if(yych >= ':') goto yy17; goto yy71; yy71: ++YYCURSOR; if(YYLIMIT == YYCURSOR) YYFILL(1); yych = *YYCURSOR; goto yy72; -yy72: if(yych <= '/') goto yy2; +yy72: if(yych <= '/') goto yy17; if(yych <= '9') goto yy71; - if(yych != ';') goto yy2; + if(yych != ';') goto yy17; goto yy73; yy73: ++YYCURSOR; goto yy74; yy74: -#line 421 "/usr/src/php/php5/ext/standard/var_unserializer.re" +#line 421 "/usr/src/php/php_5_1/ext/standard/var_unserializer.re" { *p = YYCURSOR; INIT_PZVAL(*rval); ZVAL_LONG(*rval, parse_iv(start + 2)); return 1; } -#line 984 "" +#line 956 "" yy75: yych = *++YYCURSOR; - if(yych <= '/') goto yy2; - if(yych >= '2') goto yy2; + if(yych <= '/') goto yy17; + if(yych >= '2') goto yy17; goto yy76; yy76: yych = *++YYCURSOR; - if(yych != ';') goto yy2; + if(yych != ';') goto yy17; goto yy77; yy77: ++YYCURSOR; goto yy78; yy78: -#line 414 "/usr/src/php/php5/ext/standard/var_unserializer.re" +#line 414 "/usr/src/php/php_5_1/ext/standard/var_unserializer.re" { *p = YYCURSOR; INIT_PZVAL(*rval); ZVAL_BOOL(*rval, parse_iv(start + 2)); return 1; } -#line 1002 "" +#line 974 "" yy79: ++YYCURSOR; goto yy80; yy80: -#line 407 "/usr/src/php/php5/ext/standard/var_unserializer.re" +#line 407 "/usr/src/php/php_5_1/ext/standard/var_unserializer.re" { *p = YYCURSOR; INIT_PZVAL(*rval); ZVAL_NULL(*rval); return 1; } -#line 1013 "" +#line 985 "" yy81: yych = *++YYCURSOR; if(yych <= ','){ - if(yych != '+') goto yy2; + if(yych != '+') goto yy17; goto yy82; } else { if(yych <= '-') goto yy82; - if(yych <= '/') goto yy2; + if(yych <= '/') goto yy17; if(yych <= '9') goto yy83; - goto yy2; + goto yy17; } yy82: yych = *++YYCURSOR; - if(yych <= '/') goto yy2; - if(yych >= ':') goto yy2; + if(yych <= '/') goto yy17; + if(yych >= ':') goto yy17; goto yy83; yy83: ++YYCURSOR; if(YYLIMIT == YYCURSOR) YYFILL(1); yych = *YYCURSOR; goto yy84; -yy84: if(yych <= '/') goto yy2; +yy84: if(yych <= '/') goto yy17; if(yych <= '9') goto yy83; - if(yych != ';') goto yy2; + if(yych != ';') goto yy17; goto yy85; yy85: ++YYCURSOR; goto yy86; yy86: -#line 384 "/usr/src/php/php5/ext/standard/var_unserializer.re" +#line 384 "/usr/src/php/php_5_1/ext/standard/var_unserializer.re" { long id; @@ -1058,33 +1030,33 @@ yy86: return 1; } -#line 1062 "" +#line 1034 "" yy87: yych = *++YYCURSOR; if(yych <= ','){ - if(yych != '+') goto yy2; + if(yych != '+') goto yy17; goto yy88; } else { if(yych <= '-') goto yy88; - if(yych <= '/') goto yy2; + if(yych <= '/') goto yy17; if(yych <= '9') goto yy89; - goto yy2; + goto yy17; } yy88: yych = *++YYCURSOR; - if(yych <= '/') goto yy2; - if(yych >= ':') goto yy2; + if(yych <= '/') goto yy17; + if(yych >= ':') goto yy17; goto yy89; yy89: ++YYCURSOR; if(YYLIMIT == YYCURSOR) YYFILL(1); yych = *YYCURSOR; goto yy90; -yy90: if(yych <= '/') goto yy2; +yy90: if(yych <= '/') goto yy17; if(yych <= '9') goto yy89; - if(yych != ';') goto yy2; + if(yych != ';') goto yy17; goto yy91; yy91: ++YYCURSOR; goto yy92; yy92: -#line 363 "/usr/src/php/php5/ext/standard/var_unserializer.re" +#line 363 "/usr/src/php/php_5_1/ext/standard/var_unserializer.re" { long id; @@ -1105,10 +1077,10 @@ yy92: return 1; } -#line 1109 "" +#line 1081 "" } } -#line 628 "/usr/src/php/php5/ext/standard/var_unserializer.re" +#line 628 "/usr/src/php/php_5_1/ext/standard/var_unserializer.re" return 0;