cvs: ZendEngine2(PHP_5_3) / zend_ini_scanner.c zend_ini_scanner_defs.h

http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_ini_scanner.c?r1=1.1.2.8&r2=1.1.2.9&diff_format=u
Index: ZendEngine2/zend_ini_scanner.c
diff -u ZendEngine2/zend_ini_scanner.c:1.1.2.8 ZendEngine2/zend_ini_scanner.c:1.1.2.9
--- ZendEngine2/zend_ini_scanner.c:1.1.2.8	Sun Aug 17 21:00:22 2008
+++ ZendEngine2/zend_ini_scanner.c	Sun Aug 17 21:57:52 2008
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.13.5 on Sun Aug 17 22:48:22 2008 */
+/* Generated by re2c 0.13.5 on Sun Aug 17 23:55:27 2008 */
 #line 1 "Zend/zend_ini_scanner.l"
 /*
    +----------------------------------------------------------------------+
@@ -22,7 +22,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: zend_ini_scanner.c,v 1.1.2.8 2008/08/17 21:00:22 lbarnaud Exp $ */
+/* $Id: zend_ini_scanner.c,v 1.1.2.9 2008/08/17 21:57:52 lbarnaud Exp $ */
 
 #include <errno.h>
 #include "zend.h"
@@ -441,6 +441,7 @@
 		case 'W':
 		case 'X':
 		case 'Z':
+		case '_':
 		case 'a':
 		case 'b':
 		case 'c':
@@ -486,7 +487,7 @@
 		{
 	return 0;
 }
-#line 490 "Zend/zend_ini_scanner.c"
+#line 491 "Zend/zend_ini_scanner.c"
 yy4:
 		YYDEBUG(4, *YYCURSOR);
 		yyaccept = 0;
@@ -500,7 +501,7 @@
 	/* eat whitespace */
 	goto restart;
 }
-#line 504 "Zend/zend_ini_scanner.c"
+#line 505 "Zend/zend_ini_scanner.c"
 yy6:
 		YYDEBUG(6, *YYCURSOR);
 		++YYCURSOR;
@@ -512,7 +513,7 @@
 	SCNG(lineno)++;
 	return END_OF_LINE;
 }
-#line 516 "Zend/zend_ini_scanner.c"
+#line 517 "Zend/zend_ini_scanner.c"
 yy8:
 		YYDEBUG(8, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -527,7 +528,7 @@
 		{ /* Disallow these chars outside option values */
 	return yytext[0];
 }
-#line 531 "Zend/zend_ini_scanner.c"
+#line 532 "Zend/zend_ini_scanner.c"
 yy11:
 		YYDEBUG(11, *YYCURSOR);
 		++YYCURSOR;
@@ -540,7 +541,7 @@
 		{ /* Get option name */
 	RETURN_TOKEN(TC_LABEL, yytext, yyleng);
 }
-#line 544 "Zend/zend_ini_scanner.c"
+#line 545 "Zend/zend_ini_scanner.c"
 yy13:
 		YYDEBUG(13, *YYCURSOR);
 		yyaccept = 1;
@@ -563,7 +564,7 @@
 	}
 	return '=';
 }
-#line 567 "Zend/zend_ini_scanner.c"
+#line 568 "Zend/zend_ini_scanner.c"
 yy16:
 		YYDEBUG(16, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -629,7 +630,7 @@
 	}
 	return TC_SECTION;
 }
-#line 633 "Zend/zend_ini_scanner.c"
+#line 634 "Zend/zend_ini_scanner.c"
 yy23:
 		YYDEBUG(23, *YYCURSOR);
 		++YYCURSOR;
@@ -669,7 +670,7 @@
 
 	RETURN_TOKEN(TC_OFFSET, yytext, yyleng);
 }
-#line 673 "Zend/zend_ini_scanner.c"
+#line 674 "Zend/zend_ini_scanner.c"
 yy29:
 		YYDEBUG(29, *YYCURSOR);
 		++YYCURSOR;
@@ -685,7 +686,7 @@
 		{ /* TRUE value (when used outside option value/offset this causes parse error!) */
 	RETURN_TOKEN(BOOL_TRUE, "1", 1);
 }
-#line 689 "Zend/zend_ini_scanner.c"
+#line 690 "Zend/zend_ini_scanner.c"
 yy31:
 		YYDEBUG(31, *YYCURSOR);
 		++YYCURSOR;
@@ -727,7 +728,7 @@
 		{ /* FALSE value (when used outside option value/offset this causes parse error!)*/
 	RETURN_TOKEN(BOOL_FALSE, "", 0);
 }
-#line 731 "Zend/zend_ini_scanner.c"
+#line 732 "Zend/zend_ini_scanner.c"
 yy38:
 		YYDEBUG(38, *YYCURSOR);
 		++YYCURSOR;
@@ -828,7 +829,7 @@
 	SCNG(lineno)++;
 	return END_OF_LINE;
 }
-#line 832 "Zend/zend_ini_scanner.c"
+#line 833 "Zend/zend_ini_scanner.c"
 yy53:
 		YYDEBUG(53, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -927,7 +928,7 @@
 	zend_ini_escape_string(ini_lval, yytext, yyleng, '"' TSRMLS_CC);
 	return TC_QUOTED_STRING;
 }
-#line 931 "Zend/zend_ini_scanner.c"
+#line 932 "Zend/zend_ini_scanner.c"
 yy62:
 		YYDEBUG(62, *YYCURSOR);
 		++YYCURSOR;
@@ -941,7 +942,7 @@
 	yy_pop_state(TSRMLS_C);
 	return '"';
 }
-#line 945 "Zend/zend_ini_scanner.c"
+#line 946 "Zend/zend_ini_scanner.c"
 yy64:
 		YYDEBUG(64, *YYCURSOR);
 		++YYCURSOR;
@@ -960,7 +961,7 @@
 		{
 	return 0;
 }
-#line 964 "Zend/zend_ini_scanner.c"
+#line 965 "Zend/zend_ini_scanner.c"
 yy66:
 		YYDEBUG(66, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -1050,7 +1051,7 @@
 	yy_push_state(ST_VARNAME TSRMLS_CC);
 	return TC_DOLLAR_CURLY;
 }
-#line 1054 "Zend/zend_ini_scanner.c"
+#line 1055 "Zend/zend_ini_scanner.c"
 yy80:
 		YYDEBUG(80, *YYCURSOR);
 		++YYCURSOR;
@@ -1153,7 +1154,7 @@
 		{ /* Get rest as section/offset value */
 	RETURN_TOKEN(TC_STRING, yytext, yyleng);
 }
-#line 1157 "Zend/zend_ini_scanner.c"
+#line 1158 "Zend/zend_ini_scanner.c"
 yy86:
 		YYDEBUG(86, *YYCURSOR);
 		yyaccept = 0;
@@ -1174,7 +1175,7 @@
 		{
 	return 0;
 }
-#line 1178 "Zend/zend_ini_scanner.c"
+#line 1179 "Zend/zend_ini_scanner.c"
 yy89:
 		YYDEBUG(89, *YYCURSOR);
 		++YYCURSOR;
@@ -1186,7 +1187,7 @@
 	yy_push_state(ST_DOUBLE_QUOTES TSRMLS_CC);
 	return '"';
 }
-#line 1190 "Zend/zend_ini_scanner.c"
+#line 1191 "Zend/zend_ini_scanner.c"
 yy91:
 		YYDEBUG(91, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -1252,7 +1253,7 @@
 		{ /* Get number option value as string */
 	RETURN_TOKEN(TC_NUMBER, yytext, yyleng);
 }
-#line 1256 "Zend/zend_ini_scanner.c"
+#line 1257 "Zend/zend_ini_scanner.c"
 yy97:
 		YYDEBUG(97, *YYCURSOR);
 		yyaccept = 3;
@@ -1282,7 +1283,7 @@
 		{ /* Get constant option value */
 	RETURN_TOKEN(TC_CONSTANT, yytext, yyleng);
 }
-#line 1286 "Zend/zend_ini_scanner.c"
+#line 1287 "Zend/zend_ini_scanner.c"
 yy99:
 		YYDEBUG(99, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -1298,7 +1299,7 @@
 	BEGIN(INITIAL);
 	return ']';
 }
-#line 1302 "Zend/zend_ini_scanner.c"
+#line 1303 "Zend/zend_ini_scanner.c"
 yy102:
 		YYDEBUG(102, *YYCURSOR);
 		yyaccept = 0;
@@ -1597,7 +1598,7 @@
 	}
 	RETURN_TOKEN(TC_RAW, yytext, yyleng);
 }
-#line 1601 "Zend/zend_ini_scanner.c"
+#line 1602 "Zend/zend_ini_scanner.c"
 yy127:
 		YYDEBUG(127, *YYCURSOR);
 		++YYCURSOR;
@@ -1608,7 +1609,7 @@
 	yy_push_state(ST_VARNAME TSRMLS_CC);
 	return TC_DOLLAR_CURLY;
 }
-#line 1612 "Zend/zend_ini_scanner.c"
+#line 1613 "Zend/zend_ini_scanner.c"
 yy129:
 		YYDEBUG(129, *YYCURSOR);
 		yyaccept = 0;
@@ -1724,7 +1725,7 @@
 	}
 	RETURN_TOKEN(TC_RAW, yytext, yyleng);
 }
-#line 1728 "Zend/zend_ini_scanner.c"
+#line 1729 "Zend/zend_ini_scanner.c"
 yy137:
 		YYDEBUG(137, *YYCURSOR);
 		yyaccept = 0;
@@ -1752,7 +1753,7 @@
 	SCNG(lineno)++;
 	return END_OF_LINE;
 }
-#line 1756 "Zend/zend_ini_scanner.c"
+#line 1757 "Zend/zend_ini_scanner.c"
 yy140:
 		YYDEBUG(140, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -1771,7 +1772,7 @@
 	BEGIN(INITIAL);
 	return END_OF_LINE;
 }
-#line 1775 "Zend/zend_ini_scanner.c"
+#line 1776 "Zend/zend_ini_scanner.c"
 yy143:
 		YYDEBUG(143, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -1799,7 +1800,7 @@
 	SCNG(lineno)++;
 	return END_OF_LINE;
 }
-#line 1803 "Zend/zend_ini_scanner.c"
+#line 1804 "Zend/zend_ini_scanner.c"
 yy148:
 		YYDEBUG(148, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -1905,7 +1906,7 @@
 		{ /* Raw value, only used when SCNG(scanner_mode) == ZEND_INI_SCANNER_RAW. */
 	RETURN_TOKEN(TC_RAW, yytext, yyleng);
 }
-#line 1909 "Zend/zend_ini_scanner.c"
+#line 1910 "Zend/zend_ini_scanner.c"
 yy159:
 		YYDEBUG(159, *YYCURSOR);
 		++YYCURSOR;
@@ -1915,7 +1916,7 @@
 		{
 	return 0;
 }
-#line 1919 "Zend/zend_ini_scanner.c"
+#line 1920 "Zend/zend_ini_scanner.c"
 yy161:
 		YYDEBUG(161, *YYCURSOR);
 		++YYCURSOR;
@@ -1930,7 +1931,7 @@
 	SCNG(lineno)++;
 	return ']';
 }
-#line 1934 "Zend/zend_ini_scanner.c"
+#line 1935 "Zend/zend_ini_scanner.c"
 yy163:
 		YYDEBUG(163, *YYCURSOR);
 		++YYCURSOR;
@@ -2055,7 +2056,7 @@
 		{ /* Get rest as section/offset value */
 	RETURN_TOKEN(TC_STRING, yytext, yyleng);
 }
-#line 2059 "Zend/zend_ini_scanner.c"
+#line 2060 "Zend/zend_ini_scanner.c"
 yy173:
 		YYDEBUG(173, *YYCURSOR);
 		yyaccept = 0;
@@ -2078,7 +2079,7 @@
 		{
 	return 0;
 }
-#line 2082 "Zend/zend_ini_scanner.c"
+#line 2083 "Zend/zend_ini_scanner.c"
 yy176:
 		YYDEBUG(176, *YYCURSOR);
 		++YYCURSOR;
@@ -2090,7 +2091,7 @@
 	yy_push_state(ST_DOUBLE_QUOTES TSRMLS_CC);
 	return '"';
 }
-#line 2094 "Zend/zend_ini_scanner.c"
+#line 2095 "Zend/zend_ini_scanner.c"
 yy178:
 		YYDEBUG(178, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -2156,7 +2157,7 @@
 		{ /* Get number option value as string */
 	RETURN_TOKEN(TC_NUMBER, yytext, yyleng);
 }
-#line 2160 "Zend/zend_ini_scanner.c"
+#line 2161 "Zend/zend_ini_scanner.c"
 yy184:
 		YYDEBUG(184, *YYCURSOR);
 		yyaccept = 3;
@@ -2186,7 +2187,7 @@
 		{ /* Get constant option value */
 	RETURN_TOKEN(TC_CONSTANT, yytext, yyleng);
 }
-#line 2190 "Zend/zend_ini_scanner.c"
+#line 2191 "Zend/zend_ini_scanner.c"
 yy186:
 		YYDEBUG(186, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -2205,7 +2206,7 @@
 	SCNG(lineno)++;
 	return ']';
 }
-#line 2209 "Zend/zend_ini_scanner.c"
+#line 2210 "Zend/zend_ini_scanner.c"
 yy189:
 		YYDEBUG(189, *YYCURSOR);
 		++YYCURSOR;
@@ -2526,7 +2527,7 @@
 	}
 	RETURN_TOKEN(TC_RAW, yytext, yyleng);
 }
-#line 2530 "Zend/zend_ini_scanner.c"
+#line 2531 "Zend/zend_ini_scanner.c"
 yy218:
 		YYDEBUG(218, *YYCURSOR);
 		++YYCURSOR;
@@ -2537,7 +2538,7 @@
 	yy_push_state(ST_VARNAME TSRMLS_CC);
 	return TC_DOLLAR_CURLY;
 }
-#line 2541 "Zend/zend_ini_scanner.c"
+#line 2542 "Zend/zend_ini_scanner.c"
 yy220:
 		YYDEBUG(220, *YYCURSOR);
 		yyaccept = 0;
@@ -2721,7 +2722,7 @@
 	BEGIN(INITIAL);
 	return END_OF_LINE;
 }
-#line 2725 "Zend/zend_ini_scanner.c"
+#line 2726 "Zend/zend_ini_scanner.c"
 yy227:
 		YYDEBUG(227, *YYCURSOR);
 		yyaccept = 0;
@@ -2734,7 +2735,7 @@
 		{ /* Get everything else as option/offset value */
 	RETURN_TOKEN(TC_STRING, yytext, yyleng);
 }
-#line 2738 "Zend/zend_ini_scanner.c"
+#line 2739 "Zend/zend_ini_scanner.c"
 yy229:
 		YYDEBUG(229, *YYCURSOR);
 		yyaccept = 1;
@@ -2747,7 +2748,7 @@
 		{
 	RETURN_TOKEN(TC_WHITESPACE, yytext, yyleng);
 }
-#line 2751 "Zend/zend_ini_scanner.c"
+#line 2752 "Zend/zend_ini_scanner.c"
 yy231:
 		YYDEBUG(231, *YYCURSOR);
 		++YYCURSOR;
@@ -2760,7 +2761,7 @@
 	SCNG(lineno)++;
 	return END_OF_LINE;
 }
-#line 2764 "Zend/zend_ini_scanner.c"
+#line 2765 "Zend/zend_ini_scanner.c"
 yy233:
 		YYDEBUG(233, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -2778,7 +2779,7 @@
 		{ /* Boolean operators */
 	return yytext[0];
 }
-#line 2782 "Zend/zend_ini_scanner.c"
+#line 2783 "Zend/zend_ini_scanner.c"
 yy236:
 		YYDEBUG(236, *YYCURSOR);
 		++YYCURSOR;
@@ -2790,7 +2791,7 @@
 	yy_push_state(ST_DOUBLE_QUOTES TSRMLS_CC);
 	return '"';
 }
-#line 2794 "Zend/zend_ini_scanner.c"
+#line 2795 "Zend/zend_ini_scanner.c"
 yy238:
 		YYDEBUG(238, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -2870,7 +2871,7 @@
 		{ /* Get number option value as string */
 	RETURN_TOKEN(TC_NUMBER, yytext, yyleng);
 }
-#line 2874 "Zend/zend_ini_scanner.c"
+#line 2875 "Zend/zend_ini_scanner.c"
 yy244:
 		YYDEBUG(244, *YYCURSOR);
 		yyaccept = 2;
@@ -2887,7 +2888,7 @@
 	BEGIN(INITIAL);
 	return END_OF_LINE;
 }
-#line 2891 "Zend/zend_ini_scanner.c"
+#line 2892 "Zend/zend_ini_scanner.c"
 yy247:
 		YYDEBUG(247, *YYCURSOR);
 		yyaccept = 4;
@@ -2927,7 +2928,7 @@
 		{ /* Get constant option value */
 	RETURN_TOKEN(TC_CONSTANT, yytext, yyleng);
 }
-#line 2931 "Zend/zend_ini_scanner.c"
+#line 2932 "Zend/zend_ini_scanner.c"
 yy249:
 		YYDEBUG(249, *YYCURSOR);
 		yyaccept = 4;
@@ -3423,7 +3424,7 @@
 		{ /* TRUE value (when used outside option value/offset this causes parse error!) */
 	RETURN_TOKEN(BOOL_TRUE, "1", 1);
 }
-#line 3427 "Zend/zend_ini_scanner.c"
+#line 3428 "Zend/zend_ini_scanner.c"
 yy266:
 		YYDEBUG(266, *YYCURSOR);
 		++YYCURSOR;
@@ -3627,7 +3628,7 @@
 		{ /* FALSE value (when used outside option value/offset this causes parse error!)*/
 	RETURN_TOKEN(BOOL_FALSE, "", 0);
 }
-#line 3631 "Zend/zend_ini_scanner.c"
+#line 3632 "Zend/zend_ini_scanner.c"
 yy273:
 		YYDEBUG(273, *YYCURSOR);
 		++YYCURSOR;
@@ -4009,7 +4010,7 @@
 	SCNG(lineno)++;
 	return END_OF_LINE;
 }
-#line 4013 "Zend/zend_ini_scanner.c"
+#line 4014 "Zend/zend_ini_scanner.c"
 yy286:
 		YYDEBUG(286, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -4230,7 +4231,7 @@
 	}
 	RETURN_TOKEN(TC_RAW, yytext, yyleng);
 }
-#line 4234 "Zend/zend_ini_scanner.c"
+#line 4235 "Zend/zend_ini_scanner.c"
 yy299:
 		YYDEBUG(299, *YYCURSOR);
 		++YYCURSOR;
@@ -4241,7 +4242,7 @@
 	yy_push_state(ST_VARNAME TSRMLS_CC);
 	return TC_DOLLAR_CURLY;
 }
-#line 4245 "Zend/zend_ini_scanner.c"
+#line 4246 "Zend/zend_ini_scanner.c"
 yy301:
 		YYDEBUG(301, *YYCURSOR);
 		++YYCURSOR;
@@ -4331,13 +4332,16 @@
 		YYDEBUG(308, *YYCURSOR);
 		YYFILL(2);
 		yych = *YYCURSOR;
-		if (yych <= 'Z') {
-			if (yych <= '/') goto yy310;
-			if (yych <= '9') goto yy312;
-			if (yych >= 'A') goto yy312;
+		if (yych <= '^') {
+			if (yych <= '9') {
+				if (yych >= '0') goto yy312;
+			} else {
+				if (yych <= '@') goto yy310;
+				if (yych <= 'Z') goto yy312;
+			}
 		} else {
 			if (yych <= 'z') {
-				if (yych >= 'a') goto yy312;
+				if (yych != '`') goto yy312;
 			} else {
 				if (yych == '}') goto yy314;
 			}
@@ -4351,7 +4355,7 @@
 		{
 	return 0;
 }
-#line 4355 "Zend/zend_ini_scanner.c"
+#line 4359 "Zend/zend_ini_scanner.c"
 yy312:
 		YYDEBUG(312, *YYCURSOR);
 		++YYCURSOR;
@@ -4364,7 +4368,7 @@
 		{ /* Variable name */
 	RETURN_TOKEN(TC_VARNAME, yytext, yyleng);
 }
-#line 4368 "Zend/zend_ini_scanner.c"
+#line 4372 "Zend/zend_ini_scanner.c"
 yy314:
 		YYDEBUG(314, *YYCURSOR);
 		++YYCURSOR;
@@ -4375,7 +4379,7 @@
 	yy_pop_state(TSRMLS_C);
 	return '}';
 }
-#line 4379 "Zend/zend_ini_scanner.c"
+#line 4383 "Zend/zend_ini_scanner.c"
 yy316:
 		YYDEBUG(316, *YYCURSOR);
 		++YYCURSOR;
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_ini_scanner_defs.h?r1=1.1.2.6&r2=1.1.2.7&diff_format=u
Index: ZendEngine2/zend_ini_scanner_defs.h
diff -u ZendEngine2/zend_ini_scanner_defs.h:1.1.2.6 ZendEngine2/zend_ini_scanner_defs.h:1.1.2.7
--- ZendEngine2/zend_ini_scanner_defs.h:1.1.2.6	Sun Aug 17 21:00:22 2008
+++ ZendEngine2/zend_ini_scanner_defs.h	Sun Aug 17 21:57:52 2008
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.13.5 on Sun Aug 17 22:48:22 2008 */
+/* Generated by re2c 0.13.5 on Sun Aug 17 23:55:27 2008 */
 #line 3 "Zend/zend_ini_scanner_defs.h"
 
 enum YYCONDTYPE {