cvs: ZendEngine2 / zend_ini_scanner.c zend_ini_scanner_defs.h

nlopess Thu Aug 7 12:32:48 2008 UTC Modified files: /ZendEngine2 zend_ini_scanner.c zend_ini_scanner_defs.h Log: regenerate

http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_ini_scanner.c?r1=1.4&r2=1.5&diff_format=u Index: ZendEngine2/zend_ini_scanner.c diff -u ZendEngine2/zend_ini_scanner.c:1.4 ZendEngine2/zend_ini_scanner.c:1.5 --- ZendEngine2/zend_ini_scanner.c:1.4 Mon Apr 7 11:50:00 2008 +++ ZendEngine2/zend_ini_scanner.c Thu Aug 7 12:32:48 2008 @@ -1,4 +1,4 @@ -/* Generated by re2c 0.13.4.dev on Mon Apr 7 12:50:51 2008 */ +/* Generated by re2c 0.13.6.dev on Thu Aug 7 13:31:43 2008 */ #line 1 "Zend/zend_ini_scanner.l" /* +----------------------------------------------------------------------+ @@ -22,7 +22,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_ini_scanner.c,v 1.4 2008/04/07 11:50:00 scottmac Exp $ */ +/* $Id: zend_ini_scanner.c,v 1.5 2008/08/07 12:32:48 nlopess Exp $ */ #include <errno.h> #include "zend.h" @@ -480,7 +480,7 @@ ++YYCURSOR; YYDEBUG(3, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 495 "Zend/zend_ini_scanner.l" +#line 494 "Zend/zend_ini_scanner.l" { return 0; } @@ -493,7 +493,7 @@ yy5: YYDEBUG(5, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 474 "Zend/zend_ini_scanner.l" +#line 473 "Zend/zend_ini_scanner.l" { /* eat whitespace */ goto restart; @@ -505,7 +505,7 @@ yy7: YYDEBUG(7, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 479 "Zend/zend_ini_scanner.l" +#line 478 "Zend/zend_ini_scanner.l" { SCNG(lineno)++; return END_OF_LINE; @@ -521,7 +521,7 @@ ++YYCURSOR; YYDEBUG(10, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 433 "Zend/zend_ini_scanner.l" +#line 432 "Zend/zend_ini_scanner.l" { /* Disallow these chars outside option values */ return yytext[0]; } @@ -820,7 +820,7 @@ yy52: YYDEBUG(52, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 484 "Zend/zend_ini_scanner.l" +#line 483 "Zend/zend_ini_scanner.l" { /* Comment */ BEGIN(INITIAL); SCNG(lineno)++; @@ -920,7 +920,7 @@ yy61: YYDEBUG(61, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 460 "Zend/zend_ini_scanner.l" +#line 459 "Zend/zend_ini_scanner.l" { /* Escape double quoted string contents */ zend_ini_escape_string(ini_lval, yytext, yyleng, '"' TSRMLS_CC); return TC_QUOTED_STRING; @@ -934,7 +934,7 @@ yy63: YYDEBUG(63, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 465 "Zend/zend_ini_scanner.l" +#line 464 "Zend/zend_ini_scanner.l" { /* Double quoted '"' string ends */ yy_pop_state(TSRMLS_C); return '"'; @@ -954,7 +954,7 @@ yy65: YYDEBUG(65, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 495 "Zend/zend_ini_scanner.l" +#line 494 "Zend/zend_ini_scanner.l" { return 0; } @@ -1147,7 +1147,7 @@ yy85: YYDEBUG(85, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 451 "Zend/zend_ini_scanner.l" +#line 450 "Zend/zend_ini_scanner.l" { /* Get rest as section/offset value */ RETURN_TOKEN(TC_STRING, yytext, yyleng); } @@ -1168,7 +1168,7 @@ yy88: YYDEBUG(88, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 495 "Zend/zend_ini_scanner.l" +#line 494 "Zend/zend_ini_scanner.l" { return 0; } @@ -1179,7 +1179,7 @@ yy90: YYDEBUG(90, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 455 "Zend/zend_ini_scanner.l" +#line 454 "Zend/zend_ini_scanner.l" { /* Double quoted '"' string start */ yy_push_state(ST_DOUBLE_QUOTES TSRMLS_CC); return '"'; @@ -1246,7 +1246,7 @@ yy96: YYDEBUG(96, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 429 "Zend/zend_ini_scanner.l" +#line 428 "Zend/zend_ini_scanner.l" { /* Get number option value as string */ RETURN_TOKEN(TC_NUMBER, yytext, yyleng); } @@ -1276,7 +1276,7 @@ yy98: YYDEBUG(98, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 425 "Zend/zend_ini_scanner.l" +#line 424 "Zend/zend_ini_scanner.l" { /* Get constant option value */ RETURN_TOKEN(TC_CONSTANT, yytext, yyleng); } @@ -1719,11 +1719,10 @@ if (yytext[0] == '"' && yytext[yyleng - 1] == '"') { SCNG(yy_text)++; yyleng = yyleng - 2; - yytext[yyleng] = 0; } RETURN_TOKEN(TC_RAW, yytext, yyleng); } -#line 1727 "Zend/zend_ini_scanner.c" +#line 1726 "Zend/zend_ini_scanner.c" yy137: YYDEBUG(137, *YYCURSOR); yyaccept = 0; @@ -1745,13 +1744,13 @@ yy139: YYDEBUG(139, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 419 "Zend/zend_ini_scanner.l" +#line 418 "Zend/zend_ini_scanner.l" { /* End of option value */ BEGIN(INITIAL); SCNG(lineno)++; return END_OF_LINE; } -#line 1755 "Zend/zend_ini_scanner.c" +#line 1754 "Zend/zend_ini_scanner.c" yy140: YYDEBUG(140, *YYCURSOR); yych = *++YYCURSOR; @@ -1765,12 +1764,12 @@ yy142: YYDEBUG(142, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 490 "Zend/zend_ini_scanner.l" +#line 489 "Zend/zend_ini_scanner.l" { /* End of option value (if EOF is reached before EOL) */ BEGIN(INITIAL); return END_OF_LINE; } -#line 1774 "Zend/zend_ini_scanner.c" +#line 1773 "Zend/zend_ini_scanner.c" yy143: YYDEBUG(143, *YYCURSOR); yych = *++YYCURSOR; @@ -1792,13 +1791,13 @@ yy147: YYDEBUG(147, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 484 "Zend/zend_ini_scanner.l" +#line 483 "Zend/zend_ini_scanner.l" { /* Comment */ BEGIN(INITIAL); SCNG(lineno)++; return END_OF_LINE; } -#line 1802 "Zend/zend_ini_scanner.c" +#line 1801 "Zend/zend_ini_scanner.c" yy148: YYDEBUG(148, *YYCURSOR); yych = *++YYCURSOR; @@ -1900,21 +1899,21 @@ yy158: YYDEBUG(158, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 415 "Zend/zend_ini_scanner.l" +#line 414 "Zend/zend_ini_scanner.l" { /* Raw value, only used when SCNG(scanner_mode) == ZEND_INI_SCANNER_RAW. */ RETURN_TOKEN(TC_RAW, yytext, yyleng); } -#line 1908 "Zend/zend_ini_scanner.c" +#line 1907 "Zend/zend_ini_scanner.c" yy159: YYDEBUG(159, *YYCURSOR); ++YYCURSOR; YYDEBUG(160, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 495 "Zend/zend_ini_scanner.l" +#line 494 "Zend/zend_ini_scanner.l" { return 0; } -#line 1918 "Zend/zend_ini_scanner.c" +#line 1917 "Zend/zend_ini_scanner.c" yy161: YYDEBUG(161, *YYCURSOR); ++YYCURSOR; @@ -1929,7 +1928,7 @@ SCNG(lineno)++; return ']'; } -#line 1933 "Zend/zend_ini_scanner.c" +#line 1932 "Zend/zend_ini_scanner.c" yy163: YYDEBUG(163, *YYCURSOR); ++YYCURSOR; @@ -2050,11 +2049,11 @@ yy172: YYDEBUG(172, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 451 "Zend/zend_ini_scanner.l" +#line 450 "Zend/zend_ini_scanner.l" { /* Get rest as section/offset value */ RETURN_TOKEN(TC_STRING, yytext, yyleng); } -#line 2058 "Zend/zend_ini_scanner.c" +#line 2057 "Zend/zend_ini_scanner.c" yy173: YYDEBUG(173, *YYCURSOR); yyaccept = 0; @@ -2073,23 +2072,23 @@ yy175: YYDEBUG(175, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 495 "Zend/zend_ini_scanner.l" +#line 494 "Zend/zend_ini_scanner.l" { return 0; } -#line 2081 "Zend/zend_ini_scanner.c" +#line 2080 "Zend/zend_ini_scanner.c" yy176: YYDEBUG(176, *YYCURSOR); ++YYCURSOR; yy177: YYDEBUG(177, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 455 "Zend/zend_ini_scanner.l" +#line 454 "Zend/zend_ini_scanner.l" { /* Double quoted '"' string start */ yy_push_state(ST_DOUBLE_QUOTES TSRMLS_CC); return '"'; } -#line 2093 "Zend/zend_ini_scanner.c" +#line 2092 "Zend/zend_ini_scanner.c" yy178: YYDEBUG(178, *YYCURSOR); yych = *++YYCURSOR; @@ -2151,11 +2150,11 @@ yy183: YYDEBUG(183, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 429 "Zend/zend_ini_scanner.l" +#line 428 "Zend/zend_ini_scanner.l" { /* Get number option value as string */ RETURN_TOKEN(TC_NUMBER, yytext, yyleng); } -#line 2159 "Zend/zend_ini_scanner.c" +#line 2158 "Zend/zend_ini_scanner.c" yy184: YYDEBUG(184, *YYCURSOR); yyaccept = 3; @@ -2181,11 +2180,11 @@ yy185: YYDEBUG(185, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 425 "Zend/zend_ini_scanner.l" +#line 424 "Zend/zend_ini_scanner.l" { /* Get constant option value */ RETURN_TOKEN(TC_CONSTANT, yytext, yyleng); } -#line 2189 "Zend/zend_ini_scanner.c" +#line 2188 "Zend/zend_ini_scanner.c" yy186: YYDEBUG(186, *YYCURSOR); yych = *++YYCURSOR; @@ -2204,7 +2203,7 @@ SCNG(lineno)++; return ']'; } -#line 2208 "Zend/zend_ini_scanner.c" +#line 2207 "Zend/zend_ini_scanner.c" yy189: YYDEBUG(189, *YYCURSOR); ++YYCURSOR; @@ -2525,7 +2524,7 @@ } RETURN_TOKEN(TC_RAW, yytext, yyleng); } -#line 2529 "Zend/zend_ini_scanner.c" +#line 2528 "Zend/zend_ini_scanner.c" yy218: YYDEBUG(218, *YYCURSOR); ++YYCURSOR; @@ -2536,7 +2535,7 @@ yy_push_state(ST_VARNAME TSRMLS_CC); return TC_DOLLAR_CURLY; } -#line 2540 "Zend/zend_ini_scanner.c" +#line 2539 "Zend/zend_ini_scanner.c" yy220: YYDEBUG(220, *YYCURSOR); yyaccept = 0; @@ -2715,12 +2714,12 @@ yy226: YYDEBUG(226, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 490 "Zend/zend_ini_scanner.l" +#line 489 "Zend/zend_ini_scanner.l" { /* End of option value (if EOF is reached before EOL) */ BEGIN(INITIAL); return END_OF_LINE; } -#line 2724 "Zend/zend_ini_scanner.c" +#line 2723 "Zend/zend_ini_scanner.c" yy227: YYDEBUG(227, *YYCURSOR); yyaccept = 0; @@ -2729,11 +2728,11 @@ yy228: YYDEBUG(228, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 447 "Zend/zend_ini_scanner.l" +#line 446 "Zend/zend_ini_scanner.l" { /* Get everything else as option/offset value */ RETURN_TOKEN(TC_STRING, yytext, yyleng); } -#line 2737 "Zend/zend_ini_scanner.c" +#line 2736 "Zend/zend_ini_scanner.c" yy229: YYDEBUG(229, *YYCURSOR); yyaccept = 1; @@ -2742,24 +2741,24 @@ yy230: YYDEBUG(230, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 470 "Zend/zend_ini_scanner.l" +#line 469 "Zend/zend_ini_scanner.l" { RETURN_TOKEN(TC_WHITESPACE, yytext, yyleng); } -#line 2750 "Zend/zend_ini_scanner.c" +#line 2749 "Zend/zend_ini_scanner.c" yy231: YYDEBUG(231, *YYCURSOR); ++YYCURSOR; yy232: YYDEBUG(232, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 419 "Zend/zend_ini_scanner.l" +#line 418 "Zend/zend_ini_scanner.l" { /* End of option value */ BEGIN(INITIAL); SCNG(lineno)++; return END_OF_LINE; } -#line 2763 "Zend/zend_ini_scanner.c" +#line 2762 "Zend/zend_ini_scanner.c" yy233: YYDEBUG(233, *YYCURSOR); yych = *++YYCURSOR; @@ -2773,23 +2772,23 @@ yy235: YYDEBUG(235, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 437 "Zend/zend_ini_scanner.l" +#line 436 "Zend/zend_ini_scanner.l" { /* Boolean operators */ return yytext[0]; } -#line 2781 "Zend/zend_ini_scanner.c" +#line 2780 "Zend/zend_ini_scanner.c" yy236: YYDEBUG(236, *YYCURSOR); ++YYCURSOR; yy237: YYDEBUG(237, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 455 "Zend/zend_ini_scanner.l" +#line 454 "Zend/zend_ini_scanner.l" { /* Double quoted '"' string start */ yy_push_state(ST_DOUBLE_QUOTES TSRMLS_CC); return '"'; } -#line 2793 "Zend/zend_ini_scanner.c" +#line 2792 "Zend/zend_ini_scanner.c" yy238: YYDEBUG(238, *YYCURSOR); yych = *++YYCURSOR; @@ -2865,11 +2864,11 @@ yy243: YYDEBUG(243, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 429 "Zend/zend_ini_scanner.l" +#line 428 "Zend/zend_ini_scanner.l" { /* Get number option value as string */ RETURN_TOKEN(TC_NUMBER, yytext, yyleng); } -#line 2873 "Zend/zend_ini_scanner.c" +#line 2872 "Zend/zend_ini_scanner.c" yy244: YYDEBUG(244, *YYCURSOR); yyaccept = 2; @@ -2880,13 +2879,13 @@ ++YYCURSOR; YYDEBUG(246, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 441 "Zend/zend_ini_scanner.l" +#line 440 "Zend/zend_ini_scanner.l" { /* Make = used in option value to trigger error */ yyless(0); BEGIN(INITIAL); return END_OF_LINE; } -#line 2890 "Zend/zend_ini_scanner.c" +#line 2889 "Zend/zend_ini_scanner.c" yy247: YYDEBUG(247, *YYCURSOR); yyaccept = 4; @@ -2922,11 +2921,11 @@ yy248: YYDEBUG(248, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 425 "Zend/zend_ini_scanner.l" +#line 424 "Zend/zend_ini_scanner.l" { /* Get constant option value */ RETURN_TOKEN(TC_CONSTANT, yytext, yyleng); } -#line 2930 "Zend/zend_ini_scanner.c" +#line 2929 "Zend/zend_ini_scanner.c" yy249: YYDEBUG(249, *YYCURSOR); yyaccept = 4; @@ -3422,7 +3421,7 @@ { /* TRUE value (when used outside option value/offset this causes parse error!) */ RETURN_TOKEN(BOOL_TRUE, "1", 1); } -#line 3426 "Zend/zend_ini_scanner.c" +#line 3425 "Zend/zend_ini_scanner.c" yy266: YYDEBUG(266, *YYCURSOR); ++YYCURSOR; @@ -3626,7 +3625,7 @@ { /* FALSE value (when used outside option value/offset this causes parse error!)*/ RETURN_TOKEN(BOOL_FALSE, "", 0); } -#line 3630 "Zend/zend_ini_scanner.c" +#line 3629 "Zend/zend_ini_scanner.c" yy273: YYDEBUG(273, *YYCURSOR); ++YYCURSOR; @@ -4002,13 +4001,13 @@ yy285: YYDEBUG(285, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 484 "Zend/zend_ini_scanner.l" +#line 483 "Zend/zend_ini_scanner.l" { /* Comment */ BEGIN(INITIAL); SCNG(lineno)++; return END_OF_LINE; } -#line 4012 "Zend/zend_ini_scanner.c" +#line 4011 "Zend/zend_ini_scanner.c" yy286: YYDEBUG(286, *YYCURSOR); yych = *++YYCURSOR; @@ -4229,7 +4228,7 @@ } RETURN_TOKEN(TC_RAW, yytext, yyleng); } -#line 4233 "Zend/zend_ini_scanner.c" +#line 4232 "Zend/zend_ini_scanner.c" yy299: YYDEBUG(299, *YYCURSOR); ++YYCURSOR; @@ -4240,7 +4239,7 @@ yy_push_state(ST_VARNAME TSRMLS_CC); return TC_DOLLAR_CURLY; } -#line 4244 "Zend/zend_ini_scanner.c" +#line 4243 "Zend/zend_ini_scanner.c" yy301: YYDEBUG(301, *YYCURSOR); ++YYCURSOR; @@ -4346,11 +4345,11 @@ ++YYCURSOR; YYDEBUG(311, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 495 "Zend/zend_ini_scanner.l" +#line 494 "Zend/zend_ini_scanner.l" { return 0; } -#line 4354 "Zend/zend_ini_scanner.c" +#line 4353 "Zend/zend_ini_scanner.c" yy312: YYDEBUG(312, *YYCURSOR); ++YYCURSOR; @@ -4363,7 +4362,7 @@ { /* Variable name */ RETURN_TOKEN(TC_VARNAME, yytext, yyleng); } -#line 4367 "Zend/zend_ini_scanner.c" +#line 4366 "Zend/zend_ini_scanner.c" yy314: YYDEBUG(314, *YYCURSOR); ++YYCURSOR; @@ -4374,7 +4373,7 @@ yy_pop_state(TSRMLS_C); return '}'; } -#line 4378 "Zend/zend_ini_scanner.c" +#line 4377 "Zend/zend_ini_scanner.c" yy316: YYDEBUG(316, *YYCURSOR); ++YYCURSOR; @@ -4388,6 +4387,6 @@ goto yy313; } } -#line 499 "Zend/zend_ini_scanner.l" +#line 498 "Zend/zend_ini_scanner.l" } http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_ini_scanner_defs.h?r1=1.3&r2=1.4&diff_format=u Index: ZendEngine2/zend_ini_scanner_defs.h diff -u ZendEngine2/zend_ini_scanner_defs.h:1.3 ZendEngine2/zend_ini_scanner_defs.h:1.4 --- ZendEngine2/zend_ini_scanner_defs.h:1.3 Fri Apr 4 15:13:32 2008 +++ ZendEngine2/zend_ini_scanner_defs.h Thu Aug 7 12:32:48 2008 @@ -1,4 +1,4 @@ -/* Generated by re2c 0.13.4.dev on Fri Apr 4 16:10:13 2008 */ +/* Generated by re2c 0.13.6.dev on Thu Aug 7 13:31:43 2008 */ #line 3 "Zend/zend_ini_scanner_defs.h" enum YYCONDTYPE {