sniper Mon Sep 5 12:35:06 2005 EDT
Modified files: (Branch: PHP_4_4)
/php-src/ext/standard var_unserializer.c
Log:
touch
http://cvs.php.net/diff.php/php-src/ext/standard/var_unserializer.c?r1=1.18.4.24.2.4&r2=1.18.4.24.2.5&ty=u
Index: php-src/ext/standard/var_unserializer.c
diff -u php-src/ext/standard/var_unserializer.c:1.18.4.24.2.4
php-src/ext/standard/var_unserializer.c:1.18.4.24.2.5
--- php-src/ext/standard/var_unserializer.c:1.18.4.24.2.4 Fri Jun 17
09:52:55 2005
+++ php-src/ext/standard/var_unserializer.c Mon Sep 5 12:35:05 2005
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.9.6 on Mon Jun 13 17:14:18 2005 */
+/* Generated by re2c 0.9.10 on Mon Sep 5 19:24:03 2005 */
#line 1 "/usr/src/php/php_4_4/ext/standard/var_unserializer.re"
/*
+----------------------------------------------------------------------+
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: var_unserializer.c,v 1.18.4.24.2.4 2005/06/17 13:52:55 dmitry Exp $ */
+/* $Id: var_unserializer.c,v 1.18.4.24.2.5 2005/09/05 16:35:05 sniper Exp $ */
#include "php.h"
#include "ext/standard/php_var.h"
@@ -338,11 +338,7 @@
-
-#line 7 "<stdout>"
{
- YYCTYPE yych;
- unsigned int yyaccept;
static unsigned char yybm[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
@@ -377,122 +373,100 @@
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
};
+
+#line 378 "<stdout>"
+{
+ YYCTYPE yych;
+ unsigned int yyaccept;
goto yy0;
++YYCURSOR;
yy0:
if((YYLIMIT - YYCURSOR) < 7) YYFILL(7);
yych = *YYCURSOR;
- if(yych <= 'd'){
- if(yych <= 'R'){
- if(yych <= 'N'){
- if(yych <= 'M') goto yy16;
- goto yy6;
- } else {
- if(yych <= 'O') goto yy13;
- if(yych <= 'Q') goto yy16;
- goto yy3;
- }
- } else {
- if(yych <= 'a'){
- if(yych <= '`') goto yy16;
- goto yy11;
- } else {
- if(yych <= 'b') goto yy7;
- if(yych <= 'c') goto yy16;
- goto yy9;
- }
- }
- } else {
- if(yych <= 'q'){
- if(yych <= 'i'){
- 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;
- }
- }
+ switch(yych){
+ case 'N': goto yy5;
+ case 'O': goto yy12;
+ 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;
}
-yy2: YYCURSOR = YYMARKER;
- switch(yyaccept){
- case 0: goto yy4;
- }
-yy3: yyaccept = 0;
+yy2: yyaccept = 0;
yych = *(YYMARKER = ++YYCURSOR);
if(yych == ':') goto yy87;
- goto yy4;
-yy4:
+ goto yy3;
+yy3:
#line 590 "/usr/src/php/php_4_4/ext/standard/var_unserializer.re"
{ return 0; }
-#line 102 "<stdout>"
-yy5: yyaccept = 0;
+#line 408 "<stdout>"
+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:
+ if(yych == ':') goto yy16;
+ goto yy3;
+yy13: ++YYCURSOR;
+ goto yy14;
+yy14:
#line 584 "/usr/src/php/php_4_4/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 147 "<stdout>"
+#line 453 "<stdout>"
+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;
@@ -500,10 +474,10 @@
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;
@@ -597,31 +571,31 @@
return object_common2(UNSERIALIZE_PASSTHRU, elements);
}
-#line 266 "<stdout>"
+#line 575 "<stdout>"
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;
@@ -634,26 +608,26 @@
return object_common2(UNSERIALIZE_PASSTHRU,
object_common1(UNSERIALIZE_PASSTHRU,
ZEND_STANDARD_CLASS_DEF_PTR));
}
-#line 304 "<stdout>"
+#line 612 "<stdout>"
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;
@@ -684,26 +658,26 @@
return finish_nested_data(UNSERIALIZE_PASSTHRU);
}
-#line 355 "<stdout>"
+#line 662 "<stdout>"
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;
@@ -736,46 +710,46 @@
ZVAL_STRINGL(*rval, str, len, 1);
return 1;
}
-#line 408 "<stdout>"
+#line 714 "<stdout>"
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);
@@ -783,43 +757,43 @@
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;
@@ -832,62 +806,62 @@
ZVAL_DOUBLE(*rval, zend_strtod((const char *)start + 2, NULL));
return 1;
}
-#line 506 "<stdout>"
+#line 810 "<stdout>"
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;
@@ -907,31 +881,31 @@
return 1;
}
-#line 583 "<stdout>"
+#line 885 "<stdout>"
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;
@@ -943,13 +917,13 @@
ZVAL_LONG(*rval, parse_iv(start + 2));
return 1;
}
-#line 620 "<stdout>"
+#line 921 "<stdout>"
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;
@@ -961,7 +935,7 @@
ZVAL_BOOL(*rval, parse_iv(start + 2));
return 1;
}
-#line 638 "<stdout>"
+#line 939 "<stdout>"
yy79: ++YYCURSOR;
goto yy80;
yy80:
@@ -972,28 +946,28 @@
ZVAL_NULL(*rval);
return 1;
}
-#line 649 "<stdout>"
+#line 950 "<stdout>"
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;
@@ -1021,28 +995,28 @@
return 1;
}
-#line 699 "<stdout>"
+#line 999 "<stdout>"
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;
@@ -1068,7 +1042,8 @@
return 1;
}
-#line 747 "<stdout>"
+#line 1046 "<stdout>"
+}
}
#line 592 "/usr/src/php/php_4_4/ext/standard/var_unserializer.re"
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
