regenerate to fix gcov build. plus use re2c bitvectors

1 files changed, 413 insertions, 758 deletions

diff --git a/ext/standard/var_unserializer.c b/ext/standard/var_unserializer.c
index 4f140c1ed4..4844e3cc13 100644
--- a/ext/standard/var_unserializer.c
+++ b/ext/standard/var_unserializer.c
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.11.2 on Fri Mar 23 13:13:16 2007 */
+/* Generated by re2c 0.11.0 on Fri Mar 23 20:26:08 2007 */
 #line 1 "ext/standard/var_unserializer.re"
 /*
   +----------------------------------------------------------------------+
@@ -393,173 +393,151 @@ PHPAPI int php_var_unserialize(UNSERIALIZE_PARAMETER)
 
 	
 	
-
-#line 398 "<stdout>"
 {
-	YYCTYPE yych;
-
-	if((YYLIMIT - YYCURSOR) < 7) YYFILL(7);
-	yych = *YYCURSOR;
-	switch(yych) {
-	case 'C':
-	case 'O':	goto yy13;
-	case 'N':	goto yy5;
-	case 'R':	goto yy2;
-	case 'S':	goto yy10;
-	case 'a':	goto yy11;
-	case 'b':	goto yy6;
-	case 'd':	goto yy8;
-	case 'i':	goto yy7;
-	case 'o':	goto yy12;
-	case 'r':	goto yy4;
-	case 's':	goto yy9;
-	case '}':	goto yy14;
-	default:	goto yy16;
-	}
+	static unsigned char yybm[] = {
+		  0,   0,   0,   0,   0,   0,   0,   0, 
+		  0,   0,   0,   0,   0,   0,   0,   0, 
+		  0,   0,   0,   0,   0,   0,   0,   0, 
+		  0,   0,   0,   0,   0,   0,   0,   0, 
+		  0,   0,   0,   0,   0,   0,   0,   0, 
+		  0,   0,   0,   0,   0,   0,   0,   0, 
+		128, 128, 128, 128, 128, 128, 128, 128, 
+		128, 128,   0,   0,   0,   0,   0,   0, 
+		  0,   0,   0,   0,   0,   0,   0,   0, 
+		  0,   0,   0,   0,   0,   0,   0,   0, 
+		  0,   0,   0,   0,   0,   0,   0,   0, 
+		  0,   0,   0,   0,   0,   0,   0,   0, 
+		  0,   0,   0,   0,   0,   0,   0,   0, 
+		  0,   0,   0,   0,   0,   0,   0,   0, 
+		  0,   0,   0,   0,   0,   0,   0,   0, 
+		  0,   0,   0,   0,   0,   0,   0,   0, 
+		  0,   0,   0,   0,   0,   0,   0,   0, 
+		  0,   0,   0,   0,   0,   0,   0,   0, 
+		  0,   0,   0,   0,   0,   0,   0,   0, 
+		  0,   0,   0,   0,   0,   0,   0,   0, 
+		  0,   0,   0,   0,   0,   0,   0,   0, 
+		  0,   0,   0,   0,   0,   0,   0,   0, 
+		  0,   0,   0,   0,   0,   0,   0,   0, 
+		  0,   0,   0,   0,   0,   0,   0,   0, 
+		  0,   0,   0,   0,   0,   0,   0,   0, 
+		  0,   0,   0,   0,   0,   0,   0,   0, 
+		  0,   0,   0,   0,   0,   0,   0,   0, 
+		  0,   0,   0,   0,   0,   0,   0,   0, 
+		  0,   0,   0,   0,   0,   0,   0,   0, 
+		  0,   0,   0,   0,   0,   0,   0,   0, 
+		  0,   0,   0,   0,   0,   0,   0,   0, 
+		  0,   0,   0,   0,   0,   0,   0,   0, 
+	};
+
+#line 433 "ext/standard/var_unserializer.c"
+	{
+		YYCTYPE yych;
+
+		if((YYLIMIT - YYCURSOR) < 7) YYFILL(7);
+		yych = *YYCURSOR;
+		switch(yych) {
+		case 'C':
+		case 'O':	goto yy13;
+		case 'N':	goto yy5;
+		case 'R':	goto yy2;
+		case 'S':	goto yy10;
+		case 'a':	goto yy11;
+		case 'b':	goto yy6;
+		case 'd':	goto yy8;
+		case 'i':	goto yy7;
+		case 'o':	goto yy12;
+		case 'r':	goto yy4;
+		case 's':	goto yy9;
+		case '}':	goto yy14;
+		default:	goto yy16;
+		}
 yy2:
-	yych = *(YYMARKER = ++YYCURSOR);
-	switch(yych) {
-	case ':':	goto yy95;
-	default:	goto yy3;
-	}
+		yych = *(YYMARKER = ++YYCURSOR);
+		if(yych == ':') goto yy95;
 yy3:
 #line 694 "ext/standard/var_unserializer.re"
-	{ return 0; }
-#line 429 "<stdout>"
+		{ return 0; }
+#line 461 "ext/standard/var_unserializer.c"
 yy4:
-	yych = *(YYMARKER = ++YYCURSOR);
-	switch(yych) {
-	case ':':	goto yy89;
-	default:	goto yy3;
-	}
+		yych = *(YYMARKER = ++YYCURSOR);
+		if(yych == ':') goto yy89;
+		goto yy3;
 yy5:
-	yych = *++YYCURSOR;
-	switch(yych) {
-	case ';':	goto yy87;
-	default:	goto yy3;
-	}
+		yych = *++YYCURSOR;
+		if(yych == ';') goto yy87;
+		goto yy3;
 yy6:
-	yych = *(YYMARKER = ++YYCURSOR);
-	switch(yych) {
-	case ':':	goto yy83;
-	default:	goto yy3;
-	}
+		yych = *(YYMARKER = ++YYCURSOR);
+		if(yych == ':') goto yy83;
+		goto yy3;
 yy7:
-	yych = *(YYMARKER = ++YYCURSOR);
-	switch(yych) {
-	case ':':	goto yy77;
-	default:	goto yy3;
-	}
+		yych = *(YYMARKER = ++YYCURSOR);
+		if(yych == ':') goto yy77;
+		goto yy3;
 yy8:
-	yych = *(YYMARKER = ++YYCURSOR);
-	switch(yych) {
-	case ':':	goto yy53;
-	default:	goto yy3;
-	}
+		yych = *(YYMARKER = ++YYCURSOR);
+		if(yych == ':') goto yy53;
+		goto yy3;
 yy9:
-	yych = *(YYMARKER = ++YYCURSOR);
-	switch(yych) {
-	case ':':	goto yy46;
-	default:	goto yy3;
-	}
+		yych = *(YYMARKER = ++YYCURSOR);
+		if(yych == ':') goto yy46;
+		goto yy3;
 yy10:
-	yych = *(YYMARKER = ++YYCURSOR);
-	switch(yych) {
-	case ':':	goto yy39;
-	default:	goto yy3;
-	}
+		yych = *(YYMARKER = ++YYCURSOR);
+		if(yych == ':') goto yy39;
+		goto yy3;
 yy11:
-	yych = *(YYMARKER = ++YYCURSOR);
-	switch(yych) {
-	case ':':	goto yy32;
-	default:	goto yy3;
-	}
+		yych = *(YYMARKER = ++YYCURSOR);
+		if(yych == ':') goto yy32;
+		goto yy3;
 yy12:
-	yych = *(YYMARKER = ++YYCURSOR);
-	switch(yych) {
-	case ':':	goto yy25;
-	default:	goto yy3;
-	}
+		yych = *(YYMARKER = ++YYCURSOR);
+		if(yych == ':') goto yy25;
+		goto yy3;
 yy13:
-	yych = *(YYMARKER = ++YYCURSOR);
-	switch(yych) {
-	case ':':	goto yy17;
-	default:	goto yy3;
-	}
+		yych = *(YYMARKER = ++YYCURSOR);
+		if(yych == ':') goto yy17;
+		goto yy3;
 yy14:
-	++YYCURSOR;
+		++YYCURSOR;
 #line 688 "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 498 "<stdout>"
+#line 510 "ext/standard/var_unserializer.c"
 yy16:
-	yych = *++YYCURSOR;
-	goto yy3;
+		yych = *++YYCURSOR;
+		goto yy3;
 yy17:
-	yych = *++YYCURSOR;
-	switch(yych) {
-	case '+':	goto yy19;
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy20;
-	default:	goto yy18;
-	}
+		yych = *++YYCURSOR;
+		if(yybm[0+yych] & 128) {
+			goto yy20;
+		}
+		if(yych == '+') goto yy19;
 yy18:
-	YYCURSOR = YYMARKER;
-	goto yy3;
+		YYCURSOR = YYMARKER;
+		goto yy3;
 yy19:
-	yych = *++YYCURSOR;
-	switch(yych) {
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy20;
-	default:	goto yy18;
-	}
+		yych = *++YYCURSOR;
+		if(yybm[0+yych] & 128) {
+			goto yy20;
+		}
+		goto yy18;
 yy20:
-	++YYCURSOR;
-	if((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
-	yych = *YYCURSOR;
-	switch(yych) {
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy20;
-	case ':':	goto yy22;
-	default:	goto yy18;
-	}
-yy22:
-	yych = *++YYCURSOR;
-	switch(yych) {
-	case '"':	goto yy23;
-	default:	goto yy18;
-	}
-yy23:
-	++YYCURSOR;
+		++YYCURSOR;
+		if((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
+		yych = *YYCURSOR;
+		if(yybm[0+yych] & 128) {
+			goto yy20;
+		}
+		if(yych != ':') goto yy18;
+		yych = *++YYCURSOR;
+		if(yych != '"') goto yy18;
+		++YYCURSOR;
 #line 576 "ext/standard/var_unserializer.re"
-	{
+		{
 	size_t len, len2, len3, maxlen;
 	long elements;
 	char *class_name;
@@ -670,133 +648,62 @@ yy23:
 
 	return object_common2(UNSERIALIZE_PASSTHRU, elements);
 }
-#line 674 "<stdout>"
+#line 652 "ext/standard/var_unserializer.c"
 yy25:
-	yych = *++YYCURSOR;
-	switch(yych) {
-	case '+':
-	case '-':	goto yy26;
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy27;
-	default:	goto yy18;
-	}
+		yych = *++YYCURSOR;
+		if(yych <= ',') {
+			if(yych != '+') goto yy18;
+		} else {
+			if(yych <= '-') goto yy26;
+			if(yych <= '/') goto yy18;
+			if(yych <= '9') goto yy27;
+			goto yy18;
+		}
 yy26:
-	yych = *++YYCURSOR;
-	switch(yych) {
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy27;
-	default:	goto yy18;
-	}
+		yych = *++YYCURSOR;
+		if(yych <= '/') goto yy18;
+		if(yych >= ':') goto yy18;
 yy27:
-	++YYCURSOR;
-	if((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
-	yych = *YYCURSOR;
-	switch(yych) {
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy27;
-	case ':':	goto yy29;
-	default:	goto yy18;
-	}
-yy29:
-	yych = *++YYCURSOR;
-	switch(yych) {
-	case '"':	goto yy30;
-	default:	goto yy18;
-	}
-yy30:
-	++YYCURSOR;
+		++YYCURSOR;
+		if((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
+		yych = *YYCURSOR;
+		if(yych <= '/') goto yy18;
+		if(yych <= '9') goto yy27;
+		if(yych >= ';') goto yy18;
+		yych = *++YYCURSOR;
+		if(yych != '"') goto yy18;
+		++YYCURSOR;
 #line 568 "ext/standard/var_unserializer.re"
-	{
+		{
 
 	INIT_PZVAL(*rval);
 	
 	return object_common2(UNSERIALIZE_PASSTHRU,
 			object_common1(UNSERIALIZE_PASSTHRU, ZEND_STANDARD_CLASS_DEF_PTR));
 }
-#line 741 "<stdout>"
+#line 685 "ext/standard/var_unserializer.c"
 yy32:
-	yych = *++YYCURSOR;
-	switch(yych) {
-	case '+':	goto yy33;
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy34;
-	default:	goto yy18;
-	}
+		yych = *++YYCURSOR;
+		if(yych == '+') goto yy33;
+		if(yych <= '/') goto yy18;
+		if(yych <= '9') goto yy34;
+		goto yy18;
 yy33:
-	yych = *++YYCURSOR;
-	switch(yych) {
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy34;
-	default:	goto yy18;
-	}
+		yych = *++YYCURSOR;
+		if(yych <= '/') goto yy18;
+		if(yych >= ':') goto yy18;
 yy34:
-	++YYCURSOR;
-	if((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
-	yych = *YYCURSOR;
-	switch(yych) {
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy34;
-	case ':':	goto yy36;
-	default:	goto yy18;
-	}
-yy36:
-	yych = *++YYCURSOR;
-	switch(yych) {
-	case '{':	goto yy37;
-	default:	goto yy18;
-	}
-yy37:
-	++YYCURSOR;
+		++YYCURSOR;
+		if((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
+		yych = *YYCURSOR;
+		if(yych <= '/') goto yy18;
+		if(yych <= '9') goto yy34;
+		if(yych >= ';') goto yy18;
+		yych = *++YYCURSOR;
+		if(yych != '{') goto yy18;
+		++YYCURSOR;
 #line 546 "ext/standard/var_unserializer.re"
-	{
+		{
 	long elements = parse_iv(start + 2);
 	/* use iv() not uiv() in order to check data range */
 	*p = YYCURSOR;
@@ -817,66 +724,29 @@ yy37:
 
 	return finish_nested_data(UNSERIALIZE_PASSTHRU);
 }
-#line 821 "<stdout>"
+#line 728 "ext/standard/var_unserializer.c"
 yy39:
-	yych = *++YYCURSOR;
-	switch(yych) {
-	case '+':	goto yy40;
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy41;
-	default:	goto yy18;
-	}
+		yych = *++YYCURSOR;
+		if(yych == '+') goto yy40;
+		if(yych <= '/') goto yy18;
+		if(yych <= '9') goto yy41;
+		goto yy18;
 yy40:
-	yych = *++YYCURSOR;
-	switch(yych) {
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy41;
-	default:	goto yy18;
-	}
+		yych = *++YYCURSOR;
+		if(yych <= '/') goto yy18;
+		if(yych >= ':') goto yy18;
 yy41:
-	++YYCURSOR;
-	if((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
-	yych = *YYCURSOR;
-	switch(yych) {
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy41;
-	case ':':	goto yy43;
-	default:	goto yy18;
-	}
-yy43:
-	yych = *++YYCURSOR;
-	switch(yych) {
-	case '"':	goto yy44;
-	default:	goto yy18;
-	}
-yy44:
-	++YYCURSOR;
+		++YYCURSOR;
+		if((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
+		yych = *YYCURSOR;
+		if(yych <= '/') goto yy18;
+		if(yych <= '9') goto yy41;
+		if(yych >= ';') goto yy18;
+		yych = *++YYCURSOR;
+		if(yych != '"') goto yy18;
+		++YYCURSOR;
 #line 517 "ext/standard/var_unserializer.re"
-	{
+		{
 	size_t len, maxlen;
 	char *str;
 
@@ -904,66 +774,29 @@ yy44:
 	ZVAL_STRINGL(*rval, str, len, 0);
 	return 1;
 }
-#line 908 "<stdout>"
+#line 778 "ext/standard/var_unserializer.c"
 yy46:
-	yych = *++YYCURSOR;
-	switch(yych) {
-	case '+':	goto yy47;
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy48;
-	default:	goto yy18;
-	}
+		yych = *++YYCURSOR;
+		if(yych == '+') goto yy47;
+		if(yych <= '/') goto yy18;
+		if(yych <= '9') goto yy48;
+		goto yy18;
 yy47:
-	yych = *++YYCURSOR;
-	switch(yych) {
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy48;
-	default:	goto yy18;
-	}
+		yych = *++YYCURSOR;
+		if(yych <= '/') goto yy18;
+		if(yych >= ':') goto yy18;
 yy48:
-	++YYCURSOR;
-	if((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
-	yych = *YYCURSOR;
-	switch(yych) {
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy48;
-	case ':':	goto yy50;
-	default:	goto yy18;
-	}
-yy50:
-	yych = *++YYCURSOR;
-	switch(yych) {
-	case '"':	goto yy51;
-	default:	goto yy18;
-	}
-yy51:
-	++YYCURSOR;
+		++YYCURSOR;
+		if((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
+		yych = *YYCURSOR;
+		if(yych <= '/') goto yy18;
+		if(yych <= '9') goto yy48;
+		if(yych >= ';') goto yy18;
+		yych = *++YYCURSOR;
+		if(yych != '"') goto yy18;
+		++YYCURSOR;
 #line 489 "ext/standard/var_unserializer.re"
-	{
+		{
 	size_t len, maxlen;
 	char *str;
 
@@ -990,241 +823,162 @@ yy51:
 	ZVAL_STRINGL(*rval, str, len, 1);
 	return 1;
 }
-#line 994 "<stdout>"
+#line 827 "ext/standard/var_unserializer.c"
 yy53:
-	yych = *++YYCURSOR;
-	switch(yych) {
-	case '+':	goto yy57;
-	case '-':	goto yy55;
-	case '.':	goto yy60;
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy58;
-	case 'I':	goto yy56;
-	case 'N':	goto yy54;
-	default:	goto yy18;
-	}
-yy54:
-	yych = *++YYCURSOR;
-	switch(yych) {
-	case 'A':	goto yy76;
-	default:	goto yy18;
-	}
+		yych = *++YYCURSOR;
+		if(yych <= '/') {
+			if(yych <= ',') {
+				if(yych == '+') goto yy57;
+				goto yy18;
+			} else {
+				if(yych <= '-') goto yy55;
+				if(yych <= '.') goto yy60;
+				goto yy18;
+			}
+		} else {
+			if(yych <= 'I') {
+				if(yych <= '9') goto yy58;
+				if(yych <= 'H') goto yy18;
+				goto yy56;
+			} else {
+				if(yych != 'N') goto yy18;
+			}
+		}
+		yych = *++YYCURSOR;
+		if(yych == 'A') goto yy76;
+		goto yy18;
 yy55:
-	yych = *++YYCURSOR;
-	switch(yych) {
-	case '.':	goto yy60;
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy58;
-	case 'I':	goto yy56;
-	default:	goto yy18;
-	}
+		yych = *++YYCURSOR;
+		if(yych <= '/') {
+			if(yych == '.') goto yy60;
+			goto yy18;
+		} else {
+			if(yych <= '9') goto yy58;
+			if(yych != 'I') goto yy18;
+		}
 yy56:
-	yych = *++YYCURSOR;
-	switch(yych) {
-	case 'N':	goto yy72;
-	default:	goto yy18;
-	}
+		yych = *++YYCURSOR;
+		if(yych == 'N') goto yy72;
+		goto yy18;
 yy57:
-	yych = *++YYCURSOR;
-	switch(yych) {
-	case '.':	goto yy60;
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy58;
-	default:	goto yy18;
-	}
+		yych = *++YYCURSOR;
+		if(yych == '.') goto yy60;
+		if(yych <= '/') goto yy18;
+		if(yych >= ':') goto yy18;
 yy58:
-	++YYCURSOR;
-	if((YYLIMIT - YYCURSOR) < 4) YYFILL(4);
-	yych = *YYCURSOR;
-	switch(yych) {
-	case '.':	goto yy70;
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy58;
-	case ';':	goto yy63;
-	case 'E':
-	case 'e':	goto yy65;
-	default:	goto yy18;
-	}
+		++YYCURSOR;
+		if((YYLIMIT - YYCURSOR) < 4) YYFILL(4);
+		yych = *YYCURSOR;
+		if(yych <= ':') {
+			if(yych <= '.') {
+				if(yych <= '-') goto yy18;
+				goto yy70;
+			} else {
+				if(yych <= '/') goto yy18;
+				if(yych <= '9') goto yy58;
+				goto yy18;
+			}
+		} else {
+			if(yych <= 'E') {
+				if(yych <= ';') goto yy63;
+				if(yych <= 'D') goto yy18;
+				goto yy65;
+			} else {
+				if(yych == 'e') goto yy65;
+				goto yy18;
+			}
+		}
 yy60:
-	yych = *++YYCURSOR;
-	switch(yych) {
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy61;
-	default:	goto yy18;
-	}
+		yych = *++YYCURSOR;
+		if(yych <= '/') goto yy18;
+		if(yych >= ':') goto yy18;
 yy61:
-	++YYCURSOR;
-	if((YYLIMIT - YYCURSOR) < 4) YYFILL(4);
-	yych = *YYCURSOR;
-	switch(yych) {
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy61;
-	case ';':	goto yy63;
-	case 'E':
-	case 'e':	goto yy65;
-	default:	goto yy18;
-	}
+		++YYCURSOR;
+		if((YYLIMIT - YYCURSOR) < 4) YYFILL(4);
+		yych = *YYCURSOR;
+		if(yych <= ';') {
+			if(yych <= '/') goto yy18;
+			if(yych <= '9') goto yy61;
+			if(yych <= ':') goto yy18;
+		} else {
+			if(yych <= 'E') {
+				if(yych <= 'D') goto yy18;
+				goto yy65;
+			} else {
+				if(yych == 'e') goto yy65;
+				goto yy18;
+			}
+		}
 yy63:
-	++YYCURSOR;
+		++YYCURSOR;
 #line 482 "ext/standard/var_unserializer.re"
-	{
+		{
 	*p = YYCURSOR;
 	INIT_PZVAL(*rval);
 	ZVAL_DOUBLE(*rval, zend_strtod((const char *)start + 2, NULL));
 	return 1;
 }
-#line 1125 "<stdout>"
+#line 922 "ext/standard/var_unserializer.c"
 yy65:
-	yych = *++YYCURSOR;
-	switch(yych) {
-	case '+':
-	case '-':	goto yy66;
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy67;
-	default:	goto yy18;
-	}
+		yych = *++YYCURSOR;
+		if(yych <= ',') {
+			if(yych != '+') goto yy18;
+		} else {
+			if(yych <= '-') goto yy66;
+			if(yych <= '/') goto yy18;
+			if(yych <= '9') goto yy67;
+			goto yy18;
+		}
 yy66:
-	yych = *++YYCURSOR;
-	switch(yych) {
-	case '+':
-	case '-':	goto yy69;
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy67;
-	default:	goto yy18;
-	}
+		yych = *++YYCURSOR;
+		if(yych <= ',') {
+			if(yych == '+') goto yy69;
+			goto yy18;
+		} else {
+			if(yych <= '-') goto yy69;
+			if(yych <= '/') goto yy18;
+			if(yych >= ':') goto yy18;
+		}
 yy67:
-	++YYCURSOR;
-	if(YYLIMIT == YYCURSOR) YYFILL(1);
-	yych = *YYCURSOR;
-	switch(yych) {
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy67;
-	case ';':	goto yy63;
-	default:	goto yy18;
-	}
+		++YYCURSOR;
+		if(YYLIMIT == YYCURSOR) YYFILL(1);
+		yych = *YYCURSOR;
+		if(yych <= '/') goto yy18;
+		if(yych <= '9') goto yy67;
+		if(yych == ';') goto yy63;
+		goto yy18;
 yy69:
-	yych = *++YYCURSOR;
-	switch(yych) {
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy67;
-	default:	goto yy18;
-	}
+		yych = *++YYCURSOR;
+		if(yych <= '/') goto yy18;
+		if(yych <= '9') goto yy67;
+		goto yy18;
 yy70:
-	++YYCURSOR;
-	if((YYLIMIT - YYCURSOR) < 4) YYFILL(4);
-	yych = *YYCURSOR;
-	switch(yych) {
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy70;
-	case ';':	goto yy63;
-	case 'E':
-	case 'e':	goto yy65;
-	default:	goto yy18;
-	}
+		++YYCURSOR;
+		if((YYLIMIT - YYCURSOR) < 4) YYFILL(4);
+		yych = *YYCURSOR;
+		if(yych <= ';') {
+			if(yych <= '/') goto yy18;
+			if(yych <= '9') goto yy70;
+			if(yych <= ':') goto yy18;
+			goto yy63;
+		} else {
+			if(yych <= 'E') {
+				if(yych <= 'D') goto yy18;
+				goto yy65;
+			} else {
+				if(yych == 'e') goto yy65;
+				goto yy18;
+			}
+		}
 yy72:
-	yych = *++YYCURSOR;
-	switch(yych) {
-	case 'F':	goto yy73;
-	default:	goto yy18;
-	}
+		yych = *++YYCURSOR;
+		if(yych != 'F') goto yy18;
 yy73:
-	yych = *++YYCURSOR;
-	switch(yych) {
-	case ';':	goto yy74;
-	default:	goto yy18;
-	}
-yy74:
-	++YYCURSOR;
+		yych = *++YYCURSOR;
+		if(yych != ';') goto yy18;
+		++YYCURSOR;
 #line 467 "ext/standard/var_unserializer.re"
-	{
+		{
 	*p = YYCURSOR;
 	INIT_PZVAL(*rval);
 
@@ -1238,160 +992,90 @@ yy74:
 
 	return 1;
 }
-#line 1242 "<stdout>"
+#line 996 "ext/standard/var_unserializer.c"
 yy76:
-	yych = *++YYCURSOR;
-	switch(yych) {
-	case 'N':	goto yy73;
-	default:	goto yy18;
-	}
+		yych = *++YYCURSOR;
+		if(yych == 'N') goto yy73;
+		goto yy18;
 yy77:
-	yych = *++YYCURSOR;
-	switch(yych) {
-	case '+':
-	case '-':	goto yy78;
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy79;
-	default:	goto yy18;
-	}
+		yych = *++YYCURSOR;
+		if(yych <= ',') {
+			if(yych != '+') goto yy18;
+		} else {
+			if(yych <= '-') goto yy78;
+			if(yych <= '/') goto yy18;
+			if(yych <= '9') goto yy79;
+			goto yy18;
+		}
 yy78:
-	yych = *++YYCURSOR;
-	switch(yych) {
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy79;
-	default:	goto yy18;
-	}
+		yych = *++YYCURSOR;
+		if(yych <= '/') goto yy18;
+		if(yych >= ':') goto yy18;
 yy79:
-	++YYCURSOR;
-	if(YYLIMIT == YYCURSOR) YYFILL(1);
-	yych = *YYCURSOR;
-	switch(yych) {
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy79;
-	case ';':	goto yy81;
-	default:	goto yy18;
-	}
-yy81:
-	++YYCURSOR;
+		++YYCURSOR;
+		if(YYLIMIT == YYCURSOR) YYFILL(1);
+		yych = *YYCURSOR;
+		if(yych <= '/') goto yy18;
+		if(yych <= '9') goto yy79;
+		if(yych != ';') goto yy18;
+		++YYCURSOR;
 #line 460 "ext/standard/var_unserializer.re"
-	{
+		{
 	*p = YYCURSOR;
 	INIT_PZVAL(*rval);
 	ZVAL_LONG(*rval, parse_iv(start + 2));
 	return 1;
 }
-#line 1308 "<stdout>"
+#line 1030 "ext/standard/var_unserializer.c"
 yy83:
-	yych = *++YYCURSOR;
-	switch(yych) {
-	case '0':
-	case '1':	goto yy84;
-	default:	goto yy18;
-	}
-yy84:
-	yych = *++YYCURSOR;
-	switch(yych) {
-	case ';':	goto yy85;
-	default:	goto yy18;
-	}
-yy85:
-	++YYCURSOR;
+		yych = *++YYCURSOR;
+		if(yych <= '/') goto yy18;
+		if(yych >= '2') goto yy18;
+		yych = *++YYCURSOR;
+		if(yych != ';') goto yy18;
+		++YYCURSOR;
 #line 453 "ext/standard/var_unserializer.re"
-	{
+		{
 	*p = YYCURSOR;
 	INIT_PZVAL(*rval);
 	ZVAL_BOOL(*rval, parse_iv(start + 2));
 	return 1;
 }
-#line 1331 "<stdout>"
+#line 1045 "ext/standard/var_unserializer.c"
 yy87:
-	++YYCURSOR;
+		++YYCURSOR;
 #line 446 "ext/standard/var_unserializer.re"
-	{
+		{
 	*p = YYCURSOR;
 	INIT_PZVAL(*rval);
 	ZVAL_NULL(*rval);
 	return 1;
 }
-#line 1341 "<stdout>"
+#line 1055 "ext/standard/var_unserializer.c"
 yy89:
-	yych = *++YYCURSOR;
-	switch(yych) {
-	case '+':
-	case '-':	goto yy90;
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy91;
-	default:	goto yy18;
-	}
+		yych = *++YYCURSOR;
+		if(yych <= ',') {
+			if(yych != '+') goto yy18;
+		} else {
+			if(yych <= '-') goto yy90;
+			if(yych <= '/') goto yy18;
+			if(yych <= '9') goto yy91;
+			goto yy18;
+		}
 yy90:
-	yych = *++YYCURSOR;
-	switch(yych) {
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy91;
-	default:	goto yy18;
-	}
+		yych = *++YYCURSOR;
+		if(yych <= '/') goto yy18;
+		if(yych >= ':') goto yy18;
 yy91:
-	++YYCURSOR;
-	if(YYLIMIT == YYCURSOR) YYFILL(1);
-	yych = *YYCURSOR;
-	switch(yych) {
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy91;
-	case ';':	goto yy93;
-	default:	goto yy18;
-	}
-yy93:
-	++YYCURSOR;
+		++YYCURSOR;
+		if(YYLIMIT == YYCURSOR) YYFILL(1);
+		yych = *YYCURSOR;
+		if(yych <= '/') goto yy18;
+		if(yych <= '9') goto yy91;
+		if(yych != ';') goto yy18;
+		++YYCURSOR;
 #line 423 "ext/standard/var_unserializer.re"
-	{
+		{
 	long id;
 
  	*p = YYCURSOR;
@@ -1413,61 +1097,31 @@ yy93:
 	
 	return 1;
 }
-#line 1417 "<stdout>"
+#line 1101 "ext/standard/var_unserializer.c"
 yy95:
-	yych = *++YYCURSOR;
-	switch(yych) {
-	case '+':
-	case '-':	goto yy96;
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy97;
-	default:	goto yy18;
-	}
+		yych = *++YYCURSOR;
+		if(yych <= ',') {
+			if(yych != '+') goto yy18;
+		} else {
+			if(yych <= '-') goto yy96;
+			if(yych <= '/') goto yy18;
+			if(yych <= '9') goto yy97;
+			goto yy18;
+		}
 yy96:
-	yych = *++YYCURSOR;
-	switch(yych) {
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy97;
-	default:	goto yy18;
-	}
+		yych = *++YYCURSOR;
+		if(yych <= '/') goto yy18;
+		if(yych >= ':') goto yy18;
 yy97:
-	++YYCURSOR;
-	if(YYLIMIT == YYCURSOR) YYFILL(1);
-	yych = *YYCURSOR;
-	switch(yych) {
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy97;
-	case ';':	goto yy99;
-	default:	goto yy18;
-	}
-yy99:
-	++YYCURSOR;
+		++YYCURSOR;
+		if(YYLIMIT == YYCURSOR) YYFILL(1);
+		yych = *YYCURSOR;
+		if(yych <= '/') goto yy18;
+		if(yych <= '9') goto yy97;
+		if(yych != ';') goto yy18;
+		++YYCURSOR;
 #line 402 "ext/standard/var_unserializer.re"
-	{
+		{
 	long id;
 
  	*p = YYCURSOR;
@@ -1487,7 +1141,8 @@ yy99:
 	
 	return 1;
 }
-#line 1491 "<stdout>"
+#line 1145 "ext/standard/var_unserializer.c"
+	}
 }
 #line 696 "ext/standard/var_unserializer.re"