sniper Wed Sep 3 12:24:25 2003 EDT Modified files: /php-src/ext/standard var_unserializer.c Log: sync Index: php-src/ext/standard/var_unserializer.c diff -u php-src/ext/standard/var_unserializer.c:1.29 php-src/ext/standard/var_unserializer.c:1.30 --- php-src/ext/standard/var_unserializer.c:1.29 Tue Aug 5 05:23:17 2003 +++ php-src/ext/standard/var_unserializer.c Wed Sep 3 12:24:24 2003 @@ -1,5 +1,5 @@ -/* Generated by re2c 0.5 on Tue Aug 5 12:19:02 2003 */ -#line 1 "/home/frodo/php5/ext/standard/var_unserializer.re" +/* Generated by re2c 0.5 on Wed Sep 3 19:23:11 2003 */ +#line 1 "/usr/src/web/php/php5/ext/standard/var_unserializer.re" /* +----------------------------------------------------------------------+ | PHP Version 4 | @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: var_unserializer.c,v 1.29 2003/08/05 09:23:17 stas Exp $ */ +/* $Id: var_unserializer.c,v 1.30 2003/09/03 16:24:24 sniper Exp $ */ #include "php.h" #include "ext/standard/php_var.h" @@ -111,7 +111,7 @@ #define YYMARKER marker -#line 117 +#line 118 @@ -341,7 +341,7 @@ yych = *(YYMARKER = ++YYCURSOR); if(yych == ':') goto yy74; yy4: -#line 445 +#line 446 { return 0; } yy5: yych = *++YYCURSOR; if(yych == ';') goto yy72; @@ -376,7 +376,7 @@ goto yy4; yy13: yych = *++YYCURSOR; yy14: -#line 439 +#line 440 { /* this is the case where we have less data than planned */ php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Unexpected end of serialized data"); @@ -386,8 +386,7 @@ 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; @@ -400,7 +399,7 @@ if(yych != '"') goto yy2; yy21: yych = *++YYCURSOR; yy22: -#line 354 +#line 355 { int len; int elements; @@ -507,7 +506,7 @@ if(yych != '"') goto yy2; yy28: yych = *++YYCURSOR; yy29: -#line 346 +#line 347 { INIT_PZVAL(*rval); @@ -516,14 +515,10 @@ 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; @@ -537,7 +532,7 @@ if(yych != '{') goto yy2; yy35: yych = *++YYCURSOR; yy36: -#line 328 +#line 329 { int elements = parse_iv(start + 2); @@ -556,14 +551,10 @@ 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; @@ -577,7 +568,7 @@ if(yych != '"') goto yy2; yy42: yych = *++YYCURSOR; yy43: -#line 308 +#line 309 { int len; char *str; @@ -654,7 +645,7 @@ } yy51: yych = *++YYCURSOR; yy52: -#line 301 +#line 302 { *p = YYCURSOR; INIT_PZVAL(*rval); @@ -727,7 +718,7 @@ if(yych != ';') goto yy2; yy64: yych = *++YYCURSOR; yy65: -#line 294 +#line 295 { *p = YYCURSOR; INIT_PZVAL(*rval); @@ -754,7 +745,7 @@ if(yych != ';') goto yy2; yy70: yych = *++YYCURSOR; yy71: -#line 287 +#line 288 { *p = YYCURSOR; INIT_PZVAL(*rval); @@ -763,7 +754,7 @@ } yy72: yych = *++YYCURSOR; yy73: -#line 280 +#line 281 { *p = YYCURSOR; INIT_PZVAL(*rval); @@ -790,7 +781,7 @@ if(yych != ';') goto yy2; yy78: yych = *++YYCURSOR; yy79: -#line 259 +#line 260 { int id; @@ -812,7 +803,7 @@ return 1; } } -#line 447 +#line 448 return 0;
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php