cvs: php4(PHP_4_3) /ext/standard var_unserializer.c

helly Sun May 18 08:04:53 2003 EDT Modified files: (Branch: PHP_4_3) /php4/ext/standard var_unserializer.c Log: Fix unserialize (commit later) Index: php4/ext/standard/var_unserializer.c diff -u php4/ext/standard/var_unserializer.c:1.18.4.1 php4/ext/standard/var_unserializer.c:1.18.4.2 --- php4/ext/standard/var_unserializer.c:1.18.4.1 Sat Jan 4 14:42:37 2003 +++ php4/ext/standard/var_unserializer.c Sun May 18 08:04:52 2003 @@ -1,5 +1,5 @@ -/* Generated by re2c 0.5 on Mon Aug 19 22:01:10 2002 */ -#line 1 "var_unserializer.re" +/* Generated by re2c 0.5 on Sun May 18 13:53:06 2003 */ +#line 1 "/usr/src/PHP_4_3_0/ext/standard/var_unserializer.re" #include "php.h" #include "ext/standard/php_var.h" #include "php_incomplete_class.h" @@ -317,20 +317,20 @@ } yy3: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); - if(yych == ':') goto yy75; + if(yych == ':') goto yy74; yy4: #line 410 { return 0; } yy5: yych = *++YYCURSOR; - if(yych == ';') goto yy73; + if(yych == ';') goto yy72; goto yy4; yy6: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); - if(yych == ':') goto yy67; + if(yych == ':') goto yy66; goto yy4; yy7: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); - if(yych == ':') goto yy61; + if(yych == ':') goto yy60; goto yy4; yy8: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); @@ -625,7 +625,7 @@ { *p = YYCURSOR; INIT_PZVAL(*rval); - ZVAL_DOUBLE(*rval, atof(start + 2)); + ZVAL_DOUBLE(*rval, strtod(start + 2, (char**)p)); return 1; } yy53: yych = *++YYCURSOR; @@ -657,15 +657,12 @@ if(yych <= '/') goto yy2; if(yych <= '9') goto yy55; goto yy2; -yy58: yych = *++YYCURSOR; - if(yych <= '/') goto yy2; - if(yych >= ':') goto yy2; -yy59: ++YYCURSOR; +yy58: ++YYCURSOR; if((YYLIMIT - YYCURSOR) < 4) YYFILL(4); yych = *YYCURSOR; -yy60: if(yych <= ';'){ +yy59: if(yych <= ';'){ if(yych <= '/') goto yy2; - if(yych <= '9') goto yy59; + if(yych <= '9') goto yy58; if(yych <= ':') goto yy2; goto yy51; } else { @@ -677,26 +674,26 @@ goto yy2; } } -yy61: yych = *++YYCURSOR; +yy60: yych = *++YYCURSOR; if(yych <= ','){ if(yych != '+') goto yy2; } else { - if(yych <= '-') goto yy62; + if(yych <= '-') goto yy61; if(yych <= '/') goto yy2; - if(yych <= '9') goto yy63; + if(yych <= '9') goto yy62; goto yy2; } -yy62: yych = *++YYCURSOR; +yy61: yych = *++YYCURSOR; if(yych <= '/') goto yy2; if(yych >= ':') goto yy2; -yy63: ++YYCURSOR; +yy62: ++YYCURSOR; if(YYLIMIT == YYCURSOR) YYFILL(1); yych = *YYCURSOR; -yy64: if(yych <= '/') goto yy2; - if(yych <= '9') goto yy63; +yy63: if(yych <= '/') goto yy2; + if(yych <= '9') goto yy62; if(yych != ';') goto yy2; -yy65: yych = *++YYCURSOR; -yy66: +yy64: yych = *++YYCURSOR; +yy65: #line 270 { *p = YYCURSOR; @@ -704,26 +701,26 @@ ZVAL_LONG(*rval, parse_iv(start + 2)); return 1; } -yy67: yych = *++YYCURSOR; +yy66: yych = *++YYCURSOR; if(yych <= ','){ if(yych != '+') goto yy2; } else { - if(yych <= '-') goto yy68; + if(yych <= '-') goto yy67; if(yych <= '/') goto yy2; - if(yych <= '9') goto yy69; + if(yych <= '9') goto yy68; goto yy2; } -yy68: yych = *++YYCURSOR; +yy67: yych = *++YYCURSOR; if(yych <= '/') goto yy2; if(yych >= ':') goto yy2; -yy69: ++YYCURSOR; +yy68: ++YYCURSOR; if(YYLIMIT == YYCURSOR) YYFILL(1); yych = *YYCURSOR; -yy70: if(yych <= '/') goto yy2; - if(yych <= '9') goto yy69; +yy69: if(yych <= '/') goto yy2; + if(yych <= '9') goto yy68; if(yych != ';') goto yy2; -yy71: yych = *++YYCURSOR; -yy72: +yy70: yych = *++YYCURSOR; +yy71: #line 263 { *p = YYCURSOR; @@ -731,8 +728,8 @@ ZVAL_BOOL(*rval, parse_iv(start + 2)); return 1; } -yy73: yych = *++YYCURSOR; -yy74: +yy72: yych = *++YYCURSOR; +yy73: #line 256 { *p = YYCURSOR; @@ -740,26 +737,26 @@ ZVAL_NULL(*rval); return 1; } -yy75: yych = *++YYCURSOR; +yy74: yych = *++YYCURSOR; if(yych <= ','){ if(yych != '+') goto yy2; } else { - if(yych <= '-') goto yy76; + if(yych <= '-') goto yy75; if(yych <= '/') goto yy2; - if(yych <= '9') goto yy77; + if(yych <= '9') goto yy76; goto yy2; } -yy76: yych = *++YYCURSOR; +yy75: yych = *++YYCURSOR; if(yych <= '/') goto yy2; if(yych >= ':') goto yy2; -yy77: ++YYCURSOR; +yy76: ++YYCURSOR; if(YYLIMIT == YYCURSOR) YYFILL(1); yych = *YYCURSOR; -yy78: if(yych <= '/') goto yy2; - if(yych <= '9') goto yy77; +yy77: if(yych <= '/') goto yy2; + if(yych <= '9') goto yy76; if(yych != ';') goto yy2; -yy79: yych = *++YYCURSOR; -yy80: +yy78: yych = *++YYCURSOR; +yy79: #line 237 { int id;