cvs: php-src(PHP_5_3) /ext/standard var_unserializer.c

mattwil Tue May 27 11:28:18 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/standard var_unserializer.c Log: Regenerate http://cvs.php.net/viewvc.cgi/php-src/ext/standard/var_unserializer.c?r1=1.70.2.4.2.7.2.5&r2=1.70.2.4.2.7.2.6&diff_format=u Index: php-src/ext/standard/var_unserializer.c diff -u php-src/ext/standard/var_unserializer.c:1.70.2.4.2.7.2.5 php-src/ext/standard/var_unserializer.c:1.70.2.4.2.7.2.6 --- php-src/ext/standard/var_unserializer.c:1.70.2.4.2.7.2.5 Tue Apr 8 12:17:04 2008 +++ php-src/ext/standard/var_unserializer.c Tue May 27 11:28:18 2008 @@ -1,4 +1,4 @@ -/* Generated by re2c 0.13.4 on Tue Apr 8 13:43:22 2008 */ +/* Generated by re2c 0.13.5 on Tue May 27 06:20:00 2008 */ #line 1 "ext/standard/var_unserializer.re" /* +----------------------------------------------------------------------+ @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: var_unserializer.c,v 1.70.2.4.2.7.2.5 2008/04/08 12:17:04 jani Exp $ */ +/* $Id: var_unserializer.c,v 1.70.2.4.2.7.2.6 2008/05/27 11:28:18 mattwil Exp $ */ #include "php.h" #include "ext/standard/php_var.h" @@ -458,7 +458,7 @@ yych = *(YYMARKER = ++YYCURSOR); if (yych == ':') goto yy95; yy3: -#line 698 "ext/standard/var_unserializer.re" +#line 696 "ext/standard/var_unserializer.re" { return 0; } #line 464 "ext/standard/var_unserializer.c" yy4: @@ -503,7 +503,7 @@ goto yy3; yy14: ++YYCURSOR; -#line 692 "ext/standard/var_unserializer.re" +#line 690 "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"); @@ -539,7 +539,7 @@ yych = *++YYCURSOR; if (yych != '"') goto yy18; ++YYCURSOR; -#line 580 "ext/standard/var_unserializer.re" +#line 578 "ext/standard/var_unserializer.re" { size_t len, len2, len3, maxlen; long elements; @@ -676,7 +676,7 @@ yych = *++YYCURSOR; if (yych != '"') goto yy18; ++YYCURSOR; -#line 572 "ext/standard/var_unserializer.re" +#line 570 "ext/standard/var_unserializer.re" { INIT_PZVAL(*rval); @@ -716,10 +716,8 @@ } INIT_PZVAL(*rval); - Z_TYPE_PP(rval) = IS_ARRAY; - ALLOC_HASHTABLE(Z_ARRVAL_PP(rval)); - zend_hash_init(Z_ARRVAL_PP(rval), elements + 1, NULL, ZVAL_PTR_DTOR, 0); + array_init_size(*rval, elements); if (!process_nested_data(UNSERIALIZE_PASSTHRU, Z_ARRVAL_PP(rval), elements)) { return 0; @@ -727,7 +725,7 @@ return finish_nested_data(UNSERIALIZE_PASSTHRU); } -#line 731 "ext/standard/var_unserializer.c" +#line 729 "ext/standard/var_unserializer.c" yy39: yych = *++YYCURSOR; if (yych == '+') goto yy40; @@ -777,7 +775,7 @@ ZVAL_STRINGL(*rval, str, len, 0); return 1; } -#line 781 "ext/standard/var_unserializer.c" +#line 779 "ext/standard/var_unserializer.c" yy46: yych = *++YYCURSOR; if (yych == '+') goto yy47; @@ -826,7 +824,7 @@ ZVAL_STRINGL(*rval, str, len, 1); return 1; } -#line 830 "ext/standard/var_unserializer.c" +#line 828 "ext/standard/var_unserializer.c" yy53: yych = *++YYCURSOR; if (yych <= '/') { @@ -921,7 +919,7 @@ ZVAL_DOUBLE(*rval, zend_strtod((const char *)start + 2, NULL)); return 1; } -#line 925 "ext/standard/var_unserializer.c" +#line 923 "ext/standard/var_unserializer.c" yy65: yych = *++YYCURSOR; if (yych <= ',') { @@ -995,7 +993,7 @@ return 1; } -#line 999 "ext/standard/var_unserializer.c" +#line 997 "ext/standard/var_unserializer.c" yy76: yych = *++YYCURSOR; if (yych == 'N') goto yy73; @@ -1029,7 +1027,7 @@ ZVAL_LONG(*rval, parse_iv(start + 2)); return 1; } -#line 1033 "ext/standard/var_unserializer.c" +#line 1031 "ext/standard/var_unserializer.c" yy83: yych = *++YYCURSOR; if (yych <= '/') goto yy18; @@ -1044,7 +1042,7 @@ ZVAL_BOOL(*rval, parse_iv(start + 2)); return 1; } -#line 1048 "ext/standard/var_unserializer.c" +#line 1046 "ext/standard/var_unserializer.c" yy87: ++YYCURSOR; #line 450 "ext/standard/var_unserializer.re" @@ -1054,7 +1052,7 @@ ZVAL_NULL(*rval); return 1; } -#line 1058 "ext/standard/var_unserializer.c" +#line 1056 "ext/standard/var_unserializer.c" yy89: yych = *++YYCURSOR; if (yych <= ',') { @@ -1100,7 +1098,7 @@ return 1; } -#line 1104 "ext/standard/var_unserializer.c" +#line 1102 "ext/standard/var_unserializer.c" yy95: yych = *++YYCURSOR; if (yych <= ',') { @@ -1144,9 +1142,9 @@ return 1; } -#line 1148 "ext/standard/var_unserializer.c" +#line 1146 "ext/standard/var_unserializer.c" } -#line 700 "ext/standard/var_unserializer.re" +#line 698 "ext/standard/var_unserializer.re" return 0;