sniper          Wed Sep  3 12:26:51 2003 EDT

  Modified files:              (Branch: PHP_4_3)
    /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.18.4.5 
php-src/ext/standard/var_unserializer.c:1.18.4.6
--- php-src/ext/standard/var_unserializer.c:1.18.4.5    Thu May 22 18:35:37 2003
+++ php-src/ext/standard/var_unserializer.c     Wed Sep  3 12:26:50 2003
@@ -1,5 +1,5 @@
-/* Generated by re2c 0.5 on Fri May 23 01:32:07 2003 */
-#line 1 "var_unserializer.re"
+/* Generated by re2c 0.5 on Wed Sep  3 19:14:59 2003 */
+#line 1 "/usr/src/web/php/php4_3/ext/standard/var_unserializer.re"
 #include "php.h"
 #include "ext/standard/php_var.h"
 #include "php_incomplete_class.h"
@@ -91,7 +91,7 @@
 #define YYMARKER marker
 
 
-#line 97
+#line 98
 
 
 
@@ -319,7 +319,7 @@
        yych = *(YYMARKER = ++YYCURSOR);
        if(yych == ':') goto yy74;
 yy4:
-#line 410
+#line 411
        { return 0; }
 yy5:   yych = *++YYCURSOR;
        if(yych == ';') goto yy72;
@@ -354,7 +354,7 @@
        goto yy4;
 yy13:  yych = *++YYCURSOR;
 yy14:
-#line 404
+#line 405
        {
        /* this is the case where we have less data than planned */
        zend_error(E_NOTICE, "Unexpected end of serialized data");
@@ -364,8 +364,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;
@@ -378,7 +377,7 @@
        if(yych != '"') goto yy2;
 yy21:  yych = *++YYCURSOR;
 yy22:
-#line 330
+#line 331
        {
        int len;
        int elements;
@@ -453,14 +452,10 @@
        return object_common2(UNSERIALIZE_PASSTHRU, elements);
 }
 yy23:  yych = *++YYCURSOR;
-       if(yych <= ','){
-               if(yych != '+') goto yy2;
-       } else {
-               if(yych <= '-') goto yy24;
-               if(yych <= '/') goto yy2;
-               if(yych <= '9') goto yy25;
-               goto yy2;
-       }
+       if(yych == '+') goto yy24;
+       if(yych <= '/') goto yy2;
+       if(yych <= '9') goto yy25;
+       goto yy2;
 yy24:  yych = *++YYCURSOR;
        if(yych <= '/') goto yy2;
        if(yych >= ':') goto yy2;
@@ -474,7 +469,7 @@
        if(yych != '"') goto yy2;
 yy28:  yych = *++YYCURSOR;
 yy29:
-#line 322
+#line 323
        {
 
        INIT_PZVAL(*rval);
@@ -483,14 +478,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;
@@ -504,7 +495,7 @@
        if(yych != '{') goto yy2;
 yy35:  yych = *++YYCURSOR;
 yy36:
-#line 304
+#line 305
        {
        int elements = parse_iv(start + 2);
 
@@ -523,14 +514,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;
@@ -544,7 +531,7 @@
        if(yych != '"') goto yy2;
 yy42:  yych = *++YYCURSOR;
 yy43:
-#line 284
+#line 285
        {
        int len;
        char *str;
@@ -621,7 +608,7 @@
        }
 yy51:  yych = *++YYCURSOR;
 yy52:
-#line 277
+#line 278
        {
        *p = YYCURSOR;
        INIT_PZVAL(*rval);
@@ -694,7 +681,7 @@
        if(yych != ';') goto yy2;
 yy64:  yych = *++YYCURSOR;
 yy65:
-#line 270
+#line 271
        {
        *p = YYCURSOR;
        INIT_PZVAL(*rval);
@@ -721,7 +708,7 @@
        if(yych != ';') goto yy2;
 yy70:  yych = *++YYCURSOR;
 yy71:
-#line 263
+#line 264
        {
        *p = YYCURSOR;
        INIT_PZVAL(*rval);
@@ -730,7 +717,7 @@
 }
 yy72:  yych = *++YYCURSOR;
 yy73:
-#line 256
+#line 257
        {
        *p = YYCURSOR;
        INIT_PZVAL(*rval);
@@ -757,7 +744,7 @@
        if(yych != ';') goto yy2;
 yy78:  yych = *++YYCURSOR;
 yy79:
-#line 237
+#line 238
        {
        int id;
 
@@ -777,7 +764,7 @@
        return 1;
 }
 }
-#line 412
+#line 413
 
 
        return 0;

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to