- Generated files

diff --git a/Zend/zend_ini_scanner.c b/Zend/zend_ini_scanner.c
index daf2aa518e23f9454f789c28a1e6a2cc6190caca..cbe6fabe0b2823ebc6952f8be899bfb261bb52fd 100644 (file)
--- a/Zend/zend_ini_scanner.c
+++ b/Zend/zend_ini_scanner.c
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.13.5 on Fri Aug  7 17:14:49 2009 */
+/* Generated by re2c 0.13.5 on Fri Aug  7 18:41:19 2009 */
 #line 1 "Zend/zend_ini_scanner.l"
 /*
    +----------------------------------------------------------------------+
@@ -160,12 +160,28 @@ static void yy_scan_buffer(char *str, unsigned int len TSRMLS_DC)
 
 /* {{{ init_ini_scanner()
 */
-static void init_ini_scanner(TSRMLS_D)
+static int init_ini_scanner(int scanner_mode, zend_file_handle *fh TSRMLS_DC)
 {
+       /* Sanity check */
+       if (scanner_mode != ZEND_INI_SCANNER_NORMAL && scanner_mode != ZEND_INI_SCANNER_RAW) {
+               zend_error(E_WARNING, "Invalid scanner mode");
+               return FAILURE;
+       }
+
        SCNG(lineno) = 1;
-       SCNG(scanner_mode) = ZEND_INI_SCANNER_NORMAL;
+       SCNG(scanner_mode) = scanner_mode;
+       SCNG(yy_in) = fh;
+
+       if (fh != NULL) {
+               ini_filename = zend_strndup(fh->filename, strlen(fh->filename));
+       } else {
+               ini_filename = NULL;
+       }
+
        zend_stack_init(&SCNG(state_stack));
        BEGIN(INITIAL);
+
+       return SUCCESS;
 }
 /* }}} */
 
@@ -203,15 +219,14 @@ int zend_ini_open_file_for_scanning(zend_file_handle *fh, int scanner_mode TSRML
        char *buf;
        size_t size;
 
-       if (zend_stream_fixup(fh, &buf, &size TSRMLS_CC) == FAILURE) {
+       if (zend_stream_fixup(fh, &buf, &size TSRMLS_CC) == FAILURE ||
+               init_ini_scanner(scanner_mode, fh TSRMLS_CC) == FAILURE
+       ) {
                return FAILURE;
        }
 
-       init_ini_scanner(TSRMLS_C);
-       SCNG(scanner_mode) = scanner_mode;
-       SCNG(yy_in) = fh;
        yy_scan_buffer(buf, size TSRMLS_CC);
-       ini_filename = zend_strndup(fh->filename, strlen(fh->filename));
+
        return SUCCESS;
 }
 /* }}} */
@@ -222,11 +237,12 @@ int zend_ini_prepare_string_for_scanning(char *str, int scanner_mode TSRMLS_DC)
 {
        int len = strlen(str);
 
-       init_ini_scanner(TSRMLS_C);
-       SCNG(scanner_mode) = scanner_mode;
-       SCNG(yy_in) = NULL;
+       if (init_ini_scanner(scanner_mode, NULL TSRMLS_CC) == FAILURE) {
+               return FAILURE;
+       }
+
        yy_scan_buffer(str, len TSRMLS_CC);
-       ini_filename = NULL;
+
        return SUCCESS;
 }
 /* }}} */
@@ -303,7 +319,7 @@ restart:
                }
        }
 
-#line 307 "Zend/zend_ini_scanner.c"
+#line 323 "Zend/zend_ini_scanner.c"
 {
        YYCTYPE yych;
        unsigned int yyaccept = 0;
@@ -432,11 +448,11 @@ yy2:
 yy3:
                YYDEBUG(3, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 390 "Zend/zend_ini_scanner.l"
+#line 406 "Zend/zend_ini_scanner.l"
                { /* Get option name */
        RETURN_TOKEN(TC_LABEL, yytext, yyleng);
 }
-#line 440 "Zend/zend_ini_scanner.c"
+#line 456 "Zend/zend_ini_scanner.c"
 yy4:
                YYDEBUG(4, *YYCURSOR);
                yyaccept = 0;
@@ -445,24 +461,24 @@ yy4:
 yy5:
                YYDEBUG(5, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 502 "Zend/zend_ini_scanner.l"
+#line 518 "Zend/zend_ini_scanner.l"
                {
        /* eat whitespace */
        goto restart;
 }
-#line 454 "Zend/zend_ini_scanner.c"
+#line 470 "Zend/zend_ini_scanner.c"
 yy6:
                YYDEBUG(6, *YYCURSOR);
                ++YYCURSOR;
 yy7:
                YYDEBUG(7, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 507 "Zend/zend_ini_scanner.l"
+#line 523 "Zend/zend_ini_scanner.l"
                {
        SCNG(lineno)++;
        return END_OF_LINE;
 }
-#line 466 "Zend/zend_ini_scanner.c"
+#line 482 "Zend/zend_ini_scanner.c"
 yy8:
                YYDEBUG(8, *YYCURSOR);
                yych = *++YYCURSOR;
@@ -473,11 +489,11 @@ yy9:
                ++YYCURSOR;
                YYDEBUG(10, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 430 "Zend/zend_ini_scanner.l"
+#line 446 "Zend/zend_ini_scanner.l"
                { /* Disallow these chars outside option values */
        return yytext[0];
 }
-#line 481 "Zend/zend_ini_scanner.c"
+#line 497 "Zend/zend_ini_scanner.c"
 yy11:
                YYDEBUG(11, *YYCURSOR);
                yyaccept = 1;
@@ -494,11 +510,11 @@ yy13:
                goto yy51;
                YYDEBUG(14, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 530 "Zend/zend_ini_scanner.l"
+#line 546 "Zend/zend_ini_scanner.l"
                {
        return 0;
 }
-#line 502 "Zend/zend_ini_scanner.c"
+#line 518 "Zend/zend_ini_scanner.c"
 yy15:
                YYDEBUG(15, *YYCURSOR);
                ++YYCURSOR;
@@ -507,7 +523,7 @@ yy15:
 yy16:
                YYDEBUG(16, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 394 "Zend/zend_ini_scanner.l"
+#line 410 "Zend/zend_ini_scanner.l"
                { /* Start option value */
        if (SCNG(scanner_mode) == ZEND_INI_SCANNER_RAW) {
                yy_push_state(ST_RAW TSRMLS_CC);
@@ -516,7 +532,7 @@ yy16:
        }
        return '=';
 }
-#line 520 "Zend/zend_ini_scanner.c"
+#line 536 "Zend/zend_ini_scanner.c"
 yy17:
                YYDEBUG(17, *YYCURSOR);
                yych = *++YYCURSOR;
@@ -572,7 +588,7 @@ yy22:
                ++YYCURSOR;
                YYDEBUG(23, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 328 "Zend/zend_ini_scanner.l"
+#line 344 "Zend/zend_ini_scanner.l"
                { /* Section start */
        /* Enter section data lookup state */
        if (SCNG(scanner_mode) == ZEND_INI_SCANNER_RAW) {
@@ -582,7 +598,7 @@ yy22:
        }
        return TC_SECTION;
 }
-#line 586 "Zend/zend_ini_scanner.c"
+#line 602 "Zend/zend_ini_scanner.c"
 yy24:
                YYDEBUG(24, *YYCURSOR);
                ++YYCURSOR;
@@ -612,7 +628,7 @@ yy27:
                }
                YYDEBUG(29, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 353 "Zend/zend_ini_scanner.l"
+#line 369 "Zend/zend_ini_scanner.l"
                { /* Start of option with offset */
        /* Eat trailing whitespace and [ */
        EAT_TRAILING_WHITESPACE_EX('[');
@@ -622,7 +638,7 @@ yy27:
 
        RETURN_TOKEN(TC_OFFSET, yytext, yyleng);
 }
-#line 626 "Zend/zend_ini_scanner.c"
+#line 642 "Zend/zend_ini_scanner.c"
 yy30:
                YYDEBUG(30, *YYCURSOR);
                ++YYCURSOR;
@@ -663,11 +679,11 @@ yy30:
 yy31:
                YYDEBUG(31, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 382 "Zend/zend_ini_scanner.l"
+#line 398 "Zend/zend_ini_scanner.l"
                { /* TRUE value (when used outside option value/offset this causes parse error!) */
        RETURN_TOKEN(BOOL_TRUE, "1", 1);
 }
-#line 671 "Zend/zend_ini_scanner.c"
+#line 687 "Zend/zend_ini_scanner.c"
 yy32:
                YYDEBUG(32, *YYCURSOR);
                ++YYCURSOR;
@@ -733,11 +749,11 @@ yy37:
 yy38:
                YYDEBUG(38, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 386 "Zend/zend_ini_scanner.l"
+#line 402 "Zend/zend_ini_scanner.l"
                { /* FALSE value (when used outside option value/offset this causes parse error!)*/
        RETURN_TOKEN(BOOL_FALSE, "", 0);
 }
-#line 741 "Zend/zend_ini_scanner.c"
+#line 757 "Zend/zend_ini_scanner.c"
 yy39:
                YYDEBUG(39, *YYCURSOR);
                ++YYCURSOR;
@@ -852,13 +868,13 @@ yy52:
 yy53:
                YYDEBUG(53, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 512 "Zend/zend_ini_scanner.l"
+#line 528 "Zend/zend_ini_scanner.l"
                { /* Comment */
        BEGIN(INITIAL);
        SCNG(lineno)++;
        return END_OF_LINE;
 }
-#line 862 "Zend/zend_ini_scanner.c"
+#line 878 "Zend/zend_ini_scanner.c"
 yy54:
                YYDEBUG(54, *YYCURSOR);
                yych = *++YYCURSOR;
@@ -938,14 +954,14 @@ yy61:
 yy62:
                YYDEBUG(62, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 518 "Zend/zend_ini_scanner.l"
+#line 534 "Zend/zend_ini_scanner.l"
                { /* #Comment */
        zend_error(E_DEPRECATED, "Comments starting with '#' are deprecated in %s on line %d", zend_ini_scanner_get_filename(TSRMLS_C), SCNG(lineno));
        BEGIN(INITIAL);
        SCNG(lineno)++;
        return END_OF_LINE;
 }
-#line 949 "Zend/zend_ini_scanner.c"
+#line 965 "Zend/zend_ini_scanner.c"
 yy63:
                YYDEBUG(63, *YYCURSOR);
                yych = *++YYCURSOR;
@@ -1036,7 +1052,7 @@ yyc_ST_DOUBLE_QUOTES:
 yy71:
                YYDEBUG(71, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 462 "Zend/zend_ini_scanner.l"
+#line 478 "Zend/zend_ini_scanner.l"
                { /* Escape double quoted string contents */
        if (YYCURSOR > YYLIMIT) {
                return 0;
@@ -1072,7 +1088,7 @@ yy71:
        zend_ini_escape_string(ini_lval, yytext, yyleng, '"' TSRMLS_CC);
        return TC_QUOTED_STRING;
 }
-#line 1076 "Zend/zend_ini_scanner.c"
+#line 1092 "Zend/zend_ini_scanner.c"
 yy72:
                YYDEBUG(72, *YYCURSOR);
                ++YYCURSOR;
@@ -1081,12 +1097,12 @@ yy72:
 yy73:
                YYDEBUG(73, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 457 "Zend/zend_ini_scanner.l"
+#line 473 "Zend/zend_ini_scanner.l"
                { /* Double quoted '"' string ends */
        yy_pop_state(TSRMLS_C);
        return '"';
 }
-#line 1090 "Zend/zend_ini_scanner.c"
+#line 1106 "Zend/zend_ini_scanner.c"
 yy74:
                YYDEBUG(74, *YYCURSOR);
                yych = *++YYCURSOR;
@@ -1095,12 +1111,12 @@ yy74:
                ++YYCURSOR;
                YYDEBUG(76, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 368 "Zend/zend_ini_scanner.l"
+#line 384 "Zend/zend_ini_scanner.l"
                { /* Variable start */
        yy_push_state(ST_VARNAME TSRMLS_CC);
        return TC_DOLLAR_CURLY;
 }
-#line 1104 "Zend/zend_ini_scanner.c"
+#line 1120 "Zend/zend_ini_scanner.c"
 yy77:
                YYDEBUG(77, *YYCURSOR);
                ++YYCURSOR;
@@ -1199,11 +1215,11 @@ yy81:
 yy82:
                YYDEBUG(82, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 448 "Zend/zend_ini_scanner.l"
+#line 464 "Zend/zend_ini_scanner.l"
                { /* Get rest as section/offset value */
        RETURN_TOKEN(TC_STRING, yytext, yyleng);
 }
-#line 1207 "Zend/zend_ini_scanner.c"
+#line 1223 "Zend/zend_ini_scanner.c"
 yy83:
                YYDEBUG(83, *YYCURSOR);
                yyaccept = 0;
@@ -1220,23 +1236,23 @@ yy84:
 yy85:
                YYDEBUG(85, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 530 "Zend/zend_ini_scanner.l"
+#line 546 "Zend/zend_ini_scanner.l"
                {
        return 0;
 }
-#line 1228 "Zend/zend_ini_scanner.c"
+#line 1244 "Zend/zend_ini_scanner.c"
 yy86:
                YYDEBUG(86, *YYCURSOR);
                ++YYCURSOR;
 yy87:
                YYDEBUG(87, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 452 "Zend/zend_ini_scanner.l"
+#line 468 "Zend/zend_ini_scanner.l"
                { /* Double quoted '"' string start */
        yy_push_state(ST_DOUBLE_QUOTES TSRMLS_CC);
        return '"';
 }
-#line 1240 "Zend/zend_ini_scanner.c"
+#line 1256 "Zend/zend_ini_scanner.c"
 yy88:
                YYDEBUG(88, *YYCURSOR);
                yych = *++YYCURSOR;
@@ -1298,11 +1314,11 @@ yy92:
 yy93:
                YYDEBUG(93, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 426 "Zend/zend_ini_scanner.l"
+#line 442 "Zend/zend_ini_scanner.l"
                { /* Get number option value as string */
        RETURN_TOKEN(TC_NUMBER, yytext, yyleng);
 }
-#line 1306 "Zend/zend_ini_scanner.c"
+#line 1322 "Zend/zend_ini_scanner.c"
 yy94:
                YYDEBUG(94, *YYCURSOR);
                yyaccept = 3;
@@ -1328,11 +1344,11 @@ yy94:
 yy95:
                YYDEBUG(95, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 422 "Zend/zend_ini_scanner.l"
+#line 438 "Zend/zend_ini_scanner.l"
                { /* Get constant option value */
        RETURN_TOKEN(TC_CONSTANT, yytext, yyleng);
 }
-#line 1336 "Zend/zend_ini_scanner.c"
+#line 1352 "Zend/zend_ini_scanner.c"
 yy96:
                YYDEBUG(96, *YYCURSOR);
                yych = *++YYCURSOR;
@@ -1343,12 +1359,12 @@ yy97:
 yy98:
                YYDEBUG(98, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 363 "Zend/zend_ini_scanner.l"
+#line 379 "Zend/zend_ini_scanner.l"
                { /* End of section or an option offset */
        BEGIN(INITIAL);
        return ']';
 }
-#line 1352 "Zend/zend_ini_scanner.c"
+#line 1368 "Zend/zend_ini_scanner.c"
 yy99:
                YYDEBUG(99, *YYCURSOR);
                yyaccept = 0;
@@ -1638,7 +1654,7 @@ yy120:
                ++YYCURSOR;
                YYDEBUG(123, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 338 "Zend/zend_ini_scanner.l"
+#line 354 "Zend/zend_ini_scanner.l"
                { /* Raw string */
        /* Eat leading and trailing single quotes */
        if (yytext[0] == '\'' && yytext[yyleng - 1] == '\'') {
@@ -1647,18 +1663,18 @@ yy120:
        }
        RETURN_TOKEN(TC_RAW, yytext, yyleng);
 }
-#line 1651 "Zend/zend_ini_scanner.c"
+#line 1667 "Zend/zend_ini_scanner.c"
 yy124:
                YYDEBUG(124, *YYCURSOR);
                ++YYCURSOR;
                YYDEBUG(125, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 368 "Zend/zend_ini_scanner.l"
+#line 384 "Zend/zend_ini_scanner.l"
                { /* Variable start */
        yy_push_state(ST_VARNAME TSRMLS_CC);
        return TC_DOLLAR_CURLY;
 }
-#line 1662 "Zend/zend_ini_scanner.c"
+#line 1678 "Zend/zend_ini_scanner.c"
 yy126:
                YYDEBUG(126, *YYCURSOR);
                yyaccept = 0;
@@ -1762,7 +1778,7 @@ yyc_ST_RAW:
 yy133:
                YYDEBUG(133, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 403 "Zend/zend_ini_scanner.l"
+#line 419 "Zend/zend_ini_scanner.l"
                { /* Raw value, only used when SCNG(scanner_mode) == ZEND_INI_SCANNER_RAW. */
        /* Eat leading and trailing double quotes */
        if (yytext[0] == '"' && yytext[yyleng - 1] == '"') {
@@ -1771,7 +1787,7 @@ yy133:
        }
        RETURN_TOKEN(TC_RAW, yytext, yyleng);
 }
-#line 1775 "Zend/zend_ini_scanner.c"
+#line 1791 "Zend/zend_ini_scanner.c"
 yy134:
                YYDEBUG(134, *YYCURSOR);
                yyaccept = 0;
@@ -1793,13 +1809,13 @@ yy135:
 yy136:
                YYDEBUG(136, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 416 "Zend/zend_ini_scanner.l"
+#line 432 "Zend/zend_ini_scanner.l"
                { /* End of option value */
        BEGIN(INITIAL);
        SCNG(lineno)++;
        return END_OF_LINE;
 }
-#line 1803 "Zend/zend_ini_scanner.c"
+#line 1819 "Zend/zend_ini_scanner.c"
 yy137:
                YYDEBUG(137, *YYCURSOR);
                yych = *++YYCURSOR;
@@ -1812,12 +1828,12 @@ yy138:
                goto yy141;
                YYDEBUG(139, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 525 "Zend/zend_ini_scanner.l"
+#line 541 "Zend/zend_ini_scanner.l"
                { /* End of option value (if EOF is reached before EOL */
        BEGIN(INITIAL);
        return END_OF_LINE;
 }
-#line 1821 "Zend/zend_ini_scanner.c"
+#line 1837 "Zend/zend_ini_scanner.c"
 yy140:
                YYDEBUG(140, *YYCURSOR);
                ++YYCURSOR;
@@ -1835,13 +1851,13 @@ yy142:
 yy143:
                YYDEBUG(143, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 512 "Zend/zend_ini_scanner.l"
+#line 528 "Zend/zend_ini_scanner.l"
                { /* Comment */
        BEGIN(INITIAL);
        SCNG(lineno)++;
        return END_OF_LINE;
 }
-#line 1845 "Zend/zend_ini_scanner.c"
+#line 1861 "Zend/zend_ini_scanner.c"
 yy144:
                YYDEBUG(144, *YYCURSOR);
                yych = *++YYCURSOR;
@@ -1939,21 +1955,21 @@ yyc_ST_SECTION_RAW:
 yy154:
                YYDEBUG(154, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 412 "Zend/zend_ini_scanner.l"
+#line 428 "Zend/zend_ini_scanner.l"
                { /* Raw value, only used when SCNG(scanner_mode) == ZEND_INI_SCANNER_RAW. */
        RETURN_TOKEN(TC_RAW, yytext, yyleng);
 }
-#line 1947 "Zend/zend_ini_scanner.c"
+#line 1963 "Zend/zend_ini_scanner.c"
 yy155:
                YYDEBUG(155, *YYCURSOR);
                ++YYCURSOR;
                YYDEBUG(156, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 530 "Zend/zend_ini_scanner.l"
+#line 546 "Zend/zend_ini_scanner.l"
                {
        return 0;
 }
-#line 1957 "Zend/zend_ini_scanner.c"
+#line 1973 "Zend/zend_ini_scanner.c"
 yy157:
                YYDEBUG(157, *YYCURSOR);
                ++YYCURSOR;
@@ -1962,13 +1978,13 @@ yy157:
 yy158:
                YYDEBUG(158, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 347 "Zend/zend_ini_scanner.l"
+#line 363 "Zend/zend_ini_scanner.l"
                { /* End of section */
        BEGIN(INITIAL);
        SCNG(lineno)++;
        return ']';
 }
-#line 1972 "Zend/zend_ini_scanner.c"
+#line 1988 "Zend/zend_ini_scanner.c"
 yy159:
                YYDEBUG(159, *YYCURSOR);
                ++YYCURSOR;
@@ -2089,11 +2105,11 @@ yy167:
 yy168:
                YYDEBUG(168, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 448 "Zend/zend_ini_scanner.l"
+#line 464 "Zend/zend_ini_scanner.l"
                { /* Get rest as section/offset value */
        RETURN_TOKEN(TC_STRING, yytext, yyleng);
 }
-#line 2097 "Zend/zend_ini_scanner.c"
+#line 2113 "Zend/zend_ini_scanner.c"
 yy169:
                YYDEBUG(169, *YYCURSOR);
                yyaccept = 0;
@@ -2112,23 +2128,23 @@ yy170:
 yy171:
                YYDEBUG(171, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 530 "Zend/zend_ini_scanner.l"
+#line 546 "Zend/zend_ini_scanner.l"
                {
        return 0;
 }
-#line 2120 "Zend/zend_ini_scanner.c"
+#line 2136 "Zend/zend_ini_scanner.c"
 yy172:
                YYDEBUG(172, *YYCURSOR);
                ++YYCURSOR;
 yy173:
                YYDEBUG(173, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 452 "Zend/zend_ini_scanner.l"
+#line 468 "Zend/zend_ini_scanner.l"
                { /* Double quoted '"' string start */
        yy_push_state(ST_DOUBLE_QUOTES TSRMLS_CC);
        return '"';
 }
-#line 2132 "Zend/zend_ini_scanner.c"
+#line 2148 "Zend/zend_ini_scanner.c"
 yy174:
                YYDEBUG(174, *YYCURSOR);
                yych = *++YYCURSOR;
@@ -2190,11 +2206,11 @@ yy178:
 yy179:
                YYDEBUG(179, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 426 "Zend/zend_ini_scanner.l"
+#line 442 "Zend/zend_ini_scanner.l"
                { /* Get number option value as string */
        RETURN_TOKEN(TC_NUMBER, yytext, yyleng);
 }
-#line 2198 "Zend/zend_ini_scanner.c"
+#line 2214 "Zend/zend_ini_scanner.c"
 yy180:
                YYDEBUG(180, *YYCURSOR);
                yyaccept = 3;
@@ -2220,11 +2236,11 @@ yy180:
 yy181:
                YYDEBUG(181, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 422 "Zend/zend_ini_scanner.l"
+#line 438 "Zend/zend_ini_scanner.l"
                { /* Get constant option value */
        RETURN_TOKEN(TC_CONSTANT, yytext, yyleng);
 }
-#line 2228 "Zend/zend_ini_scanner.c"
+#line 2244 "Zend/zend_ini_scanner.c"
 yy182:
                YYDEBUG(182, *YYCURSOR);
                yych = *++YYCURSOR;
@@ -2237,13 +2253,13 @@ yy183:
 yy184:
                YYDEBUG(184, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 347 "Zend/zend_ini_scanner.l"
+#line 363 "Zend/zend_ini_scanner.l"
                { /* End of section */
        BEGIN(INITIAL);
        SCNG(lineno)++;
        return ']';
 }
-#line 2247 "Zend/zend_ini_scanner.c"
+#line 2263 "Zend/zend_ini_scanner.c"
 yy185:
                YYDEBUG(185, *YYCURSOR);
                ++YYCURSOR;
@@ -2555,7 +2571,7 @@ yy210:
                ++YYCURSOR;
                YYDEBUG(213, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 338 "Zend/zend_ini_scanner.l"
+#line 354 "Zend/zend_ini_scanner.l"
                { /* Raw string */
        /* Eat leading and trailing single quotes */
        if (yytext[0] == '\'' && yytext[yyleng - 1] == '\'') {
@@ -2564,18 +2580,18 @@ yy210:
        }
        RETURN_TOKEN(TC_RAW, yytext, yyleng);
 }
-#line 2568 "Zend/zend_ini_scanner.c"
+#line 2584 "Zend/zend_ini_scanner.c"
 yy214:
                YYDEBUG(214, *YYCURSOR);
                ++YYCURSOR;
                YYDEBUG(215, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 368 "Zend/zend_ini_scanner.l"
+#line 384 "Zend/zend_ini_scanner.l"
                { /* Variable start */
        yy_push_state(ST_VARNAME TSRMLS_CC);
        return TC_DOLLAR_CURLY;
 }
-#line 2579 "Zend/zend_ini_scanner.c"
+#line 2595 "Zend/zend_ini_scanner.c"
 yy216:
                YYDEBUG(216, *YYCURSOR);
                yyaccept = 0;
@@ -2754,12 +2770,12 @@ yy221:
 yy222:
                YYDEBUG(222, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 525 "Zend/zend_ini_scanner.l"
+#line 541 "Zend/zend_ini_scanner.l"
                { /* End of option value (if EOF is reached before EOL */
        BEGIN(INITIAL);
        return END_OF_LINE;
 }
-#line 2763 "Zend/zend_ini_scanner.c"
+#line 2779 "Zend/zend_ini_scanner.c"
 yy223:
                YYDEBUG(223, *YYCURSOR);
                yyaccept = 0;
@@ -2768,11 +2784,11 @@ yy223:
 yy224:
                YYDEBUG(224, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 444 "Zend/zend_ini_scanner.l"
+#line 460 "Zend/zend_ini_scanner.l"
                { /* Get everything else as option/offset value */
        RETURN_TOKEN(TC_STRING, yytext, yyleng);
 }
-#line 2776 "Zend/zend_ini_scanner.c"
+#line 2792 "Zend/zend_ini_scanner.c"
 yy225:
                YYDEBUG(225, *YYCURSOR);
                yyaccept = 1;
@@ -2781,24 +2797,24 @@ yy225:
 yy226:
                YYDEBUG(226, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 498 "Zend/zend_ini_scanner.l"
+#line 514 "Zend/zend_ini_scanner.l"
                {
        RETURN_TOKEN(TC_WHITESPACE, yytext, yyleng);
 }
-#line 2789 "Zend/zend_ini_scanner.c"
+#line 2805 "Zend/zend_ini_scanner.c"
 yy227:
                YYDEBUG(227, *YYCURSOR);
                ++YYCURSOR;
 yy228:
                YYDEBUG(228, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 416 "Zend/zend_ini_scanner.l"
+#line 432 "Zend/zend_ini_scanner.l"
                { /* End of option value */
        BEGIN(INITIAL);
        SCNG(lineno)++;
        return END_OF_LINE;
 }
-#line 2802 "Zend/zend_ini_scanner.c"
+#line 2818 "Zend/zend_ini_scanner.c"
 yy229:
                YYDEBUG(229, *YYCURSOR);
                yych = *++YYCURSOR;
@@ -2812,23 +2828,23 @@ yy230:
 yy231:
                YYDEBUG(231, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 434 "Zend/zend_ini_scanner.l"
+#line 450 "Zend/zend_ini_scanner.l"
                { /* Boolean operators */
        return yytext[0];
 }
-#line 2820 "Zend/zend_ini_scanner.c"
+#line 2836 "Zend/zend_ini_scanner.c"
 yy232:
                YYDEBUG(232, *YYCURSOR);
                ++YYCURSOR;
 yy233:
                YYDEBUG(233, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 452 "Zend/zend_ini_scanner.l"
+#line 468 "Zend/zend_ini_scanner.l"
                { /* Double quoted '"' string start */
        yy_push_state(ST_DOUBLE_QUOTES TSRMLS_CC);
        return '"';
 }
-#line 2832 "Zend/zend_ini_scanner.c"
+#line 2848 "Zend/zend_ini_scanner.c"
 yy234:
                YYDEBUG(234, *YYCURSOR);
                yych = *++YYCURSOR;
@@ -2904,11 +2920,11 @@ yy238:
 yy239:
                YYDEBUG(239, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 426 "Zend/zend_ini_scanner.l"
+#line 442 "Zend/zend_ini_scanner.l"
                { /* Get number option value as string */
        RETURN_TOKEN(TC_NUMBER, yytext, yyleng);
 }
-#line 2912 "Zend/zend_ini_scanner.c"
+#line 2928 "Zend/zend_ini_scanner.c"
 yy240:
                YYDEBUG(240, *YYCURSOR);
                yyaccept = 2;
@@ -2919,13 +2935,13 @@ yy241:
                ++YYCURSOR;
                YYDEBUG(242, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 438 "Zend/zend_ini_scanner.l"
+#line 454 "Zend/zend_ini_scanner.l"
                { /* Make = used in option value to trigger error */
        yyless(0);
        BEGIN(INITIAL);
        return END_OF_LINE;
 }
-#line 2929 "Zend/zend_ini_scanner.c"
+#line 2945 "Zend/zend_ini_scanner.c"
 yy243:
                YYDEBUG(243, *YYCURSOR);
                yyaccept = 4;
@@ -2961,11 +2977,11 @@ yy243:
 yy244:
                YYDEBUG(244, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 422 "Zend/zend_ini_scanner.l"
+#line 438 "Zend/zend_ini_scanner.l"
                { /* Get constant option value */
        RETURN_TOKEN(TC_CONSTANT, yytext, yyleng);
 }
-#line 2969 "Zend/zend_ini_scanner.c"
+#line 2985 "Zend/zend_ini_scanner.c"
 yy245:
                YYDEBUG(245, *YYCURSOR);
                yyaccept = 4;
@@ -3457,11 +3473,11 @@ yy260:
 yy261:
                YYDEBUG(261, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 382 "Zend/zend_ini_scanner.l"
+#line 398 "Zend/zend_ini_scanner.l"
                { /* TRUE value (when used outside option value/offset this causes parse error!) */
        RETURN_TOKEN(BOOL_TRUE, "1", 1);
 }
-#line 3465 "Zend/zend_ini_scanner.c"
+#line 3481 "Zend/zend_ini_scanner.c"
 yy262:
                YYDEBUG(262, *YYCURSOR);
                ++YYCURSOR;
@@ -3661,11 +3677,11 @@ yy267:
 yy268:
                YYDEBUG(268, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 386 "Zend/zend_ini_scanner.l"
+#line 402 "Zend/zend_ini_scanner.l"
                { /* FALSE value (when used outside option value/offset this causes parse error!)*/
        RETURN_TOKEN(BOOL_FALSE, "", 0);
 }
-#line 3669 "Zend/zend_ini_scanner.c"
+#line 3685 "Zend/zend_ini_scanner.c"
 yy269:
                YYDEBUG(269, *YYCURSOR);
                ++YYCURSOR;
@@ -4041,13 +4057,13 @@ yy280:
 yy281:
                YYDEBUG(281, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 512 "Zend/zend_ini_scanner.l"
+#line 528 "Zend/zend_ini_scanner.l"
                { /* Comment */
        BEGIN(INITIAL);
        SCNG(lineno)++;
        return END_OF_LINE;
 }
-#line 4051 "Zend/zend_ini_scanner.c"
+#line 4067 "Zend/zend_ini_scanner.c"
 yy282:
                YYDEBUG(282, *YYCURSOR);
                yych = *++YYCURSOR;
@@ -4259,7 +4275,7 @@ yy291:
                ++YYCURSOR;
                YYDEBUG(294, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 338 "Zend/zend_ini_scanner.l"
+#line 354 "Zend/zend_ini_scanner.l"
                { /* Raw string */
        /* Eat leading and trailing single quotes */
        if (yytext[0] == '\'' && yytext[yyleng - 1] == '\'') {
@@ -4268,18 +4284,18 @@ yy291:
        }
        RETURN_TOKEN(TC_RAW, yytext, yyleng);
 }
-#line 4272 "Zend/zend_ini_scanner.c"
+#line 4288 "Zend/zend_ini_scanner.c"
 yy295:
                YYDEBUG(295, *YYCURSOR);
                ++YYCURSOR;
                YYDEBUG(296, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 368 "Zend/zend_ini_scanner.l"
+#line 384 "Zend/zend_ini_scanner.l"
                { /* Variable start */
        yy_push_state(ST_VARNAME TSRMLS_CC);
        return TC_DOLLAR_CURLY;
 }
-#line 4283 "Zend/zend_ini_scanner.c"
+#line 4299 "Zend/zend_ini_scanner.c"
 yy297:
                YYDEBUG(297, *YYCURSOR);
                ++YYCURSOR;
@@ -4408,32 +4424,32 @@ yyc_ST_VARNAME:
 yy307:
                YYDEBUG(307, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 373 "Zend/zend_ini_scanner.l"
+#line 389 "Zend/zend_ini_scanner.l"
                { /* Variable name */
        RETURN_TOKEN(TC_VARNAME, yytext, yyleng);
 }
-#line 4416 "Zend/zend_ini_scanner.c"
+#line 4432 "Zend/zend_ini_scanner.c"
 yy308:
                YYDEBUG(308, *YYCURSOR);
                ++YYCURSOR;
                YYDEBUG(309, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 530 "Zend/zend_ini_scanner.l"
+#line 546 "Zend/zend_ini_scanner.l"
                {
        return 0;
 }
-#line 4426 "Zend/zend_ini_scanner.c"
+#line 4442 "Zend/zend_ini_scanner.c"
 yy310:
                YYDEBUG(310, *YYCURSOR);
                ++YYCURSOR;
                YYDEBUG(311, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 377 "Zend/zend_ini_scanner.l"
+#line 393 "Zend/zend_ini_scanner.l"
                { /* Variable end */
        yy_pop_state(TSRMLS_C);
        return '}';
 }
-#line 4437 "Zend/zend_ini_scanner.c"
+#line 4453 "Zend/zend_ini_scanner.c"
 yy312:
                YYDEBUG(312, *YYCURSOR);
                ++YYCURSOR;
@@ -4447,6 +4463,6 @@ yy313:
                goto yy307;
        }
 }
-#line 534 "Zend/zend_ini_scanner.l"
+#line 550 "Zend/zend_ini_scanner.l"
 
 }

diff --git a/Zend/zend_ini_scanner_defs.h b/Zend/zend_ini_scanner_defs.h
index c8b45e6d9cb9da6b15e5deacf7626172a3d6c3c9..1984e2afed19a0dffe2a375ec0c12432a76d9c31 100644 (file)
--- a/Zend/zend_ini_scanner_defs.h
+++ b/Zend/zend_ini_scanner_defs.h
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.13.5 on Fri Aug  7 17:14:49 2009 */
+/* Generated by re2c 0.13.5 on Fri Aug  7 18:41:19 2009 */
 #line 3 "Zend/zend_ini_scanner_defs.h"
 
 enum YYCONDTYPE {