From: foobar Date: Wed, 3 Sep 2003 16:26:50 +0000 (+0000) Subject: sync X-Git-Tag: php-4.3.4RC1~108 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1f2cc89995bfa387048041a7c4bae0c30a6959aa;p=php sync --- diff --git a/ext/standard/var_unserializer.c b/ext/standard/var_unserializer.c index 270f389fce..9f0865cffe 100644 --- a/ext/standard/var_unserializer.c +++ b/ext/standard/var_unserializer.c @@ -1,5 +1,5 @@ -/* Generated by re2c 0.5 on Fri May 23 01:32:07 2003 */ -#line 1 "var_unserializer.re" +/* Generated by re2c 0.5 on Wed Sep 3 19:14:59 2003 */ +#line 1 "/usr/src/web/php/php4_3/ext/standard/var_unserializer.re" #include "php.h" #include "ext/standard/php_var.h" #include "php_incomplete_class.h" @@ -91,7 +91,7 @@ PHPAPI void var_destroy(php_unserialize_data_t *var_hashx) #define YYMARKER marker -#line 97 +#line 98 @@ -319,7 +319,7 @@ yy3: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if(yych == ':') goto yy74; yy4: -#line 410 +#line 411 { return 0; } yy5: yych = *++YYCURSOR; if(yych == ';') goto yy72; @@ -354,7 +354,7 @@ yy12: yyaccept = 0; goto yy4; yy13: yych = *++YYCURSOR; yy14: -#line 404 +#line 405 { /* this is the case where we have less data than planned */ zend_error(E_NOTICE, "Unexpected end of serialized data"); @@ -364,8 +364,7 @@ yy15: yych = *++YYCURSOR; goto yy4; yy16: yych = *++YYCURSOR; if(yybm[0+yych] & 128) goto yy18; - if(yych == '+') goto yy17; - if(yych != '-') goto yy2; + if(yych != '+') goto yy2; yy17: yych = *++YYCURSOR; if(yybm[0+yych] & 128) goto yy18; goto yy2; @@ -378,7 +377,7 @@ yy20: yych = *++YYCURSOR; if(yych != '"') goto yy2; yy21: yych = *++YYCURSOR; yy22: -#line 330 +#line 331 { int len; int elements; @@ -453,14 +452,10 @@ yy22: return object_common2(UNSERIALIZE_PASSTHRU, elements); } yy23: yych = *++YYCURSOR; - if(yych <= ','){ - if(yych != '+') goto yy2; - } else { - if(yych <= '-') goto yy24; - if(yych <= '/') goto yy2; - if(yych <= '9') goto yy25; - goto yy2; - } + if(yych == '+') goto yy24; + if(yych <= '/') goto yy2; + if(yych <= '9') goto yy25; + goto yy2; yy24: yych = *++YYCURSOR; if(yych <= '/') goto yy2; if(yych >= ':') goto yy2; @@ -474,7 +469,7 @@ yy27: yych = *++YYCURSOR; if(yych != '"') goto yy2; yy28: yych = *++YYCURSOR; yy29: -#line 322 +#line 323 { INIT_PZVAL(*rval); @@ -483,14 +478,10 @@ yy29: object_common1(UNSERIALIZE_PASSTHRU, ZEND_STANDARD_CLASS_DEF_PTR)); } yy30: yych = *++YYCURSOR; - if(yych <= ','){ - if(yych != '+') goto yy2; - } else { - if(yych <= '-') goto yy31; - if(yych <= '/') goto yy2; - if(yych <= '9') goto yy32; - goto yy2; - } + if(yych == '+') goto yy31; + if(yych <= '/') goto yy2; + if(yych <= '9') goto yy32; + goto yy2; yy31: yych = *++YYCURSOR; if(yych <= '/') goto yy2; if(yych >= ':') goto yy2; @@ -504,7 +495,7 @@ yy34: yych = *++YYCURSOR; if(yych != '{') goto yy2; yy35: yych = *++YYCURSOR; yy36: -#line 304 +#line 305 { int elements = parse_iv(start + 2); @@ -523,14 +514,10 @@ yy36: return finish_nested_data(UNSERIALIZE_PASSTHRU); } yy37: yych = *++YYCURSOR; - if(yych <= ','){ - if(yych != '+') goto yy2; - } else { - if(yych <= '-') goto yy38; - if(yych <= '/') goto yy2; - if(yych <= '9') goto yy39; - goto yy2; - } + if(yych == '+') goto yy38; + if(yych <= '/') goto yy2; + if(yych <= '9') goto yy39; + goto yy2; yy38: yych = *++YYCURSOR; if(yych <= '/') goto yy2; if(yych >= ':') goto yy2; @@ -544,7 +531,7 @@ yy41: yych = *++YYCURSOR; if(yych != '"') goto yy2; yy42: yych = *++YYCURSOR; yy43: -#line 284 +#line 285 { int len; char *str; @@ -621,7 +608,7 @@ yy50: if(yych <= ';'){ } yy51: yych = *++YYCURSOR; yy52: -#line 277 +#line 278 { *p = YYCURSOR; INIT_PZVAL(*rval); @@ -694,7 +681,7 @@ yy63: if(yych <= '/') goto yy2; if(yych != ';') goto yy2; yy64: yych = *++YYCURSOR; yy65: -#line 270 +#line 271 { *p = YYCURSOR; INIT_PZVAL(*rval); @@ -721,7 +708,7 @@ yy69: if(yych <= '/') goto yy2; if(yych != ';') goto yy2; yy70: yych = *++YYCURSOR; yy71: -#line 263 +#line 264 { *p = YYCURSOR; INIT_PZVAL(*rval); @@ -730,7 +717,7 @@ yy71: } yy72: yych = *++YYCURSOR; yy73: -#line 256 +#line 257 { *p = YYCURSOR; INIT_PZVAL(*rval); @@ -757,7 +744,7 @@ yy77: if(yych <= '/') goto yy2; if(yych != ';') goto yy2; yy78: yych = *++YYCURSOR; yy79: -#line 237 +#line 238 { int id; @@ -777,7 +764,7 @@ yy79: return 1; } } -#line 412 +#line 413 return 0;