Regenerate

diff --git a/ext/standard/var_unserializer.c b/ext/standard/var_unserializer.c
index 21583553efe4ffb0b767c14f0ac352c6451ef926..fc60ed47e2dd3d272b297992bb3bac6ddffbc63e 100644 (file)
--- a/ext/standard/var_unserializer.c
+++ b/ext/standard/var_unserializer.c
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.12.3 on Wed Mar 19 00:06:59 2008 */
+/* Generated by re2c 0.13.5 on Tue May 27 06:15:01 2008 */
 #line 1 "ext/standard/var_unserializer.re"
 /*
   +----------------------------------------------------------------------+
@@ -462,7 +462,10 @@ PHPAPI int php_var_unserialize(UNSERIALIZE_PARAMETER)
 
        start = cursor;
 
+
+#line 467 "ext/standard/var_unserializer.c"
 {
+       YYCTYPE yych;
        static const unsigned char yybm[] = {
                  0,   0,   0,   0,   0,   0,   0,   0, 
                  0,   0,   0,   0,   0,   0,   0,   0, 
@@ -498,120 +501,116 @@ PHPAPI int php_var_unserialize(UNSERIALIZE_PARAMETER)
                  0,   0,   0,   0,   0,   0,   0,   0, 
        };
 
-#line 502 "ext/standard/var_unserializer.c"
-       {
-               YYCTYPE yych;
-
-               if((YYLIMIT - YYCURSOR) < 7) YYFILL(7);
-               yych = *YYCURSOR;
-               switch(yych) {
-               case 'C':
-               case 'O':       goto yy14;
-               case 'N':       goto yy5;
-               case 'R':       goto yy2;
-               case 'S':       goto yy10;
-               case 'U':       goto yy11;
-               case 'a':       goto yy12;
-               case 'b':       goto yy6;
-               case 'd':       goto yy8;
-               case 'i':       goto yy7;
-               case 'o':       goto yy13;
-               case 'r':       goto yy4;
-               case 's':       goto yy9;
-               case '}':       goto yy15;
-               default:        goto yy17;
-               }
+       if ((YYLIMIT - YYCURSOR) < 7) YYFILL(7);
+       yych = *YYCURSOR;
+       switch (yych) {
+       case 'C':
+       case 'O':       goto yy14;
+       case 'N':       goto yy5;
+       case 'R':       goto yy2;
+       case 'S':       goto yy10;
+       case 'U':       goto yy11;
+       case 'a':       goto yy12;
+       case 'b':       goto yy6;
+       case 'd':       goto yy8;
+       case 'i':       goto yy7;
+       case 'o':       goto yy13;
+       case 'r':       goto yy4;
+       case 's':       goto yy9;
+       case '}':       goto yy15;
+       default:        goto yy17;
+       }
 yy2:
-               yych = *(YYMARKER = ++YYCURSOR);
-               if(yych == ':') goto yy103;
+       yych = *(YYMARKER = ++YYCURSOR);
+       if (yych == ':') goto yy103;
 yy3:
-#line 793 "ext/standard/var_unserializer.re"
-               { return 0; }
-#line 531 "ext/standard/var_unserializer.c"
+#line 791 "ext/standard/var_unserializer.re"
+       { return 0; }
+#line 530 "ext/standard/var_unserializer.c"
 yy4:
-               yych = *(YYMARKER = ++YYCURSOR);
-               if(yych == ':') goto yy97;
-               goto yy3;
+       yych = *(YYMARKER = ++YYCURSOR);
+       if (yych == ':') goto yy97;
+       goto yy3;
 yy5:
-               yych = *++YYCURSOR;
-               if(yych == ';') goto yy95;
-               goto yy3;
+       yych = *++YYCURSOR;
+       if (yych == ';') goto yy95;
+       goto yy3;
 yy6:
-               yych = *(YYMARKER = ++YYCURSOR);
-               if(yych == ':') goto yy91;
-               goto yy3;
+       yych = *(YYMARKER = ++YYCURSOR);
+       if (yych == ':') goto yy91;
+       goto yy3;
 yy7:
-               yych = *(YYMARKER = ++YYCURSOR);
-               if(yych == ':') goto yy85;
-               goto yy3;
+       yych = *(YYMARKER = ++YYCURSOR);
+       if (yych == ':') goto yy85;
+       goto yy3;
 yy8:
-               yych = *(YYMARKER = ++YYCURSOR);
-               if(yych == ':') goto yy61;
-               goto yy3;
+       yych = *(YYMARKER = ++YYCURSOR);
+       if (yych == ':') goto yy61;
+       goto yy3;
 yy9:
-               yych = *(YYMARKER = ++YYCURSOR);
-               if(yych == ':') goto yy54;
-               goto yy3;
+       yych = *(YYMARKER = ++YYCURSOR);
+       if (yych == ':') goto yy54;
+       goto yy3;
 yy10:
-               yych = *(YYMARKER = ++YYCURSOR);
-               if(yych == ':') goto yy47;
-               goto yy3;
+       yych = *(YYMARKER = ++YYCURSOR);
+       if (yych == ':') goto yy47;
+       goto yy3;
 yy11:
-               yych = *(YYMARKER = ++YYCURSOR);
-               if(yych == ':') goto yy40;
-               goto yy3;
+       yych = *(YYMARKER = ++YYCURSOR);
+       if (yych == ':') goto yy40;
+       goto yy3;
 yy12:
-               yych = *(YYMARKER = ++YYCURSOR);
-               if(yych == ':') goto yy33;
-               goto yy3;
+       yych = *(YYMARKER = ++YYCURSOR);
+       if (yych == ':') goto yy33;
+       goto yy3;
 yy13:
-               yych = *(YYMARKER = ++YYCURSOR);
-               if(yych == ':') goto yy26;
-               goto yy3;
+       yych = *(YYMARKER = ++YYCURSOR);
+       if (yych == ':') goto yy26;
+       goto yy3;
 yy14:
-               yych = *(YYMARKER = ++YYCURSOR);
-               if(yych == ':') goto yy18;
-               goto yy3;
+       yych = *(YYMARKER = ++YYCURSOR);
+       if (yych == ':') goto yy18;
+       goto yy3;
 yy15:
-               ++YYCURSOR;
-#line 787 "ext/standard/var_unserializer.re"
-               {
+       ++YYCURSOR;
+#line 785 "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 584 "ext/standard/var_unserializer.c"
+#line 583 "ext/standard/var_unserializer.c"
 yy17:
-               yych = *++YYCURSOR;
-               goto yy3;
+       yych = *++YYCURSOR;
+       goto yy3;
 yy18:
-               yych = *++YYCURSOR;
-               if(yybm[0+yych] & 128) {
-                       goto yy21;
-               }
-               if(yych == '+') goto yy20;
+       yych = *++YYCURSOR;
+       if (yybm[0+yych] & 128) {
+               goto yy21;
+       }
+       if (yych == '+') goto yy20;
 yy19:
-               YYCURSOR = YYMARKER;
-               goto yy3;
+       YYCURSOR = YYMARKER;
+       goto yy3;
 yy20:
-               yych = *++YYCURSOR;
-               if(yybm[0+yych] & 128) {
-                       goto yy21;
-               }
-               goto yy19;
+       yych = *++YYCURSOR;
+       if (yybm[0+yych] & 128) {
+               goto yy21;
+       }
+       goto yy19;
 yy21:
-               ++YYCURSOR;
-               if((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
-               yych = *YYCURSOR;
-               if(yybm[0+yych] & 128) {
-                       goto yy21;
-               }
-               if(yych != ':') goto yy19;
-               yych = *++YYCURSOR;
-               if(yych != '"') goto yy19;
-               ++YYCURSOR;
-#line 674 "ext/standard/var_unserializer.re"
-               {
+       ++YYCURSOR;
+       if ((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
+       yych = *YYCURSOR;
+       if (yybm[0+yych] & 128) {
+               goto yy21;
+       }
+       if (yych != ':') goto yy19;
+       yych = *++YYCURSOR;
+       if (yych != '"') goto yy19;
+       ++YYCURSOR;
+#line 672 "ext/standard/var_unserializer.re"
+       {
        size_t len, len2, len3, maxlen;
        long elements;
        zstr class_name;
@@ -723,62 +722,62 @@ yy21:
 
        return object_common2(UNSERIALIZE_PASSTHRU, elements);
 }
-#line 727 "ext/standard/var_unserializer.c"
+#line 726 "ext/standard/var_unserializer.c"
 yy26:
-               yych = *++YYCURSOR;
-               if(yych <= ',') {
-                       if(yych != '+') goto yy19;
-               } else {
-                       if(yych <= '-') goto yy27;
-                       if(yych <= '/') goto yy19;
-                       if(yych <= '9') goto yy28;
-                       goto yy19;
-               }
+       yych = *++YYCURSOR;
+       if (yych <= ',') {
+               if (yych != '+') goto yy19;
+       } else {
+               if (yych <= '-') goto yy27;
+               if (yych <= '/') goto yy19;
+               if (yych <= '9') goto yy28;
+               goto yy19;
+       }
 yy27:
-               yych = *++YYCURSOR;
-               if(yych <= '/') goto yy19;
-               if(yych >= ':') goto yy19;
+       yych = *++YYCURSOR;
+       if (yych <= '/') goto yy19;
+       if (yych >= ':') goto yy19;
 yy28:
-               ++YYCURSOR;
-               if((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
-               yych = *YYCURSOR;
-               if(yych <= '/') goto yy19;
-               if(yych <= '9') goto yy28;
-               if(yych >= ';') goto yy19;
-               yych = *++YYCURSOR;
-               if(yych != '"') goto yy19;
-               ++YYCURSOR;
-#line 666 "ext/standard/var_unserializer.re"
-               {
+       ++YYCURSOR;
+       if ((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
+       yych = *YYCURSOR;
+       if (yych <= '/') goto yy19;
+       if (yych <= '9') goto yy28;
+       if (yych >= ';') goto yy19;
+       yych = *++YYCURSOR;
+       if (yych != '"') goto yy19;
+       ++YYCURSOR;
+#line 664 "ext/standard/var_unserializer.re"
+       {
 
        INIT_PZVAL(*rval);
 
        return object_common2(UNSERIALIZE_PASSTHRU,
                        object_common1(UNSERIALIZE_PASSTHRU, ZEND_STANDARD_CLASS_DEF_PTR));
 }
-#line 760 "ext/standard/var_unserializer.c"
+#line 759 "ext/standard/var_unserializer.c"
 yy33:
-               yych = *++YYCURSOR;
-               if(yych == '+') goto yy34;
-               if(yych <= '/') goto yy19;
-               if(yych <= '9') goto yy35;
-               goto yy19;
+       yych = *++YYCURSOR;
+       if (yych == '+') goto yy34;
+       if (yych <= '/') goto yy19;
+       if (yych <= '9') goto yy35;
+       goto yy19;
 yy34:
-               yych = *++YYCURSOR;
-               if(yych <= '/') goto yy19;
-               if(yych >= ':') goto yy19;
+       yych = *++YYCURSOR;
+       if (yych <= '/') goto yy19;
+       if (yych >= ':') goto yy19;
 yy35:
-               ++YYCURSOR;
-               if((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
-               yych = *YYCURSOR;
-               if(yych <= '/') goto yy19;
-               if(yych <= '9') goto yy35;
-               if(yych >= ';') goto yy19;
-               yych = *++YYCURSOR;
-               if(yych != '{') goto yy19;
-               ++YYCURSOR;
+       ++YYCURSOR;
+       if ((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
+       yych = *YYCURSOR;
+       if (yych <= '/') goto yy19;
+       if (yych <= '9') goto yy35;
+       if (yych >= ';') goto yy19;
+       yych = *++YYCURSOR;
+       if (yych != '{') goto yy19;
+       ++YYCURSOR;
 #line 644 "ext/standard/var_unserializer.re"
-               {
+       {
        long elements = parse_iv(start + 2);
        /* use iv() not uiv() in order to check data range */
        *p = YYCURSOR;
@@ -788,10 +787,8 @@ yy35:
        }
 
        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;
@@ -799,29 +796,29 @@ yy35:
 
        return finish_nested_data(UNSERIALIZE_PASSTHRU);
 }
-#line 803 "ext/standard/var_unserializer.c"
+#line 800 "ext/standard/var_unserializer.c"
 yy40:
-               yych = *++YYCURSOR;
-               if(yych == '+') goto yy41;
-               if(yych <= '/') goto yy19;
-               if(yych <= '9') goto yy42;
-               goto yy19;
+       yych = *++YYCURSOR;
+       if (yych == '+') goto yy41;
+       if (yych <= '/') goto yy19;
+       if (yych <= '9') goto yy42;
+       goto yy19;
 yy41:
-               yych = *++YYCURSOR;
-               if(yych <= '/') goto yy19;
-               if(yych >= ':') goto yy19;
+       yych = *++YYCURSOR;
+       if (yych <= '/') goto yy19;
+       if (yych >= ':') goto yy19;
 yy42:
-               ++YYCURSOR;
-               if((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
-               yych = *YYCURSOR;
-               if(yych <= '/') goto yy19;
-               if(yych <= '9') goto yy42;
-               if(yych >= ';') goto yy19;
-               yych = *++YYCURSOR;
-               if(yych != '"') goto yy19;
-               ++YYCURSOR;
+       ++YYCURSOR;
+       if ((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
+       yych = *YYCURSOR;
+       if (yych <= '/') goto yy19;
+       if (yych <= '9') goto yy42;
+       if (yych >= ';') goto yy19;
+       yych = *++YYCURSOR;
+       if (yych != '"') goto yy19;
+       ++YYCURSOR;
 #line 615 "ext/standard/var_unserializer.re"
-               {
+       {
        size_t len, maxlen;
        UChar *ustr;
 
@@ -849,29 +846,29 @@ yy42:
        ZVAL_UNICODEL(*rval, ustr, len, 0);
        return 1;
 }
-#line 853 "ext/standard/var_unserializer.c"
+#line 850 "ext/standard/var_unserializer.c"
 yy47:
-               yych = *++YYCURSOR;
-               if(yych == '+') goto yy48;
-               if(yych <= '/') goto yy19;
-               if(yych <= '9') goto yy49;
-               goto yy19;
+       yych = *++YYCURSOR;
+       if (yych == '+') goto yy48;
+       if (yych <= '/') goto yy19;
+       if (yych <= '9') goto yy49;
+       goto yy19;
 yy48:
-               yych = *++YYCURSOR;
-               if(yych <= '/') goto yy19;
-               if(yych >= ':') goto yy19;
+       yych = *++YYCURSOR;
+       if (yych <= '/') goto yy19;
+       if (yych >= ':') goto yy19;
 yy49:
-               ++YYCURSOR;
-               if((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
-               yych = *YYCURSOR;
-               if(yych <= '/') goto yy19;
-               if(yych <= '9') goto yy49;
-               if(yych >= ';') goto yy19;
-               yych = *++YYCURSOR;
-               if(yych != '"') goto yy19;
-               ++YYCURSOR;
+       ++YYCURSOR;
+       if ((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
+       yych = *YYCURSOR;
+       if (yych <= '/') goto yy19;
+       if (yych <= '9') goto yy49;
+       if (yych >= ';') goto yy19;
+       yych = *++YYCURSOR;
+       if (yych != '"') goto yy19;
+       ++YYCURSOR;
 #line 586 "ext/standard/var_unserializer.re"
-               {
+       {
        size_t len, maxlen;
        char *str;
 
@@ -899,29 +896,29 @@ yy49:
        ZVAL_STRINGL(*rval, str, len, 0);
        return 1;
 }
-#line 903 "ext/standard/var_unserializer.c"
+#line 900 "ext/standard/var_unserializer.c"
 yy54:
-               yych = *++YYCURSOR;
-               if(yych == '+') goto yy55;
-               if(yych <= '/') goto yy19;
-               if(yych <= '9') goto yy56;
-               goto yy19;
+       yych = *++YYCURSOR;
+       if (yych == '+') goto yy55;
+       if (yych <= '/') goto yy19;
+       if (yych <= '9') goto yy56;
+       goto yy19;
 yy55:
-               yych = *++YYCURSOR;
-               if(yych <= '/') goto yy19;
-               if(yych >= ':') goto yy19;
+       yych = *++YYCURSOR;
+       if (yych <= '/') goto yy19;
+       if (yych >= ':') goto yy19;
 yy56:
-               ++YYCURSOR;
-               if((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
-               yych = *YYCURSOR;
-               if(yych <= '/') goto yy19;
-               if(yych <= '9') goto yy56;
-               if(yych >= ';') goto yy19;
-               yych = *++YYCURSOR;
-               if(yych != '"') goto yy19;
-               ++YYCURSOR;
+       ++YYCURSOR;
+       if ((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
+       yych = *YYCURSOR;
+       if (yych <= '/') goto yy19;
+       if (yych <= '9') goto yy56;
+       if (yych >= ';') goto yy19;
+       yych = *++YYCURSOR;
+       if (yych != '"') goto yy19;
+       ++YYCURSOR;
 #line 558 "ext/standard/var_unserializer.re"
-               {
+       {
        size_t len, maxlen;
        char *str;
 
@@ -948,162 +945,162 @@ yy56:
        ZVAL_STRINGL(*rval, str, len, 1);
        return 1;
 }
-#line 952 "ext/standard/var_unserializer.c"
+#line 949 "ext/standard/var_unserializer.c"
 yy61:
-               yych = *++YYCURSOR;
-               if(yych <= '/') {
-                       if(yych <= ',') {
-                               if(yych == '+') goto yy65;
-                               goto yy19;
-                       } else {
-                               if(yych <= '-') goto yy63;
-                               if(yych <= '.') goto yy68;
-                               goto yy19;
-                       }
+       yych = *++YYCURSOR;
+       if (yych <= '/') {
+               if (yych <= ',') {
+                       if (yych == '+') goto yy65;
+                       goto yy19;
                } else {
-                       if(yych <= 'I') {
-                               if(yych <= '9') goto yy66;
-                               if(yych <= 'H') goto yy19;
-                               goto yy64;
-                       } else {
-                               if(yych != 'N') goto yy19;
-                       }
-               }
-               yych = *++YYCURSOR;
-               if(yych == 'A') goto yy84;
-               goto yy19;
-yy63:
-               yych = *++YYCURSOR;
-               if(yych <= '/') {
-                       if(yych == '.') goto yy68;
+                       if (yych <= '-') goto yy63;
+                       if (yych <= '.') goto yy68;
                        goto yy19;
+               }
+       } else {
+               if (yych <= 'I') {
+                       if (yych <= '9') goto yy66;
+                       if (yych <= 'H') goto yy19;
+                       goto yy64;
                } else {
-                       if(yych <= '9') goto yy66;
-                       if(yych != 'I') goto yy19;
+                       if (yych != 'N') goto yy19;
                }
-yy64:
-               yych = *++YYCURSOR;
-               if(yych == 'N') goto yy80;
+       }
+       yych = *++YYCURSOR;
+       if (yych == 'A') goto yy84;
+       goto yy19;
+yy63:
+       yych = *++YYCURSOR;
+       if (yych <= '/') {
+               if (yych == '.') goto yy68;
                goto yy19;
+       } else {
+               if (yych <= '9') goto yy66;
+               if (yych != 'I') goto yy19;
+       }
+yy64:
+       yych = *++YYCURSOR;
+       if (yych == 'N') goto yy80;
+       goto yy19;
 yy65:
-               yych = *++YYCURSOR;
-               if(yych == '.') goto yy68;
-               if(yych <= '/') goto yy19;
-               if(yych >= ':') goto yy19;
+       yych = *++YYCURSOR;
+       if (yych == '.') goto yy68;
+       if (yych <= '/') goto yy19;
+       if (yych >= ':') goto yy19;
 yy66:
-               ++YYCURSOR;
-               if((YYLIMIT - YYCURSOR) < 4) YYFILL(4);
-               yych = *YYCURSOR;
-               if(yych <= ':') {
-                       if(yych <= '.') {
-                               if(yych <= '-') goto yy19;
-                               goto yy78;
-                       } else {
-                               if(yych <= '/') goto yy19;
-                               if(yych <= '9') goto yy66;
-                               goto yy19;
-                       }
+       ++YYCURSOR;
+       if ((YYLIMIT - YYCURSOR) < 4) YYFILL(4);
+       yych = *YYCURSOR;
+       if (yych <= ':') {
+               if (yych <= '.') {
+                       if (yych <= '-') goto yy19;
+                       goto yy78;
                } else {
-                       if(yych <= 'E') {
-                               if(yych <= ';') goto yy71;
-                               if(yych <= 'D') goto yy19;
-                               goto yy73;
-                       } else {
-                               if(yych == 'e') goto yy73;
-                               goto yy19;
-                       }
+                       if (yych <= '/') goto yy19;
+                       if (yych <= '9') goto yy66;
+                       goto yy19;
+               }
+       } else {
+               if (yych <= 'E') {
+                       if (yych <= ';') goto yy71;
+                       if (yych <= 'D') goto yy19;
+                       goto yy73;
+               } else {
+                       if (yych == 'e') goto yy73;
+                       goto yy19;
                }
+       }
 yy68:
-               yych = *++YYCURSOR;
-               if(yych <= '/') goto yy19;
-               if(yych >= ':') goto yy19;
+       yych = *++YYCURSOR;
+       if (yych <= '/') goto yy19;
+       if (yych >= ':') goto yy19;
 yy69:
-               ++YYCURSOR;
-               if((YYLIMIT - YYCURSOR) < 4) YYFILL(4);
-               yych = *YYCURSOR;
-               if(yych <= ';') {
-                       if(yych <= '/') goto yy19;
-                       if(yych <= '9') goto yy69;
-                       if(yych <= ':') goto yy19;
+       ++YYCURSOR;
+       if ((YYLIMIT - YYCURSOR) < 4) YYFILL(4);
+       yych = *YYCURSOR;
+       if (yych <= ';') {
+               if (yych <= '/') goto yy19;
+               if (yych <= '9') goto yy69;
+               if (yych <= ':') goto yy19;
+       } else {
+               if (yych <= 'E') {
+                       if (yych <= 'D') goto yy19;
+                       goto yy73;
                } else {
-                       if(yych <= 'E') {
-                               if(yych <= 'D') goto yy19;
-                               goto yy73;
-                       } else {
-                               if(yych == 'e') goto yy73;
-                               goto yy19;
-                       }
+                       if (yych == 'e') goto yy73;
+                       goto yy19;
                }
+       }
 yy71:
-               ++YYCURSOR;
+       ++YYCURSOR;
 #line 551 "ext/standard/var_unserializer.re"
-               {
+       {
        *p = YYCURSOR;
        INIT_PZVAL(*rval);
        ZVAL_DOUBLE(*rval, zend_strtod((const char *)start + 2, NULL));
        return 1;
 }
-#line 1047 "ext/standard/var_unserializer.c"
+#line 1044 "ext/standard/var_unserializer.c"
 yy73:
-               yych = *++YYCURSOR;
-               if(yych <= ',') {
-                       if(yych != '+') goto yy19;
-               } else {
-                       if(yych <= '-') goto yy74;
-                       if(yych <= '/') goto yy19;
-                       if(yych <= '9') goto yy75;
-                       goto yy19;
-               }
+       yych = *++YYCURSOR;
+       if (yych <= ',') {
+               if (yych != '+') goto yy19;
+       } else {
+               if (yych <= '-') goto yy74;
+               if (yych <= '/') goto yy19;
+               if (yych <= '9') goto yy75;
+               goto yy19;
+       }
 yy74:
-               yych = *++YYCURSOR;
-               if(yych <= ',') {
-                       if(yych == '+') goto yy77;
-                       goto yy19;
-               } else {
-                       if(yych <= '-') goto yy77;
-                       if(yych <= '/') goto yy19;
-                       if(yych >= ':') goto yy19;
-               }
-yy75:
-               ++YYCURSOR;
-               if(YYLIMIT == YYCURSOR) YYFILL(1);
-               yych = *YYCURSOR;
-               if(yych <= '/') goto yy19;
-               if(yych <= '9') goto yy75;
-               if(yych == ';') goto yy71;
+       yych = *++YYCURSOR;
+       if (yych <= ',') {
+               if (yych == '+') goto yy77;
                goto yy19;
+       } else {
+               if (yych <= '-') goto yy77;
+               if (yych <= '/') goto yy19;
+               if (yych >= ':') goto yy19;
+       }
+yy75:
+       ++YYCURSOR;
+       if (YYLIMIT <= YYCURSOR) YYFILL(1);
+       yych = *YYCURSOR;
+       if (yych <= '/') goto yy19;
+       if (yych <= '9') goto yy75;
+       if (yych == ';') goto yy71;
+       goto yy19;
 yy77:
-               yych = *++YYCURSOR;
-               if(yych <= '/') goto yy19;
-               if(yych <= '9') goto yy75;
-               goto yy19;
+       yych = *++YYCURSOR;
+       if (yych <= '/') goto yy19;
+       if (yych <= '9') goto yy75;
+       goto yy19;
 yy78:
-               ++YYCURSOR;
-               if((YYLIMIT - YYCURSOR) < 4) YYFILL(4);
-               yych = *YYCURSOR;
-               if(yych <= ';') {
-                       if(yych <= '/') goto yy19;
-                       if(yych <= '9') goto yy78;
-                       if(yych <= ':') goto yy19;
-                       goto yy71;
+       ++YYCURSOR;
+       if ((YYLIMIT - YYCURSOR) < 4) YYFILL(4);
+       yych = *YYCURSOR;
+       if (yych <= ';') {
+               if (yych <= '/') goto yy19;
+               if (yych <= '9') goto yy78;
+               if (yych <= ':') goto yy19;
+               goto yy71;
+       } else {
+               if (yych <= 'E') {
+                       if (yych <= 'D') goto yy19;
+                       goto yy73;
                } else {
-                       if(yych <= 'E') {
-                               if(yych <= 'D') goto yy19;
-                               goto yy73;
-                       } else {
-                               if(yych == 'e') goto yy73;
-                               goto yy19;
-                       }
+                       if (yych == 'e') goto yy73;
+                       goto yy19;
                }
+       }
 yy80:
-               yych = *++YYCURSOR;
-               if(yych != 'F') goto yy19;
+       yych = *++YYCURSOR;
+       if (yych != 'F') goto yy19;
 yy81:
-               yych = *++YYCURSOR;
-               if(yych != ';') goto yy19;
-               ++YYCURSOR;
+       yych = *++YYCURSOR;
+       if (yych != ';') goto yy19;
+       ++YYCURSOR;
 #line 536 "ext/standard/var_unserializer.re"
-               {
+       {
        *p = YYCURSOR;
        INIT_PZVAL(*rval);
 
@@ -1117,90 +1114,90 @@ yy81:
 
        return 1;
 }
-#line 1121 "ext/standard/var_unserializer.c"
+#line 1118 "ext/standard/var_unserializer.c"
 yy84:
-               yych = *++YYCURSOR;
-               if(yych == 'N') goto yy81;
-               goto yy19;
+       yych = *++YYCURSOR;
+       if (yych == 'N') goto yy81;
+       goto yy19;
 yy85:
-               yych = *++YYCURSOR;
-               if(yych <= ',') {
-                       if(yych != '+') goto yy19;
-               } else {
-                       if(yych <= '-') goto yy86;
-                       if(yych <= '/') goto yy19;
-                       if(yych <= '9') goto yy87;
-                       goto yy19;
-               }
+       yych = *++YYCURSOR;
+       if (yych <= ',') {
+               if (yych != '+') goto yy19;
+       } else {
+               if (yych <= '-') goto yy86;
+               if (yych <= '/') goto yy19;
+               if (yych <= '9') goto yy87;
+               goto yy19;
+       }
 yy86:
-               yych = *++YYCURSOR;
-               if(yych <= '/') goto yy19;
-               if(yych >= ':') goto yy19;
+       yych = *++YYCURSOR;
+       if (yych <= '/') goto yy19;
+       if (yych >= ':') goto yy19;
 yy87:
-               ++YYCURSOR;
-               if(YYLIMIT == YYCURSOR) YYFILL(1);
-               yych = *YYCURSOR;
-               if(yych <= '/') goto yy19;
-               if(yych <= '9') goto yy87;
-               if(yych != ';') goto yy19;
-               ++YYCURSOR;
+       ++YYCURSOR;
+       if (YYLIMIT <= YYCURSOR) YYFILL(1);
+       yych = *YYCURSOR;
+       if (yych <= '/') goto yy19;
+       if (yych <= '9') goto yy87;
+       if (yych != ';') goto yy19;
+       ++YYCURSOR;
 #line 529 "ext/standard/var_unserializer.re"
-               {
+       {
        *p = YYCURSOR;
        INIT_PZVAL(*rval);
        ZVAL_LONG(*rval, parse_iv(start + 2));
        return 1;
 }
-#line 1155 "ext/standard/var_unserializer.c"
+#line 1152 "ext/standard/var_unserializer.c"
 yy91:
-               yych = *++YYCURSOR;
-               if(yych <= '/') goto yy19;
-               if(yych >= '2') goto yy19;
-               yych = *++YYCURSOR;
-               if(yych != ';') goto yy19;
-               ++YYCURSOR;
+       yych = *++YYCURSOR;
+       if (yych <= '/') goto yy19;
+       if (yych >= '2') goto yy19;
+       yych = *++YYCURSOR;
+       if (yych != ';') goto yy19;
+       ++YYCURSOR;
 #line 522 "ext/standard/var_unserializer.re"
-               {
+       {
        *p = YYCURSOR;
        INIT_PZVAL(*rval);
        ZVAL_BOOL(*rval, parse_iv(start + 2));
        return 1;
 }
-#line 1170 "ext/standard/var_unserializer.c"
+#line 1167 "ext/standard/var_unserializer.c"
 yy95:
-               ++YYCURSOR;
+       ++YYCURSOR;
 #line 515 "ext/standard/var_unserializer.re"
-               {
+       {
        *p = YYCURSOR;
        INIT_PZVAL(*rval);
        ZVAL_NULL(*rval);
        return 1;
 }
-#line 1180 "ext/standard/var_unserializer.c"
+#line 1177 "ext/standard/var_unserializer.c"
 yy97:
-               yych = *++YYCURSOR;
-               if(yych <= ',') {
-                       if(yych != '+') goto yy19;
-               } else {
-                       if(yych <= '-') goto yy98;
-                       if(yych <= '/') goto yy19;
-                       if(yych <= '9') goto yy99;
-                       goto yy19;
-               }
+       yych = *++YYCURSOR;
+       if (yych <= ',') {
+               if (yych != '+') goto yy19;
+       } else {
+               if (yych <= '-') goto yy98;
+               if (yych <= '/') goto yy19;
+               if (yych <= '9') goto yy99;
+               goto yy19;
+       }
 yy98:
-               yych = *++YYCURSOR;
-               if(yych <= '/') goto yy19;
-               if(yych >= ':') goto yy19;
+       yych = *++YYCURSOR;
+       if (yych <= '/') goto yy19;
+       if (yych >= ':') goto yy19;
 yy99:
-               ++YYCURSOR;
-               if(YYLIMIT == YYCURSOR) YYFILL(1);
-               yych = *YYCURSOR;
-               if(yych <= '/') goto yy19;
-               if(yych <= '9') goto yy99;
-               if(yych != ';') goto yy19;
-               ++YYCURSOR;
+       ++YYCURSOR;
+       if (YYLIMIT <= YYCURSOR) YYFILL(1);
+       yych = *YYCURSOR;
+       if (yych <= '/') goto yy19;
+       if (yych <= '9') goto yy99;
+       if (yych != ';') goto yy19;
+       ++YYCURSOR;
 #line 492 "ext/standard/var_unserializer.re"
-               {
+       {
        long id;
 
        *p = YYCURSOR;
@@ -1222,31 +1219,31 @@ yy99:
 
        return 1;
 }
-#line 1226 "ext/standard/var_unserializer.c"
+#line 1223 "ext/standard/var_unserializer.c"
 yy103:
-               yych = *++YYCURSOR;
-               if(yych <= ',') {
-                       if(yych != '+') goto yy19;
-               } else {
-                       if(yych <= '-') goto yy104;
-                       if(yych <= '/') goto yy19;
-                       if(yych <= '9') goto yy105;
-                       goto yy19;
-               }
+       yych = *++YYCURSOR;
+       if (yych <= ',') {
+               if (yych != '+') goto yy19;
+       } else {
+               if (yych <= '-') goto yy104;
+               if (yych <= '/') goto yy19;
+               if (yych <= '9') goto yy105;
+               goto yy19;
+       }
 yy104:
-               yych = *++YYCURSOR;
-               if(yych <= '/') goto yy19;
-               if(yych >= ':') goto yy19;
+       yych = *++YYCURSOR;
+       if (yych <= '/') goto yy19;
+       if (yych >= ':') goto yy19;
 yy105:
-               ++YYCURSOR;
-               if(YYLIMIT == YYCURSOR) YYFILL(1);
-               yych = *YYCURSOR;
-               if(yych <= '/') goto yy19;
-               if(yych <= '9') goto yy105;
-               if(yych != ';') goto yy19;
-               ++YYCURSOR;
+       ++YYCURSOR;
+       if (YYLIMIT <= YYCURSOR) YYFILL(1);
+       yych = *YYCURSOR;
+       if (yych <= '/') goto yy19;
+       if (yych <= '9') goto yy105;
+       if (yych != ';') goto yy19;
+       ++YYCURSOR;
 #line 471 "ext/standard/var_unserializer.re"
-               {
+       {
        long id;
 
        *p = YYCURSOR;
@@ -1266,10 +1263,9 @@ yy105:
 
        return 1;
 }
-#line 1270 "ext/standard/var_unserializer.c"
-       }
+#line 1267 "ext/standard/var_unserializer.c"
 }
-#line 795 "ext/standard/var_unserializer.re"
+#line 793 "ext/standard/var_unserializer.re"
 
 
        return 0;