com php-src: Merge branch 'PHP-5.6' into PHP-7.0: Zend/zend_i ni_scanner.c Zend/zend_ini_scanner.l
| From: | Xinchen Hui | Date: | Tue, 20 Oct 2015 05:26:02 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.6' into PHP-7.0: Zend/zend_i ni_scanner.c Zend/zend_ini_scanner.l | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-89471@lists.php.net to get a copy of this message | ||
Commit: c7cb40353c8a31a3e0037ed387c5e32cb05b1da0
Author: Xinchen Hui <laruence@gmail.com> Tue, 20 Oct 2015 13:26:02 +0800
Parents: 131a348d37a2386dd71530ad380da0773dc9b770 d5f76caf6cf334d1bb4ca69662065b3bb34d76c5
Branches: PHP-7.0 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=c7cb40353c8a31a3e0037ed387c5e32cb05b1da0
Log:
Merge branch 'PHP-5.6' into PHP-7.0
Conflicts:
Zend/zend_ini_scanner.c
Changed paths:
MM Zend/zend_ini_scanner.c
MM Zend/zend_ini_scanner.l
diff --cc Zend/zend_ini_scanner.c index e3d9d4d,80bbced..02e7ec5 --- a/Zend/zend_ini_scanner.c +++ b/Zend/zend_ini_scanner.c @@@ -472,6 -471,7 +472,10 @@@ yyc_INITIAL case '|': case '}': case '~': goto yy10; ++<<<<<<< HEAD ++======= + case '#': goto yy12; ++>>>>>>> PHP-5.6 case '%': case '\'': case '*': @@@ -485,27 -485,27 +489,48 @@@ case '>': case '?': case '@': ++<<<<<<< HEAD + case ']': goto yy12; + case ';': goto yy13; + case '=': goto yy15; + case 'F': + case 'f': goto yy17; + case 'N': + case 'n': goto yy18; + case 'O': + case 'o': goto yy19; + case 'T': + case 't': goto yy20; + case 'Y': + case 'y': goto yy21; + case '[': goto yy22; ++======= + case ']': goto yy13; + case ';': goto yy14; + case '=': goto yy16; + case 'F': + case 'f': goto yy18; + case 'N': + case 'n': goto yy19; + case 'O': + case 'o': goto yy20; + case 'T': + case 't': goto yy21; + case 'Y': + case 'y': goto yy22; + case '[': goto yy23; ++>>>>>>> PHP-5.6 default: goto yy2; } yy2: YYDEBUG(2, *YYCURSOR); ++YYCURSOR; yych = *YYCURSOR; ++<<<<<<< HEAD + goto yy25; ++======= + goto yy26; ++>>>>>>> PHP-5.6 yy3: YYDEBUG(3, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); @@@ -524,7 -524,7 +549,11 @@@ yy4 YYDEBUG(4, *YYCURSOR); yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); ++<<<<<<< HEAD + goto yy63; ++======= + goto yy73; ++>>>>>>> PHP-5.6 yy5: YYDEBUG(5, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); @@@ -549,29 -549,30 +578,52 @@@ yy7 yy8: YYDEBUG(8, *YYCURSOR); yych = *++YYCURSOR; ++<<<<<<< HEAD + if (yych == '\n') goto yy66; ++======= + if (yych == '\n') goto yy76; ++>>>>>>> PHP-5.6 goto yy7; yy9: YYDEBUG(9, *YYCURSOR); yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); - if (yych <= ' ') { + if (yych <= 0x1F) { if (yych <= '\n') { ++<<<<<<< HEAD + if (yych <= 0x08) goto yy25; + if (yych <= '\t') goto yy62; + goto yy66; + } else { + if (yych == '\r') goto yy67; + goto yy25; + } + } else { + if (yych <= ';') { + if (yych <= ' ') goto yy64; + if (yych <= ':') goto yy25; + goto yy57; + } else { + if (yych == '=') goto yy55; + goto yy25; ++======= + if (yych <= 0x08) goto yy26; + if (yych <= '\t') goto yy72; + goto yy76; + } else { + if (yych == '\r') goto yy77; + if (yych <= 0x1F) goto yy26; + goto yy74; + } + } else { + if (yych <= ':') { + if (yych == '#') goto yy63; + goto yy26; + } else { + if (yych <= ';') goto yy58; + if (yych == '=') goto yy56; + goto yy26; ++>>>>>>> PHP-5.6 } } yy10: @@@ -583,97 -584,102 +635,185 @@@ { /* Disallow these chars outside option values */ return yytext[0]; } ++<<<<<<< HEAD +#line 587 "Zend/zend_ini_scanner.c" +yy12: + YYDEBUG(12, *YYCURSOR); + yych = *++YYCURSOR; + goto yy25; +yy13: + YYDEBUG(13, *YYCURSOR); + yyaccept = 2; + yych = *(YYMARKER = ++YYCURSOR); + goto yy58; + YYDEBUG(14, *YYCURSOR); ++======= + #line 588 "Zend/zend_ini_scanner.c" + yy12: + YYDEBUG(12, *YYCURSOR); + yyaccept = 1; + yych = *(YYMARKER = ++YYCURSOR); + goto yy64; + yy13: + YYDEBUG(13, *YYCURSOR); + yych = *++YYCURSOR; + goto yy26; + yy14: + YYDEBUG(14, *YYCURSOR); + yyaccept = 2; + yych = *(YYMARKER = ++YYCURSOR); + goto yy59; + YYDEBUG(15, *YYCURSOR); ++>>>>>>> PHP-5.6 yyleng = YYCURSOR - SCNG(yy_text); -#line 654 "Zend/zend_ini_scanner.l" +#line 648 "Zend/zend_ini_scanner.l" { return 0; } ++<<<<<<< HEAD +#line 603 "Zend/zend_ini_scanner.c" +yy15: + YYDEBUG(15, *YYCURSOR); + ++YYCURSOR; + yych = *YYCURSOR; + goto yy56; +yy16: + YYDEBUG(16, *YYCURSOR); ++======= + #line 609 "Zend/zend_ini_scanner.c" + yy16: + YYDEBUG(16, *YYCURSOR); + ++YYCURSOR; + yych = *YYCURSOR; + goto yy57; + yy17: + YYDEBUG(17, *YYCURSOR); ++>>>>>>> PHP-5.6 yyleng = YYCURSOR - SCNG(yy_text); -#line 490 "Zend/zend_ini_scanner.l" +#line 491 "Zend/zend_ini_scanner.l" { /* Start option value */ if (SCNG(scanner_mode) == ZEND_INI_SCANNER_RAW) { - yy_push_state(ST_RAW TSRMLS_CC); + yy_push_state(ST_RAW); } else { - yy_push_state(ST_VALUE TSRMLS_CC); + yy_push_state(ST_VALUE); } return '='; } ++<<<<<<< HEAD +#line 621 "Zend/zend_ini_scanner.c" +yy17: + YYDEBUG(17, *YYCURSOR); + yych = *++YYCURSOR; + if (yych == 'A') goto yy52; + if (yych == 'a') goto yy52; + goto yy25; +yy18: + YYDEBUG(18, *YYCURSOR); + yych = *++YYCURSOR; + if (yych <= 'U') { + if (yych == 'O') goto yy43; + if (yych <= 'T') goto yy25; + goto yy44; + } else { + if (yych <= 'o') { + if (yych <= 'n') goto yy25; + goto yy43; + } else { + if (yych == 'u') goto yy44; + goto yy25; + } + } +yy19: + YYDEBUG(19, *YYCURSOR); + yych = *++YYCURSOR; + if (yych <= 'N') { + if (yych == 'F') goto yy37; + if (yych <= 'M') goto yy25; + goto yy30; + } else { + if (yych <= 'f') { + if (yych <= 'e') goto yy25; + goto yy37; + } else { + if (yych == 'n') goto yy30; + goto yy25; + } + } +yy20: + YYDEBUG(20, *YYCURSOR); + yych = *++YYCURSOR; + if (yych == 'R') goto yy35; + if (yych == 'r') goto yy35; + goto yy25; +yy21: + YYDEBUG(21, *YYCURSOR); + yych = *++YYCURSOR; + if (yych == 'E') goto yy26; + if (yych == 'e') goto yy26; + goto yy25; +yy22: + YYDEBUG(22, *YYCURSOR); + ++YYCURSOR; + YYDEBUG(23, *YYCURSOR); ++======= + #line 627 "Zend/zend_ini_scanner.c" + yy18: + YYDEBUG(18, *YYCURSOR); + yych = *++YYCURSOR; + if (yych == 'A') goto yy53; + if (yych == 'a') goto yy53; + goto yy26; + yy19: + YYDEBUG(19, *YYCURSOR); + yych = *++YYCURSOR; + if (yych <= 'U') { + if (yych == 'O') goto yy44; + if (yych <= 'T') goto yy26; + goto yy45; + } else { + if (yych <= 'o') { + if (yych <= 'n') goto yy26; + goto yy44; + } else { + if (yych == 'u') goto yy45; + goto yy26; + } + } + yy20: + YYDEBUG(20, *YYCURSOR); + yych = *++YYCURSOR; + if (yych <= 'N') { + if (yych == 'F') goto yy38; + if (yych <= 'M') goto yy26; + goto yy31; + } else { + if (yych <= 'f') { + if (yych <= 'e') goto yy26; + goto yy38; + } else { + if (yych == 'n') goto yy31; + goto yy26; + } + } + yy21: + YYDEBUG(21, *YYCURSOR); + yych = *++YYCURSOR; + if (yych == 'R') goto yy36; + if (yych == 'r') goto yy36; + goto yy26; + yy22: + YYDEBUG(22, *YYCURSOR); + yych = *++YYCURSOR; + if (yych == 'E') goto yy27; + if (yych == 'e') goto yy27; + goto yy26; + yy23: + YYDEBUG(23, *YYCURSOR); + ++YYCURSOR; + YYDEBUG(24, *YYCURSOR); ++>>>>>>> PHP-5.6 yyleng = YYCURSOR - SCNG(yy_text); -#line 405 "Zend/zend_ini_scanner.l" +#line 406 "Zend/zend_ini_scanner.l" { /* Section start */ /* Enter section data lookup state */ if (SCNG(scanner_mode) == ZEND_INI_SCANNER_RAW) { @@@ -683,37 -689,37 +823,69 @@@ } return TC_SECTION; } ++<<<<<<< HEAD +#line 687 "Zend/zend_ini_scanner.c" +yy24: + YYDEBUG(24, *YYCURSOR); + ++YYCURSOR; + YYFILL(1); + yych = *YYCURSOR; +yy25: + YYDEBUG(25, *YYCURSOR); + if (yybm[0+yych] & 16) { + goto yy24; + } + if (yych == '[') goto yy27; + goto yy3; +yy26: + YYDEBUG(26, *YYCURSOR); + yych = *++YYCURSOR; + if (yych == 'S') goto yy30; + if (yych == 's') goto yy30; + goto yy25; +yy27: + YYDEBUG(27, *YYCURSOR); + ++YYCURSOR; + YYFILL(1); + yych = *YYCURSOR; + YYDEBUG(28, *YYCURSOR); + if (yybm[0+yych] & 32) { + goto yy27; + } + YYDEBUG(29, *YYCURSOR); ++======= + #line 693 "Zend/zend_ini_scanner.c" + yy25: + YYDEBUG(25, *YYCURSOR); + ++YYCURSOR; + YYFILL(1); + yych = *YYCURSOR; + yy26: + YYDEBUG(26, *YYCURSOR); + if (yybm[0+yych] & 16) { + goto yy25; + } + if (yych == '[') goto yy28; + goto yy3; + yy27: + YYDEBUG(27, *YYCURSOR); + yych = *++YYCURSOR; + if (yych == 'S') goto yy31; + if (yych == 's') goto yy31; + goto yy26; + yy28: + YYDEBUG(28, *YYCURSOR); + ++YYCURSOR; + YYFILL(1); + yych = *YYCURSOR; + YYDEBUG(29, *YYCURSOR); + if (yybm[0+yych] & 32) { + goto yy28; + } + YYDEBUG(30, *YYCURSOR); ++>>>>>>> PHP-5.6 yyleng = YYCURSOR - SCNG(yy_text); -#line 430 "Zend/zend_ini_scanner.l" +#line 431 "Zend/zend_ini_scanner.l" { /* Start of option with offset */ /* Eat leading whitespace */ EAT_LEADING_WHITESPACE(); @@@ -726,400 -732,487 +898,857 @@@ RETURN_TOKEN(TC_OFFSET, yytext, yyleng); } ++<<<<<<< HEAD +#line 730 "Zend/zend_ini_scanner.c" +yy30: + YYDEBUG(30, *YYCURSOR); + ++YYCURSOR; + YYFILL(1); + yych = *YYCURSOR; + YYDEBUG(31, *YYCURSOR); + if (yybm[0+yych] & 64) { + goto yy30; ++======= + #line 736 "Zend/zend_ini_scanner.c" + yy31: + YYDEBUG(31, *YYCURSOR); + ++YYCURSOR; + YYFILL(1); + yych = *YYCURSOR; + YYDEBUG(32, *YYCURSOR); + if (yybm[0+yych] & 64) { + goto yy31; ++>>>>>>> PHP-5.6 } if (yych <= '\'') { if (yych <= ' ') { if (yych <= '\n') { ++<<<<<<< HEAD + if (yych <= 0x08) goto yy24; + if (yych <= '\t') goto yy33; + } else { + if (yych != '\r') goto yy24; + } + } else { + if (yych <= '$') { + if (yych == '#') goto yy24; + } else { + if (yych != '&') goto yy24; ++======= + if (yych <= 0x08) goto yy25; + if (yych <= '\t') goto yy34; + } else { + if (yych != '\r') goto yy25; + } + } else { + if (yych <= '$') { + if (yych == '#') goto yy25; + } else { + if (yych != '&') goto yy25; ++>>>>>>> PHP-5.6 } } } else { if (yych <= 'Z') { if (yych <= ';') { ++<<<<<<< HEAD + if (yych <= ')') goto yy32; + if (yych <= ':') goto yy24; + } else { + if (yych != '=') goto yy24; + } + } else { + if (yych <= '^') { + if (yych <= '[') goto yy27; + if (yych <= ']') goto yy24; + } else { + if (yych <= 'z') goto yy24; + if (yych >= 0x7F) goto yy24; + } + } + } +yy32: + YYDEBUG(32, *YYCURSOR); ++======= + if (yych <= ')') goto yy33; + if (yych <= ':') goto yy25; + } else { + if (yych != '=') goto yy25; + } + } else { + if (yych <= '^') { + if (yych <= '[') goto yy28; + if (yych <= ']') goto yy25; + } else { + if (yych <= 'z') goto yy25; + if (yych >= 0x7F) goto yy25; + } + } + } + yy33: + YYDEBUG(33, *YYCURSOR); ++>>>>>>> PHP-5.6 yyleng = YYCURSOR - SCNG(yy_text); -#line 468 "Zend/zend_ini_scanner.l" +#line 469 "Zend/zend_ini_scanner.l" { /* TRUE value (when used outside option value/offset this causes parse error!) */ RETURN_TOKEN(BOOL_TRUE, "1", 1); } ++<<<<<<< HEAD +#line 780 "Zend/zend_ini_scanner.c" +yy33: + YYDEBUG(33, *YYCURSOR); + ++YYCURSOR; + YYFILL(1); + yych = *YYCURSOR; + YYDEBUG(34, *YYCURSOR); + if (yych == '\t') goto yy33; + if (yych == ' ') goto yy33; + goto yy32; +yy35: + YYDEBUG(35, *YYCURSOR); + yych = *++YYCURSOR; + if (yych == 'U') goto yy36; + if (yych != 'u') goto yy25; +yy36: + YYDEBUG(36, *YYCURSOR); + yych = *++YYCURSOR; + if (yych == 'E') goto yy30; + if (yych == 'e') goto yy30; + goto yy25; +yy37: + YYDEBUG(37, *YYCURSOR); + yych = *++YYCURSOR; + if (yych == 'F') goto yy38; + if (yych != 'f') goto yy25; +yy38: + YYDEBUG(38, *YYCURSOR); + ++YYCURSOR; + YYFILL(1); + yych = *YYCURSOR; + YYDEBUG(39, *YYCURSOR); + if (yych <= '&') { + if (yych <= 0x1F) { + if (yych <= '\n') { + if (yych <= 0x08) goto yy24; + if (yych <= '\t') goto yy41; + } else { + if (yych != '\r') goto yy24; + } + } else { + if (yych <= '#') { + if (yych <= ' ') goto yy38; + if (yych >= '#') goto yy24; + } else { + if (yych == '%') goto yy24; ++======= + #line 786 "Zend/zend_ini_scanner.c" + yy34: + YYDEBUG(34, *YYCURSOR); + ++YYCURSOR; + YYFILL(1); + yych = *YYCURSOR; + YYDEBUG(35, *YYCURSOR); + if (yych == '\t') goto yy34; + if (yych == ' ') goto yy34; + goto yy33; + yy36: + YYDEBUG(36, *YYCURSOR); + yych = *++YYCURSOR; + if (yych == 'U') goto yy37; + if (yych != 'u') goto yy26; + yy37: + YYDEBUG(37, *YYCURSOR); + yych = *++YYCURSOR; + if (yych == 'E') goto yy31; + if (yych == 'e') goto yy31; + goto yy26; + yy38: + YYDEBUG(38, *YYCURSOR); + yych = *++YYCURSOR; + if (yych == 'F') goto yy39; + if (yych != 'f') goto yy26; + yy39: + YYDEBUG(39, *YYCURSOR); + ++YYCURSOR; + YYFILL(1); + yych = *YYCURSOR; + YYDEBUG(40, *YYCURSOR); + if (yych <= '&') { + if (yych <= 0x1F) { + if (yych <= '\n') { + if (yych <= 0x08) goto yy25; + if (yych <= '\t') goto yy42; + } else { + if (yych != '\r') goto yy25; + } + } else { + if (yych <= '#') { + if (yych <= ' ') goto yy39; + if (yych >= '#') goto yy25; + } else { + if (yych == '%') goto yy25; ++>>>>>>> PHP-5.6 } } } else { if (yych <= '=') { if (yych <= ':') { ++<<<<<<< HEAD + if (yych <= '\'') goto yy24; + if (yych >= '*') goto yy24; + } else { + if (yych == '<') goto yy24; + } + } else { + if (yych <= ']') { + if (yych == '[') goto yy27; + goto yy24; + } else { + if (yych <= '^') goto yy40; + if (yych <= 'z') goto yy24; + if (yych >= 0x7F) goto yy24; + } + } + } +yy40: + YYDEBUG(40, *YYCURSOR); ++======= + if (yych <= '\'') goto yy25; + if (yych >= '*') goto yy25; + } else { + if (yych == '<') goto yy25; + } + } else { + if (yych <= ']') { + if (yych == '[') goto yy28; + goto yy25; + } else { + if (yych <= '^') goto yy41; + if (yych <= 'z') goto yy25; + if (yych >= 0x7F) goto yy25; + } + } + } + yy41: + YYDEBUG(41, *YYCURSOR); ++>>>>>>> PHP-5.6 yyleng = YYCURSOR - SCNG(yy_text); -#line 472 "Zend/zend_ini_scanner.l" +#line 473 "Zend/zend_ini_scanner.l" { /* FALSE value (when used outside option value/offset this causes parse error!)*/ RETURN_TOKEN(BOOL_FALSE, "", 0); } ++<<<<<<< HEAD +#line 854 "Zend/zend_ini_scanner.c" +yy41: + YYDEBUG(41, *YYCURSOR); + ++YYCURSOR; + YYFILL(1); + yych = *YYCURSOR; + YYDEBUG(42, *YYCURSOR); + if (yych == '\t') goto yy41; + if (yych == ' ') goto yy41; + goto yy40; +yy43: + YYDEBUG(43, *YYCURSOR); ++======= + #line 860 "Zend/zend_ini_scanner.c" + yy42: + YYDEBUG(42, *YYCURSOR); + ++YYCURSOR; + YYFILL(1); + yych = *YYCURSOR; + YYDEBUG(43, *YYCURSOR); + if (yych == '\t') goto yy42; + if (yych == ' ') goto yy42; + goto yy41; + yy44: + YYDEBUG(44, *YYCURSOR); ++>>>>>>> PHP-5.6 yych = *++YYCURSOR; if (yych <= '\'') { if (yych <= 0x1F) { if (yych <= '\n') { ++<<<<<<< HEAD + if (yych <= 0x08) goto yy25; + if (yych <= '\t') goto yy41; + goto yy40; + } else { + if (yych == '\r') goto yy40; + goto yy25; + } + } else { + if (yych <= '#') { + if (yych <= ' ') goto yy38; + if (yych <= '"') goto yy40; + goto yy25; + } else { + if (yych == '%') goto yy25; + if (yych <= '&') goto yy40; + goto yy25; ++======= + if (yych <= 0x08) goto yy26; + if (yych <= '\t') goto yy42; + goto yy41; + } else { + if (yych == '\r') goto yy41; + goto yy26; + } + } else { + if (yych <= '#') { + if (yych <= ' ') goto yy39; + if (yych <= '"') goto yy41; + goto yy26; + } else { + if (yych == '%') goto yy26; + if (yych <= '&') goto yy41; + goto yy26; ++>>>>>>> PHP-5.6 } } } else { if (yych <= 'N') { if (yych <= ';') { ++<<<<<<< HEAD + if (yych <= ')') goto yy40; + if (yych <= ':') goto yy25; + goto yy40; + } else { + if (yych == '=') goto yy40; + if (yych <= 'M') goto yy25; + goto yy51; + } + } else { + if (yych <= 'm') { + if (yych == '^') goto yy40; + goto yy25; + } else { + if (yych <= 'n') goto yy51; + if (yych <= 'z') goto yy25; + if (yych <= '~') goto yy40; + goto yy25; + } + } + } +yy44: + YYDEBUG(44, *YYCURSOR); + yych = *++YYCURSOR; + if (yych == 'L') goto yy45; + if (yych != 'l') goto yy25; +yy45: + YYDEBUG(45, *YYCURSOR); + yych = *++YYCURSOR; + if (yych == 'L') goto yy46; + if (yych != 'l') goto yy25; +yy46: + YYDEBUG(46, *YYCURSOR); + ++YYCURSOR; + YYFILL(1); + yych = *YYCURSOR; + YYDEBUG(47, *YYCURSOR); + if (yych <= '&') { + if (yych <= 0x1F) { + if (yych <= '\n') { + if (yych <= 0x08) goto yy24; + if (yych <= '\t') goto yy49; + } else { + if (yych != '\r') goto yy24; + } + } else { + if (yych <= '#') { + if (yych <= ' ') goto yy46; + if (yych >= '#') goto yy24; + } else { + if (yych == '%') goto yy24; ++======= + if (yych <= ')') goto yy41; + if (yych <= ':') goto yy26; + goto yy41; + } else { + if (yych == '=') goto yy41; + if (yych <= 'M') goto yy26; + goto yy52; + } + } else { + if (yych <= 'm') { + if (yych == '^') goto yy41; + goto yy26; + } else { + if (yych <= 'n') goto yy52; + if (yych <= 'z') goto yy26; + if (yych <= '~') goto yy41; + goto yy26; + } + } + } + yy45: + YYDEBUG(45, *YYCURSOR); + yych = *++YYCURSOR; + if (yych == 'L') goto yy46; + if (yych != 'l') goto yy26; + yy46: + YYDEBUG(46, *YYCURSOR); + yych = *++YYCURSOR; + if (yych == 'L') goto yy47; + if (yych != 'l') goto yy26; + yy47: + YYDEBUG(47, *YYCURSOR); + ++YYCURSOR; + YYFILL(1); + yych = *YYCURSOR; + YYDEBUG(48, *YYCURSOR); + if (yych <= '&') { + if (yych <= 0x1F) { + if (yych <= '\n') { + if (yych <= 0x08) goto yy25; + if (yych <= '\t') goto yy50; + } else { + if (yych != '\r') goto yy25; + } + } else { + if (yych <= '#') { + if (yych <= ' ') goto yy47; + if (yych >= '#') goto yy25; + } else { + if (yych == '%') goto yy25; ++>>>>>>> PHP-5.6 } } } else { if (yych <= '=') { if (yych <= ':') { ++<<<<<<< HEAD + if (yych <= '\'') goto yy24; + if (yych >= '*') goto yy24; + } else { + if (yych == '<') goto yy24; + } + } else { + if (yych <= ']') { + if (yych == '[') goto yy27; + goto yy24; + } else { + if (yych <= '^') goto yy48; + if (yych <= 'z') goto yy24; + if (yych >= 0x7F) goto yy24; + } + } + } +yy48: + YYDEBUG(48, *YYCURSOR); ++======= + if (yych <= '\'') goto yy25; + if (yych >= '*') goto yy25; + } else { + if (yych == '<') goto yy25; + } + } else { + if (yych <= ']') { + if (yych == '[') goto yy28; + goto yy25; + } else { + if (yych <= '^') goto yy49; + if (yych <= 'z') goto yy25; + if (yych >= 0x7F) goto yy25; + } + } + } + yy49: + YYDEBUG(49, *YYCURSOR); ++>>>>>>> PHP-5.6 yyleng = YYCURSOR - SCNG(yy_text); -#line 476 "Zend/zend_ini_scanner.l" +#line 477 "Zend/zend_ini_scanner.l" { RETURN_TOKEN(NULL_NULL, "", 0); } ++<<<<<<< HEAD +#line 969 "Zend/zend_ini_scanner.c" +yy49: + YYDEBUG(49, *YYCURSOR); + ++YYCURSOR; + YYFILL(1); + yych = *YYCURSOR; + YYDEBUG(50, *YYCURSOR); + if (yych == '\t') goto yy49; + if (yych == ' ') goto yy49; + goto yy48; +yy51: + YYDEBUG(51, *YYCURSOR); + yych = *++YYCURSOR; + if (yych == 'E') goto yy38; + if (yych == 'e') goto yy38; + goto yy25; +yy52: + YYDEBUG(52, *YYCURSOR); + yych = *++YYCURSOR; + if (yych == 'L') goto yy53; + if (yych != 'l') goto yy25; +yy53: + YYDEBUG(53, *YYCURSOR); + yych = *++YYCURSOR; + if (yych == 'S') goto yy54; + if (yych != 's') goto yy25; +yy54: + YYDEBUG(54, *YYCURSOR); + yych = *++YYCURSOR; + if (yych == 'E') goto yy38; + if (yych == 'e') goto yy38; + goto yy25; +yy55: + YYDEBUG(55, *YYCURSOR); + ++YYCURSOR; + YYFILL(1); + yych = *YYCURSOR; +yy56: + YYDEBUG(56, *YYCURSOR); + if (yych == '\t') goto yy55; + if (yych == ' ') goto yy55; + goto yy16; +yy57: + YYDEBUG(57, *YYCURSOR); ++======= + #line 975 "Zend/zend_ini_scanner.c" + yy50: + YYDEBUG(50, *YYCURSOR); + ++YYCURSOR; + YYFILL(1); + yych = *YYCURSOR; + YYDEBUG(51, *YYCURSOR); + if (yych == '\t') goto yy50; + if (yych == ' ') goto yy50; + goto yy49; + yy52: + YYDEBUG(52, *YYCURSOR); + yych = *++YYCURSOR; + if (yych == 'E') goto yy39; + if (yych == 'e') goto yy39; + goto yy26; + yy53: + YYDEBUG(53, *YYCURSOR); + yych = *++YYCURSOR; + if (yych == 'L') goto yy54; + if (yych != 'l') goto yy26; + yy54: + YYDEBUG(54, *YYCURSOR); + yych = *++YYCURSOR; + if (yych == 'S') goto yy55; + if (yych != 's') goto yy26; + yy55: + YYDEBUG(55, *YYCURSOR); + yych = *++YYCURSOR; + if (yych == 'E') goto yy39; + if (yych == 'e') goto yy39; + goto yy26; + yy56: + YYDEBUG(56, *YYCURSOR); ++>>>>>>> PHP-5.6 ++YYCURSOR; - YYFILL(1); + YYFILL(2); yych = *YYCURSOR; + yy57: + YYDEBUG(57, *YYCURSOR); + if (yych == '\t') goto yy56; + if (yych == ' ') goto yy56; + goto yy17; yy58: YYDEBUG(58, *YYCURSOR); ++<<<<<<< HEAD + if (yybm[0+yych] & 128) { + goto yy57; + } + if (yych >= '\r') goto yy61; +yy59: + YYDEBUG(59, *YYCURSOR); + ++YYCURSOR; +yy60: + YYDEBUG(60, *YYCURSOR); ++======= + ++YYCURSOR; + YYFILL(2); + yych = *YYCURSOR; + yy59: + YYDEBUG(59, *YYCURSOR); + if (yybm[0+yych] & 128) { + goto yy58; + } + if (yych >= '\r') goto yy62; + yy60: + YYDEBUG(60, *YYCURSOR); + ++YYCURSOR; + yy61: + YYDEBUG(61, *YYCURSOR); ++>>>>>>> PHP-5.6 yyleng = YYCURSOR - SCNG(yy_text); -#line 636 "Zend/zend_ini_scanner.l" +#line 637 "Zend/zend_ini_scanner.l" { /* Comment */ BEGIN(INITIAL); SCNG(lineno)++; return END_OF_LINE; } ++<<<<<<< HEAD +#line 1034 "Zend/zend_ini_scanner.c" +yy61: + YYDEBUG(61, *YYCURSOR); + yych = *++YYCURSOR; + if (yych == '\n') goto yy59; + goto yy60; +yy62: + YYDEBUG(62, *YYCURSOR); ++======= + #line 1040 "Zend/zend_ini_scanner.c" + yy62: + YYDEBUG(62, *YYCURSOR); + yych = *++YYCURSOR; + if (yych == '\n') goto yy60; + goto yy61; + yy63: + YYDEBUG(63, *YYCURSOR); + yyaccept = 1; + YYMARKER = ++YYCURSOR; + YYFILL(2); + yych = *YYCURSOR; + yy64: + YYDEBUG(64, *YYCURSOR); + if (yych <= '\'') { + if (yych <= ' ') { + if (yych <= '\n') { + if (yych <= 0x08) goto yy63; + if (yych >= '\n') goto yy69; + } else { + if (yych == '\r') goto yy71; + goto yy63; + } + } else { + if (yych <= '$') { + if (yych == '#') goto yy63; + } else { + if (yych != '&') goto yy63; + } + } + } else { + if (yych <= 'Z') { + if (yych <= ';') { + if (yych <= ')') goto yy65; + if (yych <= ':') goto yy63; + } else { + if (yych != '=') goto yy63; + } + } else { + if (yych <= '^') { + if (yych <= '[') goto yy67; + if (yych <= ']') goto yy63; + } else { + if (yych <= 'z') goto yy63; + if (yych >= 0x7F) goto yy63; + } + } + } + yy65: + YYDEBUG(65, *YYCURSOR); + ++YYCURSOR; + YYFILL(2); + yych = *YYCURSOR; + YYDEBUG(66, *YYCURSOR); + if (yych == '\n') goto yy69; + if (yych == '\r') goto yy71; + goto yy65; + yy67: + YYDEBUG(67, *YYCURSOR); + yyaccept = 3; + YYMARKER = ++YYCURSOR; + YYFILL(2); + yych = *YYCURSOR; + YYDEBUG(68, *YYCURSOR); + if (yych <= '\f') { + if (yych <= 0x08) goto yy65; + if (yych <= '\t') goto yy67; + if (yych >= '\v') goto yy65; + } else { + if (yych <= '\r') goto yy71; + if (yych == ' ') goto yy67; + goto yy65; + } + yy69: + YYDEBUG(69, *YYCURSOR); + ++YYCURSOR; + yy70: + YYDEBUG(70, *YYCURSOR); + yyleng = YYCURSOR - SCNG(yy_text); + #line 642 "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 1126 "Zend/zend_ini_scanner.c" + yy71: + YYDEBUG(71, *YYCURSOR); + yych = *++YYCURSOR; + if (yych == '\n') goto yy69; + goto yy70; + yy72: + YYDEBUG(72, *YYCURSOR); ++>>>>>>> PHP-5.6 yyaccept = 0; YYMARKER = ++YYCURSOR; YYFILL(2); yych = *YYCURSOR; ++<<<<<<< HEAD +yy63: + YYDEBUG(63, *YYCURSOR); + if (yych <= 0x1F) { + if (yych <= '\n') { + if (yych <= 0x08) goto yy5; + if (yych <= '\t') goto yy62; + goto yy66; + } else { + if (yych == '\r') goto yy67; + goto yy5; + } + } else { + if (yych <= ';') { + if (yych <= ' ') goto yy62; + if (yych <= ':') goto yy5; + goto yy57; + } else { + if (yych == '=') goto yy55; + goto yy5; + } + } +yy64: + YYDEBUG(64, *YYCURSOR); ++======= + yy73: + YYDEBUG(73, *YYCURSOR); + if (yych <= ' ') { + if (yych <= '\n') { + if (yych <= 0x08) goto yy5; + if (yych <= '\t') goto yy72; + goto yy76; + } else { + if (yych == '\r') goto yy77; + if (yych <= 0x1F) goto yy5; + goto yy72; + } + } else { + if (yych <= ':') { + if (yych == '#') goto yy65; + goto yy5; + } else { + if (yych <= ';') goto yy58; + if (yych == '=') goto yy56; + goto yy5; + } + } + yy74: + YYDEBUG(74, *YYCURSOR); ++>>>>>>> PHP-5.6 yyaccept = 1; YYMARKER = ++YYCURSOR; YYFILL(2); yych = *YYCURSOR; - YYDEBUG(75, *YYCURSOR); ++<<<<<<< HEAD + YYDEBUG(65, *YYCURSOR); + if (yych <= '&') { + if (yych <= 0x1F) { + if (yych <= '\n') { + if (yych <= 0x08) goto yy24; + if (yych <= '\t') goto yy62; + } else { + if (yych == '\r') goto yy67; + goto yy24; + } + } else { + if (yych <= '#') { + if (yych <= ' ') goto yy64; + if (yych <= '"') goto yy3; + goto yy24; + } else { + if (yych == '%') goto yy24; ++======= ++ YYDEBUG(75, *YYCURSOR); + if (yych <= '&') { + if (yych <= 0x1F) { + if (yych <= '\n') { + if (yych <= 0x08) goto yy25; + if (yych <= '\t') goto yy72; + } else { + if (yych == '\r') goto yy77; + goto yy25; + } + } else { + if (yych <= '#') { + if (yych <= ' ') goto yy74; + if (yych <= '"') goto yy3; + goto yy63; + } else { + if (yych == '%') goto yy25; ++>>>>>>> PHP-5.6 goto yy3; } } } else { if (yych <= '=') { if (yych <= ':') { ++<<<<<<< HEAD + if (yych <= '\'') goto yy24; + if (yych <= ')') goto yy3; + goto yy24; + } else { + if (yych <= ';') goto yy57; + if (yych <= '<') goto yy24; + goto yy55; + } + } else { + if (yych <= ']') { + if (yych == '[') goto yy27; + goto yy24; + } else { + if (yych <= '^') goto yy3; + if (yych <= 'z') goto yy24; + if (yych <= '~') goto yy3; + goto yy24; + } + } + } +yy66: + YYDEBUG(66, *YYCURSOR); + yych = *++YYCURSOR; + goto yy7; +yy67: + YYDEBUG(67, *YYCURSOR); + ++YYCURSOR; + if ((yych = *YYCURSOR) == '\n') goto yy66; ++======= + if (yych <= '\'') goto yy25; + if (yych <= ')') goto yy3; + goto yy25; + } else { + if (yych <= ';') goto yy58; + if (yych <= '<') goto yy25; + goto yy56; + } + } else { + if (yych <= ']') { + if (yych == '[') goto yy28; + goto yy25; + } else { + if (yych <= '^') goto yy3; + if (yych <= 'z') goto yy25; + if (yych <= '~') goto yy3; + goto yy25; + } + } + } + yy76: + YYDEBUG(76, *YYCURSOR); + yych = *++YYCURSOR; + goto yy7; + yy77: + YYDEBUG(77, *YYCURSOR); + ++YYCURSOR; + if ((yych = *YYCURSOR) == '\n') goto yy76; ++>>>>>>> PHP-5.6 goto yy7; } /* *********************************** */ @@@ -1159,17 -1252,17 +1788,29 @@@ yyc_ST_DOUBLE_QUOTES 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, }; ++<<<<<<< HEAD + YYDEBUG(68, *YYCURSOR); + YYFILL(2); + yych = *YYCURSOR; + if (yych == '"') goto yy72; + if (yych == '$') goto yy74; + YYDEBUG(70, *YYCURSOR); + ++YYCURSOR; +yy71: + YYDEBUG(71, *YYCURSOR); ++======= + YYDEBUG(78, *YYCURSOR); + YYFILL(2); + yych = *YYCURSOR; + if (yych == '"') goto yy82; + if (yych == '$') goto yy84; + YYDEBUG(80, *YYCURSOR); + ++YYCURSOR; + yy81: + YYDEBUG(81, *YYCURSOR); ++>>>>>>> PHP-5.6 yyleng = YYCURSOR - SCNG(yy_text); -#line 586 "Zend/zend_ini_scanner.l" +#line 587 "Zend/zend_ini_scanner.l" { /* Escape double quoted string contents */ if (YYCURSOR > YYLIMIT) { return 0; @@@ -1201,50 -1294,50 +1842,87 @@@ } yyleng = YYCURSOR - SCNG(yy_text); - - zend_ini_escape_string(ini_lval, yytext, yyleng, '"' TSRMLS_CC); + + zend_ini_escape_string(ini_lval, yytext, yyleng, '"'); return TC_QUOTED_STRING; } ++<<<<<<< HEAD +#line 1209 "Zend/zend_ini_scanner.c" +yy72: + YYDEBUG(72, *YYCURSOR); + ++YYCURSOR; + yych = *YYCURSOR; + goto yy78; +yy73: + YYDEBUG(73, *YYCURSOR); ++======= + #line 1302 "Zend/zend_ini_scanner.c" + yy82: + YYDEBUG(82, *YYCURSOR); + ++YYCURSOR; + yych = *YYCURSOR; + goto yy88; + yy83: + YYDEBUG(83, *YYCURSOR); ++>>>>>>> PHP-5.6 yyleng = YYCURSOR - SCNG(yy_text); -#line 581 "Zend/zend_ini_scanner.l" +#line 582 "Zend/zend_ini_scanner.l" { /* Double quoted '"' string ends */ - yy_pop_state(TSRMLS_C); + yy_pop_state(); return '"'; } ++<<<<<<< HEAD +#line 1223 "Zend/zend_ini_scanner.c" +yy74: + YYDEBUG(74, *YYCURSOR); + yych = *++YYCURSOR; + if (yych != '{') goto yy71; + YYDEBUG(75, *YYCURSOR); + ++YYCURSOR; + YYDEBUG(76, *YYCURSOR); ++======= + #line 1316 "Zend/zend_ini_scanner.c" + yy84: + YYDEBUG(84, *YYCURSOR); + yych = *++YYCURSOR; + if (yych != '{') goto yy81; + YYDEBUG(85, *YYCURSOR); + ++YYCURSOR; + YYDEBUG(86, *YYCURSOR); ++>>>>>>> PHP-5.6 yyleng = YYCURSOR - SCNG(yy_text); -#line 448 "Zend/zend_ini_scanner.l" +#line 449 "Zend/zend_ini_scanner.l" { /* Variable start */ - yy_push_state(ST_VARNAME TSRMLS_CC); + yy_push_state(ST_VARNAME); return TC_DOLLAR_CURLY; } ++<<<<<<< HEAD +#line 1237 "Zend/zend_ini_scanner.c" +yy77: + YYDEBUG(77, *YYCURSOR); + ++YYCURSOR; + YYFILL(1); + yych = *YYCURSOR; +yy78: + YYDEBUG(78, *YYCURSOR); + if (yybm[0+yych] & 128) { + goto yy77; + } + goto yy73; ++======= + #line 1330 "Zend/zend_ini_scanner.c" + yy87: + YYDEBUG(87, *YYCURSOR); + ++YYCURSOR; + YYFILL(1); + yych = *YYCURSOR; + yy88: + YYDEBUG(88, *YYCURSOR); + if (yybm[0+yych] & 128) { + goto yy87; + } + goto yy83; ++>>>>>>> PHP-5.6 } /* *********************************** */ yyc_ST_OFFSET: @@@ -1283,496 -1376,496 +1961,955 @@@ 66, 66, 66, 66, 66, 66, 66, 66, 66, 66, 66, 66, 66, 66, 66, 66, }; ++<<<<<<< HEAD + YYDEBUG(79, *YYCURSOR); ++======= + YYDEBUG(89, *YYCURSOR); ++>>>>>>> PHP-5.6 YYFILL(2); yych = *YYCURSOR; if (yych <= '-') { if (yych <= ' ') { if (yych <= '\n') { ++<<<<<<< HEAD + if (yych <= 0x08) goto yy81; + if (yych <= '\t') goto yy83; + goto yy84; + } else { + if (yych == '\r') goto yy84; + if (yych >= ' ') goto yy83; + } + } else { + if (yych <= '$') { + if (yych == '"') goto yy86; + if (yych >= '$') goto yy88; + } else { + if (yych == '\'') goto yy89; + if (yych >= '-') goto yy90; ++======= + if (yych <= 0x08) goto yy91; + if (yych <= '\t') goto yy93; + goto yy94; + } else { + if (yych == '\r') goto yy94; + if (yych >= ' ') goto yy93; + } + } else { + if (yych <= '$') { + if (yych == '"') goto yy96; + if (yych >= '$') goto yy98; + } else { + if (yych == '\'') goto yy99; + if (yych >= '-') goto yy100; ++>>>>>>> PHP-5.6 } } } else { if (yych <= 'Z') { if (yych <= '9') { ++<<<<<<< HEAD + if (yych <= '.') goto yy91; + if (yych >= '0') goto yy92; + } else { + if (yych == ';') goto yy84; + if (yych >= 'A') goto yy94; + } + } else { + if (yych <= '^') { + if (yych <= '[') goto yy81; + if (yych <= '\\') goto yy96; + if (yych <= ']') goto yy97; + } else { + if (yych == '`') goto yy81; + if (yych <= 'z') goto yy94; + } + } + } +yy81: + YYDEBUG(81, *YYCURSOR); + yyaccept = 0; + yych = *(YYMARKER = ++YYCURSOR); + goto yy100; +yy82: + YYDEBUG(82, *YYCURSOR); ++======= + if (yych <= '.') goto yy101; + if (yych >= '0') goto yy102; + } else { + if (yych == ';') goto yy94; + if (yych >= 'A') goto yy104; + } + } else { + if (yych <= '^') { + if (yych <= '[') goto yy91; + if (yych <= '\\') goto yy106; + if (yych <= ']') goto yy107; + } else { + if (yych == '`') goto yy91; + if (yych <= 'z') goto yy104; + } + } + } + yy91: + YYDEBUG(91, *YYCURSOR); + yyaccept = 0; + yych = *(YYMARKER = ++YYCURSOR); + goto yy110; + yy92: + YYDEBUG(92, *YYCURSOR); ++>>>>>>> PHP-5.6 yyleng = YYCURSOR - SCNG(yy_text); -#line 572 "Zend/zend_ini_scanner.l" +#line 573 "Zend/zend_ini_scanner.l" { /* Get rest as section/offset value */ RETURN_TOKEN(TC_STRING, yytext, yyleng); } ++<<<<<<< HEAD +#line 1341 "Zend/zend_ini_scanner.c" +yy83: + YYDEBUG(83, *YYCURSOR); + yyaccept = 0; + yych = *(YYMARKER = ++YYCURSOR); + if (yybm[0+yych] & 128) { + goto yy126; + } + if (yych == '"') goto yy128; + if (yych == ']') goto yy129; + goto yy100; +yy84: + YYDEBUG(84, *YYCURSOR); + ++YYCURSOR; +yy85: + YYDEBUG(85, *YYCURSOR); ++======= + #line 1434 "Zend/zend_ini_scanner.c" + yy93: + YYDEBUG(93, *YYCURSOR); + yyaccept = 0; + yych = *(YYMARKER = ++YYCURSOR); + if (yybm[0+yych] & 128) { + goto yy136; + } + if (yych == '"') goto yy138; + if (yych == ']') goto yy139; + goto yy110; + yy94: + YYDEBUG(94, *YYCURSOR); + ++YYCURSOR; + yy95: + YYDEBUG(95, *YYCURSOR); ++>>>>>>> PHP-5.6 yyleng = YYCURSOR - SCNG(yy_text); -#line 654 "Zend/zend_ini_scanner.l" +#line 648 "Zend/zend_ini_scanner.l" { return 0; } ++<<<<<<< HEAD +#line 1362 "Zend/zend_ini_scanner.c" +yy86: + YYDEBUG(86, *YYCURSOR); + ++YYCURSOR; +yy87: + YYDEBUG(87, *YYCURSOR); ++======= + #line 1455 "Zend/zend_ini_scanner.c" + yy96: + YYDEBUG(96, *YYCURSOR); + ++YYCURSOR; + yy97: + YYDEBUG(97, *YYCURSOR); ++>>>>>>> PHP-5.6 yyleng = YYCURSOR - SCNG(yy_text); -#line 576 "Zend/zend_ini_scanner.l" +#line 577 "Zend/zend_ini_scanner.l" { /* Double quoted '"' string start */ - yy_push_state(ST_DOUBLE_QUOTES TSRMLS_CC); + yy_push_state(ST_DOUBLE_QUOTES); return '"'; } ++<<<<<<< HEAD +#line 1374 "Zend/zend_ini_scanner.c" +yy88: + YYDEBUG(88, *YYCURSOR); + yych = *++YYCURSOR; + if (yych <= '\\') { + if (yych <= 0x00) goto yy85; + if (yych <= '[') goto yy99; + goto yy104; + } else { + if (yych == '{') goto yy124; + goto yy99; + } +yy89: + YYDEBUG(89, *YYCURSOR); + yyaccept = 1; + yych = *(YYMARKER = ++YYCURSOR); + if (yybm[0+yych] & 64) { - goto yy120; ++ goto yy120; ++ } ++ goto yy85; ++yy90: ++ YYDEBUG(90, *YYCURSOR); ++ yyaccept = 0; ++ yych = *(YYMARKER = ++YYCURSOR); ++ if (yych <= '/') goto yy100; ++ if (yych <= '9') goto yy118; ++ goto yy100; ++yy91: ++ YYDEBUG(91, *YYCURSOR); ++ yyaccept = 0; ++ yych = *(YYMARKER = ++YYCURSOR); ++ if (yych <= '/') goto yy100; ++ if (yych <= '9') goto yy116; ++ goto yy100; ++yy92: ++ YYDEBUG(92, *YYCURSOR); ++======= + #line 1467 "Zend/zend_ini_scanner.c" + yy98: + YYDEBUG(98, *YYCURSOR); + yych = *++YYCURSOR; + if (yych <= '\\') { + if (yych <= 0x00) goto yy95; + if (yych <= '[') goto yy109; + goto yy114; + } else { + if (yych == '{') goto yy134; + goto yy109; + } + yy99: + YYDEBUG(99, *YYCURSOR); + yyaccept = 1; + yych = *(YYMARKER = ++YYCURSOR); + if (yybm[0+yych] & 64) { + goto yy130; } - goto yy85; - yy90: - YYDEBUG(90, *YYCURSOR); + goto yy95; + yy100: + YYDEBUG(100, *YYCURSOR); yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); - if (yych <= '/') goto yy100; - if (yych <= '9') goto yy118; - goto yy100; - yy91: - YYDEBUG(91, *YYCURSOR); + if (yych <= '/') goto yy110; + if (yych <= '9') goto yy128; + goto yy110; + yy101: + YYDEBUG(101, *YYCURSOR); yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); - if (yych <= '/') goto yy100; - if (yych <= '9') goto yy116; - goto yy100; - yy92: - YYDEBUG(92, *YYCURSOR); + if (yych <= '/') goto yy110; + if (yych <= '9') goto yy126; + goto yy110; + yy102: + YYDEBUG(102, *YYCURSOR); ++>>>>>>> PHP-5.6 yyaccept = 2; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '\'') { if (yych <= '\r') { ++<<<<<<< HEAD + if (yych == '\n') goto yy93; + if (yych <= '\f') goto yy100; + } else { + if (yych == '"') goto yy93; + if (yych <= '&') goto yy100; + } + } else { + if (yych <= '9') { + if (yych == '.') goto yy112; + if (yych <= '/') goto yy100; + goto yy114; + } else { + if (yych <= ';') { + if (yych <= ':') goto yy100; + } else { + if (yych != ']') goto yy100; + } + } + } +yy93: + YYDEBUG(93, *YYCURSOR); ++======= + if (yych == '\n') goto yy103; + if (yych <= '\f') goto yy110; + } else { + if (yych == '"') goto yy103; + if (yych <= '&') goto yy110; + } + } else { + if (yych <= '9') { + if (yych == '.') goto yy122; + if (yych <= '/') goto yy110; + goto yy124; + } else { + if (yych <= ';') { + if (yych <= ':') goto yy110; + } else { + if (yych != ']') goto yy110; + } + } + } + yy103: + YYDEBUG(103, *YYCURSOR); ++>>>>>>> PHP-5.6 yyleng = YYCURSOR - SCNG(yy_text); -#line 550 "Zend/zend_ini_scanner.l" +#line 551 "Zend/zend_ini_scanner.l" { /* Get number option value as string */ RETURN_TOKEN(TC_NUMBER, yytext, yyleng); } ++<<<<<<< HEAD +#line 1440 "Zend/zend_ini_scanner.c" +yy94: + YYDEBUG(94, *YYCURSOR); + yyaccept = 3; + yych = *(YYMARKER = ++YYCURSOR); + if (yybm[0+yych] & 16) { + goto yy110; + } + if (yych <= '"') { + if (yych <= '\f') { + if (yych != '\n') goto yy100; + } else { + if (yych <= '\r') goto yy95; + if (yych <= '!') goto yy100; + } + } else { + if (yych <= ':') { + if (yych != '\'') goto yy100; + } else { + if (yych <= ';') goto yy95; + if (yych != ']') goto yy100; + } + } +yy95: + YYDEBUG(95, *YYCURSOR); ++======= + #line 1533 "Zend/zend_ini_scanner.c" + yy104: + YYDEBUG(104, *YYCURSOR); + yyaccept = 3; + yych = *(YYMARKER = ++YYCURSOR); + if (yybm[0+yych] & 16) { + goto yy120; + } + if (yych <= '"') { + if (yych <= '\f') { + if (yych != '\n') goto yy110; + } else { + if (yych <= '\r') goto yy105; + if (yych <= '!') goto yy110; + } + } else { + if (yych <= ':') { + if (yych != '\'') goto yy110; + } else { + if (yych <= ';') goto yy105; + if (yych != ']') goto yy110; + } + } + yy105: + YYDEBUG(105, *YYCURSOR); ++>>>>>>> PHP-5.6 yyleng = YYCURSOR - SCNG(yy_text); -#line 546 "Zend/zend_ini_scanner.l" +#line 547 "Zend/zend_ini_scanner.l" { /* Get constant option value */ RETURN_TOKEN(TC_CONSTANT, yytext, yyleng); } ++<<<<<<< HEAD +#line 1470 "Zend/zend_ini_scanner.c" +yy96: + YYDEBUG(96, *YYCURSOR); + yych = *++YYCURSOR; + goto yy99; +yy97: + YYDEBUG(97, *YYCURSOR); + ++YYCURSOR; +yy98: + YYDEBUG(98, *YYCURSOR); ++======= + #line 1563 "Zend/zend_ini_scanner.c" + yy106: + YYDEBUG(106, *YYCURSOR); + yych = *++YYCURSOR; + goto yy109; + yy107: + YYDEBUG(107, *YYCURSOR); + ++YYCURSOR; + yy108: + YYDEBUG(108, *YYCURSOR); ++>>>>>>> PHP-5.6 yyleng = YYCURSOR - SCNG(yy_text); -#line 443 "Zend/zend_ini_scanner.l" +#line 444 "Zend/zend_ini_scanner.l" { /* End of section or an option offset */ BEGIN(INITIAL); return ']'; } ++<<<<<<< HEAD +#line 1486 "Zend/zend_ini_scanner.c" +yy99: + YYDEBUG(99, *YYCURSOR); ++======= + #line 1579 "Zend/zend_ini_scanner.c" + yy109: + YYDEBUG(109, *YYCURSOR); ++>>>>>>> PHP-5.6 yyaccept = 0; YYMARKER = ++YYCURSOR; YYFILL(1); yych = *YYCURSOR; ++<<<<<<< HEAD +yy100: + YYDEBUG(100, *YYCURSOR); + if (yybm[0+yych] & 2) { + goto yy99; + } + if (yych == '$') goto yy102; + if (yych != '\\') goto yy82; +yy101: + YYDEBUG(101, *YYCURSOR); + ++YYCURSOR; + YYFILL(1); + yych = *YYCURSOR; + goto yy99; +yy102: + YYDEBUG(102, *YYCURSOR); ++======= + yy110: + YYDEBUG(110, *YYCURSOR); + if (yybm[0+yych] & 2) { + goto yy109; + } + if (yych == '$') goto yy112; + if (yych != '\\') goto yy92; + yy111: + YYDEBUG(111, *YYCURSOR); + ++YYCURSOR; + YYFILL(1); + yych = *YYCURSOR; + goto yy109; + yy112: + YYDEBUG(112, *YYCURSOR); ++>>>>>>> PHP-5.6 ++YYCURSOR; YYFILL(1); yych = *YYCURSOR; if (yych <= '\\') { ++<<<<<<< HEAD + if (yych <= 0x00) goto yy103; + if (yych <= '[') goto yy99; + goto yy104; + } else { + if (yych != '{') goto yy99; + } +yy103: + YYDEBUG(103, *YYCURSOR); + YYCURSOR = YYMARKER; + if (yyaccept <= 1) { + if (yyaccept <= 0) { + goto yy82; + } else { + goto yy85; + } + } else { + if (yyaccept <= 2) { + goto yy93; + } else { + goto yy95; + } + } +yy104: + YYDEBUG(104, *YYCURSOR); ++======= + if (yych <= 0x00) goto yy113; + if (yych <= '[') goto yy109; + goto yy114; + } else { + if (yych != '{') goto yy109; + } + yy113: + YYDEBUG(113, *YYCURSOR); + YYCURSOR = YYMARKER; + if (yyaccept <= 1) { + if (yyaccept <= 0) { + goto yy92; + } else { + goto yy95; + } + } else { + if (yyaccept <= 2) { + goto yy103; + } else { + goto yy105; + } + } + yy114: + YYDEBUG(114, *YYCURSOR); ++>>>>>>> PHP-5.6 + ++YYCURSOR; + YYFILL(1); + yych = *YYCURSOR; + if (yybm[0+yych] & 4) { ++<<<<<<< HEAD + goto yy105; + } + if (yych == '\\') goto yy107; + goto yy99; +yy105: + YYDEBUG(105, *YYCURSOR); + ++YYCURSOR; + YYFILL(1); + yych = *YYCURSOR; + YYDEBUG(106, *YYCURSOR); + if (yybm[0+yych] & 4) { + goto yy105; + } + if (yych == '\\') goto yy109; + goto yy99; +yy107: + YYDEBUG(107, *YYCURSOR); ++YYCURSOR; YYFILL(1); yych = *YYCURSOR; + YYDEBUG(108, *YYCURSOR); if (yybm[0+yych] & 4) { + goto yy105; + } + if (yych == '\\') goto yy107; + goto yy99; +yy109: + YYDEBUG(109, *YYCURSOR); ++======= + goto yy115; + } + if (yych == '\\') goto yy117; + goto yy109; + yy115: + YYDEBUG(115, *YYCURSOR); + ++YYCURSOR; + YYFILL(1); + yych = *YYCURSOR; + YYDEBUG(116, *YYCURSOR); + if (yybm[0+yych] & 4) { + goto yy115; + } + if (yych == '\\') goto yy119; + goto yy109; + yy117: + YYDEBUG(117, *YYCURSOR); + ++YYCURSOR; + YYFILL(1); + yych = *YYCURSOR; + YYDEBUG(118, *YYCURSOR); + if (yybm[0+yych] & 4) { + goto yy115; + } + if (yych == '\\') goto yy117; + goto yy109; + yy119: + YYDEBUG(119, *YYCURSOR); ++>>>>>>> PHP-5.6 ++YYCURSOR; YYFILL(1); yych = *YYCURSOR; if (yybm[0+yych] & 4) { ++<<<<<<< HEAD + goto yy105; + } + if (yych == '\\') goto yy107; + goto yy99; +yy110: + YYDEBUG(110, *YYCURSOR); ++======= + goto yy115; + } + if (yych == '\\') goto yy117; + goto yy109; + yy120: + YYDEBUG(120, *YYCURSOR); ++>>>>>>> PHP-5.6 yyaccept = 3; YYMARKER = ++YYCURSOR; YYFILL(1); yych = *YYCURSOR; ++<<<<<<< HEAD + YYDEBUG(111, *YYCURSOR); + if (yybm[0+yych] & 16) { + goto yy110; + } + if (yych <= '$') { + if (yych <= '\r') { + if (yych == '\n') goto yy95; + if (yych <= '\f') goto yy99; + goto yy95; + } else { + if (yych == '"') goto yy95; + if (yych <= '#') goto yy99; + goto yy102; + } + } else { + if (yych <= ';') { + if (yych == '\'') goto yy95; + if (yych <= ':') goto yy99; + goto yy95; + } else { + if (yych <= '[') goto yy99; + if (yych <= '\\') goto yy101; + if (yych <= ']') goto yy95; + goto yy99; + } + } +yy112: + YYDEBUG(112, *YYCURSOR); ++======= + YYDEBUG(121, *YYCURSOR); + if (yybm[0+yych] & 16) { + goto yy120; + } + if (yych <= '$') { + if (yych <= '\r') { + if (yych == '\n') goto yy105; + if (yych <= '\f') goto yy109; + goto yy105; + } else { + if (yych == '"') goto yy105; + if (yych <= '#') goto yy109; + goto yy112; + } + } else { + if (yych <= ';') { + if (yych == '\'') goto yy105; + if (yych <= ':') goto yy109; + goto yy105; + } else { + if (yych <= '[') goto yy109; + if (yych <= '\\') goto yy111; + if (yych <= ']') goto yy105; + goto yy109; + } + } + yy122: + YYDEBUG(122, *YYCURSOR); ++>>>>>>> PHP-5.6 yyaccept = 2; YYMARKER = ++YYCURSOR; YYFILL(1); yych = *YYCURSOR; ++<<<<<<< HEAD + YYDEBUG(113, *YYCURSOR); + if (yybm[0+yych] & 32) { + goto yy112; + } + if (yych <= '$') { + if (yych <= '\r') { + if (yych == '\n') goto yy93; + if (yych <= '\f') goto yy99; + goto yy93; + } else { + if (yych == '"') goto yy93; + if (yych <= '#') goto yy99; + goto yy102; + } + } else { + if (yych <= ';') { + if (yych == '\'') goto yy93; + if (yych <= ':') goto yy99; + goto yy93; + } else { + if (yych <= '[') goto yy99; + if (yych <= '\\') goto yy101; + if (yych <= ']') goto yy93; + goto yy99; + } + } +yy114: + YYDEBUG(114, *YYCURSOR); ++======= + YYDEBUG(123, *YYCURSOR); + if (yybm[0+yych] & 32) { + goto yy122; + } + if (yych <= '$') { + if (yych <= '\r') { + if (yych == '\n') goto yy103; + if (yych <= '\f') goto yy109; + goto yy103; + } else { + if (yych == '"') goto yy103; + if (yych <= '#') goto yy109; + goto yy112; + } + } else { + if (yych <= ';') { + if (yych == '\'') goto yy103; + if (yych <= ':') goto yy109; + goto yy103; + } else { + if (yych <= '[') goto yy109; + if (yych <= '\\') goto yy111; + if (yych <= ']') goto yy103; + goto yy109; + } + } + yy124: + YYDEBUG(124, *YYCURSOR); ++>>>>>>> PHP-5.6 yyaccept = 2; YYMARKER = ++YYCURSOR; YYFILL(1); yych = *YYCURSOR; ++<<<<<<< HEAD + YYDEBUG(115, *YYCURSOR); + if (yych <= '\'') { + if (yych <= '!') { + if (yych <= '\n') { + if (yych <= '\t') goto yy99; + goto yy93; + } else { + if (yych == '\r') goto yy93; + goto yy99; + } + } else { + if (yych <= '#') { + if (yych <= '"') goto yy93; + goto yy99; + } else { + if (yych <= '$') goto yy102; + if (yych <= '&') goto yy99; + goto yy93; ++======= + YYDEBUG(125, *YYCURSOR); + if (yych <= '\'') { + if (yych <= '!') { + if (yych <= '\n') { + if (yych <= '\t') goto yy109; + goto yy103; + } else { + if (yych == '\r') goto yy103; + goto yy109; + } + } else { + if (yych <= '#') { + if (yych <= '"') goto yy103; + goto yy109; + } else { + if (yych <= '$') goto yy112; + if (yych <= '&') goto yy109; + goto yy103; ++>>>>>>> PHP-5.6 } } } else { if (yych <= ':') { if (yych <= '.') { ++<<<<<<< HEAD + if (yych <= '-') goto yy99; + goto yy112; + } else { + if (yych <= '/') goto yy99; + if (yych <= '9') goto yy114; + goto yy99; + } + } else { + if (yych <= '[') { + if (yych <= ';') goto yy93; + goto yy99; + } else { + if (yych <= '\\') goto yy101; + if (yych <= ']') goto yy93; + goto yy99; + } + } + } +yy116: + YYDEBUG(116, *YYCURSOR); ++======= + if (yych <= '-') goto yy109; + goto yy122; + } else { + if (yych <= '/') goto yy109; + if (yych <= '9') goto yy124; + goto yy109; + } + } else { + if (yych <= '[') { + if (yych <= ';') goto yy103; + goto yy109; + } else { + if (yych <= '\\') goto yy111; + if (yych <= ']') goto yy103; + goto yy109; + } + } + } + yy126: + YYDEBUG(126, *YYCURSOR); ++>>>>>>> PHP-5.6 yyaccept = 2; YYMARKER = ++YYCURSOR; YYFILL(1); yych = *YYCURSOR; ++<<<<<<< HEAD + YYDEBUG(117, *YYCURSOR); + if (yych <= '&') { + if (yych <= '\r') { + if (yych == '\n') goto yy93; + if (yych <= '\f') goto yy99; + goto yy93; + } else { + if (yych <= '"') { + if (yych <= '!') goto yy99; + goto yy93; + } else { + if (yych == '$') goto yy102; + goto yy99; ++======= + YYDEBUG(127, *YYCURSOR); + if (yych <= '&') { + if (yych <= '\r') { + if (yych == '\n') goto yy103; + if (yych <= '\f') goto yy109; + goto yy103; + } else { + if (yych <= '"') { + if (yych <= '!') goto yy109; + goto yy103; + } else { + if (yych == '$') goto yy112; + goto yy109; ++>>>>>>> PHP-5.6 } } } else { if (yych <= ':') { - if (yych <= '\'') goto yy103; - if (yych <= '/') goto yy109; ++<<<<<<< HEAD + if (yych <= '\'') goto yy93; + if (yych <= '/') goto yy99; + if (yych <= '9') goto yy116; + goto yy99; + } else { + if (yych <= '[') { + if (yych <= ';') goto yy93; + goto yy99; + } else { + if (yych <= '\\') goto yy101; + if (yych <= ']') goto yy93; + goto yy99; + } + } + } +yy118: + YYDEBUG(118, *YYCURSOR); ++======= ++ if (yych <= '\'') goto yy103; ++ if (yych <= '/') goto yy109; + if (yych <= '9') goto yy126; + goto yy109; + } else { + if (yych <= '[') { + if (yych <= ';') goto yy103; + goto yy109; + } else { + if (yych <= '\\') goto yy111; + if (yych <= ']') goto yy103; + goto yy109; + } + } + } + yy128: + YYDEBUG(128, *YYCURSOR); ++>>>>>>> PHP-5.6 yyaccept = 2; YYMARKER = ++YYCURSOR; YYFILL(1); yych = *YYCURSOR; ++<<<<<<< HEAD + YYDEBUG(119, *YYCURSOR); + if (yych <= '&') { + if (yych <= '\r') { + if (yych == '\n') goto yy93; + if (yych <= '\f') goto yy99; + goto yy93; + } else { + if (yych <= '"') { + if (yych <= '!') goto yy99; + goto yy93; + } else { + if (yych == '$') goto yy102; + goto yy99; ++======= + YYDEBUG(129, *YYCURSOR); + if (yych <= '&') { + if (yych <= '\r') { + if (yych == '\n') goto yy103; + if (yych <= '\f') goto yy109; + goto yy103; + } else { + if (yych <= '"') { + if (yych <= '!') goto yy109; + goto yy103; + } else { + if (yych == '$') goto yy112; + goto yy109; ++>>>>>>> PHP-5.6 } } } else { if (yych <= ':') { ++<<<<<<< HEAD + if (yych <= '\'') goto yy93; + if (yych <= '/') goto yy99; + if (yych <= '9') goto yy118; + goto yy99; + } else { + if (yych <= '[') { + if (yych <= ';') goto yy93; + goto yy99; + } else { + if (yych <= '\\') goto yy101; + if (yych <= ']') goto yy93; + goto yy99; + } + } + } +yy120: + YYDEBUG(120, *YYCURSOR); + ++YYCURSOR; + YYFILL(1); + yych = *YYCURSOR; + YYDEBUG(121, *YYCURSOR); + if (yybm[0+yych] & 64) { + goto yy120; + } + YYDEBUG(122, *YYCURSOR); + ++YYCURSOR; + YYDEBUG(123, *YYCURSOR); ++======= + if (yych <= '\'') goto yy103; + if (yych <= '/') goto yy109; + if (yych <= '9') goto yy128; + goto yy109; + } else { + if (yych <= '[') { + if (yych <= ';') goto yy103; + goto yy109; + } else { + if (yych <= '\\') goto yy111; + if (yych <= ']') goto yy103; + goto yy109; + } + } + } + yy130: + YYDEBUG(130, *YYCURSOR); + ++YYCURSOR; + YYFILL(1); + yych = *YYCURSOR; + YYDEBUG(131, *YYCURSOR); + if (yybm[0+yych] & 64) { + goto yy130; + } + YYDEBUG(132, *YYCURSOR); + ++YYCURSOR; + YYDEBUG(133, *YYCURSOR); ++>>>>>>> PHP-5.6 yyleng = YYCURSOR - SCNG(yy_text); -#line 415 "Zend/zend_ini_scanner.l" +#line 416 "Zend/zend_ini_scanner.l" { /* Raw string */ /* Eat leading and trailing single quotes */ if (yytext[0] == '\'' && yytext[yyleng - 1] == '\'') { @@@ -1781,59 -1874,59 +2918,111 @@@ } RETURN_TOKEN(TC_RAW, yytext, yyleng); } ++<<<<<<< HEAD +#line 1785 "Zend/zend_ini_scanner.c" +yy124: + YYDEBUG(124, *YYCURSOR); + ++YYCURSOR; + YYDEBUG(125, *YYCURSOR); ++======= + #line 1878 "Zend/zend_ini_scanner.c" + yy134: + YYDEBUG(134, *YYCURSOR); + ++YYCURSOR; + YYDEBUG(135, *YYCURSOR); ++>>>>>>> PHP-5.6 yyleng = YYCURSOR - SCNG(yy_text); -#line 448 "Zend/zend_ini_scanner.l" +#line 449 "Zend/zend_ini_scanner.l" { /* Variable start */ - yy_push_state(ST_VARNAME TSRMLS_CC); + yy_push_state(ST_VARNAME); return TC_DOLLAR_CURLY; } ++<<<<<<< HEAD +#line 1796 "Zend/zend_ini_scanner.c" +yy126: + YYDEBUG(126, *YYCURSOR); ++======= + #line 1889 "Zend/zend_ini_scanner.c" + yy136: + YYDEBUG(136, *YYCURSOR); ++>>>>>>> PHP-5.6 yyaccept = 0; YYMARKER = ++YYCURSOR; YYFILL(1); yych = *YYCURSOR; ++<<<<<<< HEAD + YYDEBUG(127, *YYCURSOR); + if (yybm[0+yych] & 128) { + goto yy126; + } + if (yych <= '$') { + if (yych <= '\r') { + if (yych == '\n') goto yy82; + if (yych <= '\f') goto yy99; + goto yy82; + } else { + if (yych == '"') goto yy128; + if (yych <= '#') goto yy99; + goto yy102; + } + } else { + if (yych <= ';') { + if (yych == '\'') goto yy82; + if (yych <= ':') goto yy99; + goto yy82; + } else { + if (yych <= '[') goto yy99; + if (yych <= '\\') goto yy101; + if (yych <= ']') goto yy129; + goto yy99; + } + } +yy128: + YYDEBUG(128, *YYCURSOR); + yych = *++YYCURSOR; + goto yy87; +yy129: + YYDEBUG(129, *YYCURSOR); + ++YYCURSOR; + yych = *YYCURSOR; + goto yy98; ++======= + YYDEBUG(137, *YYCURSOR); + if (yybm[0+yych] & 128) { + goto yy136; + } + if (yych <= '$') { + if (yych <= '\r') { + if (yych == '\n') goto yy92; + if (yych <= '\f') goto yy109; + goto yy92; + } else { + if (yych == '"') goto yy138; + if (yych <= '#') goto yy109; + goto yy112; + } + } else { + if (yych <= ';') { + if (yych == '\'') goto yy92; + if (yych <= ':') goto yy109; + goto yy92; + } else { + if (yych <= '[') goto yy109; + if (yych <= '\\') goto yy111; + if (yych <= ']') goto yy139; + goto yy109; + } + } + yy138: + YYDEBUG(138, *YYCURSOR); + yych = *++YYCURSOR; + goto yy97; + yy139: + YYDEBUG(139, *YYCURSOR); + ++YYCURSOR; + yych = *YYCURSOR; + goto yy108; ++>>>>>>> PHP-5.6 } /* *********************************** */ yyc_ST_RAW: @@@ -1872,46 -1965,46 +3061,81 @@@ 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, }; ++<<<<<<< HEAD + YYDEBUG(130, *YYCURSOR); ++======= + YYDEBUG(140, *YYCURSOR); ++>>>>>>> PHP-5.6 YYFILL(3); yych = *YYCURSOR; if (yych <= '\f') { if (yych <= 0x08) { ++<<<<<<< HEAD + if (yych >= 0x01) goto yy134; + } else { + if (yych <= '\t') goto yy136; + if (yych <= '\n') goto yy137; + goto yy134; + } + } else { + if (yych <= ' ') { + if (yych <= '\r') goto yy139; + if (yych <= 0x1F) goto yy134; + goto yy136; + } else { + if (yych == ';') goto yy140; + goto yy134; + } + } + YYDEBUG(132, *YYCURSOR); + ++YYCURSOR; + YYDEBUG(133, *YYCURSOR); ++======= + if (yych >= 0x01) goto yy144; + } else { + if (yych <= '\t') goto yy146; + if (yych <= '\n') goto yy147; + goto yy144; + } + } else { + if (yych <= ' ') { + if (yych <= '\r') goto yy149; + if (yych <= 0x1F) goto yy144; + goto yy146; + } else { + if (yych == ';') goto yy150; + goto yy144; + } + } + YYDEBUG(142, *YYCURSOR); + ++YYCURSOR; + YYDEBUG(143, *YYCURSOR); ++>>>>>>> PHP-5.6 yyleng = YYCURSOR - SCNG(yy_text); -#line 649 "Zend/zend_ini_scanner.l" +#line 643 "Zend/zend_ini_scanner.l" { /* End of option value (if EOF is reached before EOL */ BEGIN(INITIAL); return END_OF_LINE; } ++<<<<<<< HEAD +#line 1906 "Zend/zend_ini_scanner.c" +yy134: + YYDEBUG(134, *YYCURSOR); + ++YYCURSOR; +yy135: + YYDEBUG(135, *YYCURSOR); ++======= + #line 1999 "Zend/zend_ini_scanner.c" + yy144: + YYDEBUG(144, *YYCURSOR); + ++YYCURSOR; + yy145: + YYDEBUG(145, *YYCURSOR); ++>>>>>>> PHP-5.6 yyleng = YYCURSOR - SCNG(yy_text); -#line 499 "Zend/zend_ini_scanner.l" +#line 500 "Zend/zend_ini_scanner.l" { /* Raw value, only used when SCNG(scanner_mode) == ZEND_INI_SCANNER_RAW. */ - char *sc = NULL; + unsigned char *sc = NULL; while (YYCURSOR < YYLIMIT) { switch (*YYCURSOR) { case '\n': @@@ -1946,111 -2039,111 +3170,207 @@@ end_raw_value_chars } RETURN_TOKEN(TC_RAW, yytext, yyleng); } ++<<<<<<< HEAD +#line 1950 "Zend/zend_ini_scanner.c" +yy136: + YYDEBUG(136, *YYCURSOR); + yyaccept = 0; + yych = *(YYMARKER = ++YYCURSOR); + if (yych <= '\r') { + if (yych <= 0x08) goto yy135; + if (yych <= '\n') goto yy148; + if (yych <= '\f') goto yy135; + goto yy148; + } else { + if (yych <= ' ') { + if (yych <= 0x1F) goto yy135; + goto yy148; + } else { + if (yych == ';') goto yy148; + goto yy135; + } + } +yy137: + YYDEBUG(137, *YYCURSOR); + ++YYCURSOR; +yy138: + YYDEBUG(138, *YYCURSOR); ++======= + #line 2043 "Zend/zend_ini_scanner.c" + yy146: + YYDEBUG(146, *YYCURSOR); + yyaccept = 0; + yych = *(YYMARKER = ++YYCURSOR); + if (yych <= '\r') { + if (yych <= 0x08) goto yy145; + if (yych <= '\n') goto yy158; + if (yych <= '\f') goto yy145; + goto yy158; + } else { + if (yych <= ' ') { + if (yych <= 0x1F) goto yy145; + goto yy158; + } else { + if (yych == ';') goto yy158; + goto yy145; + } + } + yy147: + YYDEBUG(147, *YYCURSOR); + ++YYCURSOR; + yy148: + YYDEBUG(148, *YYCURSOR); ++>>>>>>> PHP-5.6 yyleng = YYCURSOR - SCNG(yy_text); -#line 540 "Zend/zend_ini_scanner.l" +#line 541 "Zend/zend_ini_scanner.l" { /* End of option value */ BEGIN(INITIAL); SCNG(lineno)++; return END_OF_LINE; } ++<<<<<<< HEAD +#line 1981 "Zend/zend_ini_scanner.c" +yy139: + YYDEBUG(139, *YYCURSOR); + yych = *++YYCURSOR; + if (yych == '\n') goto yy146; + goto yy138; +yy140: + YYDEBUG(140, *YYCURSOR); + yyaccept = 1; + yych = *(YYMARKER = ++YYCURSOR); + goto yy142; +yy141: + YYDEBUG(141, *YYCURSOR); + ++YYCURSOR; + YYFILL(2); + yych = *YYCURSOR; +yy142: + YYDEBUG(142, *YYCURSOR); + if (yybm[0+yych] & 64) { + goto yy141; + } + if (yych >= '\r') goto yy145; +yy143: + YYDEBUG(143, *YYCURSOR); + ++YYCURSOR; +yy144: + YYDEBUG(144, *YYCURSOR); ++======= + #line 2074 "Zend/zend_ini_scanner.c" + yy149: + YYDEBUG(149, *YYCURSOR); + yych = *++YYCURSOR; + if (yych == '\n') goto yy156; + goto yy148; + yy150: + YYDEBUG(150, *YYCURSOR); + yyaccept = 1; + yych = *(YYMARKER = ++YYCURSOR); + goto yy152; + yy151: + YYDEBUG(151, *YYCURSOR); + ++YYCURSOR; + YYFILL(2); + yych = *YYCURSOR; + yy152: + YYDEBUG(152, *YYCURSOR); + if (yybm[0+yych] & 64) { + goto yy151; + } + if (yych >= '\r') goto yy155; + yy153: + YYDEBUG(153, *YYCURSOR); + ++YYCURSOR; + yy154: + YYDEBUG(154, *YYCURSOR); ++>>>>>>> PHP-5.6 yyleng = YYCURSOR - SCNG(yy_text); -#line 636 "Zend/zend_ini_scanner.l" +#line 637 "Zend/zend_ini_scanner.l" { /* Comment */ BEGIN(INITIAL); SCNG(lineno)++; return END_OF_LINE; } ++<<<<<<< HEAD +#line 2015 "Zend/zend_ini_scanner.c" +yy145: + YYDEBUG(145, *YYCURSOR); + yych = *++YYCURSOR; + if (yych == '\n') goto yy143; + goto yy144; +yy146: + YYDEBUG(146, *YYCURSOR); + yych = *++YYCURSOR; + goto yy138; +yy147: + YYDEBUG(147, *YYCURSOR); ++======= + #line 2108 "Zend/zend_ini_scanner.c" + yy155: + YYDEBUG(155, *YYCURSOR); + yych = *++YYCURSOR; + if (yych == '\n') goto yy153; + goto yy154; + yy156: + YYDEBUG(156, *YYCURSOR); + yych = *++YYCURSOR; + goto yy148; + yy157: + YYDEBUG(157, *YYCURSOR); ++>>>>>>> PHP-5.6 yyaccept = 2; YYMARKER = ++YYCURSOR; YYFILL(2); yych = *YYCURSOR; ++<<<<<<< HEAD +yy148: + YYDEBUG(148, *YYCURSOR); + if (yybm[0+yych] & 128) { + goto yy147; + } + if (yych <= '\f') { + if (yych == '\n') goto yy146; + } else { + if (yych <= '\r') goto yy150; + if (yych == ';') goto yy141; + } + YYDEBUG(149, *YYCURSOR); ++======= + yy158: + YYDEBUG(158, *YYCURSOR); + if (yybm[0+yych] & 128) { + goto yy157; + } + if (yych <= '\f') { + if (yych == '\n') goto yy156; + } else { + if (yych <= '\r') goto yy160; + if (yych == ';') goto yy151; + } + YYDEBUG(159, *YYCURSOR); ++>>>>>>> PHP-5.6 yyleng = YYCURSOR - SCNG(yy_text); -#line 626 "Zend/zend_ini_scanner.l" +#line 627 "Zend/zend_ini_scanner.l" { /* eat whitespace */ goto restart; } ++<<<<<<< HEAD +#line 2049 "Zend/zend_ini_scanner.c" +yy150: + YYDEBUG(150, *YYCURSOR); + ++YYCURSOR; + if ((yych = *YYCURSOR) == '\n') goto yy146; + goto yy138; ++======= + #line 2142 "Zend/zend_ini_scanner.c" + yy160: + YYDEBUG(160, *YYCURSOR); + ++YYCURSOR; + if ((yych = *YYCURSOR) == '\n') goto yy156; + goto yy148; ++>>>>>>> PHP-5.6 } /* *********************************** */ yyc_ST_SECTION_RAW: @@@ -2089,85 -2182,85 +3409,159 @@@ 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, }; ++<<<<<<< HEAD + YYDEBUG(151, *YYCURSOR); + YYFILL(3); + yych = *YYCURSOR; + if (yych <= '\f') { + if (yych == '\n') goto yy155; + } else { + if (yych <= '\r') goto yy155; + if (yych == ']') goto yy157; + } + YYDEBUG(153, *YYCURSOR); + ++YYCURSOR; + yych = *YYCURSOR; + goto yy164; +yy154: + YYDEBUG(154, *YYCURSOR); ++======= + YYDEBUG(161, *YYCURSOR); + YYFILL(3); + yych = *YYCURSOR; + if (yych <= '\f') { + if (yych == '\n') goto yy165; + } else { + if (yych <= '\r') goto yy165; + if (yych == ']') goto yy167; + } + YYDEBUG(163, *YYCURSOR); + ++YYCURSOR; + yych = *YYCURSOR; + goto yy174; + yy164: + YYDEBUG(164, *YYCURSOR); ++>>>>>>> PHP-5.6 yyleng = YYCURSOR - SCNG(yy_text); -#line 536 "Zend/zend_ini_scanner.l" +#line 537 "Zend/zend_ini_scanner.l" { /* Raw value, only used when SCNG(scanner_mode) == ZEND_INI_SCANNER_RAW. */ RETURN_TOKEN(TC_RAW, yytext, yyleng); } ++<<<<<<< HEAD +#line 2113 "Zend/zend_ini_scanner.c" +yy155: + YYDEBUG(155, *YYCURSOR); + ++YYCURSOR; + YYDEBUG(156, *YYCURSOR); ++======= + #line 2206 "Zend/zend_ini_scanner.c" + yy165: + YYDEBUG(165, *YYCURSOR); + ++YYCURSOR; + YYDEBUG(166, *YYCURSOR); ++>>>>>>> PHP-5.6 yyleng = YYCURSOR - SCNG(yy_text); -#line 654 "Zend/zend_ini_scanner.l" +#line 648 "Zend/zend_ini_scanner.l" { return 0; } ++<<<<<<< HEAD +#line 2123 "Zend/zend_ini_scanner.c" +yy157: + YYDEBUG(157, *YYCURSOR); + ++YYCURSOR; + yych = *YYCURSOR; + goto yy160; +yy158: + YYDEBUG(158, *YYCURSOR); ++======= + #line 2216 "Zend/zend_ini_scanner.c" + yy167: + YYDEBUG(167, *YYCURSOR); + ++YYCURSOR; + yych = *YYCURSOR; + goto yy170; + yy168: + YYDEBUG(168, *YYCURSOR); ++>>>>>>> PHP-5.6 yyleng = YYCURSOR - SCNG(yy_text); -#line 424 "Zend/zend_ini_scanner.l" +#line 425 "Zend/zend_ini_scanner.l" { /* End of section */ BEGIN(INITIAL); SCNG(lineno)++; return ']'; } ++<<<<<<< HEAD +#line 2138 "Zend/zend_ini_scanner.c" +yy159: + YYDEBUG(159, *YYCURSOR); + ++YYCURSOR; + YYFILL(2); + yych = *YYCURSOR; +yy160: + YYDEBUG(160, *YYCURSOR); + if (yybm[0+yych] & 64) { + goto yy159; + } + if (yych == '\n') goto yy161; + if (yych == '\r') goto yy162; + goto yy158; +yy161: + YYDEBUG(161, *YYCURSOR); + yych = *++YYCURSOR; + goto yy158; +yy162: + YYDEBUG(162, *YYCURSOR); + yych = *++YYCURSOR; + if (yych == '\n') goto yy161; + goto yy158; +yy163: + YYDEBUG(163, *YYCURSOR); + ++YYCURSOR; + YYFILL(1); + yych = *YYCURSOR; +yy164: + YYDEBUG(164, *YYCURSOR); + if (yybm[0+yych] & 128) { + goto yy163; + } + goto yy154; ++======= + #line 2231 "Zend/zend_ini_scanner.c" + yy169: + YYDEBUG(169, *YYCURSOR); + ++YYCURSOR; + YYFILL(2); + yych = *YYCURSOR; + yy170: + YYDEBUG(170, *YYCURSOR); + if (yybm[0+yych] & 64) { + goto yy169; + } + if (yych == '\n') goto yy171; + if (yych == '\r') goto yy172; + goto yy168; + yy171: + YYDEBUG(171, *YYCURSOR); + yych = *++YYCURSOR; + goto yy168; + yy172: + YYDEBUG(172, *YYCURSOR); + yych = *++YYCURSOR; + if (yych == '\n') goto yy171; + goto yy168; + yy173: + YYDEBUG(173, *YYCURSOR); + ++YYCURSOR; + YYFILL(1); + yych = *YYCURSOR; + yy174: + YYDEBUG(174, *YYCURSOR); + if (yybm[0+yych] & 128) { + goto yy173; + } + goto yy164; ++>>>>>>> PHP-5.6 } /* *********************************** */ yyc_ST_SECTION_VALUE: @@@ -2206,523 -2299,523 +3600,1008 @@@ 132, 132, 132, 132, 132, 132, 132, 132, 132, 132, 132, 132, 132, 132, 132, 132, }; ++<<<<<<< HEAD + YYDEBUG(165, *YYCURSOR); ++======= + YYDEBUG(175, *YYCURSOR); ++>>>>>>> PHP-5.6 YYFILL(3); yych = *YYCURSOR; if (yych <= '-') { if (yych <= ' ') { if (yych <= '\n') { ++<<<<<<< HEAD + if (yych <= 0x08) goto yy167; + if (yych <= '\t') goto yy169; + goto yy170; + } else { + if (yych == '\r') goto yy170; + if (yych >= ' ') goto yy169; + } + } else { + if (yych <= '$') { + if (yych == '"') goto yy172; + if (yych >= '$') goto yy174; + } else { + if (yych == '\'') goto yy175; + if (yych >= '-') goto yy176; ++======= + if (yych <= 0x08) goto yy177; + if (yych <= '\t') goto yy179; + goto yy180; + } else { + if (yych == '\r') goto yy180; + if (yych >= ' ') goto yy179; + } + } else { + if (yych <= '$') { + if (yych == '"') goto yy182; + if (yych >= '$') goto yy184; + } else { + if (yych == '\'') goto yy185; + if (yych >= '-') goto yy186; ++>>>>>>> PHP-5.6 } } } else { if (yych <= 'Z') { if (yych <= '9') { ++<<<<<<< HEAD + if (yych <= '.') goto yy177; + if (yych >= '0') goto yy178; + } else { + if (yych == ';') goto yy170; + if (yych >= 'A') goto yy180; + } + } else { + if (yych <= '^') { + if (yych <= '[') goto yy167; + if (yych <= '\\') goto yy182; + if (yych <= ']') goto yy183; + } else { + if (yych == '`') goto yy167; + if (yych <= 'z') goto yy180; + } + } + } +yy167: + YYDEBUG(167, *YYCURSOR); + yyaccept = 0; + yych = *(YYMARKER = ++YYCURSOR); + goto yy190; +yy168: + YYDEBUG(168, *YYCURSOR); ++======= + if (yych <= '.') goto yy187; + if (yych >= '0') goto yy188; + } else { + if (yych == ';') goto yy180; + if (yych >= 'A') goto yy190; + } + } else { + if (yych <= '^') { + if (yych <= '[') goto yy177; + if (yych <= '\\') goto yy192; + if (yych <= ']') goto yy193; + } else { + if (yych == '`') goto yy177; + if (yych <= 'z') goto yy190; + } + } + } + yy177: + YYDEBUG(177, *YYCURSOR); + yyaccept = 0; + yych = *(YYMARKER = ++YYCURSOR); + goto yy200; + yy178: + YYDEBUG(178, *YYCURSOR); ++>>>>>>> PHP-5.6 yyleng = YYCURSOR - SCNG(yy_text); -#line 572 "Zend/zend_ini_scanner.l" +#line 573 "Zend/zend_ini_scanner.l" { /* Get rest as section/offset value */ RETURN_TOKEN(TC_STRING, yytext, yyleng); } ++<<<<<<< HEAD +#line 2264 "Zend/zend_ini_scanner.c" +yy169: + YYDEBUG(169, *YYCURSOR); + yyaccept = 0; + yych = *(YYMARKER = ++YYCURSOR); + if (yych <= 0x1F) { + if (yych == '\t') goto yy216; + goto yy190; + } else { + if (yych <= ' ') goto yy216; + if (yych == '"') goto yy218; + goto yy190; + } +yy170: + YYDEBUG(170, *YYCURSOR); + ++YYCURSOR; +yy171: + YYDEBUG(171, *YYCURSOR); ++======= + #line 2357 "Zend/zend_ini_scanner.c" + yy179: + YYDEBUG(179, *YYCURSOR); + yyaccept = 0; + yych = *(YYMARKER = ++YYCURSOR); + if (yych <= 0x1F) { + if (yych == '\t') goto yy226; + goto yy200; + } else { + if (yych <= ' ') goto yy226; + if (yych == '"') goto yy228; + goto yy200; + } + yy180: + YYDEBUG(180, *YYCURSOR); + ++YYCURSOR; + yy181: + YYDEBUG(181, *YYCURSOR); ++>>>>>>> PHP-5.6 yyleng = YYCURSOR - SCNG(yy_text); -#line 654 "Zend/zend_ini_scanner.l" +#line 648 "Zend/zend_ini_scanner.l" { return 0; } ++<<<<<<< HEAD +#line 2287 "Zend/zend_ini_scanner.c" +yy172: + YYDEBUG(172, *YYCURSOR); + ++YYCURSOR; +yy173: + YYDEBUG(173, *YYCURSOR); ++======= + #line 2380 "Zend/zend_ini_scanner.c" + yy182: + YYDEBUG(182, *YYCURSOR); + ++YYCURSOR; + yy183: + YYDEBUG(183, *YYCURSOR); ++>>>>>>> PHP-5.6 yyleng = YYCURSOR - SCNG(yy_text); -#line 576 "Zend/zend_ini_scanner.l" +#line 577 "Zend/zend_ini_scanner.l" { /* Double quoted '"' string start */ - yy_push_state(ST_DOUBLE_QUOTES TSRMLS_CC); + yy_push_state(ST_DOUBLE_QUOTES); return '"'; } ++<<<<<<< HEAD +#line 2299 "Zend/zend_ini_scanner.c" +yy174: + YYDEBUG(174, *YYCURSOR); + yych = *++YYCURSOR; + if (yych <= '\\') { + if (yych <= 0x00) goto yy171; + if (yych <= '[') goto yy189; + goto yy194; + } else { + if (yych == '{') goto yy214; + goto yy189; + } +yy175: + YYDEBUG(175, *YYCURSOR); + yyaccept = 1; + yych = *(YYMARKER = ++YYCURSOR); + if (yybm[0+yych] & 128) { + goto yy210; + } + goto yy171; +yy176: + YYDEBUG(176, *YYCURSOR); + yyaccept = 0; + yych = *(YYMARKER = ++YYCURSOR); + if (yych <= '/') goto yy190; + if (yych <= '9') goto yy208; + goto yy190; +yy177: + YYDEBUG(177, *YYCURSOR); + yyaccept = 0; + yych = *(YYMARKER = ++YYCURSOR); + if (yych <= '/') goto yy190; + if (yych <= '9') goto yy206; + goto yy190; +yy178: + YYDEBUG(178, *YYCURSOR); ++======= + #line 2392 "Zend/zend_ini_scanner.c" + yy184: + YYDEBUG(184, *YYCURSOR); + yych = *++YYCURSOR; + if (yych <= '\\') { + if (yych <= 0x00) goto yy181; + if (yych <= '[') goto yy199; + goto yy204; + } else { + if (yych == '{') goto yy224; + goto yy199; + } + yy185: + YYDEBUG(185, *YYCURSOR); + yyaccept = 1; + yych = *(YYMARKER = ++YYCURSOR); + if (yybm[0+yych] & 128) { + goto yy220; + } + goto yy181; + yy186: + YYDEBUG(186, *YYCURSOR); + yyaccept = 0; + yych = *(YYMARKER = ++YYCURSOR); + if (yych <= '/') goto yy200; + if (yych <= '9') goto yy218; + goto yy200; + yy187: + YYDEBUG(187, *YYCURSOR); + yyaccept = 0; + yych = *(YYMARKER = ++YYCURSOR); + if (yych <= '/') goto yy200; + if (yych <= '9') goto yy216; + goto yy200; + yy188: + YYDEBUG(188, *YYCURSOR); ++>>>>>>> PHP-5.6 yyaccept = 2; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '\'') { if (yych <= '\r') { ++<<<<<<< HEAD + if (yych == '\n') goto yy179; + if (yych <= '\f') goto yy190; + } else { + if (yych == '"') goto yy179; + if (yych <= '&') goto yy190; + } + } else { + if (yych <= '9') { + if (yych == '.') goto yy202; + if (yych <= '/') goto yy190; + goto yy204; + } else { + if (yych <= ';') { + if (yych <= ':') goto yy190; + } else { + if (yych != ']') goto yy190; + } + } + } +yy179: + YYDEBUG(179, *YYCURSOR); ++======= + if (yych == '\n') goto yy189; + if (yych <= '\f') goto yy200; + } else { + if (yych == '"') goto yy189; + if (yych <= '&') goto yy200; + } + } else { + if (yych <= '9') { + if (yych == '.') goto yy212; + if (yych <= '/') goto yy200; + goto yy214; + } else { + if (yych <= ';') { + if (yych <= ':') goto yy200; + } else { + if (yych != ']') goto yy200; + } + } + } + yy189: + YYDEBUG(189, *YYCURSOR); ++>>>>>>> PHP-5.6 yyleng = YYCURSOR - SCNG(yy_text); -#line 550 "Zend/zend_ini_scanner.l" +#line 551 "Zend/zend_ini_scanner.l" { /* Get number option value as string */ RETURN_TOKEN(TC_NUMBER, yytext, yyleng); } ++<<<<<<< HEAD +#line 2365 "Zend/zend_ini_scanner.c" +yy180: + YYDEBUG(180, *YYCURSOR); + yyaccept = 3; + yych = *(YYMARKER = ++YYCURSOR); + if (yybm[0+yych] & 32) { + goto yy200; + } + if (yych <= '"') { + if (yych <= '\f') { + if (yych != '\n') goto yy190; + } else { + if (yych <= '\r') goto yy181; + if (yych <= '!') goto yy190; + } + } else { + if (yych <= ':') { + if (yych != '\'') goto yy190; + } else { + if (yych <= ';') goto yy181; + if (yych != ']') goto yy190; + } + } +yy181: + YYDEBUG(181, *YYCURSOR); ++======= + #line 2458 "Zend/zend_ini_scanner.c" + yy190: + YYDEBUG(190, *YYCURSOR); + yyaccept = 3; + yych = *(YYMARKER = ++YYCURSOR); + if (yybm[0+yych] & 32) { + goto yy210; + } + if (yych <= '"') { + if (yych <= '\f') { + if (yych != '\n') goto yy200; + } else { + if (yych <= '\r') goto yy191; + if (yych <= '!') goto yy200; + } + } else { + if (yych <= ':') { + if (yych != '\'') goto yy200; + } else { + if (yych <= ';') goto yy191; + if (yych != ']') goto yy200; + } + } + yy191: + YYDEBUG(191, *YYCURSOR); ++>>>>>>> PHP-5.6 yyleng = YYCURSOR - SCNG(yy_text); -#line 546 "Zend/zend_ini_scanner.l" +#line 547 "Zend/zend_ini_scanner.l" { /* Get constant option value */ RETURN_TOKEN(TC_CONSTANT, yytext, yyleng); } ++<<<<<<< HEAD +#line 2395 "Zend/zend_ini_scanner.c" +yy182: + YYDEBUG(182, *YYCURSOR); + yych = *++YYCURSOR; + goto yy189; +yy183: + YYDEBUG(183, *YYCURSOR); + ++YYCURSOR; + yych = *YYCURSOR; + goto yy186; +yy184: + YYDEBUG(184, *YYCURSOR); ++======= + #line 2488 "Zend/zend_ini_scanner.c" + yy192: + YYDEBUG(192, *YYCURSOR); + yych = *++YYCURSOR; + goto yy199; + yy193: + YYDEBUG(193, *YYCURSOR); + ++YYCURSOR; + yych = *YYCURSOR; + goto yy196; + yy194: + YYDEBUG(194, *YYCURSOR); ++>>>>>>> PHP-5.6 yyleng = YYCURSOR - SCNG(yy_text); -#line 424 "Zend/zend_ini_scanner.l" +#line 425 "Zend/zend_ini_scanner.l" { /* End of section */ BEGIN(INITIAL); SCNG(lineno)++; return ']'; } ++<<<<<<< HEAD +#line 2414 "Zend/zend_ini_scanner.c" +yy185: + YYDEBUG(185, *YYCURSOR); + ++YYCURSOR; + YYFILL(2); + yych = *YYCURSOR; +yy186: + YYDEBUG(186, *YYCURSOR); + if (yybm[0+yych] & 2) { + goto yy185; + } + if (yych == '\n') goto yy187; + if (yych == '\r') goto yy188; + goto yy184; +yy187: + YYDEBUG(187, *YYCURSOR); + yych = *++YYCURSOR; + goto yy184; +yy188: + YYDEBUG(188, *YYCURSOR); + yych = *++YYCURSOR; + if (yych == '\n') goto yy187; + goto yy184; +yy189: + YYDEBUG(189, *YYCURSOR); ++======= + #line 2507 "Zend/zend_ini_scanner.c" + yy195: + YYDEBUG(195, *YYCURSOR); + ++YYCURSOR; + YYFILL(2); + yych = *YYCURSOR; + yy196: + YYDEBUG(196, *YYCURSOR); + if (yybm[0+yych] & 2) { + goto yy195; + } + if (yych == '\n') goto yy197; + if (yych == '\r') goto yy198; + goto yy194; + yy197: + YYDEBUG(197, *YYCURSOR); + yych = *++YYCURSOR; + goto yy194; + yy198: + YYDEBUG(198, *YYCURSOR); + yych = *++YYCURSOR; + if (yych == '\n') goto yy197; + goto yy194; + yy199: + YYDEBUG(199, *YYCURSOR); ++>>>>>>> PHP-5.6 yyaccept = 0; YYMARKER = ++YYCURSOR; YYFILL(1); yych = *YYCURSOR; ++<<<<<<< HEAD +yy190: + YYDEBUG(190, *YYCURSOR); + if (yybm[0+yych] & 4) { + goto yy189; + } + if (yych == '$') goto yy192; + if (yych != '\\') goto yy168; +yy191: + YYDEBUG(191, *YYCURSOR); + ++YYCURSOR; + YYFILL(1); + yych = *YYCURSOR; + goto yy189; +yy192: + YYDEBUG(192, *YYCURSOR); ++======= + yy200: + YYDEBUG(200, *YYCURSOR); + if (yybm[0+yych] & 4) { + goto yy199; + } + if (yych == '$') goto yy202; + if (yych != '\\') goto yy178; + yy201: + YYDEBUG(201, *YYCURSOR); + ++YYCURSOR; + YYFILL(1); + yych = *YYCURSOR; + goto yy199; + yy202: + YYDEBUG(202, *YYCURSOR); ++>>>>>>> PHP-5.6 ++YYCURSOR; YYFILL(1); yych = *YYCURSOR; if (yych <= '\\') { ++<<<<<<< HEAD + if (yych <= 0x00) goto yy193; + if (yych <= '[') goto yy189; + goto yy194; + } else { + if (yych != '{') goto yy189; + } +yy193: + YYDEBUG(193, *YYCURSOR); + YYCURSOR = YYMARKER; + if (yyaccept <= 1) { + if (yyaccept <= 0) { + goto yy168; + } else { + goto yy171; + } + } else { + if (yyaccept <= 2) { + goto yy179; + } else { + goto yy181; + } + } +yy194: + YYDEBUG(194, *YYCURSOR); ++======= + if (yych <= 0x00) goto yy203; + if (yych <= '[') goto yy199; + goto yy204; + } else { + if (yych != '{') goto yy199; + } + yy203: + YYDEBUG(203, *YYCURSOR); + YYCURSOR = YYMARKER; + if (yyaccept <= 1) { + if (yyaccept <= 0) { + goto yy178; + } else { + goto yy181; + } + } else { + if (yyaccept <= 2) { + goto yy189; + } else { + goto yy191; + } + } + yy204: + YYDEBUG(204, *YYCURSOR); ++>>>>>>> PHP-5.6 + ++YYCURSOR; + YYFILL(1); + yych = *YYCURSOR; + if (yybm[0+yych] & 8) { ++<<<<<<< HEAD + goto yy195; + } + if (yych == '\\') goto yy197; + goto yy189; +yy195: + YYDEBUG(195, *YYCURSOR); + ++YYCURSOR; + YYFILL(1); + yych = *YYCURSOR; + YYDEBUG(196, *YYCURSOR); + if (yybm[0+yych] & 8) { + goto yy195; + } + if (yych == '\\') goto yy199; + goto yy189; +yy197: + YYDEBUG(197, *YYCURSOR); ++YYCURSOR; YYFILL(1); yych = *YYCURSOR; + YYDEBUG(198, *YYCURSOR); if (yybm[0+yych] & 8) { + goto yy195; + } + if (yych == '\\') goto yy197; + goto yy189; +yy199: + YYDEBUG(199, *YYCURSOR); ++======= + goto yy205; + } + if (yych == '\\') goto yy207; + goto yy199; + yy205: + YYDEBUG(205, *YYCURSOR); + ++YYCURSOR; + YYFILL(1); + yych = *YYCURSOR; + YYDEBUG(206, *YYCURSOR); + if (yybm[0+yych] & 8) { + goto yy205; + } + if (yych == '\\') goto yy209; + goto yy199; + yy207: + YYDEBUG(207, *YYCURSOR); + ++YYCURSOR; + YYFILL(1); + yych = *YYCURSOR; + YYDEBUG(208, *YYCURSOR); + if (yybm[0+yych] & 8) { + goto yy205; + } + if (yych == '\\') goto yy207; + goto yy199; + yy209: + YYDEBUG(209, *YYCURSOR); ++>>>>>>> PHP-5.6 ++YYCURSOR; YYFILL(1); yych = *YYCURSOR; if (yybm[0+yych] & 8) { ++<<<<<<< HEAD + goto yy195; + } + if (yych == '\\') goto yy197; + goto yy189; +yy200: + YYDEBUG(200, *YYCURSOR); ++======= + goto yy205; + } + if (yych == '\\') goto yy207; + goto yy199; + yy210: + YYDEBUG(210, *YYCURSOR); ++>>>>>>> PHP-5.6 yyaccept = 3; YYMARKER = ++YYCURSOR; YYFILL(1); yych = *YYCURSOR; ++<<<<<<< HEAD + YYDEBUG(201, *YYCURSOR); + if (yybm[0+yych] & 32) { + goto yy200; + } + if (yych <= '$') { + if (yych <= '\r') { + if (yych == '\n') goto yy181; + if (yych <= '\f') goto yy189; + goto yy181; + } else { + if (yych == '"') goto yy181; + if (yych <= '#') goto yy189; + goto yy192; + } + } else { + if (yych <= ';') { + if (yych == '\'') goto yy181; + if (yych <= ':') goto yy189; + goto yy181; + } else { + if (yych <= '[') goto yy189; + if (yych <= '\\') goto yy191; + if (yych <= ']') goto yy181; + goto yy189; + } + } +yy202: + YYDEBUG(202, *YYCURSOR); ++======= + YYDEBUG(211, *YYCURSOR); + if (yybm[0+yych] & 32) { + goto yy210; + } + if (yych <= '$') { + if (yych <= '\r') { + if (yych == '\n') goto yy191; + if (yych <= '\f') goto yy199; + goto yy191; + } else { + if (yych == '"') goto yy191; + if (yych <= '#') goto yy199; + goto yy202; + } + } else { + if (yych <= ';') { + if (yych == '\'') goto yy191; + if (yych <= ':') goto yy199; + goto yy191; + } else { + if (yych <= '[') goto yy199; + if (yych <= '\\') goto yy201; + if (yych <= ']') goto yy191; + goto yy199; + } + } + yy212: + YYDEBUG(212, *YYCURSOR); ++>>>>>>> PHP-5.6 yyaccept = 2; YYMARKER = ++YYCURSOR; YYFILL(1); yych = *YYCURSOR; ++<<<<<<< HEAD + YYDEBUG(203, *YYCURSOR); + if (yybm[0+yych] & 64) { + goto yy202; + } + if (yych <= '$') { + if (yych <= '\r') { + if (yych == '\n') goto yy179; + if (yych <= '\f') goto yy189; + goto yy179; + } else { + if (yych == '"') goto yy179; + if (yych <= '#') goto yy189; + goto yy192; + } + } else { + if (yych <= ';') { + if (yych == '\'') goto yy179; + if (yych <= ':') goto yy189; + goto yy179; + } else { + if (yych <= '[') goto yy189; + if (yych <= '\\') goto yy191; + if (yych <= ']') goto yy179; + goto yy189; + } + } - yy204: - YYDEBUG(204, *YYCURSOR); ++yy204: ++ YYDEBUG(204, *YYCURSOR); ++======= + YYDEBUG(213, *YYCURSOR); + if (yybm[0+yych] & 64) { + goto yy212; + } + if (yych <= '$') { + if (yych <= '\r') { + if (yych == '\n') goto yy189; + if (yych <= '\f') goto yy199; + goto yy189; + } else { + if (yych == '"') goto yy189; + if (yych <= '#') goto yy199; + goto yy202; + } + } else { + if (yych <= ';') { + if (yych == '\'') goto yy189; + if (yych <= ':') goto yy199; + goto yy189; + } else { + if (yych <= '[') goto yy199; + if (yych <= '\\') goto yy201; + if (yych <= ']') goto yy189; + goto yy199; + } + } + yy214: + YYDEBUG(214, *YYCURSOR); ++>>>>>>> PHP-5.6 yyaccept = 2; YYMARKER = ++YYCURSOR; YYFILL(1); yych = *YYCURSOR; ++<<<<<<< HEAD + YYDEBUG(205, *YYCURSOR); + if (yych <= '\'') { + if (yych <= '!') { + if (yych <= '\n') { + if (yych <= '\t') goto yy189; + goto yy179; + } else { + if (yych == '\r') goto yy179; + goto yy189; + } + } else { + if (yych <= '#') { + if (yych <= '"') goto yy179; + goto yy189; + } else { + if (yych <= '$') goto yy192; + if (yych <= '&') goto yy189; + goto yy179; ++======= + YYDEBUG(215, *YYCURSOR); + if (yych <= '\'') { + if (yych <= '!') { + if (yych <= '\n') { + if (yych <= '\t') goto yy199; + goto yy189; + } else { + if (yych == '\r') goto yy189; + goto yy199; + } + } else { + if (yych <= '#') { + if (yych <= '"') goto yy189; + goto yy199; + } else { + if (yych <= '$') goto yy202; + if (yych <= '&') goto yy199; + goto yy189; ++>>>>>>> PHP-5.6 } } } else { if (yych <= ':') { if (yych <= '.') { ++<<<<<<< HEAD + if (yych <= '-') goto yy189; + goto yy202; + } else { + if (yych <= '/') goto yy189; + if (yych <= '9') goto yy204; + goto yy189; + } + } else { + if (yych <= '[') { + if (yych <= ';') goto yy179; + goto yy189; + } else { + if (yych <= '\\') goto yy191; + if (yych <= ']') goto yy179; + goto yy189; + } + } + } +yy206: + YYDEBUG(206, *YYCURSOR); ++======= + if (yych <= '-') goto yy199; + goto yy212; + } else { + if (yych <= '/') goto yy199; + if (yych <= '9') goto yy214; + goto yy199; + } + } else { + if (yych <= '[') { + if (yych <= ';') goto yy189; + goto yy199; + } else { + if (yych <= '\\') goto yy201; + if (yych <= ']') goto yy189; + goto yy199; + } + } + } + yy216: + YYDEBUG(216, *YYCURSOR); ++>>>>>>> PHP-5.6 yyaccept = 2; YYMARKER = ++YYCURSOR; YYFILL(1); yych = *YYCURSOR; ++<<<<<<< HEAD + YYDEBUG(207, *YYCURSOR); + if (yych <= '&') { + if (yych <= '\r') { + if (yych == '\n') goto yy179; + if (yych <= '\f') goto yy189; + goto yy179; + } else { + if (yych <= '"') { + if (yych <= '!') goto yy189; + goto yy179; + } else { + if (yych == '$') goto yy192; + goto yy189; ++======= + YYDEBUG(217, *YYCURSOR); + if (yych <= '&') { + if (yych <= '\r') { + if (yych == '\n') goto yy189; + if (yych <= '\f') goto yy199; + goto yy189; + } else { + if (yych <= '"') { + if (yych <= '!') goto yy199; + goto yy189; + } else { + if (yych == '$') goto yy202; + goto yy199; ++>>>>>>> PHP-5.6 } } } else { if (yych <= ':') { ++<<<<<<< HEAD + if (yych <= '\'') goto yy179; + if (yych <= '/') goto yy189; + if (yych <= '9') goto yy206; + goto yy189; + } else { + if (yych <= '[') { + if (yych <= ';') goto yy179; + goto yy189; + } else { + if (yych <= '\\') goto yy191; + if (yych <= ']') goto yy179; + goto yy189; + } + } + } +yy208: + YYDEBUG(208, *YYCURSOR); ++======= + if (yych <= '\'') goto yy189; + if (yych <= '/') goto yy199; + if (yych <= '9') goto yy216; + goto yy199; + } else { + if (yych <= '[') { + if (yych <= ';') goto yy189; + goto yy199; + } else { + if (yych <= '\\') goto yy201; + if (yych <= ']') goto yy189; + goto yy199; + } + } + } + yy218: + YYDEBUG(218, *YYCURSOR); ++>>>>>>> PHP-5.6 yyaccept = 2; YYMARKER = ++YYCURSOR; YYFILL(1); yych = *YYCURSOR; ++<<<<<<< HEAD + YYDEBUG(209, *YYCURSOR); + if (yych <= '&') { + if (yych <= '\r') { + if (yych == '\n') goto yy179; + if (yych <= '\f') goto yy189; + goto yy179; + } else { + if (yych <= '"') { + if (yych <= '!') goto yy189; + goto yy179; + } else { + if (yych == '$') goto yy192; + goto yy189; ++======= + YYDEBUG(219, *YYCURSOR); + if (yych <= '&') { + if (yych <= '\r') { + if (yych == '\n') goto yy189; + if (yych <= '\f') goto yy199; + goto yy189; + } else { + if (yych <= '"') { + if (yych <= '!') goto yy199; + goto yy189; + } else { + if (yych == '$') goto yy202; + goto yy199; ++>>>>>>> PHP-5.6 } } } else { if (yych <= ':') { ++<<<<<<< HEAD + if (yych <= '\'') goto yy179; + if (yych <= '/') goto yy189; + if (yych <= '9') goto yy208; + goto yy189; + } else { + if (yych <= '[') { + if (yych <= ';') goto yy179; + goto yy189; + } else { + if (yych <= '\\') goto yy191; + if (yych <= ']') goto yy179; + goto yy189; + } + } + } +yy210: + YYDEBUG(210, *YYCURSOR); + ++YYCURSOR; + YYFILL(1); + yych = *YYCURSOR; + YYDEBUG(211, *YYCURSOR); + if (yybm[0+yych] & 128) { + goto yy210; + } + YYDEBUG(212, *YYCURSOR); + ++YYCURSOR; + YYDEBUG(213, *YYCURSOR); ++======= + if (yych <= '\'') goto yy189; + if (yych <= '/') goto yy199; + if (yych <= '9') goto yy218; + goto yy199; + } else { + if (yych <= '[') { + if (yych <= ';') goto yy189; + goto yy199; + } else { + if (yych <= '\\') goto yy201; + if (yych <= ']') goto yy189; + goto yy199; + } + } + } + yy220: + YYDEBUG(220, *YYCURSOR); + ++YYCURSOR; + YYFILL(1); + yych = *YYCURSOR; + YYDEBUG(221, *YYCURSOR); + if (yybm[0+yych] & 128) { + goto yy220; + } + YYDEBUG(222, *YYCURSOR); + ++YYCURSOR; + YYDEBUG(223, *YYCURSOR); ++>>>>>>> PHP-5.6 yyleng = YYCURSOR - SCNG(yy_text); -#line 415 "Zend/zend_ini_scanner.l" +#line 416 "Zend/zend_ini_scanner.l" { /* Raw string */ /* Eat leading and trailing single quotes */ if (yytext[0] == '\'' && yytext[yyleng - 1] == '\'') { @@@ -2731,65 -2824,65 +4610,121 @@@ } RETURN_TOKEN(TC_RAW, yytext, yyleng); } ++<<<<<<< HEAD +#line 2735 "Zend/zend_ini_scanner.c" +yy214: + YYDEBUG(214, *YYCURSOR); + ++YYCURSOR; + YYDEBUG(215, *YYCURSOR); ++======= + #line 2828 "Zend/zend_ini_scanner.c" + yy224: + YYDEBUG(224, *YYCURSOR); + ++YYCURSOR; + YYDEBUG(225, *YYCURSOR); ++>>>>>>> PHP-5.6 yyleng = YYCURSOR - SCNG(yy_text); -#line 448 "Zend/zend_ini_scanner.l" +#line 449 "Zend/zend_ini_scanner.l" { /* Variable start */ - yy_push_state(ST_VARNAME TSRMLS_CC); + yy_push_state(ST_VARNAME); return TC_DOLLAR_CURLY; } ++<<<<<<< HEAD +#line 2746 "Zend/zend_ini_scanner.c" +yy216: + YYDEBUG(216, *YYCURSOR); ++======= + #line 2839 "Zend/zend_ini_scanner.c" + yy226: + YYDEBUG(226, *YYCURSOR); ++>>>>>>> PHP-5.6 yyaccept = 0; YYMARKER = ++YYCURSOR; YYFILL(1); yych = *YYCURSOR; ++<<<<<<< HEAD + YYDEBUG(217, *YYCURSOR); + if (yych <= '"') { + if (yych <= '\f') { + if (yych <= 0x08) goto yy189; + if (yych <= '\t') goto yy216; + if (yych <= '\n') goto yy168; + goto yy189; + } else { + if (yych <= 0x1F) { + if (yych <= '\r') goto yy168; + goto yy189; + } else { + if (yych <= ' ') goto yy216; + if (yych <= '!') goto yy189; ++======= + YYDEBUG(227, *YYCURSOR); + if (yych <= '"') { + if (yych <= '\f') { + if (yych <= 0x08) goto yy199; + if (yych <= '\t') goto yy226; + if (yych <= '\n') goto yy178; + goto yy199; + } else { + if (yych <= 0x1F) { + if (yych <= '\r') goto yy178; + goto yy199; + } else { + if (yych <= ' ') goto yy226; + if (yych <= '!') goto yy199; ++>>>>>>> PHP-5.6 } } } else { if (yych <= ':') { if (yych <= '$') { ++<<<<<<< HEAD + if (yych <= '#') goto yy189; + goto yy192; + } else { + if (yych == '\'') goto yy168; + goto yy189; + } + } else { + if (yych <= '[') { + if (yych <= ';') goto yy168; + goto yy189; + } else { + if (yych <= '\\') goto yy191; + if (yych <= ']') goto yy168; + goto yy189; + } + } + } +yy218: + YYDEBUG(218, *YYCURSOR); + ++YYCURSOR; + yych = *YYCURSOR; + goto yy173; ++======= + if (yych <= '#') goto yy199; + goto yy202; + } else { + if (yych == '\'') goto yy178; + goto yy199; + } + } else { + if (yych <= '[') { + if (yych <= ';') goto yy178; + goto yy199; + } else { + if (yych <= '\\') goto yy201; + if (yych <= ']') goto yy178; + goto yy199; + } + } + } + yy228: + YYDEBUG(228, *YYCURSOR); + ++YYCURSOR; + yych = *YYCURSOR; + goto yy183; ++>>>>>>> PHP-5.6 } /* *********************************** */ yyc_ST_VALUE: @@@ -2828,28 -2921,28 +4763,49 @@@ 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, }; ++<<<<<<< HEAD + YYDEBUG(219, *YYCURSOR); ++======= + YYDEBUG(229, *YYCURSOR); ++>>>>>>> PHP-5.6 YYFILL(6); yych = *YYCURSOR; YYDEBUG(-1, yych); switch (yych) { ++<<<<<<< HEAD + case 0x00: goto yy221; + case '\t': + case ' ': goto yy225; + case '\n': goto yy227; + case '\r': goto yy229; ++======= + case 0x00: goto yy231; + case '\t': + case ' ': goto yy235; + case '\n': goto yy237; + case '\r': goto yy239; ++>>>>>>> PHP-5.6 case '!': case '&': case '(': case ')': case '^': case '|': ++<<<<<<< HEAD + case '~': goto yy230; + case '"': goto yy232; + case '$': goto yy234; + case '\'': goto yy235; + case '-': goto yy236; + case '.': goto yy237; ++======= + case '~': goto yy240; + case '"': goto yy242; + case '$': goto yy244; + case '\'': goto yy245; + case '-': goto yy246; + case '.': goto yy247; ++>>>>>>> PHP-5.6 case '0': case '1': case '2': @@@ -2859,9 -2952,9 +4815,15 @@@ case '6': case '7': case '8': ++<<<<<<< HEAD + case '9': goto yy238; + case ';': goto yy240; + case '=': goto yy241; ++======= + case '9': goto yy248; + case ';': goto yy250; + case '=': goto yy251; ++>>>>>>> PHP-5.6 case 'A': case 'B': case 'C': @@@ -2904,1637 -2997,1637 +4866,3125 @@@ case 'v': case 'w': case 'x': ++<<<<<<< HEAD + case 'z': goto yy243; + case 'F': + case 'f': goto yy245; + case 'N': + case 'n': goto yy246; + case 'O': + case 'o': goto yy247; + case 'T': + case 't': goto yy248; + case 'Y': + case 'y': goto yy249; + default: goto yy223; + } +yy221: + YYDEBUG(221, *YYCURSOR); + ++YYCURSOR; +yy222: + YYDEBUG(222, *YYCURSOR); ++======= + case 'z': goto yy253; + case 'F': + case 'f': goto yy255; + case 'N': + case 'n': goto yy256; + case 'O': + case 'o': goto yy257; + case 'T': + case 't': goto yy258; + case 'Y': + case 'y': goto yy259; + default: goto yy233; + } + yy231: + YYDEBUG(231, *YYCURSOR); + ++YYCURSOR; + yy232: + YYDEBUG(232, *YYCURSOR); ++>>>>>>> PHP-5.6 yyleng = YYCURSOR - SCNG(yy_text); -#line 649 "Zend/zend_ini_scanner.l" +#line 643 "Zend/zend_ini_scanner.l" { /* End of option value (if EOF is reached before EOL */ BEGIN(INITIAL); return END_OF_LINE; } ++<<<<<<< HEAD +#line 2932 "Zend/zend_ini_scanner.c" +yy223: + YYDEBUG(223, *YYCURSOR); + yyaccept = 0; + yych = *(YYMARKER = ++YYCURSOR); + goto yy251; +yy224: + YYDEBUG(224, *YYCURSOR); ++======= + #line 3025 "Zend/zend_ini_scanner.c" + yy233: + YYDEBUG(233, *YYCURSOR); + yyaccept = 0; + yych = *(YYMARKER = ++YYCURSOR); + goto yy261; + yy234: + YYDEBUG(234, *YYCURSOR); ++>>>>>>> PHP-5.6 yyleng = YYCURSOR - SCNG(yy_text); -#line 568 "Zend/zend_ini_scanner.l" +#line 569 "Zend/zend_ini_scanner.l" { /* Get everything else as option/offset value */ RETURN_TOKEN(TC_STRING, yytext, yyleng); } ++<<<<<<< HEAD +#line 2945 "Zend/zend_ini_scanner.c" +yy225: + YYDEBUG(225, *YYCURSOR); + yyaccept = 1; + yych = *(YYMARKER = ++YYCURSOR); + goto yy305; +yy226: + YYDEBUG(226, *YYCURSOR); ++======= + #line 3038 "Zend/zend_ini_scanner.c" + yy235: + YYDEBUG(235, *YYCURSOR); + yyaccept = 1; + yych = *(YYMARKER = ++YYCURSOR); + goto yy315; + yy236: + YYDEBUG(236, *YYCURSOR); ++>>>>>>> PHP-5.6 yyleng = YYCURSOR - SCNG(yy_text); -#line 622 "Zend/zend_ini_scanner.l" +#line 623 "Zend/zend_ini_scanner.l" { RETURN_TOKEN(TC_WHITESPACE, yytext, yyleng); } ++<<<<<<< HEAD +#line 2958 "Zend/zend_ini_scanner.c" +yy227: + YYDEBUG(227, *YYCURSOR); + ++YYCURSOR; +yy228: + YYDEBUG(228, *YYCURSOR); ++======= + #line 3051 "Zend/zend_ini_scanner.c" + yy237: + YYDEBUG(237, *YYCURSOR); + ++YYCURSOR; + yy238: + YYDEBUG(238, *YYCURSOR); ++>>>>>>> PHP-5.6 yyleng = YYCURSOR - SCNG(yy_text); -#line 540 "Zend/zend_ini_scanner.l" +#line 541 "Zend/zend_ini_scanner.l" { /* End of option value */ BEGIN(INITIAL); SCNG(lineno)++; return END_OF_LINE; } ++<<<<<<< HEAD +#line 2971 "Zend/zend_ini_scanner.c" +yy229: + YYDEBUG(229, *YYCURSOR); + yych = *++YYCURSOR; + if (yych == '\n') goto yy303; + goto yy228; +yy230: + YYDEBUG(230, *YYCURSOR); + ++YYCURSOR; + yych = *YYCURSOR; + goto yy302; +yy231: + YYDEBUG(231, *YYCURSOR); ++======= + #line 3064 "Zend/zend_ini_scanner.c" + yy239: + YYDEBUG(239, *YYCURSOR); + yych = *++YYCURSOR; + if (yych == '\n') goto yy313; + goto yy238; + yy240: + YYDEBUG(240, *YYCURSOR); + ++YYCURSOR; + yych = *YYCURSOR; + goto yy312; + yy241: + YYDEBUG(241, *YYCURSOR); ++>>>>>>> PHP-5.6 yyleng = YYCURSOR - SCNG(yy_text); -#line 558 "Zend/zend_ini_scanner.l" +#line 559 "Zend/zend_ini_scanner.l" { /* Boolean operators */ return yytext[0]; } ++<<<<<<< HEAD +#line 2989 "Zend/zend_ini_scanner.c" +yy232: + YYDEBUG(232, *YYCURSOR); + ++YYCURSOR; +yy233: + YYDEBUG(233, *YYCURSOR); ++======= + #line 3082 "Zend/zend_ini_scanner.c" + yy242: + YYDEBUG(242, *YYCURSOR); + ++YYCURSOR; + yy243: + YYDEBUG(243, *YYCURSOR); ++>>>>>>> PHP-5.6 yyleng = YYCURSOR - SCNG(yy_text); -#line 576 "Zend/zend_ini_scanner.l" +#line 577 "Zend/zend_ini_scanner.l" { /* Double quoted '"' string start */ - yy_push_state(ST_DOUBLE_QUOTES TSRMLS_CC); + yy_push_state(ST_DOUBLE_QUOTES); return '"'; } ++<<<<<<< HEAD +#line 3001 "Zend/zend_ini_scanner.c" +yy234: + YYDEBUG(234, *YYCURSOR); + yych = *++YYCURSOR; + if (yych <= '\\') { + if (yych <= 0x00) goto yy222; + if (yych <= '[') goto yy250; + goto yy257; + } else { + if (yych == '{') goto yy299; + goto yy250; + } +yy235: + YYDEBUG(235, *YYCURSOR); + yyaccept = 2; + yych = *(YYMARKER = ++YYCURSOR); + if (yybm[0+yych] & 128) { + goto yy295; + } + goto yy222; +yy236: + YYDEBUG(236, *YYCURSOR); + yyaccept = 0; + yych = *(YYMARKER = ++YYCURSOR); + if (yych <= '/') goto yy251; + if (yych <= '9') goto yy293; + goto yy251; +yy237: + YYDEBUG(237, *YYCURSOR); + yyaccept = 0; + yych = *(YYMARKER = ++YYCURSOR); + if (yych <= '/') goto yy251; + if (yych <= '9') goto yy291; + goto yy251; +yy238: + YYDEBUG(238, *YYCURSOR); ++======= + #line 3094 "Zend/zend_ini_scanner.c" + yy244: + YYDEBUG(244, *YYCURSOR); + yych = *++YYCURSOR; + if (yych <= '\\') { + if (yych <= 0x00) goto yy232; + if (yych <= '[') goto yy260; + goto yy267; + } else { + if (yych == '{') goto yy309; + goto yy260; + } + yy245: + YYDEBUG(245, *YYCURSOR); + yyaccept = 2; + yych = *(YYMARKER = ++YYCURSOR); + if (yybm[0+yych] & 128) { + goto yy305; + } + goto yy232; + yy246: + YYDEBUG(246, *YYCURSOR); + yyaccept = 0; + yych = *(YYMARKER = ++YYCURSOR); + if (yych <= '/') goto yy261; + if (yych <= '9') goto yy303; + goto yy261; + yy247: + YYDEBUG(247, *YYCURSOR); + yyaccept = 0; + yych = *(YYMARKER = ++YYCURSOR); + if (yych <= '/') goto yy261; + if (yych <= '9') goto yy301; + goto yy261; + yy248: + YYDEBUG(248, *YYCURSOR); ++>>>>>>> PHP-5.6 yyaccept = 3; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '/') { if (yych <= 0x1F) { if (yych <= '\n') { ++<<<<<<< HEAD + if (yych <= 0x00) goto yy239; + if (yych <= 0x08) goto yy251; + } else { + if (yych != '\r') goto yy251; + } + } else { + if (yych <= ')') { + if (yych <= '"') goto yy239; + if (yych <= '%') goto yy251; + } else { + if (yych == '.') goto yy287; + goto yy251; ++======= + if (yych <= 0x00) goto yy249; + if (yych <= 0x08) goto yy261; + } else { + if (yych != '\r') goto yy261; + } + } else { + if (yych <= ')') { + if (yych <= '"') goto yy249; + if (yych <= '%') goto yy261; + } else { + if (yych == '.') goto yy297; + goto yy261; ++>>>>>>> PHP-5.6 } } } else { if (yych <= ']') { if (yych <= ';') { ++<<<<<<< HEAD + if (yych <= '9') goto yy289; + if (yych <= ':') goto yy251; + } else { + if (yych != '=') goto yy251; + } + } else { + if (yych <= '|') { + if (yych <= '^') goto yy239; + if (yych <= '{') goto yy251; + } else { + if (yych != '~') goto yy251; + } + } + } +yy239: + YYDEBUG(239, *YYCURSOR); ++======= + if (yych <= '9') goto yy299; + if (yych <= ':') goto yy261; + } else { + if (yych != '=') goto yy261; + } + } else { + if (yych <= '|') { + if (yych <= '^') goto yy249; + if (yych <= '{') goto yy261; + } else { + if (yych != '~') goto yy261; + } + } + } + yy249: + YYDEBUG(249, *YYCURSOR); ++>>>>>>> PHP-5.6 yyleng = YYCURSOR - SCNG(yy_text); -#line 550 "Zend/zend_ini_scanner.l" +#line 551 "Zend/zend_ini_scanner.l" { /* Get number option value as string */ RETURN_TOKEN(TC_NUMBER, yytext, yyleng); } ++<<<<<<< HEAD +#line 3080 "Zend/zend_ini_scanner.c" +yy240: + YYDEBUG(240, *YYCURSOR); + yyaccept = 2; + yych = *(YYMARKER = ++YYCURSOR); + goto yy283; +yy241: + YYDEBUG(241, *YYCURSOR); + ++YYCURSOR; + YYDEBUG(242, *YYCURSOR); ++======= + #line 3173 "Zend/zend_ini_scanner.c" + yy250: + YYDEBUG(250, *YYCURSOR); + yyaccept = 2; + yych = *(YYMARKER = ++YYCURSOR); + goto yy293; + yy251: + YYDEBUG(251, *YYCURSOR); + ++YYCURSOR; + YYDEBUG(252, *YYCURSOR); ++>>>>>>> PHP-5.6 yyleng = YYCURSOR - SCNG(yy_text); -#line 562 "Zend/zend_ini_scanner.l" +#line 563 "Zend/zend_ini_scanner.l" { /* Make = used in option value to trigger error */ yyless(0); BEGIN(INITIAL); return END_OF_LINE; } ++<<<<<<< HEAD +#line 3097 "Zend/zend_ini_scanner.c" +yy243: + YYDEBUG(243, *YYCURSOR); + yyaccept = 4; + yych = *(YYMARKER = ++YYCURSOR); + if (yybm[0+yych] & 4) { + goto yy252; ++======= + #line 3190 "Zend/zend_ini_scanner.c" + yy253: + YYDEBUG(253, *YYCURSOR); + yyaccept = 4; + yych = *(YYMARKER = ++YYCURSOR); + if (yybm[0+yych] & 4) { + goto yy262; ++>>>>>>> PHP-5.6 } if (yych <= ':') { if (yych <= '\r') { if (yych <= 0x08) { ++<<<<<<< HEAD + if (yych >= 0x01) goto yy251; + } else { + if (yych <= '\n') goto yy244; + if (yych <= '\f') goto yy251; + } + } else { + if (yych <= '"') { + if (yych <= 0x1F) goto yy251; + } else { + if (yych <= '%') goto yy251; + if (yych >= '*') goto yy251; ++======= + if (yych >= 0x01) goto yy261; + } else { + if (yych <= '\n') goto yy254; + if (yych <= '\f') goto yy261; + } + } else { + if (yych <= '"') { + if (yych <= 0x1F) goto yy261; + } else { + if (yych <= '%') goto yy261; + if (yych >= '*') goto yy261; ++>>>>>>> PHP-5.6 } } } else { if (yych <= '^') { if (yych <= '<') { ++<<<<<<< HEAD + if (yych >= '<') goto yy251; + } else { + if (yych <= '=') goto yy244; + if (yych <= ']') goto yy251; + } + } else { + if (yych <= '|') { + if (yych <= '{') goto yy251; + } else { + if (yych != '~') goto yy251; + } + } + } +yy244: + YYDEBUG(244, *YYCURSOR); ++======= + if (yych >= '<') goto yy261; + } else { + if (yych <= '=') goto yy254; + if (yych <= ']') goto yy261; + } + } else { + if (yych <= '|') { + if (yych <= '{') goto yy261; + } else { + if (yych != '~') goto yy261; + } + } + } + yy254: + YYDEBUG(254, *YYCURSOR); ++>>>>>>> PHP-5.6 yyleng = YYCURSOR - SCNG(yy_text); -#line 546 "Zend/zend_ini_scanner.l" +#line 547 "Zend/zend_ini_scanner.l" { /* Get constant option value */ RETURN_TOKEN(TC_CONSTANT, yytext, yyleng); } ++<<<<<<< HEAD +#line 3144 "Zend/zend_ini_scanner.c" +yy245: + YYDEBUG(245, *YYCURSOR); ++======= + #line 3237 "Zend/zend_ini_scanner.c" + yy255: + YYDEBUG(255, *YYCURSOR); ++>>>>>>> PHP-5.6 yyaccept = 4; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '<') { if (yych <= '"') { if (yych <= '\n') { ++<<<<<<< HEAD + if (yych <= 0x00) goto yy244; + if (yych <= 0x08) goto yy251; + goto yy244; + } else { + if (yych == '\r') goto yy244; + if (yych <= 0x1F) goto yy251; + goto yy244; + } + } else { + if (yych <= '/') { + if (yych <= '%') goto yy251; + if (yych <= ')') goto yy244; + goto yy251; + } else { + if (yych <= '9') goto yy252; + if (yych == ';') goto yy244; + goto yy251; ++======= + if (yych <= 0x00) goto yy254; + if (yych <= 0x08) goto yy261; + goto yy254; + } else { + if (yych == '\r') goto yy254; + if (yych <= 0x1F) goto yy261; + goto yy254; + } + } else { + if (yych <= '/') { + if (yych <= '%') goto yy261; + if (yych <= ')') goto yy254; + goto yy261; + } else { + if (yych <= '9') goto yy262; + if (yych == ';') goto yy254; + goto yy261; ++>>>>>>> PHP-5.6 + } + } + } else { + if (yych <= '_') { + if (yych <= 'A') { ++<<<<<<< HEAD + if (yych <= '=') goto yy244; + if (yych <= '@') goto yy251; + goto yy279; + } else { + if (yych <= 'Z') goto yy252; + if (yych <= ']') goto yy251; + if (yych <= '^') goto yy244; + goto yy252; + } + } else { + if (yych <= '{') { + if (yych <= '`') goto yy251; + if (yych <= 'a') goto yy279; + if (yych <= 'z') goto yy252; + goto yy251; + } else { + if (yych == '}') goto yy251; + if (yych <= '~') goto yy244; + goto yy251; } } - } else { - if (yych <= '_') { - if (yych <= 'A') { + } +yy246: + YYDEBUG(246, *YYCURSOR); ++======= + if (yych <= '=') goto yy254; + if (yych <= '@') goto yy261; + goto yy289; + } else { + if (yych <= 'Z') goto yy262; + if (yych <= ']') goto yy261; + if (yych <= '^') goto yy254; + goto yy262; + } + } else { + if (yych <= '{') { + if (yych <= '`') goto yy261; + if (yych <= 'a') goto yy289; + if (yych <= 'z') goto yy262; + goto yy261; + } else { + if (yych == '}') goto yy261; + if (yych <= '~') goto yy254; + goto yy261; + } + } + } + yy256: + YYDEBUG(256, *YYCURSOR); ++>>>>>>> PHP-5.6 yyaccept = 4; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'N') { if (yych <= '%') { if (yych <= '\f') { ++<<<<<<< HEAD + if (yych <= 0x00) goto yy244; + if (yych <= 0x08) goto yy251; + if (yych <= '\n') goto yy244; + goto yy251; + } else { + if (yych <= '\r') goto yy244; + if (yych <= 0x1F) goto yy251; + if (yych <= '"') goto yy244; + goto yy251; + } + } else { + if (yych <= ':') { + if (yych <= ')') goto yy244; + if (yych <= '/') goto yy251; + if (yych <= '9') goto yy252; + goto yy251; + } else { + if (yych <= '<') { + if (yych <= ';') goto yy244; + goto yy251; + } else { + if (yych <= '=') goto yy244; + if (yych <= '@') goto yy251; + goto yy252; ++======= + if (yych <= 0x00) goto yy254; + if (yych <= 0x08) goto yy261; + if (yych <= '\n') goto yy254; + goto yy261; + } else { + if (yych <= '\r') goto yy254; + if (yych <= 0x1F) goto yy261; + if (yych <= '"') goto yy254; + goto yy261; + } + } else { + if (yych <= ':') { + if (yych <= ')') goto yy254; + if (yych <= '/') goto yy261; + if (yych <= '9') goto yy262; + goto yy261; + } else { + if (yych <= '<') { + if (yych <= ';') goto yy254; + goto yy261; + } else { + if (yych <= '=') goto yy254; + if (yych <= '@') goto yy261; + goto yy262; ++>>>>>>> PHP-5.6 } } } } else { if (yych <= 'n') { if (yych <= 'Z') { ++<<<<<<< HEAD + if (yych <= 'O') goto yy271; + if (yych == 'U') goto yy272; + goto yy252; + } else { + if (yych <= '^') { + if (yych <= ']') goto yy251; + goto yy244; + } else { + if (yych == '`') goto yy251; + goto yy252; ++======= + if (yych <= 'O') goto yy281; + if (yych == 'U') goto yy282; + goto yy262; + } else { + if (yych <= '^') { + if (yych <= ']') goto yy261; + goto yy254; + } else { + if (yych == '`') goto yy261; + goto yy262; ++>>>>>>> PHP-5.6 } } } else { if (yych <= 'z') { ++<<<<<<< HEAD + if (yych <= 'o') goto yy271; + if (yych == 'u') goto yy272; + goto yy252; + } else { + if (yych <= '|') { + if (yych <= '{') goto yy251; + goto yy244; + } else { + if (yych == '~') goto yy244; + goto yy251; ++======= + if (yych <= 'o') goto yy281; + if (yych == 'u') goto yy282; + goto yy262; + } else { + if (yych <= '|') { + if (yych <= '{') goto yy261; + goto yy254; + } else { + if (yych == '~') goto yy254; + goto yy261; ++>>>>>>> PHP-5.6 } } } } ++<<<<<<< HEAD +yy247: + YYDEBUG(247, *YYCURSOR); ++======= + yy257: + YYDEBUG(257, *YYCURSOR); ++>>>>>>> PHP-5.6 yyaccept = 4; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'E') { if (yych <= '%') { if (yych <= '\f') { ++<<<<<<< HEAD + if (yych <= 0x00) goto yy244; + if (yych <= 0x08) goto yy251; + if (yych <= '\n') goto yy244; + goto yy251; + } else { + if (yych <= '\r') goto yy244; + if (yych <= 0x1F) goto yy251; + if (yych <= '"') goto yy244; + goto yy251; + } + } else { + if (yych <= ':') { + if (yych <= ')') goto yy244; + if (yych <= '/') goto yy251; + if (yych <= '9') goto yy252; + goto yy251; + } else { + if (yych <= '<') { + if (yych <= ';') goto yy244; + goto yy251; + } else { + if (yych <= '=') goto yy244; + if (yych <= '@') goto yy251; + goto yy252; ++======= + if (yych <= 0x00) goto yy254; + if (yych <= 0x08) goto yy261; + if (yych <= '\n') goto yy254; + goto yy261; + } else { + if (yych <= '\r') goto yy254; + if (yych <= 0x1F) goto yy261; + if (yych <= '"') goto yy254; + goto yy261; + } + } else { + if (yych <= ':') { + if (yych <= ')') goto yy254; + if (yych <= '/') goto yy261; + if (yych <= '9') goto yy262; + goto yy261; + } else { + if (yych <= '<') { + if (yych <= ';') goto yy254; + goto yy261; + } else { + if (yych <= '=') goto yy254; + if (yych <= '@') goto yy261; + goto yy262; ++>>>>>>> PHP-5.6 } } } } else { if (yych <= 'e') { if (yych <= 'Z') { ++<<<<<<< HEAD + if (yych <= 'F') goto yy266; + if (yych == 'N') goto yy260; + goto yy252; + } else { + if (yych <= '^') { + if (yych <= ']') goto yy251; + goto yy244; + } else { + if (yych == '`') goto yy251; + goto yy252; ++======= + if (yych <= 'F') goto yy276; + if (yych == 'N') goto yy270; + goto yy262; + } else { + if (yych <= '^') { + if (yych <= ']') goto yy261; + goto yy254; + } else { + if (yych == '`') goto yy261; + goto yy262; ++>>>>>>> PHP-5.6 } } } else { if (yych <= 'z') { ++<<<<<<< HEAD + if (yych <= 'f') goto yy266; + if (yych == 'n') goto yy260; + goto yy252; + } else { + if (yych <= '|') { + if (yych <= '{') goto yy251; + goto yy244; + } else { + if (yych == '~') goto yy244; + goto yy251; ++======= + if (yych <= 'f') goto yy276; + if (yych == 'n') goto yy270; + goto yy262; + } else { + if (yych <= '|') { + if (yych <= '{') goto yy261; + goto yy254; + } else { + if (yych == '~') goto yy254; + goto yy261; ++>>>>>>> PHP-5.6 } } } } ++<<<<<<< HEAD +yy248: + YYDEBUG(248, *YYCURSOR); ++======= + yy258: + YYDEBUG(258, *YYCURSOR); ++>>>>>>> PHP-5.6 yyaccept = 4; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '=') { if (yych <= '"') { if (yych <= '\n') { ++<<<<<<< HEAD + if (yych <= 0x00) goto yy244; + if (yych <= 0x08) goto yy251; + goto yy244; + } else { + if (yych == '\r') goto yy244; + if (yych <= 0x1F) goto yy251; + goto yy244; + } + } else { + if (yych <= '9') { + if (yych <= '%') goto yy251; + if (yych <= ')') goto yy244; + if (yych <= '/') goto yy251; + goto yy252; + } else { + if (yych == ';') goto yy244; + if (yych <= '<') goto yy251; + goto yy244; ++======= + if (yych <= 0x00) goto yy254; + if (yych <= 0x08) goto yy261; + goto yy254; + } else { + if (yych == '\r') goto yy254; + if (yych <= 0x1F) goto yy261; + goto yy254; + } + } else { + if (yych <= '9') { + if (yych <= '%') goto yy261; + if (yych <= ')') goto yy254; + if (yych <= '/') goto yy261; + goto yy262; + } else { + if (yych == ';') goto yy254; + if (yych <= '<') goto yy261; + goto yy254; ++>>>>>>> PHP-5.6 } } } else { if (yych <= '`') { if (yych <= 'Z') { ++<<<<<<< HEAD + if (yych <= '@') goto yy251; + if (yych == 'R') goto yy264; + goto yy252; + } else { + if (yych <= ']') goto yy251; + if (yych <= '^') goto yy244; + if (yych <= '_') goto yy252; + goto yy251; + } + } else { + if (yych <= '{') { + if (yych == 'r') goto yy264; + if (yych <= 'z') goto yy252; + goto yy251; + } else { + if (yych == '}') goto yy251; + if (yych <= '~') goto yy244; + goto yy251; + } + } + } +yy249: + YYDEBUG(249, *YYCURSOR); ++======= + if (yych <= '@') goto yy261; + if (yych == 'R') goto yy274; + goto yy262; + } else { + if (yych <= ']') goto yy261; + if (yych <= '^') goto yy254; + if (yych <= '_') goto yy262; + goto yy261; + } + } else { + if (yych <= '{') { + if (yych == 'r') goto yy274; + if (yych <= 'z') goto yy262; + goto yy261; + } else { + if (yych == '}') goto yy261; + if (yych <= '~') goto yy254; + goto yy261; + } + } + } + yy259: + YYDEBUG(259, *YYCURSOR); ++>>>>>>> PHP-5.6 yyaccept = 4; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '=') { if (yych <= '"') { if (yych <= '\n') { ++<<<<<<< HEAD + if (yych <= 0x00) goto yy244; + if (yych <= 0x08) goto yy251; + goto yy244; + } else { + if (yych == '\r') goto yy244; + if (yych <= 0x1F) goto yy251; + goto yy244; + } + } else { + if (yych <= '9') { + if (yych <= '%') goto yy251; + if (yych <= ')') goto yy244; + if (yych <= '/') goto yy251; + goto yy252; + } else { + if (yych == ';') goto yy244; + if (yych <= '<') goto yy251; + goto yy244; ++======= + if (yych <= 0x00) goto yy254; + if (yych <= 0x08) goto yy261; + goto yy254; + } else { + if (yych == '\r') goto yy254; + if (yych <= 0x1F) goto yy261; + goto yy254; + } + } else { + if (yych <= '9') { + if (yych <= '%') goto yy261; + if (yych <= ')') goto yy254; + if (yych <= '/') goto yy261; + goto yy262; + } else { + if (yych == ';') goto yy254; + if (yych <= '<') goto yy261; + goto yy254; ++>>>>>>> PHP-5.6 } } } else { if (yych <= '`') { if (yych <= 'Z') { ++<<<<<<< HEAD + if (yych <= '@') goto yy251; + if (yych == 'E') goto yy254; + goto yy252; + } else { + if (yych <= ']') goto yy251; + if (yych <= '^') goto yy244; + if (yych <= '_') goto yy252; + goto yy251; + } + } else { + if (yych <= '{') { + if (yych == 'e') goto yy254; + if (yych <= 'z') goto yy252; + goto yy251; + } else { + if (yych == '}') goto yy251; + if (yych <= '~') goto yy244; + goto yy251; + } + } + } +yy250: + YYDEBUG(250, *YYCURSOR); ++======= + if (yych <= '@') goto yy261; + if (yych == 'E') goto yy264; + goto yy262; + } else { + if (yych <= ']') goto yy261; + if (yych <= '^') goto yy254; + if (yych <= '_') goto yy262; + goto yy261; + } + } else { + if (yych <= '{') { + if (yych == 'e') goto yy264; + if (yych <= 'z') goto yy262; + goto yy261; + } else { + if (yych == '}') goto yy261; + if (yych <= '~') goto yy254; + goto yy261; + } + } + } + yy260: + YYDEBUG(260, *YYCURSOR); ++>>>>>>> PHP-5.6 yyaccept = 0; YYMARKER = ++YYCURSOR; YYFILL(1); yych = *YYCURSOR; ++<<<<<<< HEAD +yy251: + YYDEBUG(251, *YYCURSOR); + if (yybm[0+yych] & 2) { + goto yy250; + } + if (yych == '$') goto yy255; + goto yy224; +yy252: + YYDEBUG(252, *YYCURSOR); ++======= + yy261: + YYDEBUG(261, *YYCURSOR); + if (yybm[0+yych] & 2) { + goto yy260; + } + if (yych == '$') goto yy265; + goto yy234; + yy262: + YYDEBUG(262, *YYCURSOR); ++>>>>>>> PHP-5.6 yyaccept = 4; YYMARKER = ++YYCURSOR; YYFILL(1); yych = *YYCURSOR; ++<<<<<<< HEAD + YYDEBUG(253, *YYCURSOR); + if (yybm[0+yych] & 4) { + goto yy252; ++======= + YYDEBUG(263, *YYCURSOR); + if (yybm[0+yych] & 4) { + goto yy262; ++>>>>>>> PHP-5.6 } if (yych <= ')') { if (yych <= '\r') { if (yych <= 0x08) { ++<<<<<<< HEAD + if (yych <= 0x00) goto yy244; + goto yy250; + } else { + if (yych <= '\n') goto yy244; + if (yych <= '\f') goto yy250; + goto yy244; + } + } else { + if (yych <= '#') { + if (yych <= 0x1F) goto yy250; + if (yych <= '"') goto yy244; + goto yy250; + } else { + if (yych <= '$') goto yy255; + if (yych <= '%') goto yy250; + goto yy244; ++======= + if (yych <= 0x00) goto yy254; + goto yy260; + } else { + if (yych <= '\n') goto yy254; + if (yych <= '\f') goto yy260; + goto yy254; + } + } else { + if (yych <= '#') { + if (yych <= 0x1F) goto yy260; + if (yych <= '"') goto yy254; + goto yy260; + } else { + if (yych <= '$') goto yy265; + if (yych <= '%') goto yy260; + goto yy254; ++>>>>>>> PHP-5.6 } } } else { if (yych <= ']') { if (yych <= ';') { ++<<<<<<< HEAD + if (yych <= ':') goto yy250; + goto yy244; + } else { + if (yych == '=') goto yy244; + goto yy250; + } + } else { + if (yych <= '|') { + if (yych <= '^') goto yy244; + if (yych <= '{') goto yy250; + goto yy244; + } else { + if (yych == '~') goto yy244; + goto yy250; + } + } + } +yy254: + YYDEBUG(254, *YYCURSOR); ++======= + if (yych <= ':') goto yy260; + goto yy254; + } else { + if (yych == '=') goto yy254; + goto yy260; + } + } else { + if (yych <= '|') { + if (yych <= '^') goto yy254; + if (yych <= '{') goto yy260; + goto yy254; + } else { + if (yych == '~') goto yy254; + goto yy260; + } + } + } + yy264: + YYDEBUG(264, *YYCURSOR); ++>>>>>>> PHP-5.6 yyaccept = 4; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '=') { if (yych <= '"') { if (yych <= '\n') { ++<<<<<<< HEAD + if (yych <= 0x00) goto yy244; + if (yych <= 0x08) goto yy251; + goto yy244; + } else { + if (yych == '\r') goto yy244; + if (yych <= 0x1F) goto yy251; + goto yy244; + } + } else { + if (yych <= '9') { + if (yych <= '%') goto yy251; + if (yych <= ')') goto yy244; + if (yych <= '/') goto yy251; + goto yy252; + } else { + if (yych == ';') goto yy244; + if (yych <= '<') goto yy251; + goto yy244; ++======= + if (yych <= 0x00) goto yy254; + if (yych <= 0x08) goto yy261; + goto yy254; + } else { + if (yych == '\r') goto yy254; + if (yych <= 0x1F) goto yy261; + goto yy254; + } + } else { + if (yych <= '9') { + if (yych <= '%') goto yy261; + if (yych <= ')') goto yy254; + if (yych <= '/') goto yy261; + goto yy262; + } else { + if (yych == ';') goto yy254; + if (yych <= '<') goto yy261; + goto yy254; ++>>>>>>> PHP-5.6 } } } else { if (yych <= '`') { if (yych <= 'Z') { ++<<<<<<< HEAD + if (yych <= '@') goto yy251; + if (yych == 'S') goto yy260; + goto yy252; + } else { + if (yych <= ']') goto yy251; + if (yych <= '^') goto yy244; + if (yych <= '_') goto yy252; + goto yy251; + } + } else { + if (yych <= '{') { + if (yych == 's') goto yy260; + if (yych <= 'z') goto yy252; + goto yy251; + } else { + if (yych == '}') goto yy251; + if (yych <= '~') goto yy244; + goto yy251; + } + } + } +yy255: + YYDEBUG(255, *YYCURSOR); ++======= + if (yych <= '@') goto yy261; + if (yych == 'S') goto yy270; + goto yy262; + } else { + if (yych <= ']') goto yy261; + if (yych <= '^') goto yy254; + if (yych <= '_') goto yy262; + goto yy261; + } + } else { + if (yych <= '{') { + if (yych == 's') goto yy270; + if (yych <= 'z') goto yy262; + goto yy261; + } else { + if (yych == '}') goto yy261; + if (yych <= '~') goto yy254; + goto yy261; + } + } + } + yy265: + YYDEBUG(265, *YYCURSOR); ++>>>>>>> PHP-5.6 ++YYCURSOR; YYFILL(1); yych = *YYCURSOR; if (yych <= '\\') { ++<<<<<<< HEAD + if (yych <= 0x00) goto yy256; + if (yych <= '[') goto yy250; + goto yy257; + } else { + if (yych != '{') goto yy250; + } +yy256: + YYDEBUG(256, *YYCURSOR); ++======= + if (yych <= 0x00) goto yy266; + if (yych <= '[') goto yy260; + goto yy267; + } else { + if (yych != '{') goto yy260; + } + yy266: + YYDEBUG(266, *YYCURSOR); ++>>>>>>> PHP-5.6 YYCURSOR = YYMARKER; if (yyaccept <= 3) { if (yyaccept <= 1) { if (yyaccept <= 0) { ++<<<<<<< HEAD + goto yy224; + } else { + goto yy226; + } + } else { + if (yyaccept <= 2) { + goto yy222; + } else { + goto yy239; ++======= + goto yy234; + } else { + goto yy236; + } + } else { + if (yyaccept <= 2) { + goto yy232; + } else { + goto yy249; ++>>>>>>> PHP-5.6 } } } else { if (yyaccept <= 5) { if (yyaccept <= 4) { ++<<<<<<< HEAD + goto yy244; + } else { + goto yy261; + } + } else { + if (yyaccept <= 6) { + goto yy268; + } else { + goto yy275; + } + } + } +yy257: + YYDEBUG(257, *YYCURSOR); ++======= + goto yy254; + } else { + goto yy271; + } + } else { + if (yyaccept <= 6) { + goto yy278; + } else { + goto yy285; + } + } + } + yy267: + YYDEBUG(267, *YYCURSOR); ++>>>>>>> PHP-5.6 + ++YYCURSOR; + YYFILL(1); + yych = *YYCURSOR; + if (yybm[0+yych] & 8) { ++<<<<<<< HEAD + goto yy258; + } + goto yy250; +yy258: + YYDEBUG(258, *YYCURSOR); ++YYCURSOR; YYFILL(1); yych = *YYCURSOR; + YYDEBUG(259, *YYCURSOR); if (yybm[0+yych] & 8) { + goto yy258; + } + if (yych <= 0x00) goto yy224; + if (yych == '\\') goto yy257; + goto yy250; +yy260: + YYDEBUG(260, *YYCURSOR); + yyaccept = 5; + yych = *(YYMARKER = ++YYCURSOR); + if (yybm[0+yych] & 16) { + goto yy262; ++======= + goto yy268; + } + goto yy260; + yy268: + YYDEBUG(268, *YYCURSOR); + ++YYCURSOR; + YYFILL(1); + yych = *YYCURSOR; + YYDEBUG(269, *YYCURSOR); + if (yybm[0+yych] & 8) { + goto yy268; + } + if (yych <= 0x00) goto yy234; + if (yych == '\\') goto yy267; + goto yy260; + yy270: + YYDEBUG(270, *YYCURSOR); + yyaccept = 5; + yych = *(YYMARKER = ++YYCURSOR); + if (yybm[0+yych] & 16) { + goto yy272; ++>>>>>>> PHP-5.6 } if (yych <= ';') { if (yych <= ' ') { if (yych <= '\n') { ++<<<<<<< HEAD + if (yych <= 0x00) goto yy261; + if (yych <= '\t') goto yy251; + } else { + if (yych != '\r') goto yy251; + } + } else { + if (yych <= ')') { + if (yych <= '"') goto yy261; + if (yych <= '%') goto yy251; + } else { + if (yych <= '/') goto yy251; + if (yych <= '9') goto yy252; + if (yych <= ':') goto yy251; ++======= + if (yych <= 0x00) goto yy271; + if (yych <= '\t') goto yy261; + } else { + if (yych != '\r') goto yy261; + } + } else { + if (yych <= ')') { + if (yych <= '"') goto yy271; + if (yych <= '%') goto yy261; + } else { + if (yych <= '/') goto yy261; + if (yych <= '9') goto yy262; + if (yych <= ':') goto yy261; ++>>>>>>> PHP-5.6 } } } else { if (yych <= '_') { if (yych <= '@') { ++<<<<<<< HEAD + if (yych != '=') goto yy251; + } else { + if (yych <= 'Z') goto yy252; + if (yych <= ']') goto yy251; + if (yych >= '_') goto yy252; + } + } else { + if (yych <= '{') { + if (yych <= '`') goto yy251; + if (yych <= 'z') goto yy252; + goto yy251; + } else { + if (yych == '}') goto yy251; + if (yych >= 0x7F) goto yy251; + } + } + } +yy261: + YYDEBUG(261, *YYCURSOR); ++======= + if (yych != '=') goto yy261; + } else { + if (yych <= 'Z') goto yy262; + if (yych <= ']') goto yy261; + if (yych >= '_') goto yy262; + } + } else { + if (yych <= '{') { + if (yych <= '`') goto yy261; + if (yych <= 'z') goto yy262; + goto yy261; + } else { + if (yych == '}') goto yy261; + if (yych >= 0x7F) goto yy261; + } + } + } + yy271: + YYDEBUG(271, *YYCURSOR); ++>>>>>>> PHP-5.6 yyleng = YYCURSOR - SCNG(yy_text); -#line 468 "Zend/zend_ini_scanner.l" +#line 469 "Zend/zend_ini_scanner.l" { /* TRUE value (when used outside option value/offset this causes parse error!) */ RETURN_TOKEN(BOOL_TRUE, "1", 1); } ++<<<<<<< HEAD +#line 3660 "Zend/zend_ini_scanner.c" +yy262: + YYDEBUG(262, *YYCURSOR); + ++YYCURSOR; + YYFILL(1); + yych = *YYCURSOR; + YYDEBUG(263, *YYCURSOR); + if (yybm[0+yych] & 16) { + goto yy262; + } + goto yy261; +yy264: + YYDEBUG(264, *YYCURSOR); ++======= + #line 3753 "Zend/zend_ini_scanner.c" + yy272: + YYDEBUG(272, *YYCURSOR); + ++YYCURSOR; + YYFILL(1); + yych = *YYCURSOR; + YYDEBUG(273, *YYCURSOR); + if (yybm[0+yych] & 16) { + goto yy272; + } + goto yy271; + yy274: + YYDEBUG(274, *YYCURSOR); ++>>>>>>> PHP-5.6 yyaccept = 4; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '=') { if (yych <= '"') { if (yych <= '\n') { ++<<<<<<< HEAD + if (yych <= 0x00) goto yy244; + if (yych <= 0x08) goto yy251; + goto yy244; + } else { + if (yych == '\r') goto yy244; + if (yych <= 0x1F) goto yy251; + goto yy244; + } + } else { + if (yych <= '9') { + if (yych <= '%') goto yy251; + if (yych <= ')') goto yy244; + if (yych <= '/') goto yy251; + goto yy252; + } else { + if (yych == ';') goto yy244; + if (yych <= '<') goto yy251; + goto yy244; ++======= + if (yych <= 0x00) goto yy254; + if (yych <= 0x08) goto yy261; + goto yy254; + } else { + if (yych == '\r') goto yy254; + if (yych <= 0x1F) goto yy261; + goto yy254; + } + } else { + if (yych <= '9') { + if (yych <= '%') goto yy261; + if (yych <= ')') goto yy254; + if (yych <= '/') goto yy261; + goto yy262; + } else { + if (yych == ';') goto yy254; + if (yych <= '<') goto yy261; + goto yy254; ++>>>>>>> PHP-5.6 } } } else { if (yych <= '`') { if (yych <= 'Z') { ++<<<<<<< HEAD + if (yych <= '@') goto yy251; + if (yych != 'U') goto yy252; + } else { + if (yych <= ']') goto yy251; + if (yych <= '^') goto yy244; + if (yych <= '_') goto yy252; + goto yy251; + } + } else { + if (yych <= '{') { + if (yych == 'u') goto yy265; + if (yych <= 'z') goto yy252; + goto yy251; + } else { + if (yych == '}') goto yy251; + if (yych <= '~') goto yy244; + goto yy251; + } + } + } +yy265: + YYDEBUG(265, *YYCURSOR); ++======= + if (yych <= '@') goto yy261; + if (yych != 'U') goto yy262; + } else { + if (yych <= ']') goto yy261; + if (yych <= '^') goto yy254; + if (yych <= '_') goto yy262; + goto yy261; + } + } else { + if (yych <= '{') { + if (yych == 'u') goto yy275; + if (yych <= 'z') goto yy262; + goto yy261; + } else { + if (yych == '}') goto yy261; + if (yych <= '~') goto yy254; + goto yy261; + } + } + } + yy275: + YYDEBUG(275, *YYCURSOR); ++>>>>>>> PHP-5.6 yyaccept = 4; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '=') { if (yych <= '"') { if (yych <= '\n') { ++<<<<<<< HEAD + if (yych <= 0x00) goto yy244; + if (yych <= 0x08) goto yy251; + goto yy244; + } else { + if (yych == '\r') goto yy244; + if (yych <= 0x1F) goto yy251; + goto yy244; + } + } else { + if (yych <= '9') { + if (yych <= '%') goto yy251; + if (yych <= ')') goto yy244; + if (yych <= '/') goto yy251; + goto yy252; + } else { + if (yych == ';') goto yy244; + if (yych <= '<') goto yy251; + goto yy244; ++======= + if (yych <= 0x00) goto yy254; + if (yych <= 0x08) goto yy261; + goto yy254; + } else { + if (yych == '\r') goto yy254; + if (yych <= 0x1F) goto yy261; + goto yy254; + } + } else { + if (yych <= '9') { + if (yych <= '%') goto yy261; + if (yych <= ')') goto yy254; + if (yych <= '/') goto yy261; + goto yy262; + } else { + if (yych == ';') goto yy254; + if (yych <= '<') goto yy261; + goto yy254; ++>>>>>>> PHP-5.6 } } } else { if (yych <= '`') { if (yych <= 'Z') { ++<<<<<<< HEAD + if (yych <= '@') goto yy251; + if (yych == 'E') goto yy260; + goto yy252; + } else { + if (yych <= ']') goto yy251; + if (yych <= '^') goto yy244; + if (yych <= '_') goto yy252; + goto yy251; + } + } else { + if (yych <= '{') { + if (yych == 'e') goto yy260; + if (yych <= 'z') goto yy252; + goto yy251; + } else { + if (yych == '}') goto yy251; + if (yych <= '~') goto yy244; + goto yy251; + } + } + } +yy266: + YYDEBUG(266, *YYCURSOR); ++======= + if (yych <= '@') goto yy261; + if (yych == 'E') goto yy270; + goto yy262; + } else { + if (yych <= ']') goto yy261; + if (yych <= '^') goto yy254; + if (yych <= '_') goto yy262; + goto yy261; + } + } else { + if (yych <= '{') { + if (yych == 'e') goto yy270; + if (yych <= 'z') goto yy262; + goto yy261; + } else { + if (yych == '}') goto yy261; + if (yych <= '~') goto yy254; + goto yy261; + } + } + } + yy276: + YYDEBUG(276, *YYCURSOR); ++>>>>>>> PHP-5.6 yyaccept = 4; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '=') { if (yych <= '"') { if (yych <= '\n') { ++<<<<<<< HEAD + if (yych <= 0x00) goto yy244; + if (yych <= 0x08) goto yy251; + goto yy244; + } else { + if (yych == '\r') goto yy244; + if (yych <= 0x1F) goto yy251; + goto yy244; + } + } else { + if (yych <= '9') { + if (yych <= '%') goto yy251; + if (yych <= ')') goto yy244; + if (yych <= '/') goto yy251; + goto yy252; + } else { + if (yych == ';') goto yy244; + if (yych <= '<') goto yy251; + goto yy244; ++======= + if (yych <= 0x00) goto yy254; + if (yych <= 0x08) goto yy261; + goto yy254; + } else { + if (yych == '\r') goto yy254; + if (yych <= 0x1F) goto yy261; + goto yy254; + } + } else { + if (yych <= '9') { + if (yych <= '%') goto yy261; + if (yych <= ')') goto yy254; + if (yych <= '/') goto yy261; + goto yy262; + } else { + if (yych == ';') goto yy254; + if (yych <= '<') goto yy261; + goto yy254; ++>>>>>>> PHP-5.6 } } } else { if (yych <= '`') { if (yych <= 'Z') { ++<<<<<<< HEAD + if (yych <= '@') goto yy251; + if (yych != 'F') goto yy252; + } else { + if (yych <= ']') goto yy251; + if (yych <= '^') goto yy244; + if (yych <= '_') goto yy252; + goto yy251; + } + } else { + if (yych <= '{') { + if (yych == 'f') goto yy267; + if (yych <= 'z') goto yy252; + goto yy251; + } else { + if (yych == '}') goto yy251; + if (yych <= '~') goto yy244; + goto yy251; + } + } + } +yy267: + YYDEBUG(267, *YYCURSOR); + yyaccept = 6; + yych = *(YYMARKER = ++YYCURSOR); + if (yybm[0+yych] & 4) { + goto yy252; ++======= + if (yych <= '@') goto yy261; + if (yych != 'F') goto yy262; + } else { + if (yych <= ']') goto yy261; + if (yych <= '^') goto yy254; + if (yych <= '_') goto yy262; + goto yy261; + } + } else { + if (yych <= '{') { + if (yych == 'f') goto yy277; + if (yych <= 'z') goto yy262; + goto yy261; + } else { + if (yych == '}') goto yy261; + if (yych <= '~') goto yy254; + goto yy261; + } + } + } + yy277: + YYDEBUG(277, *YYCURSOR); + yyaccept = 6; + yych = *(YYMARKER = ++YYCURSOR); + if (yybm[0+yych] & 4) { + goto yy262; ++>>>>>>> PHP-5.6 } if (yych <= ')') { if (yych <= '\f') { if (yych <= 0x08) { ++<<<<<<< HEAD + if (yych >= 0x01) goto yy251; + } else { + if (yych <= '\t') goto yy269; + if (yych >= '\v') goto yy251; + } + } else { + if (yych <= ' ') { + if (yych <= '\r') goto yy268; + if (yych <= 0x1F) goto yy251; + goto yy269; + } else { + if (yych <= '"') goto yy268; + if (yych <= '%') goto yy251; ++======= + if (yych >= 0x01) goto yy261; + } else { + if (yych <= '\t') goto yy279; + if (yych >= '\v') goto yy261; + } + } else { + if (yych <= ' ') { + if (yych <= '\r') goto yy278; + if (yych <= 0x1F) goto yy261; + goto yy279; + } else { + if (yych <= '"') goto yy278; + if (yych <= '%') goto yy261; ++>>>>>>> PHP-5.6 } } } else { if (yych <= ']') { if (yych <= ';') { ++<<<<<<< HEAD + if (yych <= ':') goto yy251; + } else { + if (yych != '=') goto yy251; + } + } else { + if (yych <= '|') { + if (yych <= '^') goto yy268; + if (yych <= '{') goto yy251; + } else { + if (yych != '~') goto yy251; + } + } + } +yy268: + YYDEBUG(268, *YYCURSOR); ++======= + if (yych <= ':') goto yy261; + } else { + if (yych != '=') goto yy261; + } + } else { + if (yych <= '|') { + if (yych <= '^') goto yy278; + if (yych <= '{') goto yy261; + } else { + if (yych != '~') goto yy261; + } + } + } + yy278: + YYDEBUG(278, *YYCURSOR); ++>>>>>>> PHP-5.6 yyleng = YYCURSOR - SCNG(yy_text); -#line 472 "Zend/zend_ini_scanner.l" +#line 473 "Zend/zend_ini_scanner.l" { /* FALSE value (when used outside option value/offset this causes parse error!)*/ RETURN_TOKEN(BOOL_FALSE, "", 0); } ++<<<<<<< HEAD +#line 3870 "Zend/zend_ini_scanner.c" +yy269: + YYDEBUG(269, *YYCURSOR); + ++YYCURSOR; + YYFILL(1); + yych = *YYCURSOR; + YYDEBUG(270, *YYCURSOR); + if (yych == '\t') goto yy269; + if (yych == ' ') goto yy269; + goto yy268; +yy271: + YYDEBUG(271, *YYCURSOR); ++======= + #line 3963 "Zend/zend_ini_scanner.c" + yy279: + YYDEBUG(279, *YYCURSOR); + ++YYCURSOR; + YYFILL(1); + yych = *YYCURSOR; + YYDEBUG(280, *YYCURSOR); + if (yych == '\t') goto yy279; + if (yych == ' ') goto yy279; + goto yy278; + yy281: + YYDEBUG(281, *YYCURSOR); ++>>>>>>> PHP-5.6 yyaccept = 6; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '<') { if (yych <= ' ') { if (yych <= '\n') { ++<<<<<<< HEAD + if (yych <= 0x00) goto yy268; + if (yych <= 0x08) goto yy251; + if (yych <= '\t') goto yy269; + goto yy268; + } else { + if (yych == '\r') goto yy268; + if (yych <= 0x1F) goto yy251; + goto yy269; + } + } else { + if (yych <= '/') { + if (yych <= '"') goto yy268; + if (yych <= '%') goto yy251; + if (yych <= ')') goto yy268; + goto yy251; + } else { + if (yych <= '9') goto yy252; + if (yych == ';') goto yy268; + goto yy251; ++======= + if (yych <= 0x00) goto yy278; + if (yych <= 0x08) goto yy261; + if (yych <= '\t') goto yy279; + goto yy278; + } else { + if (yych == '\r') goto yy278; + if (yych <= 0x1F) goto yy261; + goto yy279; + } + } else { + if (yych <= '/') { + if (yych <= '"') goto yy278; + if (yych <= '%') goto yy261; + if (yych <= ')') goto yy278; + goto yy261; + } else { + if (yych <= '9') goto yy262; + if (yych == ';') goto yy278; + goto yy261; ++>>>>>>> PHP-5.6 } } } else { if (yych <= '_') { if (yych <= 'N') { ++<<<<<<< HEAD + if (yych <= '=') goto yy268; + if (yych <= '@') goto yy251; + if (yych <= 'M') goto yy252; + goto yy278; + } else { + if (yych <= 'Z') goto yy252; + if (yych <= ']') goto yy251; + if (yych <= '^') goto yy268; + goto yy252; + } + } else { + if (yych <= 'z') { + if (yych <= '`') goto yy251; + if (yych == 'n') goto yy278; + goto yy252; + } else { + if (yych <= '|') { + if (yych <= '{') goto yy251; + goto yy268; + } else { + if (yych == '~') goto yy268; + goto yy251; ++======= + if (yych <= '=') goto yy278; + if (yych <= '@') goto yy261; + if (yych <= 'M') goto yy262; + goto yy288; + } else { + if (yych <= 'Z') goto yy262; + if (yych <= ']') goto yy261; + if (yych <= '^') goto yy278; + goto yy262; + } + } else { + if (yych <= 'z') { + if (yych <= '`') goto yy261; + if (yych == 'n') goto yy288; + goto yy262; + } else { + if (yych <= '|') { + if (yych <= '{') goto yy261; + goto yy278; + } else { + if (yych == '~') goto yy278; + goto yy261; ++>>>>>>> PHP-5.6 } } } } ++<<<<<<< HEAD +yy272: + YYDEBUG(272, *YYCURSOR); ++======= + yy282: + YYDEBUG(282, *YYCURSOR); ++>>>>>>> PHP-5.6 yyaccept = 4; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '=') { if (yych <= '"') { if (yych <= '\n') { ++<<<<<<< HEAD + if (yych <= 0x00) goto yy244; + if (yych <= 0x08) goto yy251; + goto yy244; + } else { + if (yych == '\r') goto yy244; + if (yych <= 0x1F) goto yy251; + goto yy244; + } + } else { + if (yych <= '9') { + if (yych <= '%') goto yy251; + if (yych <= ')') goto yy244; + if (yych <= '/') goto yy251; + goto yy252; + } else { + if (yych == ';') goto yy244; + if (yych <= '<') goto yy251; + goto yy244; ++======= + if (yych <= 0x00) goto yy254; + if (yych <= 0x08) goto yy261; + goto yy254; + } else { + if (yych == '\r') goto yy254; + if (yych <= 0x1F) goto yy261; + goto yy254; + } + } else { + if (yych <= '9') { + if (yych <= '%') goto yy261; + if (yych <= ')') goto yy254; + if (yych <= '/') goto yy261; + goto yy262; + } else { + if (yych == ';') goto yy254; + if (yych <= '<') goto yy261; + goto yy254; ++>>>>>>> PHP-5.6 } } } else { if (yych <= '`') { if (yych <= 'Z') { ++<<<<<<< HEAD + if (yych <= '@') goto yy251; + if (yych != 'L') goto yy252; + } else { + if (yych <= ']') goto yy251; + if (yych <= '^') goto yy244; + if (yych <= '_') goto yy252; + goto yy251; + } + } else { + if (yych <= '{') { + if (yych == 'l') goto yy273; + if (yych <= 'z') goto yy252; + goto yy251; + } else { + if (yych == '}') goto yy251; + if (yych <= '~') goto yy244; + goto yy251; + } + } + } +yy273: + YYDEBUG(273, *YYCURSOR); ++======= + if (yych <= '@') goto yy261; + if (yych != 'L') goto yy262; + } else { + if (yych <= ']') goto yy261; + if (yych <= '^') goto yy254; + if (yych <= '_') goto yy262; + goto yy261; + } + } else { + if (yych <= '{') { + if (yych == 'l') goto yy283; + if (yych <= 'z') goto yy262; + goto yy261; + } else { + if (yych == '}') goto yy261; + if (yych <= '~') goto yy254; + goto yy261; + } + } + } + yy283: + YYDEBUG(283, *YYCURSOR); ++>>>>>>> PHP-5.6 yyaccept = 4; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '=') { if (yych <= '"') { if (yych <= '\n') { ++<<<<<<< HEAD + if (yych <= 0x00) goto yy244; + if (yych <= 0x08) goto yy251; + goto yy244; + } else { + if (yych == '\r') goto yy244; + if (yych <= 0x1F) goto yy251; + goto yy244; + } + } else { + if (yych <= '9') { + if (yych <= '%') goto yy251; + if (yych <= ')') goto yy244; + if (yych <= '/') goto yy251; + goto yy252; + } else { + if (yych == ';') goto yy244; + if (yych <= '<') goto yy251; + goto yy244; ++======= + if (yych <= 0x00) goto yy254; + if (yych <= 0x08) goto yy261; + goto yy254; + } else { + if (yych == '\r') goto yy254; + if (yych <= 0x1F) goto yy261; + goto yy254; + } + } else { + if (yych <= '9') { + if (yych <= '%') goto yy261; + if (yych <= ')') goto yy254; + if (yych <= '/') goto yy261; + goto yy262; + } else { + if (yych == ';') goto yy254; + if (yych <= '<') goto yy261; + goto yy254; ++>>>>>>> PHP-5.6 } } } else { if (yych <= '`') { if (yych <= 'Z') { ++<<<<<<< HEAD + if (yych <= '@') goto yy251; + if (yych != 'L') goto yy252; + } else { + if (yych <= ']') goto yy251; + if (yych <= '^') goto yy244; + if (yych <= '_') goto yy252; + goto yy251; + } + } else { + if (yych <= '{') { + if (yych == 'l') goto yy274; + if (yych <= 'z') goto yy252; + goto yy251; + } else { + if (yych == '}') goto yy251; + if (yych <= '~') goto yy244; + goto yy251; + } + } + } +yy274: + YYDEBUG(274, *YYCURSOR); + yyaccept = 7; + yych = *(YYMARKER = ++YYCURSOR); + if (yybm[0+yych] & 4) { + goto yy252; ++======= + if (yych <= '@') goto yy261; + if (yych != 'L') goto yy262; + } else { + if (yych <= ']') goto yy261; + if (yych <= '^') goto yy254; + if (yych <= '_') goto yy262; + goto yy261; + } + } else { + if (yych <= '{') { + if (yych == 'l') goto yy284; + if (yych <= 'z') goto yy262; + goto yy261; + } else { + if (yych == '}') goto yy261; + if (yych <= '~') goto yy254; + goto yy261; + } + } + } + yy284: + YYDEBUG(284, *YYCURSOR); + yyaccept = 7; + yych = *(YYMARKER = ++YYCURSOR); + if (yybm[0+yych] & 4) { + goto yy262; ++>>>>>>> PHP-5.6 } if (yych <= ')') { if (yych <= '\f') { if (yych <= 0x08) { ++<<<<<<< HEAD + if (yych >= 0x01) goto yy251; + } else { + if (yych <= '\t') goto yy276; + if (yych >= '\v') goto yy251; + } + } else { + if (yych <= ' ') { + if (yych <= '\r') goto yy275; + if (yych <= 0x1F) goto yy251; + goto yy276; + } else { + if (yych <= '"') goto yy275; + if (yych <= '%') goto yy251; ++======= + if (yych >= 0x01) goto yy261; + } else { + if (yych <= '\t') goto yy286; + if (yych >= '\v') goto yy261; + } + } else { + if (yych <= ' ') { + if (yych <= '\r') goto yy285; + if (yych <= 0x1F) goto yy261; + goto yy286; + } else { + if (yych <= '"') goto yy285; + if (yych <= '%') goto yy261; ++>>>>>>> PHP-5.6 } } } else { if (yych <= ']') { if (yych <= ';') { ++<<<<<<< HEAD + if (yych <= ':') goto yy251; + } else { + if (yych != '=') goto yy251; + } + } else { + if (yych <= '|') { + if (yych <= '^') goto yy275; + if (yych <= '{') goto yy251; + } else { + if (yych != '~') goto yy251; + } + } + } +yy275: + YYDEBUG(275, *YYCURSOR); ++======= + if (yych <= ':') goto yy261; + } else { + if (yych != '=') goto yy261; + } + } else { + if (yych <= '|') { + if (yych <= '^') goto yy285; + if (yych <= '{') goto yy261; + } else { + if (yych != '~') goto yy261; + } + } + } + yy285: + YYDEBUG(285, *YYCURSOR); ++>>>>>>> PHP-5.6 yyleng = YYCURSOR - SCNG(yy_text); -#line 476 "Zend/zend_ini_scanner.l" +#line 477 "Zend/zend_ini_scanner.l" { RETURN_TOKEN(NULL_NULL, "", 0); } ++<<<<<<< HEAD +#line 4085 "Zend/zend_ini_scanner.c" +yy276: + YYDEBUG(276, *YYCURSOR); + ++YYCURSOR; + YYFILL(1); + yych = *YYCURSOR; + YYDEBUG(277, *YYCURSOR); + if (yych == '\t') goto yy276; + if (yych == ' ') goto yy276; + goto yy275; +yy278: + YYDEBUG(278, *YYCURSOR); ++======= + #line 4178 "Zend/zend_ini_scanner.c" + yy286: + YYDEBUG(286, *YYCURSOR); + ++YYCURSOR; + YYFILL(1); + yych = *YYCURSOR; + YYDEBUG(287, *YYCURSOR); + if (yych == '\t') goto yy286; + if (yych == ' ') goto yy286; + goto yy285; + yy288: + YYDEBUG(288, *YYCURSOR); ++>>>>>>> PHP-5.6 yyaccept = 4; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '=') { if (yych <= '"') { if (yych <= '\n') { ++<<<<<<< HEAD + if (yych <= 0x00) goto yy244; + if (yych <= 0x08) goto yy251; + goto yy244; + } else { + if (yych == '\r') goto yy244; + if (yych <= 0x1F) goto yy251; + goto yy244; + } + } else { + if (yych <= '9') { + if (yych <= '%') goto yy251; + if (yych <= ')') goto yy244; + if (yych <= '/') goto yy251; + goto yy252; + } else { + if (yych == ';') goto yy244; + if (yych <= '<') goto yy251; + goto yy244; ++======= + if (yych <= 0x00) goto yy254; + if (yych <= 0x08) goto yy261; + goto yy254; + } else { + if (yych == '\r') goto yy254; + if (yych <= 0x1F) goto yy261; + goto yy254; + } + } else { + if (yych <= '9') { + if (yych <= '%') goto yy261; + if (yych <= ')') goto yy254; + if (yych <= '/') goto yy261; + goto yy262; + } else { + if (yych == ';') goto yy254; + if (yych <= '<') goto yy261; + goto yy254; ++>>>>>>> PHP-5.6 } } } else { if (yych <= '`') { if (yych <= 'Z') { ++<<<<<<< HEAD + if (yych <= '@') goto yy251; + if (yych == 'E') goto yy267; + goto yy252; + } else { + if (yych <= ']') goto yy251; + if (yych <= '^') goto yy244; + if (yych <= '_') goto yy252; + goto yy251; + } + } else { + if (yych <= '{') { + if (yych == 'e') goto yy267; + if (yych <= 'z') goto yy252; + goto yy251; + } else { + if (yych == '}') goto yy251; + if (yych <= '~') goto yy244; + goto yy251; + } + } + } +yy279: + YYDEBUG(279, *YYCURSOR); ++======= + if (yych <= '@') goto yy261; + if (yych == 'E') goto yy277; + goto yy262; + } else { + if (yych <= ']') goto yy261; + if (yych <= '^') goto yy254; + if (yych <= '_') goto yy262; + goto yy261; + } + } else { + if (yych <= '{') { + if (yych == 'e') goto yy277; + if (yych <= 'z') goto yy262; + goto yy261; + } else { + if (yych == '}') goto yy261; + if (yych <= '~') goto yy254; + goto yy261; + } + } + } + yy289: + YYDEBUG(289, *YYCURSOR); ++>>>>>>> PHP-5.6 yyaccept = 4; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '=') { if (yych <= '"') { if (yych <= '\n') { ++<<<<<<< HEAD + if (yych <= 0x00) goto yy244; + if (yych <= 0x08) goto yy251; + goto yy244; + } else { + if (yych == '\r') goto yy244; + if (yych <= 0x1F) goto yy251; + goto yy244; + } + } else { + if (yych <= '9') { + if (yych <= '%') goto yy251; + if (yych <= ')') goto yy244; + if (yych <= '/') goto yy251; + goto yy252; + } else { + if (yych == ';') goto yy244; + if (yych <= '<') goto yy251; + goto yy244; ++======= + if (yych <= 0x00) goto yy254; + if (yych <= 0x08) goto yy261; + goto yy254; + } else { + if (yych == '\r') goto yy254; + if (yych <= 0x1F) goto yy261; + goto yy254; + } + } else { + if (yych <= '9') { + if (yych <= '%') goto yy261; + if (yych <= ')') goto yy254; + if (yych <= '/') goto yy261; + goto yy262; + } else { + if (yych == ';') goto yy254; + if (yych <= '<') goto yy261; + goto yy254; ++>>>>>>> PHP-5.6 } } } else { if (yych <= '`') { if (yych <= 'Z') { ++<<<<<<< HEAD + if (yych <= '@') goto yy251; + if (yych != 'L') goto yy252; + } else { + if (yych <= ']') goto yy251; + if (yych <= '^') goto yy244; + if (yych <= '_') goto yy252; + goto yy251; + } + } else { + if (yych <= '{') { + if (yych == 'l') goto yy280; + if (yych <= 'z') goto yy252; + goto yy251; + } else { + if (yych == '}') goto yy251; + if (yych <= '~') goto yy244; + goto yy251; + } + } + } +yy280: + YYDEBUG(280, *YYCURSOR); ++======= + if (yych <= '@') goto yy261; + if (yych != 'L') goto yy262; + } else { + if (yych <= ']') goto yy261; + if (yych <= '^') goto yy254; + if (yych <= '_') goto yy262; + goto yy261; + } + } else { + if (yych <= '{') { + if (yych == 'l') goto yy290; + if (yych <= 'z') goto yy262; + goto yy261; + } else { + if (yych == '}') goto yy261; + if (yych <= '~') goto yy254; + goto yy261; + } + } + } + yy290: + YYDEBUG(290, *YYCURSOR); ++>>>>>>> PHP-5.6 yyaccept = 4; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '=') { if (yych <= '"') { if (yych <= '\n') { ++<<<<<<< HEAD + if (yych <= 0x00) goto yy244; + if (yych <= 0x08) goto yy251; + goto yy244; + } else { + if (yych == '\r') goto yy244; + if (yych <= 0x1F) goto yy251; + goto yy244; + } + } else { + if (yych <= '9') { + if (yych <= '%') goto yy251; + if (yych <= ')') goto yy244; + if (yych <= '/') goto yy251; + goto yy252; + } else { + if (yych == ';') goto yy244; + if (yych <= '<') goto yy251; + goto yy244; ++======= + if (yych <= 0x00) goto yy254; + if (yych <= 0x08) goto yy261; + goto yy254; + } else { + if (yych == '\r') goto yy254; + if (yych <= 0x1F) goto yy261; + goto yy254; + } + } else { + if (yych <= '9') { + if (yych <= '%') goto yy261; + if (yych <= ')') goto yy254; + if (yych <= '/') goto yy261; + goto yy262; + } else { + if (yych == ';') goto yy254; + if (yych <= '<') goto yy261; + goto yy254; ++>>>>>>> PHP-5.6 } } } else { if (yych <= '`') { if (yych <= 'Z') { ++<<<<<<< HEAD + if (yych <= '@') goto yy251; + if (yych != 'S') goto yy252; + } else { + if (yych <= ']') goto yy251; + if (yych <= '^') goto yy244; + if (yych <= '_') goto yy252; + goto yy251; + } + } else { + if (yych <= '{') { + if (yych == 's') goto yy281; + if (yych <= 'z') goto yy252; + goto yy251; + } else { + if (yych == '}') goto yy251; + if (yych <= '~') goto yy244; + goto yy251; + } + } + } +yy281: + YYDEBUG(281, *YYCURSOR); ++======= + if (yych <= '@') goto yy261; + if (yych != 'S') goto yy262; + } else { + if (yych <= ']') goto yy261; + if (yych <= '^') goto yy254; + if (yych <= '_') goto yy262; + goto yy261; + } + } else { + if (yych <= '{') { + if (yych == 's') goto yy291; + if (yych <= 'z') goto yy262; + goto yy261; + } else { + if (yych == '}') goto yy261; + if (yych <= '~') goto yy254; + goto yy261; + } + } + } + yy291: + YYDEBUG(291, *YYCURSOR); ++>>>>>>> PHP-5.6 yyaccept = 4; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '=') { if (yych <= '"') { if (yych <= '\n') { ++<<<<<<< HEAD + if (yych <= 0x00) goto yy244; + if (yych <= 0x08) goto yy251; + goto yy244; + } else { + if (yych == '\r') goto yy244; + if (yych <= 0x1F) goto yy251; + goto yy244; + } + } else { + if (yych <= '9') { + if (yych <= '%') goto yy251; + if (yych <= ')') goto yy244; + if (yych <= '/') goto yy251; + goto yy252; + } else { + if (yych == ';') goto yy244; + if (yych <= '<') goto yy251; + goto yy244; ++======= + if (yych <= 0x00) goto yy254; + if (yych <= 0x08) goto yy261; + goto yy254; + } else { + if (yych == '\r') goto yy254; + if (yych <= 0x1F) goto yy261; + goto yy254; + } + } else { + if (yych <= '9') { + if (yych <= '%') goto yy261; + if (yych <= ')') goto yy254; + if (yych <= '/') goto yy261; + goto yy262; + } else { + if (yych == ';') goto yy254; + if (yych <= '<') goto yy261; + goto yy254; ++>>>>>>> PHP-5.6 } } } else { if (yych <= '`') { if (yych <= 'Z') { ++<<<<<<< HEAD + if (yych <= '@') goto yy251; + if (yych == 'E') goto yy267; + goto yy252; + } else { + if (yych <= ']') goto yy251; + if (yych <= '^') goto yy244; + if (yych <= '_') goto yy252; + goto yy251; + } + } else { + if (yych <= '{') { + if (yych == 'e') goto yy267; + if (yych <= 'z') goto yy252; + goto yy251; + } else { + if (yych == '}') goto yy251; + if (yych <= '~') goto yy244; + goto yy251; + } + } + } +yy282: + YYDEBUG(282, *YYCURSOR); + ++YYCURSOR; + YYFILL(2); + yych = *YYCURSOR; +yy283: + YYDEBUG(283, *YYCURSOR); + if (yybm[0+yych] & 32) { + goto yy282; + } + if (yych >= '\r') goto yy286; +yy284: + YYDEBUG(284, *YYCURSOR); + ++YYCURSOR; +yy285: + YYDEBUG(285, *YYCURSOR); ++======= + if (yych <= '@') goto yy261; + if (yych == 'E') goto yy277; + goto yy262; + } else { + if (yych <= ']') goto yy261; + if (yych <= '^') goto yy254; + if (yych <= '_') goto yy262; + goto yy261; + } + } else { + if (yych <= '{') { + if (yych == 'e') goto yy277; + if (yych <= 'z') goto yy262; + goto yy261; + } else { + if (yych == '}') goto yy261; + if (yych <= '~') goto yy254; + goto yy261; + } + } + } + yy292: + YYDEBUG(292, *YYCURSOR); + ++YYCURSOR; + YYFILL(2); + yych = *YYCURSOR; + yy293: + YYDEBUG(293, *YYCURSOR); + if (yybm[0+yych] & 32) { + goto yy292; + } + if (yych >= '\r') goto yy296; + yy294: + YYDEBUG(294, *YYCURSOR); + ++YYCURSOR; + yy295: + YYDEBUG(295, *YYCURSOR); ++>>>>>>> PHP-5.6 yyleng = YYCURSOR - SCNG(yy_text); -#line 636 "Zend/zend_ini_scanner.l" +#line 637 "Zend/zend_ini_scanner.l" { /* Comment */ BEGIN(INITIAL); SCNG(lineno)++; return END_OF_LINE; } ++<<<<<<< HEAD +#line 4320 "Zend/zend_ini_scanner.c" +yy286: + YYDEBUG(286, *YYCURSOR); + yych = *++YYCURSOR; + if (yych == '\n') goto yy284; + goto yy285; +yy287: + YYDEBUG(287, *YYCURSOR); ++======= + #line 4413 "Zend/zend_ini_scanner.c" + yy296: + YYDEBUG(296, *YYCURSOR); + yych = *++YYCURSOR; + if (yych == '\n') goto yy294; + goto yy295; + yy297: + YYDEBUG(297, *YYCURSOR); ++>>>>>>> PHP-5.6 yyaccept = 3; YYMARKER = ++YYCURSOR; YYFILL(1); yych = *YYCURSOR; ++<<<<<<< HEAD + YYDEBUG(288, *YYCURSOR); + if (yybm[0+yych] & 64) { + goto yy287; ++======= + YYDEBUG(298, *YYCURSOR); + if (yybm[0+yych] & 64) { + goto yy297; ++>>>>>>> PHP-5.6 } if (yych <= ')') { if (yych <= '\r') { if (yych <= 0x08) { ++<<<<<<< HEAD + if (yych <= 0x00) goto yy239; + goto yy250; + } else { + if (yych <= '\n') goto yy239; + if (yych <= '\f') goto yy250; + goto yy239; + } + } else { + if (yych <= '#') { + if (yych <= 0x1F) goto yy250; + if (yych <= '"') goto yy239; + goto yy250; + } else { + if (yych <= '$') goto yy255; + if (yych <= '%') goto yy250; + goto yy239; ++======= + if (yych <= 0x00) goto yy249; + goto yy260; + } else { + if (yych <= '\n') goto yy249; + if (yych <= '\f') goto yy260; + goto yy249; + } + } else { + if (yych <= '#') { + if (yych <= 0x1F) goto yy260; + if (yych <= '"') goto yy249; + goto yy260; + } else { + if (yych <= '$') goto yy265; + if (yych <= '%') goto yy260; + goto yy249; ++>>>>>>> PHP-5.6 } } } else { if (yych <= ']') { if (yych <= ';') { ++<<<<<<< HEAD + if (yych <= ':') goto yy250; + goto yy239; + } else { + if (yych == '=') goto yy239; + goto yy250; + } + } else { + if (yych <= '|') { + if (yych <= '^') goto yy239; + if (yych <= '{') goto yy250; + goto yy239; + } else { + if (yych == '~') goto yy239; + goto yy250; + } + } + } +yy289: + YYDEBUG(289, *YYCURSOR); ++======= + if (yych <= ':') goto yy260; + goto yy249; + } else { + if (yych == '=') goto yy249; + goto yy260; + } + } else { + if (yych <= '|') { + if (yych <= '^') goto yy249; + if (yych <= '{') goto yy260; + goto yy249; + } else { + if (yych == '~') goto yy249; + goto yy260; + } + } + } + yy299: + YYDEBUG(299, *YYCURSOR); ++>>>>>>> PHP-5.6 yyaccept = 3; YYMARKER = ++YYCURSOR; YYFILL(1); yych = *YYCURSOR; ++<<<<<<< HEAD + YYDEBUG(290, *YYCURSOR); + if (yych <= '.') { + if (yych <= 0x1F) { + if (yych <= '\n') { + if (yych <= 0x00) goto yy239; + if (yych <= 0x08) goto yy250; + goto yy239; + } else { + if (yych == '\r') goto yy239; + goto yy250; + } + } else { + if (yych <= '$') { + if (yych <= '"') goto yy239; + if (yych <= '#') goto yy250; + goto yy255; + } else { + if (yych <= '%') goto yy250; + if (yych <= ')') goto yy239; + if (yych <= '-') goto yy250; + goto yy287; ++======= + YYDEBUG(300, *YYCURSOR); + if (yych <= '.') { + if (yych <= 0x1F) { + if (yych <= '\n') { + if (yych <= 0x00) goto yy249; + if (yych <= 0x08) goto yy260; + goto yy249; + } else { + if (yych == '\r') goto yy249; + goto yy260; + } + } else { + if (yych <= '$') { + if (yych <= '"') goto yy249; + if (yych <= '#') goto yy260; + goto yy265; + } else { + if (yych <= '%') goto yy260; + if (yych <= ')') goto yy249; + if (yych <= '-') goto yy260; + goto yy297; ++>>>>>>> PHP-5.6 } } } else { if (yych <= '=') { if (yych <= ':') { ++<<<<<<< HEAD + if (yych <= '/') goto yy250; + if (yych <= '9') goto yy289; + goto yy250; + } else { + if (yych == '<') goto yy250; + goto yy239; + } + } else { + if (yych <= '{') { + if (yych == '^') goto yy239; + goto yy250; + } else { + if (yych == '}') goto yy250; + if (yych <= '~') goto yy239; + goto yy250; + } + } + } +yy291: + YYDEBUG(291, *YYCURSOR); ++======= + if (yych <= '/') goto yy260; + if (yych <= '9') goto yy299; + goto yy260; + } else { + if (yych == '<') goto yy260; + goto yy249; + } + } else { + if (yych <= '{') { + if (yych == '^') goto yy249; + goto yy260; + } else { + if (yych == '}') goto yy260; + if (yych <= '~') goto yy249; + goto yy260; + } + } + } + yy301: + YYDEBUG(301, *YYCURSOR); ++>>>>>>> PHP-5.6 yyaccept = 3; YYMARKER = ++YYCURSOR; YYFILL(1); yych = *YYCURSOR; ++<<<<<<< HEAD + YYDEBUG(292, *YYCURSOR); + if (yych <= '/') { + if (yych <= 0x1F) { + if (yych <= '\n') { + if (yych <= 0x00) goto yy239; + if (yych <= 0x08) goto yy250; + goto yy239; + } else { + if (yych == '\r') goto yy239; + goto yy250; + } + } else { + if (yych <= '$') { + if (yych <= '"') goto yy239; + if (yych <= '#') goto yy250; + goto yy255; + } else { + if (yych <= '%') goto yy250; + if (yych <= ')') goto yy239; + goto yy250; ++======= + YYDEBUG(302, *YYCURSOR); + if (yych <= '/') { + if (yych <= 0x1F) { + if (yych <= '\n') { + if (yych <= 0x00) goto yy249; + if (yych <= 0x08) goto yy260; + goto yy249; + } else { + if (yych == '\r') goto yy249; + goto yy260; + } + } else { + if (yych <= '$') { + if (yych <= '"') goto yy249; + if (yych <= '#') goto yy260; + goto yy265; + } else { + if (yych <= '%') goto yy260; + if (yych <= ')') goto yy249; + goto yy260; ++>>>>>>> PHP-5.6 } } } else { if (yych <= ']') { if (yych <= ';') { ++<<<<<<< HEAD + if (yych <= '9') goto yy291; + if (yych <= ':') goto yy250; + goto yy239; + } else { + if (yych == '=') goto yy239; + goto yy250; + } + } else { + if (yych <= '|') { + if (yych <= '^') goto yy239; + if (yych <= '{') goto yy250; + goto yy239; + } else { + if (yych == '~') goto yy239; + goto yy250; + } + } + } +yy293: + YYDEBUG(293, *YYCURSOR); ++======= + if (yych <= '9') goto yy301; + if (yych <= ':') goto yy260; + goto yy249; + } else { + if (yych == '=') goto yy249; + goto yy260; + } + } else { + if (yych <= '|') { + if (yych <= '^') goto yy249; + if (yych <= '{') goto yy260; + goto yy249; + } else { + if (yych == '~') goto yy249; + goto yy260; + } + } + } + yy303: + YYDEBUG(303, *YYCURSOR); ++>>>>>>> PHP-5.6 yyaccept = 3; YYMARKER = ++YYCURSOR; YYFILL(1); yych = *YYCURSOR; ++<<<<<<< HEAD + YYDEBUG(294, *YYCURSOR); + if (yych <= '/') { + if (yych <= 0x1F) { + if (yych <= '\n') { + if (yych <= 0x00) goto yy239; + if (yych <= 0x08) goto yy250; + goto yy239; + } else { + if (yych == '\r') goto yy239; + goto yy250; + } + } else { + if (yych <= '$') { + if (yych <= '"') goto yy239; + if (yych <= '#') goto yy250; + goto yy255; + } else { + if (yych <= '%') goto yy250; + if (yych <= ')') goto yy239; + goto yy250; ++======= + YYDEBUG(304, *YYCURSOR); + if (yych <= '/') { + if (yych <= 0x1F) { + if (yych <= '\n') { + if (yych <= 0x00) goto yy249; + if (yych <= 0x08) goto yy260; + goto yy249; + } else { + if (yych == '\r') goto yy249; + goto yy260; + } + } else { + if (yych <= '$') { + if (yych <= '"') goto yy249; + if (yych <= '#') goto yy260; + goto yy265; + } else { + if (yych <= '%') goto yy260; + if (yych <= ')') goto yy249; + goto yy260; ++>>>>>>> PHP-5.6 } } } else { if (yych <= ']') { if (yych <= ';') { ++<<<<<<< HEAD + if (yych <= '9') goto yy293; + if (yych <= ':') goto yy250; + goto yy239; + } else { + if (yych == '=') goto yy239; + goto yy250; + } + } else { + if (yych <= '|') { + if (yych <= '^') goto yy239; + if (yych <= '{') goto yy250; + goto yy239; + } else { + if (yych == '~') goto yy239; + goto yy250; + } + } + } +yy295: + YYDEBUG(295, *YYCURSOR); + ++YYCURSOR; + YYFILL(1); + yych = *YYCURSOR; + YYDEBUG(296, *YYCURSOR); + if (yybm[0+yych] & 128) { + goto yy295; + } + YYDEBUG(297, *YYCURSOR); + ++YYCURSOR; + YYDEBUG(298, *YYCURSOR); ++======= + if (yych <= '9') goto yy303; + if (yych <= ':') goto yy260; + goto yy249; + } else { + if (yych == '=') goto yy249; + goto yy260; + } + } else { + if (yych <= '|') { + if (yych <= '^') goto yy249; + if (yych <= '{') goto yy260; + goto yy249; + } else { + if (yych == '~') goto yy249; + goto yy260; + } + } + } + yy305: + YYDEBUG(305, *YYCURSOR); + ++YYCURSOR; + YYFILL(1); + yych = *YYCURSOR; + YYDEBUG(306, *YYCURSOR); + if (yybm[0+yych] & 128) { + goto yy305; + } + YYDEBUG(307, *YYCURSOR); + ++YYCURSOR; + YYDEBUG(308, *YYCURSOR); ++>>>>>>> PHP-5.6 yyleng = YYCURSOR - SCNG(yy_text); -#line 415 "Zend/zend_ini_scanner.l" +#line 416 "Zend/zend_ini_scanner.l" { /* Raw string */ /* Eat leading and trailing single quotes */ if (yytext[0] == '\'' && yytext[yyleng - 1] == '\'') { @@@ -4543,66 -4636,66 +7993,125 @@@ } RETURN_TOKEN(TC_RAW, yytext, yyleng); } ++<<<<<<< HEAD +#line 4547 "Zend/zend_ini_scanner.c" +yy299: + YYDEBUG(299, *YYCURSOR); + ++YYCURSOR; + YYDEBUG(300, *YYCURSOR); ++======= + #line 4640 "Zend/zend_ini_scanner.c" + yy309: + YYDEBUG(309, *YYCURSOR); + ++YYCURSOR; + YYDEBUG(310, *YYCURSOR); ++>>>>>>> PHP-5.6 yyleng = YYCURSOR - SCNG(yy_text); -#line 448 "Zend/zend_ini_scanner.l" +#line 449 "Zend/zend_ini_scanner.l" { /* Variable start */ - yy_push_state(ST_VARNAME TSRMLS_CC); + yy_push_state(ST_VARNAME); return TC_DOLLAR_CURLY; } ++<<<<<<< HEAD +#line 4558 "Zend/zend_ini_scanner.c" +yy301: + YYDEBUG(301, *YYCURSOR); + ++YYCURSOR; + YYFILL(1); + yych = *YYCURSOR; +yy302: + YYDEBUG(302, *YYCURSOR); + if (yych == '\t') goto yy301; + if (yych == ' ') goto yy301; + goto yy231; +yy303: + YYDEBUG(303, *YYCURSOR); + yych = *++YYCURSOR; + goto yy228; +yy304: + YYDEBUG(304, *YYCURSOR); ++======= + #line 4651 "Zend/zend_ini_scanner.c" + yy311: + YYDEBUG(311, *YYCURSOR); + ++YYCURSOR; + YYFILL(1); + yych = *YYCURSOR; + yy312: + YYDEBUG(312, *YYCURSOR); + if (yych == '\t') goto yy311; + if (yych == ' ') goto yy311; + goto yy241; + yy313: + YYDEBUG(313, *YYCURSOR); + yych = *++YYCURSOR; + goto yy238; + yy314: + YYDEBUG(314, *YYCURSOR); ++>>>>>>> PHP-5.6 yyaccept = 1; YYMARKER = ++YYCURSOR; YYFILL(2); yych = *YYCURSOR; ++<<<<<<< HEAD +yy305: + YYDEBUG(305, *YYCURSOR); + if (yych <= 0x1F) { + if (yych <= '\n') { + if (yych <= 0x08) goto yy226; + if (yych <= '\t') goto yy304; + goto yy303; + } else { + if (yych == '\r') goto yy307; + goto yy226; + } + } else { + if (yych <= '"') { + if (yych <= ' ') goto yy304; + if (yych <= '!') goto yy226; + } else { + if (yych == ';') goto yy282; + goto yy226; + } + } + YYDEBUG(306, *YYCURSOR); + yych = *++YYCURSOR; + goto yy233; +yy307: + YYDEBUG(307, *YYCURSOR); + ++YYCURSOR; + if ((yych = *YYCURSOR) == '\n') goto yy303; + goto yy228; ++======= + yy315: + YYDEBUG(315, *YYCURSOR); + if (yych <= 0x1F) { + if (yych <= '\n') { + if (yych <= 0x08) goto yy236; + if (yych <= '\t') goto yy314; + goto yy313; + } else { + if (yych == '\r') goto yy317; + goto yy236; + } + } else { + if (yych <= '"') { + if (yych <= ' ') goto yy314; + if (yych <= '!') goto yy236; + } else { + if (yych == ';') goto yy292; + goto yy236; + } + } + YYDEBUG(316, *YYCURSOR); + yych = *++YYCURSOR; + goto yy243; + yy317: + YYDEBUG(317, *YYCURSOR); + ++YYCURSOR; + if ((yych = *YYCURSOR) == '\n') goto yy313; + goto yy238; ++>>>>>>> PHP-5.6 } /* *********************************** */ yyc_ST_VARNAME: @@@ -4641,51 -4734,51 +8150,93 @@@ 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, }; ++<<<<<<< HEAD + YYDEBUG(308, *YYCURSOR); ++======= + YYDEBUG(318, *YYCURSOR); ++>>>>>>> PHP-5.6 YYFILL(2); yych = *YYCURSOR; if (yych <= ')') { if (yych <= '"') { if (yych <= '\f') { ++<<<<<<< HEAD + if (yych <= 0x08) goto yy310; + if (yych <= '\n') goto yy312; + } else { + if (yych <= '\r') goto yy312; + if (yych >= '!') goto yy312; + } + } else { + if (yych <= '%') { + if (yych == '$') goto yy312; + } else { + if (yych != '\'') goto yy312; ++======= + if (yych <= 0x08) goto yy320; + if (yych <= '\n') goto yy322; + } else { + if (yych <= '\r') goto yy322; + if (yych >= '!') goto yy322; + } + } else { + if (yych <= '%') { + if (yych == '$') goto yy322; + } else { + if (yych != '\'') goto yy322; ++>>>>>>> PHP-5.6 } } } else { if (yych <= '[') { if (yych <= '<') { ++<<<<<<< HEAD + if (yych == ';') goto yy312; + } else { + if (yych <= '=') goto yy312; + if (yych >= '[') goto yy312; + } + } else { + if (yych <= 'z') { + if (yych == '^') goto yy312; + } else { + if (yych == '}') goto yy314; + if (yych <= '~') goto yy312; + } + } + } +yy310: + YYDEBUG(310, *YYCURSOR); + ++YYCURSOR; + yych = *YYCURSOR; + goto yy317; +yy311: + YYDEBUG(311, *YYCURSOR); ++======= + if (yych == ';') goto yy322; + } else { + if (yych <= '=') goto yy322; + if (yych >= '[') goto yy322; + } + } else { + if (yych <= 'z') { + if (yych == '^') goto yy322; + } else { + if (yych == '}') goto yy324; + if (yych <= '~') goto yy322; + } + } + } + yy320: + YYDEBUG(320, *YYCURSOR); + ++YYCURSOR; + yych = *YYCURSOR; + goto yy327; + yy321: + YYDEBUG(321, *YYCURSOR); ++>>>>>>> PHP-5.6 yyleng = YYCURSOR - SCNG(yy_text); -#line 453 "Zend/zend_ini_scanner.l" +#line 454 "Zend/zend_ini_scanner.l" { /* Variable name */ /* Eat leading whitespace */ EAT_LEADING_WHITESPACE(); @@@ -4695,41 -4788,41 +8246,72 @@@ RETURN_TOKEN(TC_VARNAME, yytext, yyleng); } ++<<<<<<< HEAD +#line 4699 "Zend/zend_ini_scanner.c" +yy312: + YYDEBUG(312, *YYCURSOR); + ++YYCURSOR; + YYDEBUG(313, *YYCURSOR); ++======= + #line 4792 "Zend/zend_ini_scanner.c" + yy322: + YYDEBUG(322, *YYCURSOR); + ++YYCURSOR; + YYDEBUG(323, *YYCURSOR); ++>>>>>>> PHP-5.6 yyleng = YYCURSOR - SCNG(yy_text); -#line 654 "Zend/zend_ini_scanner.l" +#line 648 "Zend/zend_ini_scanner.l" { return 0; } ++<<<<<<< HEAD +#line 4709 "Zend/zend_ini_scanner.c" +yy314: + YYDEBUG(314, *YYCURSOR); + ++YYCURSOR; + YYDEBUG(315, *YYCURSOR); ++======= + #line 4802 "Zend/zend_ini_scanner.c" + yy324: + YYDEBUG(324, *YYCURSOR); + ++YYCURSOR; + YYDEBUG(325, *YYCURSOR); ++>>>>>>> PHP-5.6 yyleng = YYCURSOR - SCNG(yy_text); -#line 463 "Zend/zend_ini_scanner.l" +#line 464 "Zend/zend_ini_scanner.l" { /* Variable end */ - yy_pop_state(TSRMLS_C); + yy_pop_state(); return '}'; } ++<<<<<<< HEAD +#line 4720 "Zend/zend_ini_scanner.c" +yy316: + YYDEBUG(316, *YYCURSOR); + ++YYCURSOR; + YYFILL(1); + yych = *YYCURSOR; +yy317: + YYDEBUG(317, *YYCURSOR); + if (yybm[0+yych] & 128) { + goto yy316; + } + goto yy311; ++======= + #line 4813 "Zend/zend_ini_scanner.c" + yy326: + YYDEBUG(326, *YYCURSOR); + ++YYCURSOR; + YYFILL(1); + yych = *YYCURSOR; + yy327: + YYDEBUG(327, *YYCURSOR); + if (yybm[0+yych] & 128) { + goto yy326; + } + goto yy321; ++>>>>>>> PHP-5.6 } } -#line 658 "Zend/zend_ini_scanner.l" +#line 652 "Zend/zend_ini_scanner.l" }
diff --cc Zend/zend_ini_scanner.c index e3d9d4d,80bbced..02e7ec5 --- a/Zend/zend_ini_scanner.c +++ b/Zend/zend_ini_scanner.c @@@ -472,6 -471,7 +472,10 @@@ yyc_INITIAL case '|': case '}': case '~': goto yy10; ++<<<<<<< HEAD ++======= + case '#': goto yy12; ++>>>>>>> PHP-5.6 case '%': case '\'': case '*': @@@ -485,27 -485,27 +489,48 @@@ case '>': case '?': case '@': ++<<<<<<< HEAD + case ']': goto yy12; + case ';': goto yy13; + case '=': goto yy15; + case 'F': + case 'f': goto yy17; + case 'N': + case 'n': goto yy18; + case 'O': + case 'o': goto yy19; + case 'T': + case 't': goto yy20; + case 'Y': + case 'y': goto yy21; + case '[': goto yy22; ++======= + case ']': goto yy13; + case ';': goto yy14; + case '=': goto yy16; + case 'F': + case 'f': goto yy18; + case 'N': + case 'n': goto yy19; + case 'O': + case 'o': goto yy20; + case 'T': + case 't': goto yy21; + case 'Y': + case 'y': goto yy22; + case '[': goto yy23; ++>>>>>>> PHP-5.6 default: goto yy2; } yy2: YYDEBUG(2, *YYCURSOR); ++YYCURSOR; yych = *YYCURSOR; ++<<<<<<< HEAD + goto yy25; ++======= + goto yy26; ++>>>>>>> PHP-5.6 yy3: YYDEBUG(3, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); @@@ -524,7 -524,7 +549,11 @@@ yy4 YYDEBUG(4, *YYCURSOR); yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); ++<<<<<<< HEAD + goto yy63; ++======= + goto yy73; ++>>>>>>> PHP-5.6 yy5: YYDEBUG(5, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); @@@ -549,29 -549,30 +578,52 @@@ yy7 yy8: YYDEBUG(8, *YYCURSOR); yych = *++YYCURSOR; ++<<<<<<< HEAD + if (yych == '\n') goto yy66; ++======= + if (yych == '\n') goto yy76; ++>>>>>>> PHP-5.6 goto yy7; yy9: YYDEBUG(9, *YYCURSOR); yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); - if (yych <= ' ') { + if (yych <= 0x1F) { if (yych <= '\n') { ++<<<<<<< HEAD + if (yych <= 0x08) goto yy25; + if (yych <= '\t') goto yy62; + goto yy66; + } else { + if (yych == '\r') goto yy67; + goto yy25; + } + } else { + if (yych <= ';') { + if (yych <= ' ') goto yy64; + if (yych <= ':') goto yy25; + goto yy57; + } else { + if (yych == '=') goto yy55; + goto yy25; ++======= + if (yych <= 0x08) goto yy26; + if (yych <= '\t') goto yy72; + goto yy76; + } else { + if (yych == '\r') goto yy77; + if (yych <= 0x1F) goto yy26; + goto yy74; + } + } else { + if (yych <= ':') { + if (yych == '#') goto yy63; + goto yy26; + } else { + if (yych <= ';') goto yy58; + if (yych == '=') goto yy56; + goto yy26; ++>>>>>>> PHP-5.6 } } yy10: @@@ -583,97 -584,102 +635,185 @@@ { /* Disallow these chars outside option values */ return yytext[0]; } ++<<<<<<< HEAD +#line 587 "Zend/zend_ini_scanner.c" +yy12: + YYDEBUG(12, *YYCURSOR); + yych = *++YYCURSOR; + goto yy25; +yy13: + YYDEBUG(13, *YYCURSOR); + yyaccept = 2; + yych = *(YYMARKER = ++YYCURSOR); + goto yy58; + YYDEBUG(14, *YYCURSOR); ++======= + #line 588 "Zend/zend_ini_scanner.c" + yy12: + YYDEBUG(12, *YYCURSOR); + yyaccept = 1; + yych = *(YYMARKER = ++YYCURSOR); + goto yy64; + yy13: + YYDEBUG(13, *YYCURSOR); + yych = *++YYCURSOR; + goto yy26; + yy14: + YYDEBUG(14, *YYCURSOR); + yyaccept = 2; + yych = *(YYMARKER = ++YYCURSOR); + goto yy59; + YYDEBUG(15, *YYCURSOR); ++>>>>>>> PHP-5.6 yyleng = YYCURSOR - SCNG(yy_text); -#line 654 "Zend/zend_ini_scanner.l" +#line 648 "Zend/zend_ini_scanner.l" { return 0; } ++<<<<<<< HEAD +#line 603 "Zend/zend_ini_scanner.c" +yy15: + YYDEBUG(15, *YYCURSOR); + ++YYCURSOR; + yych = *YYCURSOR; + goto yy56; +yy16: + YYDEBUG(16, *YYCURSOR); ++======= + #line 609 "Zend/zend_ini_scanner.c" + yy16: + YYDEBUG(16, *YYCURSOR); + ++YYCURSOR; + yych = *YYCURSOR; + goto yy57; + yy17: + YYDEBUG(17, *YYCURSOR); ++>>>>>>> PHP-5.6 yyleng = YYCURSOR - SCNG(yy_text); -#line 490 "Zend/zend_ini_scanner.l" +#line 491 "Zend/zend_ini_scanner.l" { /* Start option value */ if (SCNG(scanner_mode) == ZEND_INI_SCANNER_RAW) { - yy_push_state(ST_RAW TSRMLS_CC); + yy_push_state(ST_RAW); } else { - yy_push_state(ST_VALUE TSRMLS_CC); + yy_push_state(ST_VALUE); } return '='; } ++<<<<<<< HEAD +#line 621 "Zend/zend_ini_scanner.c" +yy17: + YYDEBUG(17, *YYCURSOR); + yych = *++YYCURSOR; + if (yych == 'A') goto yy52; + if (yych == 'a') goto yy52; + goto yy25; +yy18: + YYDEBUG(18, *YYCURSOR); + yych = *++YYCURSOR; + if (yych <= 'U') { + if (yych == 'O') goto yy43; + if (yych <= 'T') goto yy25; + goto yy44; + } else { + if (yych <= 'o') { + if (yych <= 'n') goto yy25; + goto yy43; + } else { + if (yych == 'u') goto yy44; + goto yy25; + } + } +yy19: + YYDEBUG(19, *YYCURSOR); + yych = *++YYCURSOR; + if (yych <= 'N') { + if (yych == 'F') goto yy37; + if (yych <= 'M') goto yy25; + goto yy30; + } else { + if (yych <= 'f') { + if (yych <= 'e') goto yy25; + goto yy37; + } else { + if (yych == 'n') goto yy30; + goto yy25; + } + } +yy20: + YYDEBUG(20, *YYCURSOR); + yych = *++YYCURSOR; + if (yych == 'R') goto yy35; + if (yych == 'r') goto yy35; + goto yy25; +yy21: + YYDEBUG(21, *YYCURSOR); + yych = *++YYCURSOR; + if (yych == 'E') goto yy26; + if (yych == 'e') goto yy26; + goto yy25; +yy22: + YYDEBUG(22, *YYCURSOR); + ++YYCURSOR; + YYDEBUG(23, *YYCURSOR); ++======= + #line 627 "Zend/zend_ini_scanner.c" + yy18: + YYDEBUG(18, *YYCURSOR); + yych = *++YYCURSOR; + if (yych == 'A') goto yy53; + if (yych == 'a') goto yy53; + goto yy26; + yy19: + YYDEBUG(19, *YYCURSOR); + yych = *++YYCURSOR; + if (yych <= 'U') { + if (yych == 'O') goto yy44; + if (yych <= 'T') goto yy26; + goto yy45; + } else { + if (yych <= 'o') { + if (yych <= 'n') goto yy26; + goto yy44; + } else { + if (yych == 'u') goto yy45; + goto yy26; + } + } + yy20: + YYDEBUG(20, *YYCURSOR); + yych = *++YYCURSOR; + if (yych <= 'N') { + if (yych == 'F') goto yy38; + if (yych <= 'M') goto yy26; + goto yy31; + } else { + if (yych <= 'f') { + if (yych <= 'e') goto yy26; + goto yy38; + } else { + if (yych == 'n') goto yy31; + goto yy26; + } + } + yy21: + YYDEBUG(21, *YYCURSOR); + yych = *++YYCURSOR; + if (yych == 'R') goto yy36; + if (yych == 'r') goto yy36; + goto yy26; + yy22: + YYDEBUG(22, *YYCURSOR); + yych = *++YYCURSOR; + if (yych == 'E') goto yy27; + if (yych == 'e') goto yy27; + goto yy26; + yy23: + YYDEBUG(23, *YYCURSOR); + ++YYCURSOR; + YYDEBUG(24, *YYCURSOR); ++>>>>>>> PHP-5.6 yyleng = YYCURSOR - SCNG(yy_text); -#line 405 "Zend/zend_ini_scanner.l" +#line 406 "Zend/zend_ini_scanner.l" { /* Section start */ /* Enter section data lookup state */ if (SCNG(scanner_mode) == ZEND_INI_SCANNER_RAW) { @@@ -683,37 -689,37 +823,69 @@@ } return TC_SECTION; } ++<<<<<<< HEAD +#line 687 "Zend/zend_ini_scanner.c" +yy24: + YYDEBUG(24, *YYCURSOR); + ++YYCURSOR; + YYFILL(1); + yych = *YYCURSOR; +yy25: + YYDEBUG(25, *YYCURSOR); + if (yybm[0+yych] & 16) { + goto yy24; + } + if (yych == '[') goto yy27; + goto yy3; +yy26: + YYDEBUG(26, *YYCURSOR); + yych = *++YYCURSOR; + if (yych == 'S') goto yy30; + if (yych == 's') goto yy30; + goto yy25; +yy27: + YYDEBUG(27, *YYCURSOR); + ++YYCURSOR; + YYFILL(1); + yych = *YYCURSOR; + YYDEBUG(28, *YYCURSOR); + if (yybm[0+yych] & 32) { + goto yy27; + } + YYDEBUG(29, *YYCURSOR); ++======= + #line 693 "Zend/zend_ini_scanner.c" + yy25: + YYDEBUG(25, *YYCURSOR); + ++YYCURSOR; + YYFILL(1); + yych = *YYCURSOR; + yy26: + YYDEBUG(26, *YYCURSOR); + if (yybm[0+yych] & 16) { + goto yy25; + } + if (yych == '[') goto yy28; + goto yy3; + yy27: + YYDEBUG(27, *YYCURSOR); + yych = *++YYCURSOR; + if (yych == 'S') goto yy31; + if (yych == 's') goto yy31; + goto yy26; + yy28: + YYDEBUG(28, *YYCURSOR); + ++YYCURSOR; + YYFILL(1); + yych = *YYCURSOR; + YYDEBUG(29, *YYCURSOR); + if (yybm[0+yych] & 32) { + goto yy28; + } + YYDEBUG(30, *YYCURSOR); ++>>>>>>> PHP-5.6 yyleng = YYCURSOR - SCNG(yy_text); -#line 430 "Zend/zend_ini_scanner.l" +#line 431 "Zend/zend_ini_scanner.l" { /* Start of option with offset */ /* Eat leading whitespace */ EAT_LEADING_WHITESPACE(); @@@ -726,400 -732,487 +898,857 @@@ RETURN_TOKEN(TC_OFFSET, yytext, yyleng); } ++<<<<<<< HEAD +#line 730 "Zend/zend_ini_scanner.c" +yy30: + YYDEBUG(30, *YYCURSOR); + ++YYCURSOR; + YYFILL(1); + yych = *YYCURSOR; + YYDEBUG(31, *YYCURSOR); + if (yybm[0+yych] & 64) { + goto yy30; ++======= + #line 736 "Zend/zend_ini_scanner.c" + yy31: + YYDEBUG(31, *YYCURSOR); + ++YYCURSOR; + YYFILL(1); + yych = *YYCURSOR; + YYDEBUG(32, *YYCURSOR); + if (yybm[0+yych] & 64) { + goto yy31; ++>>>>>>> PHP-5.6 } if (yych <= '\'') { if (yych <= ' ') { if (yych <= '\n') { ++<<<<<<< HEAD + if (yych <= 0x08) goto yy24; + if (yych <= '\t') goto yy33; + } else { + if (yych != '\r') goto yy24; + } + } else { + if (yych <= '$') { + if (yych == '#') goto yy24; + } else { + if (yych != '&') goto yy24; ++======= + if (yych <= 0x08) goto yy25; + if (yych <= '\t') goto yy34; + } else { + if (yych != '\r') goto yy25; + } + } else { + if (yych <= '$') { + if (yych == '#') goto yy25; + } else { + if (yych != '&') goto yy25; ++>>>>>>> PHP-5.6 } } } else { if (yych <= 'Z') { if (yych <= ';') { ++<<<<<<< HEAD + if (yych <= ')') goto yy32; + if (yych <= ':') goto yy24; + } else { + if (yych != '=') goto yy24; + } + } else { + if (yych <= '^') { + if (yych <= '[') goto yy27; + if (yych <= ']') goto yy24; + } else { + if (yych <= 'z') goto yy24; + if (yych >= 0x7F) goto yy24; + } + } + } +yy32: + YYDEBUG(32, *YYCURSOR); ++======= + if (yych <= ')') goto yy33; + if (yych <= ':') goto yy25; + } else { + if (yych != '=') goto yy25; + } + } else { + if (yych <= '^') { + if (yych <= '[') goto yy28; + if (yych <= ']') goto yy25; + } else { + if (yych <= 'z') goto yy25; + if (yych >= 0x7F) goto yy25; + } + } + } + yy33: + YYDEBUG(33, *YYCURSOR); ++>>>>>>> PHP-5.6 yyleng = YYCURSOR - SCNG(yy_text); -#line 468 "Zend/zend_ini_scanner.l" +#line 469 "Zend/zend_ini_scanner.l" { /* TRUE value (when used outside option value/offset this causes parse error!) */ RETURN_TOKEN(BOOL_TRUE, "1", 1); } ++<<<<<<< HEAD +#line 780 "Zend/zend_ini_scanner.c" +yy33: + YYDEBUG(33, *YYCURSOR); + ++YYCURSOR; + YYFILL(1); + yych = *YYCURSOR; + YYDEBUG(34, *YYCURSOR); + if (yych == '\t') goto yy33; + if (yych == ' ') goto yy33; + goto yy32; +yy35: + YYDEBUG(35, *YYCURSOR); + yych = *++YYCURSOR; + if (yych == 'U') goto yy36; + if (yych != 'u') goto yy25; +yy36: + YYDEBUG(36, *YYCURSOR); + yych = *++YYCURSOR; + if (yych == 'E') goto yy30; + if (yych == 'e') goto yy30; + goto yy25; +yy37: + YYDEBUG(37, *YYCURSOR); + yych = *++YYCURSOR; + if (yych == 'F') goto yy38; + if (yych != 'f') goto yy25; +yy38: + YYDEBUG(38, *YYCURSOR); + ++YYCURSOR; + YYFILL(1); + yych = *YYCURSOR; + YYDEBUG(39, *YYCURSOR); + if (yych <= '&') { + if (yych <= 0x1F) { + if (yych <= '\n') { + if (yych <= 0x08) goto yy24; + if (yych <= '\t') goto yy41; + } else { + if (yych != '\r') goto yy24; + } + } else { + if (yych <= '#') { + if (yych <= ' ') goto yy38; + if (yych >= '#') goto yy24; + } else { + if (yych == '%') goto yy24; ++======= + #line 786 "Zend/zend_ini_scanner.c" + yy34: + YYDEBUG(34, *YYCURSOR); + ++YYCURSOR; + YYFILL(1); + yych = *YYCURSOR; + YYDEBUG(35, *YYCURSOR); + if (yych == '\t') goto yy34; + if (yych == ' ') goto yy34; + goto yy33; + yy36: + YYDEBUG(36, *YYCURSOR); + yych = *++YYCURSOR; + if (yych == 'U') goto yy37; + if (yych != 'u') goto yy26; + yy37: + YYDEBUG(37, *YYCURSOR); + yych = *++YYCURSOR; + if (yych == 'E') goto yy31; + if (yych == 'e') goto yy31; + goto yy26; + yy38: + YYDEBUG(38, *YYCURSOR); + yych = *++YYCURSOR; + if (yych == 'F') goto yy39; + if (yych != 'f') goto yy26; + yy39: + YYDEBUG(39, *YYCURSOR); + ++YYCURSOR; + YYFILL(1); + yych = *YYCURSOR; + YYDEBUG(40, *YYCURSOR); + if (yych <= '&') { + if (yych <= 0x1F) { + if (yych <= '\n') { + if (yych <= 0x08) goto yy25; + if (yych <= '\t') goto yy42; + } else { + if (yych != '\r') goto yy25; + } + } else { + if (yych <= '#') { + if (yych <= ' ') goto yy39; + if (yych >= '#') goto yy25; + } else { + if (yych == '%') goto yy25; ++>>>>>>> PHP-5.6 } } } else { if (yych <= '=') { if (yych <= ':') { ++<<<<<<< HEAD + if (yych <= '\'') goto yy24; + if (yych >= '*') goto yy24; + } else { + if (yych == '<') goto yy24; + } + } else { + if (yych <= ']') { + if (yych == '[') goto yy27; + goto yy24; + } else { + if (yych <= '^') goto yy40; + if (yych <= 'z') goto yy24; + if (yych >= 0x7F) goto yy24; + } + } + } +yy40: + YYDEBUG(40, *YYCURSOR); ++======= + if (yych <= '\'') goto yy25; + if (yych >= '*') goto yy25; + } else { + if (yych == '<') goto yy25; + } + } else { + if (yych <= ']') { + if (yych == '[') goto yy28; + goto yy25; + } else { + if (yych <= '^') goto yy41; + if (yych <= 'z') goto yy25; + if (yych >= 0x7F) goto yy25; + } + } + } + yy41: + YYDEBUG(41, *YYCURSOR); ++>>>>>>> PHP-5.6 yyleng = YYCURSOR - SCNG(yy_text); -#line 472 "Zend/zend_ini_scanner.l" +#line 473 "Zend/zend_ini_scanner.l" { /* FALSE value (when used outside option value/offset this causes parse error!)*/ RETURN_TOKEN(BOOL_FALSE, "", 0); } ++<<<<<<< HEAD +#line 854 "Zend/zend_ini_scanner.c" +yy41: + YYDEBUG(41, *YYCURSOR); + ++YYCURSOR; + YYFILL(1); + yych = *YYCURSOR; + YYDEBUG(42, *YYCURSOR); + if (yych == '\t') goto yy41; + if (yych == ' ') goto yy41; + goto yy40; +yy43: + YYDEBUG(43, *YYCURSOR); ++======= + #line 860 "Zend/zend_ini_scanner.c" + yy42: + YYDEBUG(42, *YYCURSOR); + ++YYCURSOR; + YYFILL(1); + yych = *YYCURSOR; + YYDEBUG(43, *YYCURSOR); + if (yych == '\t') goto yy42; + if (yych == ' ') goto yy42; + goto yy41; + yy44: + YYDEBUG(44, *YYCURSOR); ++>>>>>>> PHP-5.6 yych = *++YYCURSOR; if (yych <= '\'') { if (yych <= 0x1F) { if (yych <= '\n') { ++<<<<<<< HEAD + if (yych <= 0x08) goto yy25; + if (yych <= '\t') goto yy41; + goto yy40; + } else { + if (yych == '\r') goto yy40; + goto yy25; + } + } else { + if (yych <= '#') { + if (yych <= ' ') goto yy38; + if (yych <= '"') goto yy40; + goto yy25; + } else { + if (yych == '%') goto yy25; + if (yych <= '&') goto yy40; + goto yy25; ++======= + if (yych <= 0x08) goto yy26; + if (yych <= '\t') goto yy42; + goto yy41; + } else { + if (yych == '\r') goto yy41; + goto yy26; + } + } else { + if (yych <= '#') { + if (yych <= ' ') goto yy39; + if (yych <= '"') goto yy41; + goto yy26; + } else { + if (yych == '%') goto yy26; + if (yych <= '&') goto yy41; + goto yy26; ++>>>>>>> PHP-5.6 } } } else { if (yych <= 'N') { if (yych <= ';') { ++<<<<<<< HEAD + if (yych <= ')') goto yy40; + if (yych <= ':') goto yy25; + goto yy40; + } else { + if (yych == '=') goto yy40; + if (yych <= 'M') goto yy25; + goto yy51; + } + } else { + if (yych <= 'm') { + if (yych == '^') goto yy40; + goto yy25; + } else { + if (yych <= 'n') goto yy51; + if (yych <= 'z') goto yy25; + if (yych <= '~') goto yy40; + goto yy25; + } + } + } +yy44: + YYDEBUG(44, *YYCURSOR); + yych = *++YYCURSOR; + if (yych == 'L') goto yy45; + if (yych != 'l') goto yy25; +yy45: + YYDEBUG(45, *YYCURSOR); + yych = *++YYCURSOR; + if (yych == 'L') goto yy46; + if (yych != 'l') goto yy25; +yy46: + YYDEBUG(46, *YYCURSOR); + ++YYCURSOR; + YYFILL(1); + yych = *YYCURSOR; + YYDEBUG(47, *YYCURSOR); + if (yych <= '&') { + if (yych <= 0x1F) { + if (yych <= '\n') { + if (yych <= 0x08) goto yy24; + if (yych <= '\t') goto yy49; + } else { + if (yych != '\r') goto yy24; + } + } else { + if (yych <= '#') { + if (yych <= ' ') goto yy46; + if (yych >= '#') goto yy24; + } else { + if (yych == '%') goto yy24; ++======= + if (yych <= ')') goto yy41; + if (yych <= ':') goto yy26; + goto yy41; + } else { + if (yych == '=') goto yy41; + if (yych <= 'M') goto yy26; + goto yy52; + } + } else { + if (yych <= 'm') { + if (yych == '^') goto yy41; + goto yy26; + } else { + if (yych <= 'n') goto yy52; + if (yych <= 'z') goto yy26; + if (yych <= '~') goto yy41; + goto yy26; + } + } + } + yy45: + YYDEBUG(45, *YYCURSOR); + yych = *++YYCURSOR; + if (yych == 'L') goto yy46; + if (yych != 'l') goto yy26; + yy46: + YYDEBUG(46, *YYCURSOR); + yych = *++YYCURSOR; + if (yych == 'L') goto yy47; + if (yych != 'l') goto yy26; + yy47: + YYDEBUG(47, *YYCURSOR); + ++YYCURSOR; + YYFILL(1); + yych = *YYCURSOR; + YYDEBUG(48, *YYCURSOR); + if (yych <= '&') { + if (yych <= 0x1F) { + if (yych <= '\n') { + if (yych <= 0x08) goto yy25; + if (yych <= '\t') goto yy50; + } else { + if (yych != '\r') goto yy25; + } + } else { + if (yych <= '#') { + if (yych <= ' ') goto yy47; + if (yych >= '#') goto yy25; + } else { + if (yych == '%') goto yy25; ++>>>>>>> PHP-5.6 } } } else { if (yych <= '=') { if (yych <= ':') { ++<<<<<<< HEAD + if (yych <= '\'') goto yy24; + if (yych >= '*') goto yy24; + } else { + if (yych == '<') goto yy24; + } + } else { + if (yych <= ']') { + if (yych == '[') goto yy27; + goto yy24; + } else { + if (yych <= '^') goto yy48; + if (yych <= 'z') goto yy24; + if (yych >= 0x7F) goto yy24; + } + } + } +yy48: + YYDEBUG(48, *YYCURSOR); ++======= + if (yych <= '\'') goto yy25; + if (yych >= '*') goto yy25; + } else { + if (yych == '<') goto yy25; + } + } else { + if (yych <= ']') { + if (yych == '[') goto yy28; + goto yy25; + } else { + if (yych <= '^') goto yy49; + if (yych <= 'z') goto yy25; + if (yych >= 0x7F) goto yy25; + } + } + } + yy49: + YYDEBUG(49, *YYCURSOR); ++>>>>>>> PHP-5.6 yyleng = YYCURSOR - SCNG(yy_text); -#line 476 "Zend/zend_ini_scanner.l" +#line 477 "Zend/zend_ini_scanner.l" { RETURN_TOKEN(NULL_NULL, "", 0); } ++<<<<<<< HEAD +#line 969 "Zend/zend_ini_scanner.c" +yy49: + YYDEBUG(49, *YYCURSOR); + ++YYCURSOR; + YYFILL(1); + yych = *YYCURSOR; + YYDEBUG(50, *YYCURSOR); + if (yych == '\t') goto yy49; + if (yych == ' ') goto yy49; + goto yy48; +yy51: + YYDEBUG(51, *YYCURSOR); + yych = *++YYCURSOR; + if (yych == 'E') goto yy38; + if (yych == 'e') goto yy38; + goto yy25; +yy52: + YYDEBUG(52, *YYCURSOR); + yych = *++YYCURSOR; + if (yych == 'L') goto yy53; + if (yych != 'l') goto yy25; +yy53: + YYDEBUG(53, *YYCURSOR); + yych = *++YYCURSOR; + if (yych == 'S') goto yy54; + if (yych != 's') goto yy25; +yy54: + YYDEBUG(54, *YYCURSOR); + yych = *++YYCURSOR; + if (yych == 'E') goto yy38; + if (yych == 'e') goto yy38; + goto yy25; +yy55: + YYDEBUG(55, *YYCURSOR); + ++YYCURSOR; + YYFILL(1); + yych = *YYCURSOR; +yy56: + YYDEBUG(56, *YYCURSOR); + if (yych == '\t') goto yy55; + if (yych == ' ') goto yy55; + goto yy16; +yy57: + YYDEBUG(57, *YYCURSOR); ++======= + #line 975 "Zend/zend_ini_scanner.c" + yy50: + YYDEBUG(50, *YYCURSOR); + ++YYCURSOR; + YYFILL(1); + yych = *YYCURSOR; + YYDEBUG(51, *YYCURSOR); + if (yych == '\t') goto yy50; + if (yych == ' ') goto yy50; + goto yy49; + yy52: + YYDEBUG(52, *YYCURSOR); + yych = *++YYCURSOR; + if (yych == 'E') goto yy39; + if (yych == 'e') goto yy39; + goto yy26; + yy53: + YYDEBUG(53, *YYCURSOR); + yych = *++YYCURSOR; + if (yych == 'L') goto yy54; + if (yych != 'l') goto yy26; + yy54: + YYDEBUG(54, *YYCURSOR); + yych = *++YYCURSOR; + if (yych == 'S') goto yy55; + if (yych != 's') goto yy26; + yy55: + YYDEBUG(55, *YYCURSOR); + yych = *++YYCURSOR; + if (yych == 'E') goto yy39; + if (yych == 'e') goto yy39; + goto yy26; + yy56: + YYDEBUG(56, *YYCURSOR); ++>>>>>>> PHP-5.6 ++YYCURSOR; - YYFILL(1); + YYFILL(2); yych = *YYCURSOR; + yy57: + YYDEBUG(57, *YYCURSOR); + if (yych == '\t') goto yy56; + if (yych == ' ') goto yy56; + goto yy17; yy58: YYDEBUG(58, *YYCURSOR); ++<<<<<<< HEAD + if (yybm[0+yych] & 128) { + goto yy57; + } + if (yych >= '\r') goto yy61; +yy59: + YYDEBUG(59, *YYCURSOR); + ++YYCURSOR; +yy60: + YYDEBUG(60, *YYCURSOR); ++======= + ++YYCURSOR; + YYFILL(2); + yych = *YYCURSOR; + yy59: + YYDEBUG(59, *YYCURSOR); + if (yybm[0+yych] & 128) { + goto yy58; + } + if (yych >= '\r') goto yy62; + yy60: + YYDEBUG(60, *YYCURSOR); + ++YYCURSOR; + yy61: + YYDEBUG(61, *YYCURSOR); ++>>>>>>> PHP-5.6 yyleng = YYCURSOR - SCNG(yy_text); -#line 636 "Zend/zend_ini_scanner.l" +#line 637 "Zend/zend_ini_scanner.l" { /* Comment */ BEGIN(INITIAL); SCNG(lineno)++; return END_OF_LINE; } ++<<<<<<< HEAD +#line 1034 "Zend/zend_ini_scanner.c" +yy61: + YYDEBUG(61, *YYCURSOR); + yych = *++YYCURSOR; + if (yych == '\n') goto yy59; + goto yy60; +yy62: + YYDEBUG(62, *YYCURSOR); ++======= + #line 1040 "Zend/zend_ini_scanner.c" + yy62: + YYDEBUG(62, *YYCURSOR); + yych = *++YYCURSOR; + if (yych == '\n') goto yy60; + goto yy61; + yy63: + YYDEBUG(63, *YYCURSOR); + yyaccept = 1; + YYMARKER = ++YYCURSOR; + YYFILL(2); + yych = *YYCURSOR; + yy64: + YYDEBUG(64, *YYCURSOR); + if (yych <= '\'') { + if (yych <= ' ') { + if (yych <= '\n') { + if (yych <= 0x08) goto yy63; + if (yych >= '\n') goto yy69; + } else { + if (yych == '\r') goto yy71; + goto yy63; + } + } else { + if (yych <= '$') { + if (yych == '#') goto yy63; + } else { + if (yych != '&') goto yy63; + } + } + } else { + if (yych <= 'Z') { + if (yych <= ';') { + if (yych <= ')') goto yy65; + if (yych <= ':') goto yy63; + } else { + if (yych != '=') goto yy63; + } + } else { + if (yych <= '^') { + if (yych <= '[') goto yy67; + if (yych <= ']') goto yy63; + } else { + if (yych <= 'z') goto yy63; + if (yych >= 0x7F) goto yy63; + } + } + } + yy65: + YYDEBUG(65, *YYCURSOR); + ++YYCURSOR; + YYFILL(2); + yych = *YYCURSOR; + YYDEBUG(66, *YYCURSOR); + if (yych == '\n') goto yy69; + if (yych == '\r') goto yy71; + goto yy65; + yy67: + YYDEBUG(67, *YYCURSOR); + yyaccept = 3; + YYMARKER = ++YYCURSOR; + YYFILL(2); + yych = *YYCURSOR; + YYDEBUG(68, *YYCURSOR); + if (yych <= '\f') { + if (yych <= 0x08) goto yy65; + if (yych <= '\t') goto yy67; + if (yych >= '\v') goto yy65; + } else { + if (yych <= '\r') goto yy71; + if (yych == ' ') goto yy67; + goto yy65; + } + yy69: + YYDEBUG(69, *YYCURSOR); + ++YYCURSOR; + yy70: + YYDEBUG(70, *YYCURSOR); + yyleng = YYCURSOR - SCNG(yy_text); + #line 642 "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 1126 "Zend/zend_ini_scanner.c" + yy71: + YYDEBUG(71, *YYCURSOR); + yych = *++YYCURSOR; + if (yych == '\n') goto yy69; + goto yy70; + yy72: + YYDEBUG(72, *YYCURSOR); ++>>>>>>> PHP-5.6 yyaccept = 0; YYMARKER = ++YYCURSOR; YYFILL(2); yych = *YYCURSOR; ++<<<<<<< HEAD +yy63: + YYDEBUG(63, *YYCURSOR); + if (yych <= 0x1F) { + if (yych <= '\n') { + if (yych <= 0x08) goto yy5; + if (yych <= '\t') goto yy62; + goto yy66; + } else { + if (yych == '\r') goto yy67; + goto yy5; + } + } else { + if (yych <= ';') { + if (yych <= ' ') goto yy62; + if (yych <= ':') goto yy5; + goto yy57; + } else { + if (yych == '=') goto yy55; + goto yy5; + } + } +yy64: + YYDEBUG(64, *YYCURSOR); ++======= + yy73: + YYDEBUG(73, *YYCURSOR); + if (yych <= ' ') { + if (yych <= '\n') { + if (yych <= 0x08) goto yy5; + if (yych <= '\t') goto yy72; + goto yy76; + } else { + if (yych == '\r') goto yy77; + if (yych <= 0x1F) goto yy5; + goto yy72; + } + } else { + if (yych <= ':') { + if (yych == '#') goto yy65; + goto yy5; + } else { + if (yych <= ';') goto yy58; + if (yych == '=') goto yy56; + goto yy5; + } + } + yy74: + YYDEBUG(74, *YYCURSOR); ++>>>>>>> PHP-5.6 yyaccept = 1; YYMARKER = ++YYCURSOR; YYFILL(2); yych = *YYCURSOR; - YYDEBUG(75, *YYCURSOR); ++<<<<<<< HEAD + YYDEBUG(65, *YYCURSOR); + if (yych <= '&') { + if (yych <= 0x1F) { + if (yych <= '\n') { + if (yych <= 0x08) goto yy24; + if (yych <= '\t') goto yy62; + } else { + if (yych == '\r') goto yy67; + goto yy24; + } + } else { + if (yych <= '#') { + if (yych <= ' ') goto yy64; + if (yych <= '"') goto yy3; + goto yy24; + } else { + if (yych == '%') goto yy24; ++======= ++ YYDEBUG(75, *YYCURSOR); + if (yych <= '&') { + if (yych <= 0x1F) { + if (yych <= '\n') { + if (yych <= 0x08) goto yy25; + if (yych <= '\t') goto yy72; + } else { + if (yych == '\r') goto yy77; + goto yy25; + } + } else { + if (yych <= '#') { + if (yych <= ' ') goto yy74; + if (yych <= '"') goto yy3; + goto yy63; + } else { + if (yych == '%') goto yy25; ++>>>>>>> PHP-5.6 goto yy3; } } } else { if (yych <= '=') { if (yych <= ':') { ++<<<<<<< HEAD + if (yych <= '\'') goto yy24; + if (yych <= ')') goto yy3; + goto yy24; + } else { + if (yych <= ';') goto yy57; + if (yych <= '<') goto yy24; + goto yy55; + } + } else { + if (yych <= ']') { + if (yych == '[') goto yy27; + goto yy24; + } else { + if (yych <= '^') goto yy3; + if (yych <= 'z') goto yy24; + if (yych <= '~') goto yy3; + goto yy24; + } + } + } +yy66: + YYDEBUG(66, *YYCURSOR); + yych = *++YYCURSOR; + goto yy7; +yy67: + YYDEBUG(67, *YYCURSOR); + ++YYCURSOR; + if ((yych = *YYCURSOR) == '\n') goto yy66; ++======= + if (yych <= '\'') goto yy25; + if (yych <= ')') goto yy3; + goto yy25; + } else { + if (yych <= ';') goto yy58; + if (yych <= '<') goto yy25; + goto yy56; + } + } else { + if (yych <= ']') { + if (yych == '[') goto yy28; + goto yy25; + } else { + if (yych <= '^') goto yy3; + if (yych <= 'z') goto yy25; + if (yych <= '~') goto yy3; + goto yy25; + } + } + } + yy76: + YYDEBUG(76, *YYCURSOR); + yych = *++YYCURSOR; + goto yy7; + yy77: + YYDEBUG(77, *YYCURSOR); + ++YYCURSOR; + if ((yych = *YYCURSOR) == '\n') goto yy76; ++>>>>>>> PHP-5.6 goto yy7; } /* *********************************** */ @@@ -1159,17 -1252,17 +1788,29 @@@ yyc_ST_DOUBLE_QUOTES 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, }; ++<<<<<<< HEAD + YYDEBUG(68, *YYCURSOR); + YYFILL(2); + yych = *YYCURSOR; + if (yych == '"') goto yy72; + if (yych == '$') goto yy74; + YYDEBUG(70, *YYCURSOR); + ++YYCURSOR; +yy71: + YYDEBUG(71, *YYCURSOR); ++======= + YYDEBUG(78, *YYCURSOR); + YYFILL(2); + yych = *YYCURSOR; + if (yych == '"') goto yy82; + if (yych == '$') goto yy84; + YYDEBUG(80, *YYCURSOR); + ++YYCURSOR; + yy81: + YYDEBUG(81, *YYCURSOR); ++>>>>>>> PHP-5.6 yyleng = YYCURSOR - SCNG(yy_text); -#line 586 "Zend/zend_ini_scanner.l" +#line 587 "Zend/zend_ini_scanner.l" { /* Escape double quoted string contents */ if (YYCURSOR > YYLIMIT) { return 0; @@@ -1201,50 -1294,50 +1842,87 @@@ } yyleng = YYCURSOR - SCNG(yy_text); - - zend_ini_escape_string(ini_lval, yytext, yyleng, '"' TSRMLS_CC); + + zend_ini_escape_string(ini_lval, yytext, yyleng, '"'); return TC_QUOTED_STRING; } ++<<<<<<< HEAD +#line 1209 "Zend/zend_ini_scanner.c" +yy72: + YYDEBUG(72, *YYCURSOR); + ++YYCURSOR; + yych = *YYCURSOR; + goto yy78; +yy73: + YYDEBUG(73, *YYCURSOR); ++======= + #line 1302 "Zend/zend_ini_scanner.c" + yy82: + YYDEBUG(82, *YYCURSOR); + ++YYCURSOR; + yych = *YYCURSOR; + goto yy88; + yy83: + YYDEBUG(83, *YYCURSOR); ++>>>>>>> PHP-5.6 yyleng = YYCURSOR - SCNG(yy_text); -#line 581 "Zend/zend_ini_scanner.l" +#line 582 "Zend/zend_ini_scanner.l" { /* Double quoted '"' string ends */ - yy_pop_state(TSRMLS_C); + yy_pop_state(); return '"'; } ++<<<<<<< HEAD +#line 1223 "Zend/zend_ini_scanner.c" +yy74: + YYDEBUG(74, *YYCURSOR); + yych = *++YYCURSOR; + if (yych != '{') goto yy71; + YYDEBUG(75, *YYCURSOR); + ++YYCURSOR; + YYDEBUG(76, *YYCURSOR); ++======= + #line 1316 "Zend/zend_ini_scanner.c" + yy84: + YYDEBUG(84, *YYCURSOR); + yych = *++YYCURSOR; + if (yych != '{') goto yy81; + YYDEBUG(85, *YYCURSOR); + ++YYCURSOR; + YYDEBUG(86, *YYCURSOR); ++>>>>>>> PHP-5.6 yyleng = YYCURSOR - SCNG(yy_text); -#line 448 "Zend/zend_ini_scanner.l" +#line 449 "Zend/zend_ini_scanner.l" { /* Variable start */ - yy_push_state(ST_VARNAME TSRMLS_CC); + yy_push_state(ST_VARNAME); return TC_DOLLAR_CURLY; } ++<<<<<<< HEAD +#line 1237 "Zend/zend_ini_scanner.c" +yy77: + YYDEBUG(77, *YYCURSOR); + ++YYCURSOR; + YYFILL(1); + yych = *YYCURSOR; +yy78: + YYDEBUG(78, *YYCURSOR); + if (yybm[0+yych] & 128) { + goto yy77; + } + goto yy73; ++======= + #line 1330 "Zend/zend_ini_scanner.c" + yy87: + YYDEBUG(87, *YYCURSOR); + ++YYCURSOR; + YYFILL(1); + yych = *YYCURSOR; + yy88: + YYDEBUG(88, *YYCURSOR); + if (yybm[0+yych] & 128) { + goto yy87; + } + goto yy83; ++>>>>>>> PHP-5.6 } /* *********************************** */ yyc_ST_OFFSET: @@@ -1283,496 -1376,496 +1961,955 @@@ 66, 66, 66, 66, 66, 66, 66, 66, 66, 66, 66, 66, 66, 66, 66, 66, }; ++<<<<<<< HEAD + YYDEBUG(79, *YYCURSOR); ++======= + YYDEBUG(89, *YYCURSOR); ++>>>>>>> PHP-5.6 YYFILL(2); yych = *YYCURSOR; if (yych <= '-') { if (yych <= ' ') { if (yych <= '\n') { ++<<<<<<< HEAD + if (yych <= 0x08) goto yy81; + if (yych <= '\t') goto yy83; + goto yy84; + } else { + if (yych == '\r') goto yy84; + if (yych >= ' ') goto yy83; + } + } else { + if (yych <= '$') { + if (yych == '"') goto yy86; + if (yych >= '$') goto yy88; + } else { + if (yych == '\'') goto yy89; + if (yych >= '-') goto yy90; ++======= + if (yych <= 0x08) goto yy91; + if (yych <= '\t') goto yy93; + goto yy94; + } else { + if (yych == '\r') goto yy94; + if (yych >= ' ') goto yy93; + } + } else { + if (yych <= '$') { + if (yych == '"') goto yy96; + if (yych >= '$') goto yy98; + } else { + if (yych == '\'') goto yy99; + if (yych >= '-') goto yy100; ++>>>>>>> PHP-5.6 } } } else { if (yych <= 'Z') { if (yych <= '9') { ++<<<<<<< HEAD + if (yych <= '.') goto yy91; + if (yych >= '0') goto yy92; + } else { + if (yych == ';') goto yy84; + if (yych >= 'A') goto yy94; + } + } else { + if (yych <= '^') { + if (yych <= '[') goto yy81; + if (yych <= '\\') goto yy96; + if (yych <= ']') goto yy97; + } else { + if (yych == '`') goto yy81; + if (yych <= 'z') goto yy94; + } + } + } +yy81: + YYDEBUG(81, *YYCURSOR); + yyaccept = 0; + yych = *(YYMARKER = ++YYCURSOR); + goto yy100; +yy82: + YYDEBUG(82, *YYCURSOR); ++======= + if (yych <= '.') goto yy101; + if (yych >= '0') goto yy102; + } else { + if (yych == ';') goto yy94; + if (yych >= 'A') goto yy104; + } + } else { + if (yych <= '^') { + if (yych <= '[') goto yy91; + if (yych <= '\\') goto yy106; + if (yych <= ']') goto yy107; + } else { + if (yych == '`') goto yy91; + if (yych <= 'z') goto yy104; + } + } + } + yy91: + YYDEBUG(91, *YYCURSOR); + yyaccept = 0; + yych = *(YYMARKER = ++YYCURSOR); + goto yy110; + yy92: + YYDEBUG(92, *YYCURSOR); ++>>>>>>> PHP-5.6 yyleng = YYCURSOR - SCNG(yy_text); -#line 572 "Zend/zend_ini_scanner.l" +#line 573 "Zend/zend_ini_scanner.l" { /* Get rest as section/offset value */ RETURN_TOKEN(TC_STRING, yytext, yyleng); } ++<<<<<<< HEAD +#line 1341 "Zend/zend_ini_scanner.c" +yy83: + YYDEBUG(83, *YYCURSOR); + yyaccept = 0; + yych = *(YYMARKER = ++YYCURSOR); + if (yybm[0+yych] & 128) { + goto yy126; + } + if (yych == '"') goto yy128; + if (yych == ']') goto yy129; + goto yy100; +yy84: + YYDEBUG(84, *YYCURSOR); + ++YYCURSOR; +yy85: + YYDEBUG(85, *YYCURSOR); ++======= + #line 1434 "Zend/zend_ini_scanner.c" + yy93: + YYDEBUG(93, *YYCURSOR); + yyaccept = 0; + yych = *(YYMARKER = ++YYCURSOR); + if (yybm[0+yych] & 128) { + goto yy136; + } + if (yych == '"') goto yy138; + if (yych == ']') goto yy139; + goto yy110; + yy94: + YYDEBUG(94, *YYCURSOR); + ++YYCURSOR; + yy95: + YYDEBUG(95, *YYCURSOR); ++>>>>>>> PHP-5.6 yyleng = YYCURSOR - SCNG(yy_text); -#line 654 "Zend/zend_ini_scanner.l" +#line 648 "Zend/zend_ini_scanner.l" { return 0; } ++<<<<<<< HEAD +#line 1362 "Zend/zend_ini_scanner.c" +yy86: + YYDEBUG(86, *YYCURSOR); + ++YYCURSOR; +yy87: + YYDEBUG(87, *YYCURSOR); ++======= + #line 1455 "Zend/zend_ini_scanner.c" + yy96: + YYDEBUG(96, *YYCURSOR); + ++YYCURSOR; + yy97: + YYDEBUG(97, *YYCURSOR); ++>>>>>>> PHP-5.6 yyleng = YYCURSOR - SCNG(yy_text); -#line 576 "Zend/zend_ini_scanner.l" +#line 577 "Zend/zend_ini_scanner.l" { /* Double quoted '"' string start */ - yy_push_state(ST_DOUBLE_QUOTES TSRMLS_CC); + yy_push_state(ST_DOUBLE_QUOTES); return '"'; } ++<<<<<<< HEAD +#line 1374 "Zend/zend_ini_scanner.c" +yy88: + YYDEBUG(88, *YYCURSOR); + yych = *++YYCURSOR; + if (yych <= '\\') { + if (yych <= 0x00) goto yy85; + if (yych <= '[') goto yy99; + goto yy104; + } else { + if (yych == '{') goto yy124; + goto yy99; + } +yy89: + YYDEBUG(89, *YYCURSOR); + yyaccept = 1; + yych = *(YYMARKER = ++YYCURSOR); + if (yybm[0+yych] & 64) { - goto yy120; ++ goto yy120; ++ } ++ goto yy85; ++yy90: ++ YYDEBUG(90, *YYCURSOR); ++ yyaccept = 0; ++ yych = *(YYMARKER = ++YYCURSOR); ++ if (yych <= '/') goto yy100; ++ if (yych <= '9') goto yy118; ++ goto yy100; ++yy91: ++ YYDEBUG(91, *YYCURSOR); ++ yyaccept = 0; ++ yych = *(YYMARKER = ++YYCURSOR); ++ if (yych <= '/') goto yy100; ++ if (yych <= '9') goto yy116; ++ goto yy100; ++yy92: ++ YYDEBUG(92, *YYCURSOR); ++======= + #line 1467 "Zend/zend_ini_scanner.c" + yy98: + YYDEBUG(98, *YYCURSOR); + yych = *++YYCURSOR; + if (yych <= '\\') { + if (yych <= 0x00) goto yy95; + if (yych <= '[') goto yy109; + goto yy114; + } else { + if (yych == '{') goto yy134; + goto yy109; + } + yy99: + YYDEBUG(99, *YYCURSOR); + yyaccept = 1; + yych = *(YYMARKER = ++YYCURSOR); + if (yybm[0+yych] & 64) { + goto yy130; } - goto yy85; - yy90: - YYDEBUG(90, *YYCURSOR); + goto yy95; + yy100: + YYDEBUG(100, *YYCURSOR); yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); - if (yych <= '/') goto yy100; - if (yych <= '9') goto yy118; - goto yy100; - yy91: - YYDEBUG(91, *YYCURSOR); + if (yych <= '/') goto yy110; + if (yych <= '9') goto yy128; + goto yy110; + yy101: + YYDEBUG(101, *YYCURSOR); yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); - if (yych <= '/') goto yy100; - if (yych <= '9') goto yy116; - goto yy100; - yy92: - YYDEBUG(92, *YYCURSOR); + if (yych <= '/') goto yy110; + if (yych <= '9') goto yy126; + goto yy110; + yy102: + YYDEBUG(102, *YYCURSOR); ++>>>>>>> PHP-5.6 yyaccept = 2; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '\'') { if (yych <= '\r') { ++<<<<<<< HEAD + if (yych == '\n') goto yy93; + if (yych <= '\f') goto yy100; + } else { + if (yych == '"') goto yy93; + if (yych <= '&') goto yy100; + } + } else { + if (yych <= '9') { + if (yych == '.') goto yy112; + if (yych <= '/') goto yy100; + goto yy114; + } else { + if (yych <= ';') { + if (yych <= ':') goto yy100; + } else { + if (yych != ']') goto yy100; + } + } + } +yy93: + YYDEBUG(93, *YYCURSOR); ++======= + if (yych == '\n') goto yy103; + if (yych <= '\f') goto yy110; + } else { + if (yych == '"') goto yy103; + if (yych <= '&') goto yy110; + } + } else { + if (yych <= '9') { + if (yych == '.') goto yy122; + if (yych <= '/') goto yy110; + goto yy124; + } else { + if (yych <= ';') { + if (yych <= ':') goto yy110; + } else { + if (yych != ']') goto yy110; + } + } + } + yy103: + YYDEBUG(103, *YYCURSOR); ++>>>>>>> PHP-5.6 yyleng = YYCURSOR - SCNG(yy_text); -#line 550 "Zend/zend_ini_scanner.l" +#line 551 "Zend/zend_ini_scanner.l" { /* Get number option value as string */ RETURN_TOKEN(TC_NUMBER, yytext, yyleng); } ++<<<<<<< HEAD +#line 1440 "Zend/zend_ini_scanner.c" +yy94: + YYDEBUG(94, *YYCURSOR); + yyaccept = 3; + yych = *(YYMARKER = ++YYCURSOR); + if (yybm[0+yych] & 16) { + goto yy110; + } + if (yych <= '"') { + if (yych <= '\f') { + if (yych != '\n') goto yy100; + } else { + if (yych <= '\r') goto yy95; + if (yych <= '!') goto yy100; + } + } else { + if (yych <= ':') { + if (yych != '\'') goto yy100; + } else { + if (yych <= ';') goto yy95; + if (yych != ']') goto yy100; + } + } +yy95: + YYDEBUG(95, *YYCURSOR); ++======= + #line 1533 "Zend/zend_ini_scanner.c" + yy104: + YYDEBUG(104, *YYCURSOR); + yyaccept = 3; + yych = *(YYMARKER = ++YYCURSOR); + if (yybm[0+yych] & 16) { + goto yy120; + } + if (yych <= '"') { + if (yych <= '\f') { + if (yych != '\n') goto yy110; + } else { + if (yych <= '\r') goto yy105; + if (yych <= '!') goto yy110; + } + } else { + if (yych <= ':') { + if (yych != '\'') goto yy110; + } else { + if (yych <= ';') goto yy105; + if (yych != ']') goto yy110; + } + } + yy105: + YYDEBUG(105, *YYCURSOR); ++>>>>>>> PHP-5.6 yyleng = YYCURSOR - SCNG(yy_text); -#line 546 "Zend/zend_ini_scanner.l" +#line 547 "Zend/zend_ini_scanner.l" { /* Get constant option value */ RETURN_TOKEN(TC_CONSTANT, yytext, yyleng); } ++<<<<<<< HEAD +#line 1470 "Zend/zend_ini_scanner.c" +yy96: + YYDEBUG(96, *YYCURSOR); + yych = *++YYCURSOR; + goto yy99; +yy97: + YYDEBUG(97, *YYCURSOR); + ++YYCURSOR; +yy98: + YYDEBUG(98, *YYCURSOR); ++======= + #line 1563 "Zend/zend_ini_scanner.c" + yy106: + YYDEBUG(106, *YYCURSOR); + yych = *++YYCURSOR; + goto yy109; + yy107: + YYDEBUG(107, *YYCURSOR); + ++YYCURSOR; + yy108: + YYDEBUG(108, *YYCURSOR); ++>>>>>>> PHP-5.6 yyleng = YYCURSOR - SCNG(yy_text); -#line 443 "Zend/zend_ini_scanner.l" +#line 444 "Zend/zend_ini_scanner.l" { /* End of section or an option offset */ BEGIN(INITIAL); return ']'; } ++<<<<<<< HEAD +#line 1486 "Zend/zend_ini_scanner.c" +yy99: + YYDEBUG(99, *YYCURSOR); ++======= + #line 1579 "Zend/zend_ini_scanner.c" + yy109: + YYDEBUG(109, *YYCURSOR); ++>>>>>>> PHP-5.6 yyaccept = 0; YYMARKER = ++YYCURSOR; YYFILL(1); yych = *YYCURSOR; ++<<<<<<< HEAD +yy100: + YYDEBUG(100, *YYCURSOR); + if (yybm[0+yych] & 2) { + goto yy99; + } + if (yych == '$') goto yy102; + if (yych != '\\') goto yy82; +yy101: + YYDEBUG(101, *YYCURSOR); + ++YYCURSOR; + YYFILL(1); + yych = *YYCURSOR; + goto yy99; +yy102: + YYDEBUG(102, *YYCURSOR); ++======= + yy110: + YYDEBUG(110, *YYCURSOR); + if (yybm[0+yych] & 2) { + goto yy109; + } + if (yych == '$') goto yy112; + if (yych != '\\') goto yy92; + yy111: + YYDEBUG(111, *YYCURSOR); + ++YYCURSOR; + YYFILL(1); + yych = *YYCURSOR; + goto yy109; + yy112: + YYDEBUG(112, *YYCURSOR); ++>>>>>>> PHP-5.6 ++YYCURSOR; YYFILL(1); yych = *YYCURSOR; if (yych <= '\\') { ++<<<<<<< HEAD + if (yych <= 0x00) goto yy103; + if (yych <= '[') goto yy99; + goto yy104; + } else { + if (yych != '{') goto yy99; + } +yy103: + YYDEBUG(103, *YYCURSOR); + YYCURSOR = YYMARKER; + if (yyaccept <= 1) { + if (yyaccept <= 0) { + goto yy82; + } else { + goto yy85; + } + } else { + if (yyaccept <= 2) { + goto yy93; + } else { + goto yy95; + } + } +yy104: + YYDEBUG(104, *YYCURSOR); ++======= + if (yych <= 0x00) goto yy113; + if (yych <= '[') goto yy109; + goto yy114; + } else { + if (yych != '{') goto yy109; + } + yy113: + YYDEBUG(113, *YYCURSOR); + YYCURSOR = YYMARKER; + if (yyaccept <= 1) { + if (yyaccept <= 0) { + goto yy92; + } else { + goto yy95; + } + } else { + if (yyaccept <= 2) { + goto yy103; + } else { + goto yy105; + } + } + yy114: + YYDEBUG(114, *YYCURSOR); ++>>>>>>> PHP-5.6 + ++YYCURSOR; + YYFILL(1); + yych = *YYCURSOR; + if (yybm[0+yych] & 4) { ++<<<<<<< HEAD + goto yy105; + } + if (yych == '\\') goto yy107; + goto yy99; +yy105: + YYDEBUG(105, *YYCURSOR); + ++YYCURSOR; + YYFILL(1); + yych = *YYCURSOR; + YYDEBUG(106, *YYCURSOR); + if (yybm[0+yych] & 4) { + goto yy105; + } + if (yych == '\\') goto yy109; + goto yy99; +yy107: + YYDEBUG(107, *YYCURSOR); ++YYCURSOR; YYFILL(1); yych = *YYCURSOR; + YYDEBUG(108, *YYCURSOR); if (yybm[0+yych] & 4) { + goto yy105; + } + if (yych == '\\') goto yy107; + goto yy99; +yy109: + YYDEBUG(109, *YYCURSOR); ++======= + goto yy115; + } + if (yych == '\\') goto yy117; + goto yy109; + yy115: + YYDEBUG(115, *YYCURSOR); + ++YYCURSOR; + YYFILL(1); + yych = *YYCURSOR; + YYDEBUG(116, *YYCURSOR); + if (yybm[0+yych] & 4) { + goto yy115; + } + if (yych == '\\') goto yy119; + goto yy109; + yy117: + YYDEBUG(117, *YYCURSOR); + ++YYCURSOR; + YYFILL(1); + yych = *YYCURSOR; + YYDEBUG(118, *YYCURSOR); + if (yybm[0+yych] & 4) { + goto yy115; + } + if (yych == '\\') goto yy117; + goto yy109; + yy119: + YYDEBUG(119, *YYCURSOR); ++>>>>>>> PHP-5.6 ++YYCURSOR; YYFILL(1); yych = *YYCURSOR; if (yybm[0+yych] & 4) { ++<<<<<<< HEAD + goto yy105; + } + if (yych == '\\') goto yy107; + goto yy99; +yy110: + YYDEBUG(110, *YYCURSOR); ++======= + goto yy115; + } + if (yych == '\\') goto yy117; + goto yy109; + yy120: + YYDEBUG(120, *YYCURSOR); ++>>>>>>> PHP-5.6 yyaccept = 3; YYMARKER = ++YYCURSOR; YYFILL(1); yych = *YYCURSOR; ++<<<<<<< HEAD + YYDEBUG(111, *YYCURSOR); + if (yybm[0+yych] & 16) { + goto yy110; + } + if (yych <= '$') { + if (yych <= '\r') { + if (yych == '\n') goto yy95; + if (yych <= '\f') goto yy99; + goto yy95; + } else { + if (yych == '"') goto yy95; + if (yych <= '#') goto yy99; + goto yy102; + } + } else { + if (yych <= ';') { + if (yych == '\'') goto yy95; + if (yych <= ':') goto yy99; + goto yy95; + } else { + if (yych <= '[') goto yy99; + if (yych <= '\\') goto yy101; + if (yych <= ']') goto yy95; + goto yy99; + } + } +yy112: + YYDEBUG(112, *YYCURSOR); ++======= + YYDEBUG(121, *YYCURSOR); + if (yybm[0+yych] & 16) { + goto yy120; + } + if (yych <= '$') { + if (yych <= '\r') { + if (yych == '\n') goto yy105; + if (yych <= '\f') goto yy109; + goto yy105; + } else { + if (yych == '"') goto yy105; + if (yych <= '#') goto yy109; + goto yy112; + } + } else { + if (yych <= ';') { + if (yych == '\'') goto yy105; + if (yych <= ':') goto yy109; + goto yy105; + } else { + if (yych <= '[') goto yy109; + if (yych <= '\\') goto yy111; + if (yych <= ']') goto yy105; + goto yy109; + } + } + yy122: + YYDEBUG(122, *YYCURSOR); ++>>>>>>> PHP-5.6 yyaccept = 2; YYMARKER = ++YYCURSOR; YYFILL(1); yych = *YYCURSOR; ++<<<<<<< HEAD + YYDEBUG(113, *YYCURSOR); + if (yybm[0+yych] & 32) { + goto yy112; + } + if (yych <= '$') { + if (yych <= '\r') { + if (yych == '\n') goto yy93; + if (yych <= '\f') goto yy99; + goto yy93; + } else { + if (yych == '"') goto yy93; + if (yych <= '#') goto yy99; + goto yy102; + } + } else { + if (yych <= ';') { + if (yych == '\'') goto yy93; + if (yych <= ':') goto yy99; + goto yy93; + } else { + if (yych <= '[') goto yy99; + if (yych <= '\\') goto yy101; + if (yych <= ']') goto yy93; + goto yy99; + } + } +yy114: + YYDEBUG(114, *YYCURSOR); ++======= + YYDEBUG(123, *YYCURSOR); + if (yybm[0+yych] & 32) { + goto yy122; + } + if (yych <= '$') { + if (yych <= '\r') { + if (yych == '\n') goto yy103; + if (yych <= '\f') goto yy109; + goto yy103; + } else { + if (yych == '"') goto yy103; + if (yych <= '#') goto yy109; + goto yy112; + } + } else { + if (yych <= ';') { + if (yych == '\'') goto yy103; + if (yych <= ':') goto yy109; + goto yy103; + } else { + if (yych <= '[') goto yy109; + if (yych <= '\\') goto yy111; + if (yych <= ']') goto yy103; + goto yy109; + } + } + yy124: + YYDEBUG(124, *YYCURSOR); ++>>>>>>> PHP-5.6 yyaccept = 2; YYMARKER = ++YYCURSOR; YYFILL(1); yych = *YYCURSOR; ++<<<<<<< HEAD + YYDEBUG(115, *YYCURSOR); + if (yych <= '\'') { + if (yych <= '!') { + if (yych <= '\n') { + if (yych <= '\t') goto yy99; + goto yy93; + } else { + if (yych == '\r') goto yy93; + goto yy99; + } + } else { + if (yych <= '#') { + if (yych <= '"') goto yy93; + goto yy99; + } else { + if (yych <= '$') goto yy102; + if (yych <= '&') goto yy99; + goto yy93; ++======= + YYDEBUG(125, *YYCURSOR); + if (yych <= '\'') { + if (yych <= '!') { + if (yych <= '\n') { + if (yych <= '\t') goto yy109; + goto yy103; + } else { + if (yych == '\r') goto yy103; + goto yy109; + } + } else { + if (yych <= '#') { + if (yych <= '"') goto yy103; + goto yy109; + } else { + if (yych <= '$') goto yy112; + if (yych <= '&') goto yy109; + goto yy103; ++>>>>>>> PHP-5.6 } } } else { if (yych <= ':') { if (yych <= '.') { ++<<<<<<< HEAD + if (yych <= '-') goto yy99; + goto yy112; + } else { + if (yych <= '/') goto yy99; + if (yych <= '9') goto yy114; + goto yy99; + } + } else { + if (yych <= '[') { + if (yych <= ';') goto yy93; + goto yy99; + } else { + if (yych <= '\\') goto yy101; + if (yych <= ']') goto yy93; + goto yy99; + } + } + } +yy116: + YYDEBUG(116, *YYCURSOR); ++======= + if (yych <= '-') goto yy109; + goto yy122; + } else { + if (yych <= '/') goto yy109; + if (yych <= '9') goto yy124; + goto yy109; + } + } else { + if (yych <= '[') { + if (yych <= ';') goto yy103; + goto yy109; + } else { + if (yych <= '\\') goto yy111; + if (yych <= ']') goto yy103; + goto yy109; + } + } + } + yy126: + YYDEBUG(126, *YYCURSOR); ++>>>>>>> PHP-5.6 yyaccept = 2; YYMARKER = ++YYCURSOR; YYFILL(1); yych = *YYCURSOR; ++<<<<<<< HEAD + YYDEBUG(117, *YYCURSOR); + if (yych <= '&') { + if (yych <= '\r') { + if (yych == '\n') goto yy93; + if (yych <= '\f') goto yy99; + goto yy93; + } else { + if (yych <= '"') { + if (yych <= '!') goto yy99; + goto yy93; + } else { + if (yych == '$') goto yy102; + goto yy99; ++======= + YYDEBUG(127, *YYCURSOR); + if (yych <= '&') { + if (yych <= '\r') { + if (yych == '\n') goto yy103; + if (yych <= '\f') goto yy109; + goto yy103; + } else { + if (yych <= '"') { + if (yych <= '!') goto yy109; + goto yy103; + } else { + if (yych == '$') goto yy112; + goto yy109; ++>>>>>>> PHP-5.6 } } } else { if (yych <= ':') { - if (yych <= '\'') goto yy103; - if (yych <= '/') goto yy109; ++<<<<<<< HEAD + if (yych <= '\'') goto yy93; + if (yych <= '/') goto yy99; + if (yych <= '9') goto yy116; + goto yy99; + } else { + if (yych <= '[') { + if (yych <= ';') goto yy93; + goto yy99; + } else { + if (yych <= '\\') goto yy101; + if (yych <= ']') goto yy93; + goto yy99; + } + } + } +yy118: + YYDEBUG(118, *YYCURSOR); ++======= ++ if (yych <= '\'') goto yy103; ++ if (yych <= '/') goto yy109; + if (yych <= '9') goto yy126; + goto yy109; + } else { + if (yych <= '[') { + if (yych <= ';') goto yy103; + goto yy109; + } else { + if (yych <= '\\') goto yy111; + if (yych <= ']') goto yy103; + goto yy109; + } + } + } + yy128: + YYDEBUG(128, *YYCURSOR); ++>>>>>>> PHP-5.6 yyaccept = 2; YYMARKER = ++YYCURSOR; YYFILL(1); yych = *YYCURSOR; ++<<<<<<< HEAD + YYDEBUG(119, *YYCURSOR); + if (yych <= '&') { + if (yych <= '\r') { + if (yych == '\n') goto yy93; + if (yych <= '\f') goto yy99; + goto yy93; + } else { + if (yych <= '"') { + if (yych <= '!') goto yy99; + goto yy93; + } else { + if (yych == '$') goto yy102; + goto yy99; ++======= + YYDEBUG(129, *YYCURSOR); + if (yych <= '&') { + if (yych <= '\r') { + if (yych == '\n') goto yy103; + if (yych <= '\f') goto yy109; + goto yy103; + } else { + if (yych <= '"') { + if (yych <= '!') goto yy109; + goto yy103; + } else { + if (yych == '$') goto yy112; + goto yy109; ++>>>>>>> PHP-5.6 } } } else { if (yych <= ':') { ++<<<<<<< HEAD + if (yych <= '\'') goto yy93; + if (yych <= '/') goto yy99; + if (yych <= '9') goto yy118; + goto yy99; + } else { + if (yych <= '[') { + if (yych <= ';') goto yy93; + goto yy99; + } else { + if (yych <= '\\') goto yy101; + if (yych <= ']') goto yy93; + goto yy99; + } + } + } +yy120: + YYDEBUG(120, *YYCURSOR); + ++YYCURSOR; + YYFILL(1); + yych = *YYCURSOR; + YYDEBUG(121, *YYCURSOR); + if (yybm[0+yych] & 64) { + goto yy120; + } + YYDEBUG(122, *YYCURSOR); + ++YYCURSOR; + YYDEBUG(123, *YYCURSOR); ++======= + if (yych <= '\'') goto yy103; + if (yych <= '/') goto yy109; + if (yych <= '9') goto yy128; + goto yy109; + } else { + if (yych <= '[') { + if (yych <= ';') goto yy103; + goto yy109; + } else { + if (yych <= '\\') goto yy111; + if (yych <= ']') goto yy103; + goto yy109; + } + } + } + yy130: + YYDEBUG(130, *YYCURSOR); + ++YYCURSOR; + YYFILL(1); + yych = *YYCURSOR; + YYDEBUG(131, *YYCURSOR); + if (yybm[0+yych] & 64) { + goto yy130; + } + YYDEBUG(132, *YYCURSOR); + ++YYCURSOR; + YYDEBUG(133, *YYCURSOR); ++>>>>>>> PHP-5.6 yyleng = YYCURSOR - SCNG(yy_text); -#line 415 "Zend/zend_ini_scanner.l" +#line 416 "Zend/zend_ini_scanner.l" { /* Raw string */ /* Eat leading and trailing single quotes */ if (yytext[0] == '\'' && yytext[yyleng - 1] == '\'') { @@@ -1781,59 -1874,59 +2918,111 @@@ } RETURN_TOKEN(TC_RAW, yytext, yyleng); } ++<<<<<<< HEAD +#line 1785 "Zend/zend_ini_scanner.c" +yy124: + YYDEBUG(124, *YYCURSOR); + ++YYCURSOR; + YYDEBUG(125, *YYCURSOR); ++======= + #line 1878 "Zend/zend_ini_scanner.c" + yy134: + YYDEBUG(134, *YYCURSOR); + ++YYCURSOR; + YYDEBUG(135, *YYCURSOR); ++>>>>>>> PHP-5.6 yyleng = YYCURSOR - SCNG(yy_text); -#line 448 "Zend/zend_ini_scanner.l" +#line 449 "Zend/zend_ini_scanner.l" { /* Variable start */ - yy_push_state(ST_VARNAME TSRMLS_CC); + yy_push_state(ST_VARNAME); return TC_DOLLAR_CURLY; } ++<<<<<<< HEAD +#line 1796 "Zend/zend_ini_scanner.c" +yy126: + YYDEBUG(126, *YYCURSOR); ++======= + #line 1889 "Zend/zend_ini_scanner.c" + yy136: + YYDEBUG(136, *YYCURSOR); ++>>>>>>> PHP-5.6 yyaccept = 0; YYMARKER = ++YYCURSOR; YYFILL(1); yych = *YYCURSOR; ++<<<<<<< HEAD + YYDEBUG(127, *YYCURSOR); + if (yybm[0+yych] & 128) { + goto yy126; + } + if (yych <= '$') { + if (yych <= '\r') { + if (yych == '\n') goto yy82; + if (yych <= '\f') goto yy99; + goto yy82; + } else { + if (yych == '"') goto yy128; + if (yych <= '#') goto yy99; + goto yy102; + } + } else { + if (yych <= ';') { + if (yych == '\'') goto yy82; + if (yych <= ':') goto yy99; + goto yy82; + } else { + if (yych <= '[') goto yy99; + if (yych <= '\\') goto yy101; + if (yych <= ']') goto yy129; + goto yy99; + } + } +yy128: + YYDEBUG(128, *YYCURSOR); + yych = *++YYCURSOR; + goto yy87; +yy129: + YYDEBUG(129, *YYCURSOR); + ++YYCURSOR; + yych = *YYCURSOR; + goto yy98; ++======= + YYDEBUG(137, *YYCURSOR); + if (yybm[0+yych] & 128) { + goto yy136; + } + if (yych <= '$') { + if (yych <= '\r') { + if (yych == '\n') goto yy92; + if (yych <= '\f') goto yy109; + goto yy92; + } else { + if (yych == '"') goto yy138; + if (yych <= '#') goto yy109; + goto yy112; + } + } else { + if (yych <= ';') { + if (yych == '\'') goto yy92; + if (yych <= ':') goto yy109; + goto yy92; + } else { + if (yych <= '[') goto yy109; + if (yych <= '\\') goto yy111; + if (yych <= ']') goto yy139; + goto yy109; + } + } + yy138: + YYDEBUG(138, *YYCURSOR); + yych = *++YYCURSOR; + goto yy97; + yy139: + YYDEBUG(139, *YYCURSOR); + ++YYCURSOR; + yych = *YYCURSOR; + goto yy108; ++>>>>>>> PHP-5.6 } /* *********************************** */ yyc_ST_RAW: @@@ -1872,46 -1965,46 +3061,81 @@@ 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, }; ++<<<<<<< HEAD + YYDEBUG(130, *YYCURSOR); ++======= + YYDEBUG(140, *YYCURSOR); ++>>>>>>> PHP-5.6 YYFILL(3); yych = *YYCURSOR; if (yych <= '\f') { if (yych <= 0x08) { ++<<<<<<< HEAD + if (yych >= 0x01) goto yy134; + } else { + if (yych <= '\t') goto yy136; + if (yych <= '\n') goto yy137; + goto yy134; + } + } else { + if (yych <= ' ') { + if (yych <= '\r') goto yy139; + if (yych <= 0x1F) goto yy134; + goto yy136; + } else { + if (yych == ';') goto yy140; + goto yy134; + } + } + YYDEBUG(132, *YYCURSOR); + ++YYCURSOR; + YYDEBUG(133, *YYCURSOR); ++======= + if (yych >= 0x01) goto yy144; + } else { + if (yych <= '\t') goto yy146; + if (yych <= '\n') goto yy147; + goto yy144; + } + } else { + if (yych <= ' ') { + if (yych <= '\r') goto yy149; + if (yych <= 0x1F) goto yy144; + goto yy146; + } else { + if (yych == ';') goto yy150; + goto yy144; + } + } + YYDEBUG(142, *YYCURSOR); + ++YYCURSOR; + YYDEBUG(143, *YYCURSOR); ++>>>>>>> PHP-5.6 yyleng = YYCURSOR - SCNG(yy_text); -#line 649 "Zend/zend_ini_scanner.l" +#line 643 "Zend/zend_ini_scanner.l" { /* End of option value (if EOF is reached before EOL */ BEGIN(INITIAL); return END_OF_LINE; } ++<<<<<<< HEAD +#line 1906 "Zend/zend_ini_scanner.c" +yy134: + YYDEBUG(134, *YYCURSOR); + ++YYCURSOR; +yy135: + YYDEBUG(135, *YYCURSOR); ++======= + #line 1999 "Zend/zend_ini_scanner.c" + yy144: + YYDEBUG(144, *YYCURSOR); + ++YYCURSOR; + yy145: + YYDEBUG(145, *YYCURSOR); ++>>>>>>> PHP-5.6 yyleng = YYCURSOR - SCNG(yy_text); -#line 499 "Zend/zend_ini_scanner.l" +#line 500 "Zend/zend_ini_scanner.l" { /* Raw value, only used when SCNG(scanner_mode) == ZEND_INI_SCANNER_RAW. */ - char *sc = NULL; + unsigned char *sc = NULL; while (YYCURSOR < YYLIMIT) { switch (*YYCURSOR) { case '\n': @@@ -1946,111 -2039,111 +3170,207 @@@ end_raw_value_chars } RETURN_TOKEN(TC_RAW, yytext, yyleng); } ++<<<<<<< HEAD +#line 1950 "Zend/zend_ini_scanner.c" +yy136: + YYDEBUG(136, *YYCURSOR); + yyaccept = 0; + yych = *(YYMARKER = ++YYCURSOR); + if (yych <= '\r') { + if (yych <= 0x08) goto yy135; + if (yych <= '\n') goto yy148; + if (yych <= '\f') goto yy135; + goto yy148; + } else { + if (yych <= ' ') { + if (yych <= 0x1F) goto yy135; + goto yy148; + } else { + if (yych == ';') goto yy148; + goto yy135; + } + } +yy137: + YYDEBUG(137, *YYCURSOR); + ++YYCURSOR; +yy138: + YYDEBUG(138, *YYCURSOR); ++======= + #line 2043 "Zend/zend_ini_scanner.c" + yy146: + YYDEBUG(146, *YYCURSOR); + yyaccept = 0; + yych = *(YYMARKER = ++YYCURSOR); + if (yych <= '\r') { + if (yych <= 0x08) goto yy145; + if (yych <= '\n') goto yy158; + if (yych <= '\f') goto yy145; + goto yy158; + } else { + if (yych <= ' ') { + if (yych <= 0x1F) goto yy145; + goto yy158; + } else { + if (yych == ';') goto yy158; + goto yy145; + } + } + yy147: + YYDEBUG(147, *YYCURSOR); + ++YYCURSOR; + yy148: + YYDEBUG(148, *YYCURSOR); ++>>>>>>> PHP-5.6 yyleng = YYCURSOR - SCNG(yy_text); -#line 540 "Zend/zend_ini_scanner.l" +#line 541 "Zend/zend_ini_scanner.l" { /* End of option value */ BEGIN(INITIAL); SCNG(lineno)++; return END_OF_LINE; } ++<<<<<<< HEAD +#line 1981 "Zend/zend_ini_scanner.c" +yy139: + YYDEBUG(139, *YYCURSOR); + yych = *++YYCURSOR; + if (yych == '\n') goto yy146; + goto yy138; +yy140: + YYDEBUG(140, *YYCURSOR); + yyaccept = 1; + yych = *(YYMARKER = ++YYCURSOR); + goto yy142; +yy141: + YYDEBUG(141, *YYCURSOR); + ++YYCURSOR; + YYFILL(2); + yych = *YYCURSOR; +yy142: + YYDEBUG(142, *YYCURSOR); + if (yybm[0+yych] & 64) { + goto yy141; + } + if (yych >= '\r') goto yy145; +yy143: + YYDEBUG(143, *YYCURSOR); + ++YYCURSOR; +yy144: + YYDEBUG(144, *YYCURSOR); ++======= + #line 2074 "Zend/zend_ini_scanner.c" + yy149: + YYDEBUG(149, *YYCURSOR); + yych = *++YYCURSOR; + if (yych == '\n') goto yy156; + goto yy148; + yy150: + YYDEBUG(150, *YYCURSOR); + yyaccept = 1; + yych = *(YYMARKER = ++YYCURSOR); + goto yy152; + yy151: + YYDEBUG(151, *YYCURSOR); + ++YYCURSOR; + YYFILL(2); + yych = *YYCURSOR; + yy152: + YYDEBUG(152, *YYCURSOR); + if (yybm[0+yych] & 64) { + goto yy151; + } + if (yych >= '\r') goto yy155; + yy153: + YYDEBUG(153, *YYCURSOR); + ++YYCURSOR; + yy154: + YYDEBUG(154, *YYCURSOR); ++>>>>>>> PHP-5.6 yyleng = YYCURSOR - SCNG(yy_text); -#line 636 "Zend/zend_ini_scanner.l" +#line 637 "Zend/zend_ini_scanner.l" { /* Comment */ BEGIN(INITIAL); SCNG(lineno)++; return END_OF_LINE; } ++<<<<<<< HEAD +#line 2015 "Zend/zend_ini_scanner.c" +yy145: + YYDEBUG(145, *YYCURSOR); + yych = *++YYCURSOR; + if (yych == '\n') goto yy143; + goto yy144; +yy146: + YYDEBUG(146, *YYCURSOR); + yych = *++YYCURSOR; + goto yy138; +yy147: + YYDEBUG(147, *YYCURSOR); ++======= + #line 2108 "Zend/zend_ini_scanner.c" + yy155: + YYDEBUG(155, *YYCURSOR); + yych = *++YYCURSOR; + if (yych == '\n') goto yy153; + goto yy154; + yy156: + YYDEBUG(156, *YYCURSOR); + yych = *++YYCURSOR; + goto yy148; + yy157: + YYDEBUG(157, *YYCURSOR); ++>>>>>>> PHP-5.6 yyaccept = 2; YYMARKER = ++YYCURSOR; YYFILL(2); yych = *YYCURSOR; ++<<<<<<< HEAD +yy148: + YYDEBUG(148, *YYCURSOR); + if (yybm[0+yych] & 128) { + goto yy147; + } + if (yych <= '\f') { + if (yych == '\n') goto yy146; + } else { + if (yych <= '\r') goto yy150; + if (yych == ';') goto yy141; + } + YYDEBUG(149, *YYCURSOR); ++======= + yy158: + YYDEBUG(158, *YYCURSOR); + if (yybm[0+yych] & 128) { + goto yy157; + } + if (yych <= '\f') { + if (yych == '\n') goto yy156; + } else { + if (yych <= '\r') goto yy160; + if (yych == ';') goto yy151; + } + YYDEBUG(159, *YYCURSOR); ++>>>>>>> PHP-5.6 yyleng = YYCURSOR - SCNG(yy_text); -#line 626 "Zend/zend_ini_scanner.l" +#line 627 "Zend/zend_ini_scanner.l" { /* eat whitespace */ goto restart; } ++<<<<<<< HEAD +#line 2049 "Zend/zend_ini_scanner.c" +yy150: + YYDEBUG(150, *YYCURSOR); + ++YYCURSOR; + if ((yych = *YYCURSOR) == '\n') goto yy146; + goto yy138; ++======= + #line 2142 "Zend/zend_ini_scanner.c" + yy160: + YYDEBUG(160, *YYCURSOR); + ++YYCURSOR; + if ((yych = *YYCURSOR) == '\n') goto yy156; + goto yy148; ++>>>>>>> PHP-5.6 } /* *********************************** */ yyc_ST_SECTION_RAW: @@@ -2089,85 -2182,85 +3409,159 @@@ 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, }; ++<<<<<<< HEAD + YYDEBUG(151, *YYCURSOR); + YYFILL(3); + yych = *YYCURSOR; + if (yych <= '\f') { + if (yych == '\n') goto yy155; + } else { + if (yych <= '\r') goto yy155; + if (yych == ']') goto yy157; + } + YYDEBUG(153, *YYCURSOR); + ++YYCURSOR; + yych = *YYCURSOR; + goto yy164; +yy154: + YYDEBUG(154, *YYCURSOR); ++======= + YYDEBUG(161, *YYCURSOR); + YYFILL(3); + yych = *YYCURSOR; + if (yych <= '\f') { + if (yych == '\n') goto yy165; + } else { + if (yych <= '\r') goto yy165; + if (yych == ']') goto yy167; + } + YYDEBUG(163, *YYCURSOR); + ++YYCURSOR; + yych = *YYCURSOR; + goto yy174; + yy164: + YYDEBUG(164, *YYCURSOR); ++>>>>>>> PHP-5.6 yyleng = YYCURSOR - SCNG(yy_text); -#line 536 "Zend/zend_ini_scanner.l" +#line 537 "Zend/zend_ini_scanner.l" { /* Raw value, only used when SCNG(scanner_mode) == ZEND_INI_SCANNER_RAW. */ RETURN_TOKEN(TC_RAW, yytext, yyleng); } ++<<<<<<< HEAD +#line 2113 "Zend/zend_ini_scanner.c" +yy155: + YYDEBUG(155, *YYCURSOR); + ++YYCURSOR; + YYDEBUG(156, *YYCURSOR); ++======= + #line 2206 "Zend/zend_ini_scanner.c" + yy165: + YYDEBUG(165, *YYCURSOR); + ++YYCURSOR; + YYDEBUG(166, *YYCURSOR); ++>>>>>>> PHP-5.6 yyleng = YYCURSOR - SCNG(yy_text); -#line 654 "Zend/zend_ini_scanner.l" +#line 648 "Zend/zend_ini_scanner.l" { return 0; } ++<<<<<<< HEAD +#line 2123 "Zend/zend_ini_scanner.c" +yy157: + YYDEBUG(157, *YYCURSOR); + ++YYCURSOR; + yych = *YYCURSOR; + goto yy160; +yy158: + YYDEBUG(158, *YYCURSOR); ++======= + #line 2216 "Zend/zend_ini_scanner.c" + yy167: + YYDEBUG(167, *YYCURSOR); + ++YYCURSOR; + yych = *YYCURSOR; + goto yy170; + yy168: + YYDEBUG(168, *YYCURSOR); ++>>>>>>> PHP-5.6 yyleng = YYCURSOR - SCNG(yy_text); -#line 424 "Zend/zend_ini_scanner.l" +#line 425 "Zend/zend_ini_scanner.l" { /* End of section */ BEGIN(INITIAL); SCNG(lineno)++; return ']'; } ++<<<<<<< HEAD +#line 2138 "Zend/zend_ini_scanner.c" +yy159: + YYDEBUG(159, *YYCURSOR); + ++YYCURSOR; + YYFILL(2); + yych = *YYCURSOR; +yy160: + YYDEBUG(160, *YYCURSOR); + if (yybm[0+yych] & 64) { + goto yy159; + } + if (yych == '\n') goto yy161; + if (yych == '\r') goto yy162; + goto yy158; +yy161: + YYDEBUG(161, *YYCURSOR); + yych = *++YYCURSOR; + goto yy158; +yy162: + YYDEBUG(162, *YYCURSOR); + yych = *++YYCURSOR; + if (yych == '\n') goto yy161; + goto yy158; +yy163: + YYDEBUG(163, *YYCURSOR); + ++YYCURSOR; + YYFILL(1); + yych = *YYCURSOR; +yy164: + YYDEBUG(164, *YYCURSOR); + if (yybm[0+yych] & 128) { + goto yy163; + } + goto yy154; ++======= + #line 2231 "Zend/zend_ini_scanner.c" + yy169: + YYDEBUG(169, *YYCURSOR); + ++YYCURSOR; + YYFILL(2); + yych = *YYCURSOR; + yy170: + YYDEBUG(170, *YYCURSOR); + if (yybm[0+yych] & 64) { + goto yy169; + } + if (yych == '\n') goto yy171; + if (yych == '\r') goto yy172; + goto yy168; + yy171: + YYDEBUG(171, *YYCURSOR); + yych = *++YYCURSOR; + goto yy168; + yy172: + YYDEBUG(172, *YYCURSOR); + yych = *++YYCURSOR; + if (yych == '\n') goto yy171; + goto yy168; + yy173: + YYDEBUG(173, *YYCURSOR); + ++YYCURSOR; + YYFILL(1); + yych = *YYCURSOR; + yy174: + YYDEBUG(174, *YYCURSOR); + if (yybm[0+yych] & 128) { + goto yy173; + } + goto yy164; ++>>>>>>> PHP-5.6 } /* *********************************** */ yyc_ST_SECTION_VALUE: @@@ -2206,523 -2299,523 +3600,1008 @@@ 132, 132, 132, 132, 132, 132, 132, 132, 132, 132, 132, 132, 132, 132, 132, 132, }; ++<<<<<<< HEAD + YYDEBUG(165, *YYCURSOR); ++======= + YYDEBUG(175, *YYCURSOR); ++>>>>>>> PHP-5.6 YYFILL(3); yych = *YYCURSOR; if (yych <= '-') { if (yych <= ' ') { if (yych <= '\n') { ++<<<<<<< HEAD + if (yych <= 0x08) goto yy167; + if (yych <= '\t') goto yy169; + goto yy170; + } else { + if (yych == '\r') goto yy170; + if (yych >= ' ') goto yy169; + } + } else { + if (yych <= '$') { + if (yych == '"') goto yy172; + if (yych >= '$') goto yy174; + } else { + if (yych == '\'') goto yy175; + if (yych >= '-') goto yy176; ++======= + if (yych <= 0x08) goto yy177; + if (yych <= '\t') goto yy179; + goto yy180; + } else { + if (yych == '\r') goto yy180; + if (yych >= ' ') goto yy179; + } + } else { + if (yych <= '$') { + if (yych == '"') goto yy182; + if (yych >= '$') goto yy184; + } else { + if (yych == '\'') goto yy185; + if (yych >= '-') goto yy186; ++>>>>>>> PHP-5.6 } } } else { if (yych <= 'Z') { if (yych <= '9') { ++<<<<<<< HEAD + if (yych <= '.') goto yy177; + if (yych >= '0') goto yy178; + } else { + if (yych == ';') goto yy170; + if (yych >= 'A') goto yy180; + } + } else { + if (yych <= '^') { + if (yych <= '[') goto yy167; + if (yych <= '\\') goto yy182; + if (yych <= ']') goto yy183; + } else { + if (yych == '`') goto yy167; + if (yych <= 'z') goto yy180; + } + } + } +yy167: + YYDEBUG(167, *YYCURSOR); + yyaccept = 0; + yych = *(YYMARKER = ++YYCURSOR); + goto yy190; +yy168: + YYDEBUG(168, *YYCURSOR); ++======= + if (yych <= '.') goto yy187; + if (yych >= '0') goto yy188; + } else { + if (yych == ';') goto yy180; + if (yych >= 'A') goto yy190; + } + } else { + if (yych <= '^') { + if (yych <= '[') goto yy177; + if (yych <= '\\') goto yy192; + if (yych <= ']') goto yy193; + } else { + if (yych == '`') goto yy177; + if (yych <= 'z') goto yy190; + } + } + } + yy177: + YYDEBUG(177, *YYCURSOR); + yyaccept = 0; + yych = *(YYMARKER = ++YYCURSOR); + goto yy200; + yy178: + YYDEBUG(178, *YYCURSOR); ++>>>>>>> PHP-5.6 yyleng = YYCURSOR - SCNG(yy_text); -#line 572 "Zend/zend_ini_scanner.l" +#line 573 "Zend/zend_ini_scanner.l" { /* Get rest as section/offset value */ RETURN_TOKEN(TC_STRING, yytext, yyleng); } ++<<<<<<< HEAD +#line 2264 "Zend/zend_ini_scanner.c" +yy169: + YYDEBUG(169, *YYCURSOR); + yyaccept = 0; + yych = *(YYMARKER = ++YYCURSOR); + if (yych <= 0x1F) { + if (yych == '\t') goto yy216; + goto yy190; + } else { + if (yych <= ' ') goto yy216; + if (yych == '"') goto yy218; + goto yy190; + } +yy170: + YYDEBUG(170, *YYCURSOR); + ++YYCURSOR; +yy171: + YYDEBUG(171, *YYCURSOR); ++======= + #line 2357 "Zend/zend_ini_scanner.c" + yy179: + YYDEBUG(179, *YYCURSOR); + yyaccept = 0; + yych = *(YYMARKER = ++YYCURSOR); + if (yych <= 0x1F) { + if (yych == '\t') goto yy226; + goto yy200; + } else { + if (yych <= ' ') goto yy226; + if (yych == '"') goto yy228; + goto yy200; + } + yy180: + YYDEBUG(180, *YYCURSOR); + ++YYCURSOR; + yy181: + YYDEBUG(181, *YYCURSOR); ++>>>>>>> PHP-5.6 yyleng = YYCURSOR - SCNG(yy_text); -#line 654 "Zend/zend_ini_scanner.l" +#line 648 "Zend/zend_ini_scanner.l" { return 0; } ++<<<<<<< HEAD +#line 2287 "Zend/zend_ini_scanner.c" +yy172: + YYDEBUG(172, *YYCURSOR); + ++YYCURSOR; +yy173: + YYDEBUG(173, *YYCURSOR); ++======= + #line 2380 "Zend/zend_ini_scanner.c" + yy182: + YYDEBUG(182, *YYCURSOR); + ++YYCURSOR; + yy183: + YYDEBUG(183, *YYCURSOR); ++>>>>>>> PHP-5.6 yyleng = YYCURSOR - SCNG(yy_text); -#line 576 "Zend/zend_ini_scanner.l" +#line 577 "Zend/zend_ini_scanner.l" { /* Double quoted '"' string start */ - yy_push_state(ST_DOUBLE_QUOTES TSRMLS_CC); + yy_push_state(ST_DOUBLE_QUOTES); return '"'; } ++<<<<<<< HEAD +#line 2299 "Zend/zend_ini_scanner.c" +yy174: + YYDEBUG(174, *YYCURSOR); + yych = *++YYCURSOR; + if (yych <= '\\') { + if (yych <= 0x00) goto yy171; + if (yych <= '[') goto yy189; + goto yy194; + } else { + if (yych == '{') goto yy214; + goto yy189; + } +yy175: + YYDEBUG(175, *YYCURSOR); + yyaccept = 1; + yych = *(YYMARKER = ++YYCURSOR); + if (yybm[0+yych] & 128) { + goto yy210; + } + goto yy171; +yy176: + YYDEBUG(176, *YYCURSOR); + yyaccept = 0; + yych = *(YYMARKER = ++YYCURSOR); + if (yych <= '/') goto yy190; + if (yych <= '9') goto yy208; + goto yy190; +yy177: + YYDEBUG(177, *YYCURSOR); + yyaccept = 0; + yych = *(YYMARKER = ++YYCURSOR); + if (yych <= '/') goto yy190; + if (yych <= '9') goto yy206; + goto yy190; +yy178: + YYDEBUG(178, *YYCURSOR); ++======= + #line 2392 "Zend/zend_ini_scanner.c" + yy184: + YYDEBUG(184, *YYCURSOR); + yych = *++YYCURSOR; + if (yych <= '\\') { + if (yych <= 0x00) goto yy181; + if (yych <= '[') goto yy199; + goto yy204; + } else { + if (yych == '{') goto yy224; + goto yy199; + } + yy185: + YYDEBUG(185, *YYCURSOR); + yyaccept = 1; + yych = *(YYMARKER = ++YYCURSOR); + if (yybm[0+yych] & 128) { + goto yy220; + } + goto yy181; + yy186: + YYDEBUG(186, *YYCURSOR); + yyaccept = 0; + yych = *(YYMARKER = ++YYCURSOR); + if (yych <= '/') goto yy200; + if (yych <= '9') goto yy218; + goto yy200; + yy187: + YYDEBUG(187, *YYCURSOR); + yyaccept = 0; + yych = *(YYMARKER = ++YYCURSOR); + if (yych <= '/') goto yy200; + if (yych <= '9') goto yy216; + goto yy200; + yy188: + YYDEBUG(188, *YYCURSOR); ++>>>>>>> PHP-5.6 yyaccept = 2; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '\'') { if (yych <= '\r') { ++<<<<<<< HEAD + if (yych == '\n') goto yy179; + if (yych <= '\f') goto yy190; + } else { + if (yych == '"') goto yy179; + if (yych <= '&') goto yy190; + } + } else { + if (yych <= '9') { + if (yych == '.') goto yy202; + if (yych <= '/') goto yy190; + goto yy204; + } else { + if (yych <= ';') { + if (yych <= ':') goto yy190; + } else { + if (yych != ']') goto yy190; + } + } + } +yy179: + YYDEBUG(179, *YYCURSOR); ++======= + if (yych == '\n') goto yy189; + if (yych <= '\f') goto yy200; + } else { + if (yych == '"') goto yy189; + if (yych <= '&') goto yy200; + } + } else { + if (yych <= '9') { + if (yych == '.') goto yy212; + if (yych <= '/') goto yy200; + goto yy214; + } else { + if (yych <= ';') { + if (yych <= ':') goto yy200; + } else { + if (yych != ']') goto yy200; + } + } + } + yy189: + YYDEBUG(189, *YYCURSOR); ++>>>>>>> PHP-5.6 yyleng = YYCURSOR - SCNG(yy_text); -#line 550 "Zend/zend_ini_scanner.l" +#line 551 "Zend/zend_ini_scanner.l" { /* Get number option value as string */ RETURN_TOKEN(TC_NUMBER, yytext, yyleng); } ++<<<<<<< HEAD +#line 2365 "Zend/zend_ini_scanner.c" +yy180: + YYDEBUG(180, *YYCURSOR); + yyaccept = 3; + yych = *(YYMARKER = ++YYCURSOR); + if (yybm[0+yych] & 32) { + goto yy200; + } + if (yych <= '"') { + if (yych <= '\f') { + if (yych != '\n') goto yy190; + } else { + if (yych <= '\r') goto yy181; + if (yych <= '!') goto yy190; + } + } else { + if (yych <= ':') { + if (yych != '\'') goto yy190; + } else { + if (yych <= ';') goto yy181; + if (yych != ']') goto yy190; + } + } +yy181: + YYDEBUG(181, *YYCURSOR); ++======= + #line 2458 "Zend/zend_ini_scanner.c" + yy190: + YYDEBUG(190, *YYCURSOR); + yyaccept = 3; + yych = *(YYMARKER = ++YYCURSOR); + if (yybm[0+yych] & 32) { + goto yy210; + } + if (yych <= '"') { + if (yych <= '\f') { + if (yych != '\n') goto yy200; + } else { + if (yych <= '\r') goto yy191; + if (yych <= '!') goto yy200; + } + } else { + if (yych <= ':') { + if (yych != '\'') goto yy200; + } else { + if (yych <= ';') goto yy191; + if (yych != ']') goto yy200; + } + } + yy191: + YYDEBUG(191, *YYCURSOR); ++>>>>>>> PHP-5.6 yyleng = YYCURSOR - SCNG(yy_text); -#line 546 "Zend/zend_ini_scanner.l" +#line 547 "Zend/zend_ini_scanner.l" { /* Get constant option value */ RETURN_TOKEN(TC_CONSTANT, yytext, yyleng); } ++<<<<<<< HEAD +#line 2395 "Zend/zend_ini_scanner.c" +yy182: + YYDEBUG(182, *YYCURSOR); + yych = *++YYCURSOR; + goto yy189; +yy183: + YYDEBUG(183, *YYCURSOR); + ++YYCURSOR; + yych = *YYCURSOR; + goto yy186; +yy184: + YYDEBUG(184, *YYCURSOR); ++======= + #line 2488 "Zend/zend_ini_scanner.c" + yy192: + YYDEBUG(192, *YYCURSOR); + yych = *++YYCURSOR; + goto yy199; + yy193: + YYDEBUG(193, *YYCURSOR); + ++YYCURSOR; + yych = *YYCURSOR; + goto yy196; + yy194: + YYDEBUG(194, *YYCURSOR); ++>>>>>>> PHP-5.6 yyleng = YYCURSOR - SCNG(yy_text); -#line 424 "Zend/zend_ini_scanner.l" +#line 425 "Zend/zend_ini_scanner.l" { /* End of section */ BEGIN(INITIAL); SCNG(lineno)++; return ']'; } ++<<<<<<< HEAD +#line 2414 "Zend/zend_ini_scanner.c" +yy185: + YYDEBUG(185, *YYCURSOR); + ++YYCURSOR; + YYFILL(2); + yych = *YYCURSOR; +yy186: + YYDEBUG(186, *YYCURSOR); + if (yybm[0+yych] & 2) { + goto yy185; + } + if (yych == '\n') goto yy187; + if (yych == '\r') goto yy188; + goto yy184; +yy187: + YYDEBUG(187, *YYCURSOR); + yych = *++YYCURSOR; + goto yy184; +yy188: + YYDEBUG(188, *YYCURSOR); + yych = *++YYCURSOR; + if (yych == '\n') goto yy187; + goto yy184; +yy189: + YYDEBUG(189, *YYCURSOR); ++======= + #line 2507 "Zend/zend_ini_scanner.c" + yy195: + YYDEBUG(195, *YYCURSOR); + ++YYCURSOR; + YYFILL(2); + yych = *YYCURSOR; + yy196: + YYDEBUG(196, *YYCURSOR); + if (yybm[0+yych] & 2) { + goto yy195; + } + if (yych == '\n') goto yy197; + if (yych == '\r') goto yy198; + goto yy194; + yy197: + YYDEBUG(197, *YYCURSOR); + yych = *++YYCURSOR; + goto yy194; + yy198: + YYDEBUG(198, *YYCURSOR); + yych = *++YYCURSOR; + if (yych == '\n') goto yy197; + goto yy194; + yy199: + YYDEBUG(199, *YYCURSOR); ++>>>>>>> PHP-5.6 yyaccept = 0; YYMARKER = ++YYCURSOR; YYFILL(1); yych = *YYCURSOR; ++<<<<<<< HEAD +yy190: + YYDEBUG(190, *YYCURSOR); + if (yybm[0+yych] & 4) { + goto yy189; + } + if (yych == '$') goto yy192; + if (yych != '\\') goto yy168; +yy191: + YYDEBUG(191, *YYCURSOR); + ++YYCURSOR; + YYFILL(1); + yych = *YYCURSOR; + goto yy189; +yy192: + YYDEBUG(192, *YYCURSOR); ++======= + yy200: + YYDEBUG(200, *YYCURSOR); + if (yybm[0+yych] & 4) { + goto yy199; + } + if (yych == '$') goto yy202; + if (yych != '\\') goto yy178; + yy201: + YYDEBUG(201, *YYCURSOR); + ++YYCURSOR; + YYFILL(1); + yych = *YYCURSOR; + goto yy199; + yy202: + YYDEBUG(202, *YYCURSOR); ++>>>>>>> PHP-5.6 ++YYCURSOR; YYFILL(1); yych = *YYCURSOR; if (yych <= '\\') { ++<<<<<<< HEAD + if (yych <= 0x00) goto yy193; + if (yych <= '[') goto yy189; + goto yy194; + } else { + if (yych != '{') goto yy189; + } +yy193: + YYDEBUG(193, *YYCURSOR); + YYCURSOR = YYMARKER; + if (yyaccept <= 1) { + if (yyaccept <= 0) { + goto yy168; + } else { + goto yy171; + } + } else { + if (yyaccept <= 2) { + goto yy179; + } else { + goto yy181; + } + } +yy194: + YYDEBUG(194, *YYCURSOR); ++======= + if (yych <= 0x00) goto yy203; + if (yych <= '[') goto yy199; + goto yy204; + } else { + if (yych != '{') goto yy199; + } + yy203: + YYDEBUG(203, *YYCURSOR); + YYCURSOR = YYMARKER; + if (yyaccept <= 1) { + if (yyaccept <= 0) { + goto yy178; + } else { + goto yy181; + } + } else { + if (yyaccept <= 2) { + goto yy189; + } else { + goto yy191; + } + } + yy204: + YYDEBUG(204, *YYCURSOR); ++>>>>>>> PHP-5.6 + ++YYCURSOR; + YYFILL(1); + yych = *YYCURSOR; + if (yybm[0+yych] & 8) { ++<<<<<<< HEAD + goto yy195; + } + if (yych == '\\') goto yy197; + goto yy189; +yy195: + YYDEBUG(195, *YYCURSOR); + ++YYCURSOR; + YYFILL(1); + yych = *YYCURSOR; + YYDEBUG(196, *YYCURSOR); + if (yybm[0+yych] & 8) { + goto yy195; + } + if (yych == '\\') goto yy199; + goto yy189; +yy197: + YYDEBUG(197, *YYCURSOR); ++YYCURSOR; YYFILL(1); yych = *YYCURSOR; + YYDEBUG(198, *YYCURSOR); if (yybm[0+yych] & 8) { + goto yy195; + } + if (yych == '\\') goto yy197; + goto yy189; +yy199: + YYDEBUG(199, *YYCURSOR); ++======= + goto yy205; + } + if (yych == '\\') goto yy207; + goto yy199; + yy205: + YYDEBUG(205, *YYCURSOR); + ++YYCURSOR; + YYFILL(1); + yych = *YYCURSOR; + YYDEBUG(206, *YYCURSOR); + if (yybm[0+yych] & 8) { + goto yy205; + } + if (yych == '\\') goto yy209; + goto yy199; + yy207: + YYDEBUG(207, *YYCURSOR); + ++YYCURSOR; + YYFILL(1); + yych = *YYCURSOR; + YYDEBUG(208, *YYCURSOR); + if (yybm[0+yych] & 8) { + goto yy205; + } + if (yych == '\\') goto yy207; + goto yy199; + yy209: + YYDEBUG(209, *YYCURSOR); ++>>>>>>> PHP-5.6 ++YYCURSOR; YYFILL(1); yych = *YYCURSOR; if (yybm[0+yych] & 8) { ++<<<<<<< HEAD + goto yy195; + } + if (yych == '\\') goto yy197; + goto yy189; +yy200: + YYDEBUG(200, *YYCURSOR); ++======= + goto yy205; + } + if (yych == '\\') goto yy207; + goto yy199; + yy210: + YYDEBUG(210, *YYCURSOR); ++>>>>>>> PHP-5.6 yyaccept = 3; YYMARKER = ++YYCURSOR; YYFILL(1); yych = *YYCURSOR; ++<<<<<<< HEAD + YYDEBUG(201, *YYCURSOR); + if (yybm[0+yych] & 32) { + goto yy200; + } + if (yych <= '$') { + if (yych <= '\r') { + if (yych == '\n') goto yy181; + if (yych <= '\f') goto yy189; + goto yy181; + } else { + if (yych == '"') goto yy181; + if (yych <= '#') goto yy189; + goto yy192; + } + } else { + if (yych <= ';') { + if (yych == '\'') goto yy181; + if (yych <= ':') goto yy189; + goto yy181; + } else { + if (yych <= '[') goto yy189; + if (yych <= '\\') goto yy191; + if (yych <= ']') goto yy181; + goto yy189; + } + } +yy202: + YYDEBUG(202, *YYCURSOR); ++======= + YYDEBUG(211, *YYCURSOR); + if (yybm[0+yych] & 32) { + goto yy210; + } + if (yych <= '$') { + if (yych <= '\r') { + if (yych == '\n') goto yy191; + if (yych <= '\f') goto yy199; + goto yy191; + } else { + if (yych == '"') goto yy191; + if (yych <= '#') goto yy199; + goto yy202; + } + } else { + if (yych <= ';') { + if (yych == '\'') goto yy191; + if (yych <= ':') goto yy199; + goto yy191; + } else { + if (yych <= '[') goto yy199; + if (yych <= '\\') goto yy201; + if (yych <= ']') goto yy191; + goto yy199; + } + } + yy212: + YYDEBUG(212, *YYCURSOR); ++>>>>>>> PHP-5.6 yyaccept = 2; YYMARKER = ++YYCURSOR; YYFILL(1); yych = *YYCURSOR; ++<<<<<<< HEAD + YYDEBUG(203, *YYCURSOR); + if (yybm[0+yych] & 64) { + goto yy202; + } + if (yych <= '$') { + if (yych <= '\r') { + if (yych == '\n') goto yy179; + if (yych <= '\f') goto yy189; + goto yy179; + } else { + if (yych == '"') goto yy179; + if (yych <= '#') goto yy189; + goto yy192; + } + } else { + if (yych <= ';') { + if (yych == '\'') goto yy179; + if (yych <= ':') goto yy189; + goto yy179; + } else { + if (yych <= '[') goto yy189; + if (yych <= '\\') goto yy191; + if (yych <= ']') goto yy179; + goto yy189; + } + } - yy204: - YYDEBUG(204, *YYCURSOR); ++yy204: ++ YYDEBUG(204, *YYCURSOR); ++======= + YYDEBUG(213, *YYCURSOR); + if (yybm[0+yych] & 64) { + goto yy212; + } + if (yych <= '$') { + if (yych <= '\r') { + if (yych == '\n') goto yy189; + if (yych <= '\f') goto yy199; + goto yy189; + } else { + if (yych == '"') goto yy189; + if (yych <= '#') goto yy199; + goto yy202; + } + } else { + if (yych <= ';') { + if (yych == '\'') goto yy189; + if (yych <= ':') goto yy199; + goto yy189; + } else { + if (yych <= '[') goto yy199; + if (yych <= '\\') goto yy201; + if (yych <= ']') goto yy189; + goto yy199; + } + } + yy214: + YYDEBUG(214, *YYCURSOR); ++>>>>>>> PHP-5.6 yyaccept = 2; YYMARKER = ++YYCURSOR; YYFILL(1); yych = *YYCURSOR; ++<<<<<<< HEAD + YYDEBUG(205, *YYCURSOR); + if (yych <= '\'') { + if (yych <= '!') { + if (yych <= '\n') { + if (yych <= '\t') goto yy189; + goto yy179; + } else { + if (yych == '\r') goto yy179; + goto yy189; + } + } else { + if (yych <= '#') { + if (yych <= '"') goto yy179; + goto yy189; + } else { + if (yych <= '$') goto yy192; + if (yych <= '&') goto yy189; + goto yy179; ++======= + YYDEBUG(215, *YYCURSOR); + if (yych <= '\'') { + if (yych <= '!') { + if (yych <= '\n') { + if (yych <= '\t') goto yy199; + goto yy189; + } else { + if (yych == '\r') goto yy189; + goto yy199; + } + } else { + if (yych <= '#') { + if (yych <= '"') goto yy189; + goto yy199; + } else { + if (yych <= '$') goto yy202; + if (yych <= '&') goto yy199; + goto yy189; ++>>>>>>> PHP-5.6 } } } else { if (yych <= ':') { if (yych <= '.') { ++<<<<<<< HEAD + if (yych <= '-') goto yy189; + goto yy202; + } else { + if (yych <= '/') goto yy189; + if (yych <= '9') goto yy204; + goto yy189; + } + } else { + if (yych <= '[') { + if (yych <= ';') goto yy179; + goto yy189; + } else { + if (yych <= '\\') goto yy191; + if (yych <= ']') goto yy179; + goto yy189; + } + } + } +yy206: + YYDEBUG(206, *YYCURSOR); ++======= + if (yych <= '-') goto yy199; + goto yy212; + } else { + if (yych <= '/') goto yy199; + if (yych <= '9') goto yy214; + goto yy199; + } + } else { + if (yych <= '[') { + if (yych <= ';') goto yy189; + goto yy199; + } else { + if (yych <= '\\') goto yy201; + if (yych <= ']') goto yy189; + goto yy199; + } + } + } + yy216: + YYDEBUG(216, *YYCURSOR); ++>>>>>>> PHP-5.6 yyaccept = 2; YYMARKER = ++YYCURSOR; YYFILL(1); yych = *YYCURSOR; ++<<<<<<< HEAD + YYDEBUG(207, *YYCURSOR); + if (yych <= '&') { + if (yych <= '\r') { + if (yych == '\n') goto yy179; + if (yych <= '\f') goto yy189; + goto yy179; + } else { + if (yych <= '"') { + if (yych <= '!') goto yy189; + goto yy179; + } else { + if (yych == '$') goto yy192; + goto yy189; ++======= + YYDEBUG(217, *YYCURSOR); + if (yych <= '&') { + if (yych <= '\r') { + if (yych == '\n') goto yy189; + if (yych <= '\f') goto yy199; + goto yy189; + } else { + if (yych <= '"') { + if (yych <= '!') goto yy199; + goto yy189; + } else { + if (yych == '$') goto yy202; + goto yy199; ++>>>>>>> PHP-5.6 } } } else { if (yych <= ':') { ++<<<<<<< HEAD + if (yych <= '\'') goto yy179; + if (yych <= '/') goto yy189; + if (yych <= '9') goto yy206; + goto yy189; + } else { + if (yych <= '[') { + if (yych <= ';') goto yy179; + goto yy189; + } else { + if (yych <= '\\') goto yy191; + if (yych <= ']') goto yy179; + goto yy189; + } + } + } +yy208: + YYDEBUG(208, *YYCURSOR); ++======= + if (yych <= '\'') goto yy189; + if (yych <= '/') goto yy199; + if (yych <= '9') goto yy216; + goto yy199; + } else { + if (yych <= '[') { + if (yych <= ';') goto yy189; + goto yy199; + } else { + if (yych <= '\\') goto yy201; + if (yych <= ']') goto yy189; + goto yy199; + } + } + } + yy218: + YYDEBUG(218, *YYCURSOR); ++>>>>>>> PHP-5.6 yyaccept = 2; YYMARKER = ++YYCURSOR; YYFILL(1); yych = *YYCURSOR; ++<<<<<<< HEAD + YYDEBUG(209, *YYCURSOR); + if (yych <= '&') { + if (yych <= '\r') { + if (yych == '\n') goto yy179; + if (yych <= '\f') goto yy189; + goto yy179; + } else { + if (yych <= '"') { + if (yych <= '!') goto yy189; + goto yy179; + } else { + if (yych == '$') goto yy192; + goto yy189; ++======= + YYDEBUG(219, *YYCURSOR); + if (yych <= '&') { + if (yych <= '\r') { + if (yych == '\n') goto yy189; + if (yych <= '\f') goto yy199; + goto yy189; + } else { + if (yych <= '"') { + if (yych <= '!') goto yy199; + goto yy189; + } else { + if (yych == '$') goto yy202; + goto yy199; ++>>>>>>> PHP-5.6 } } } else { if (yych <= ':') { ++<<<<<<< HEAD + if (yych <= '\'') goto yy179; + if (yych <= '/') goto yy189; + if (yych <= '9') goto yy208; + goto yy189; + } else { + if (yych <= '[') { + if (yych <= ';') goto yy179; + goto yy189; + } else { + if (yych <= '\\') goto yy191; + if (yych <= ']') goto yy179; + goto yy189; + } + } + } +yy210: + YYDEBUG(210, *YYCURSOR); + ++YYCURSOR; + YYFILL(1); + yych = *YYCURSOR; + YYDEBUG(211, *YYCURSOR); + if (yybm[0+yych] & 128) { + goto yy210; + } + YYDEBUG(212, *YYCURSOR); + ++YYCURSOR; + YYDEBUG(213, *YYCURSOR); ++======= + if (yych <= '\'') goto yy189; + if (yych <= '/') goto yy199; + if (yych <= '9') goto yy218; + goto yy199; + } else { + if (yych <= '[') { + if (yych <= ';') goto yy189; + goto yy199; + } else { + if (yych <= '\\') goto yy201; + if (yych <= ']') goto yy189; + goto yy199; + } + } + } + yy220: + YYDEBUG(220, *YYCURSOR); + ++YYCURSOR; + YYFILL(1); + yych = *YYCURSOR; + YYDEBUG(221, *YYCURSOR); + if (yybm[0+yych] & 128) { + goto yy220; + } + YYDEBUG(222, *YYCURSOR); + ++YYCURSOR; + YYDEBUG(223, *YYCURSOR); ++>>>>>>> PHP-5.6 yyleng = YYCURSOR - SCNG(yy_text); -#line 415 "Zend/zend_ini_scanner.l" +#line 416 "Zend/zend_ini_scanner.l" { /* Raw string */ /* Eat leading and trailing single quotes */ if (yytext[0] == '\'' && yytext[yyleng - 1] == '\'') { @@@ -2731,65 -2824,65 +4610,121 @@@ } RETURN_TOKEN(TC_RAW, yytext, yyleng); } ++<<<<<<< HEAD +#line 2735 "Zend/zend_ini_scanner.c" +yy214: + YYDEBUG(214, *YYCURSOR); + ++YYCURSOR; + YYDEBUG(215, *YYCURSOR); ++======= + #line 2828 "Zend/zend_ini_scanner.c" + yy224: + YYDEBUG(224, *YYCURSOR); + ++YYCURSOR; + YYDEBUG(225, *YYCURSOR); ++>>>>>>> PHP-5.6 yyleng = YYCURSOR - SCNG(yy_text); -#line 448 "Zend/zend_ini_scanner.l" +#line 449 "Zend/zend_ini_scanner.l" { /* Variable start */ - yy_push_state(ST_VARNAME TSRMLS_CC); + yy_push_state(ST_VARNAME); return TC_DOLLAR_CURLY; } ++<<<<<<< HEAD +#line 2746 "Zend/zend_ini_scanner.c" +yy216: + YYDEBUG(216, *YYCURSOR); ++======= + #line 2839 "Zend/zend_ini_scanner.c" + yy226: + YYDEBUG(226, *YYCURSOR); ++>>>>>>> PHP-5.6 yyaccept = 0; YYMARKER = ++YYCURSOR; YYFILL(1); yych = *YYCURSOR; ++<<<<<<< HEAD + YYDEBUG(217, *YYCURSOR); + if (yych <= '"') { + if (yych <= '\f') { + if (yych <= 0x08) goto yy189; + if (yych <= '\t') goto yy216; + if (yych <= '\n') goto yy168; + goto yy189; + } else { + if (yych <= 0x1F) { + if (yych <= '\r') goto yy168; + goto yy189; + } else { + if (yych <= ' ') goto yy216; + if (yych <= '!') goto yy189; ++======= + YYDEBUG(227, *YYCURSOR); + if (yych <= '"') { + if (yych <= '\f') { + if (yych <= 0x08) goto yy199; + if (yych <= '\t') goto yy226; + if (yych <= '\n') goto yy178; + goto yy199; + } else { + if (yych <= 0x1F) { + if (yych <= '\r') goto yy178; + goto yy199; + } else { + if (yych <= ' ') goto yy226; + if (yych <= '!') goto yy199; ++>>>>>>> PHP-5.6 } } } else { if (yych <= ':') { if (yych <= '$') { ++<<<<<<< HEAD + if (yych <= '#') goto yy189; + goto yy192; + } else { + if (yych == '\'') goto yy168; + goto yy189; + } + } else { + if (yych <= '[') { + if (yych <= ';') goto yy168; + goto yy189; + } else { + if (yych <= '\\') goto yy191; + if (yych <= ']') goto yy168; + goto yy189; + } + } + } +yy218: + YYDEBUG(218, *YYCURSOR); + ++YYCURSOR; + yych = *YYCURSOR; + goto yy173; ++======= + if (yych <= '#') goto yy199; + goto yy202; + } else { + if (yych == '\'') goto yy178; + goto yy199; + } + } else { + if (yych <= '[') { + if (yych <= ';') goto yy178; + goto yy199; + } else { + if (yych <= '\\') goto yy201; + if (yych <= ']') goto yy178; + goto yy199; + } + } + } + yy228: + YYDEBUG(228, *YYCURSOR); + ++YYCURSOR; + yych = *YYCURSOR; + goto yy183; ++>>>>>>> PHP-5.6 } /* *********************************** */ yyc_ST_VALUE: @@@ -2828,28 -2921,28 +4763,49 @@@ 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, }; ++<<<<<<< HEAD + YYDEBUG(219, *YYCURSOR); ++======= + YYDEBUG(229, *YYCURSOR); ++>>>>>>> PHP-5.6 YYFILL(6); yych = *YYCURSOR; YYDEBUG(-1, yych); switch (yych) { ++<<<<<<< HEAD + case 0x00: goto yy221; + case '\t': + case ' ': goto yy225; + case '\n': goto yy227; + case '\r': goto yy229; ++======= + case 0x00: goto yy231; + case '\t': + case ' ': goto yy235; + case '\n': goto yy237; + case '\r': goto yy239; ++>>>>>>> PHP-5.6 case '!': case '&': case '(': case ')': case '^': case '|': ++<<<<<<< HEAD + case '~': goto yy230; + case '"': goto yy232; + case '$': goto yy234; + case '\'': goto yy235; + case '-': goto yy236; + case '.': goto yy237; ++======= + case '~': goto yy240; + case '"': goto yy242; + case '$': goto yy244; + case '\'': goto yy245; + case '-': goto yy246; + case '.': goto yy247; ++>>>>>>> PHP-5.6 case '0': case '1': case '2': @@@ -2859,9 -2952,9 +4815,15 @@@ case '6': case '7': case '8': ++<<<<<<< HEAD + case '9': goto yy238; + case ';': goto yy240; + case '=': goto yy241; ++======= + case '9': goto yy248; + case ';': goto yy250; + case '=': goto yy251; ++>>>>>>> PHP-5.6 case 'A': case 'B': case 'C': @@@ -2904,1637 -2997,1637 +4866,3125 @@@ case 'v': case 'w': case 'x': ++<<<<<<< HEAD + case 'z': goto yy243; + case 'F': + case 'f': goto yy245; + case 'N': + case 'n': goto yy246; + case 'O': + case 'o': goto yy247; + case 'T': + case 't': goto yy248; + case 'Y': + case 'y': goto yy249; + default: goto yy223; + } +yy221: + YYDEBUG(221, *YYCURSOR); + ++YYCURSOR; +yy222: + YYDEBUG(222, *YYCURSOR); ++======= + case 'z': goto yy253; + case 'F': + case 'f': goto yy255; + case 'N': + case 'n': goto yy256; + case 'O': + case 'o': goto yy257; + case 'T': + case 't': goto yy258; + case 'Y': + case 'y': goto yy259; + default: goto yy233; + } + yy231: + YYDEBUG(231, *YYCURSOR); + ++YYCURSOR; + yy232: + YYDEBUG(232, *YYCURSOR); ++>>>>>>> PHP-5.6 yyleng = YYCURSOR - SCNG(yy_text); -#line 649 "Zend/zend_ini_scanner.l" +#line 643 "Zend/zend_ini_scanner.l" { /* End of option value (if EOF is reached before EOL */ BEGIN(INITIAL); return END_OF_LINE; } ++<<<<<<< HEAD +#line 2932 "Zend/zend_ini_scanner.c" +yy223: + YYDEBUG(223, *YYCURSOR); + yyaccept = 0; + yych = *(YYMARKER = ++YYCURSOR); + goto yy251; +yy224: + YYDEBUG(224, *YYCURSOR); ++======= + #line 3025 "Zend/zend_ini_scanner.c" + yy233: + YYDEBUG(233, *YYCURSOR); + yyaccept = 0; + yych = *(YYMARKER = ++YYCURSOR); + goto yy261; + yy234: + YYDEBUG(234, *YYCURSOR); ++>>>>>>> PHP-5.6 yyleng = YYCURSOR - SCNG(yy_text); -#line 568 "Zend/zend_ini_scanner.l" +#line 569 "Zend/zend_ini_scanner.l" { /* Get everything else as option/offset value */ RETURN_TOKEN(TC_STRING, yytext, yyleng); } ++<<<<<<< HEAD +#line 2945 "Zend/zend_ini_scanner.c" +yy225: + YYDEBUG(225, *YYCURSOR); + yyaccept = 1; + yych = *(YYMARKER = ++YYCURSOR); + goto yy305; +yy226: + YYDEBUG(226, *YYCURSOR); ++======= + #line 3038 "Zend/zend_ini_scanner.c" + yy235: + YYDEBUG(235, *YYCURSOR); + yyaccept = 1; + yych = *(YYMARKER = ++YYCURSOR); + goto yy315; + yy236: + YYDEBUG(236, *YYCURSOR); ++>>>>>>> PHP-5.6 yyleng = YYCURSOR - SCNG(yy_text); -#line 622 "Zend/zend_ini_scanner.l" +#line 623 "Zend/zend_ini_scanner.l" { RETURN_TOKEN(TC_WHITESPACE, yytext, yyleng); } ++<<<<<<< HEAD +#line 2958 "Zend/zend_ini_scanner.c" +yy227: + YYDEBUG(227, *YYCURSOR); + ++YYCURSOR; +yy228: + YYDEBUG(228, *YYCURSOR); ++======= + #line 3051 "Zend/zend_ini_scanner.c" + yy237: + YYDEBUG(237, *YYCURSOR); + ++YYCURSOR; + yy238: + YYDEBUG(238, *YYCURSOR); ++>>>>>>> PHP-5.6 yyleng = YYCURSOR - SCNG(yy_text); -#line 540 "Zend/zend_ini_scanner.l" +#line 541 "Zend/zend_ini_scanner.l" { /* End of option value */ BEGIN(INITIAL); SCNG(lineno)++; return END_OF_LINE; } ++<<<<<<< HEAD +#line 2971 "Zend/zend_ini_scanner.c" +yy229: + YYDEBUG(229, *YYCURSOR); + yych = *++YYCURSOR; + if (yych == '\n') goto yy303; + goto yy228; +yy230: + YYDEBUG(230, *YYCURSOR); + ++YYCURSOR; + yych = *YYCURSOR; + goto yy302; +yy231: + YYDEBUG(231, *YYCURSOR); ++======= + #line 3064 "Zend/zend_ini_scanner.c" + yy239: + YYDEBUG(239, *YYCURSOR); + yych = *++YYCURSOR; + if (yych == '\n') goto yy313; + goto yy238; + yy240: + YYDEBUG(240, *YYCURSOR); + ++YYCURSOR; + yych = *YYCURSOR; + goto yy312; + yy241: + YYDEBUG(241, *YYCURSOR); ++>>>>>>> PHP-5.6 yyleng = YYCURSOR - SCNG(yy_text); -#line 558 "Zend/zend_ini_scanner.l" +#line 559 "Zend/zend_ini_scanner.l" { /* Boolean operators */ return yytext[0]; } ++<<<<<<< HEAD +#line 2989 "Zend/zend_ini_scanner.c" +yy232: + YYDEBUG(232, *YYCURSOR); + ++YYCURSOR; +yy233: + YYDEBUG(233, *YYCURSOR); ++======= + #line 3082 "Zend/zend_ini_scanner.c" + yy242: + YYDEBUG(242, *YYCURSOR); + ++YYCURSOR; + yy243: + YYDEBUG(243, *YYCURSOR); ++>>>>>>> PHP-5.6 yyleng = YYCURSOR - SCNG(yy_text); -#line 576 "Zend/zend_ini_scanner.l" +#line 577 "Zend/zend_ini_scanner.l" { /* Double quoted '"' string start */ - yy_push_state(ST_DOUBLE_QUOTES TSRMLS_CC); + yy_push_state(ST_DOUBLE_QUOTES); return '"'; } ++<<<<<<< HEAD +#line 3001 "Zend/zend_ini_scanner.c" +yy234: + YYDEBUG(234, *YYCURSOR); + yych = *++YYCURSOR; + if (yych <= '\\') { + if (yych <= 0x00) goto yy222; + if (yych <= '[') goto yy250; + goto yy257; + } else { + if (yych == '{') goto yy299; + goto yy250; + } +yy235: + YYDEBUG(235, *YYCURSOR); + yyaccept = 2; + yych = *(YYMARKER = ++YYCURSOR); + if (yybm[0+yych] & 128) { + goto yy295; + } + goto yy222; +yy236: + YYDEBUG(236, *YYCURSOR); + yyaccept = 0; + yych = *(YYMARKER = ++YYCURSOR); + if (yych <= '/') goto yy251; + if (yych <= '9') goto yy293; + goto yy251; +yy237: + YYDEBUG(237, *YYCURSOR); + yyaccept = 0; + yych = *(YYMARKER = ++YYCURSOR); + if (yych <= '/') goto yy251; + if (yych <= '9') goto yy291; + goto yy251; +yy238: + YYDEBUG(238, *YYCURSOR); ++======= + #line 3094 "Zend/zend_ini_scanner.c" + yy244: + YYDEBUG(244, *YYCURSOR); + yych = *++YYCURSOR; + if (yych <= '\\') { + if (yych <= 0x00) goto yy232; + if (yych <= '[') goto yy260; + goto yy267; + } else { + if (yych == '{') goto yy309; + goto yy260; + } + yy245: + YYDEBUG(245, *YYCURSOR); + yyaccept = 2; + yych = *(YYMARKER = ++YYCURSOR); + if (yybm[0+yych] & 128) { + goto yy305; + } + goto yy232; + yy246: + YYDEBUG(246, *YYCURSOR); + yyaccept = 0; + yych = *(YYMARKER = ++YYCURSOR); + if (yych <= '/') goto yy261; + if (yych <= '9') goto yy303; + goto yy261; + yy247: + YYDEBUG(247, *YYCURSOR); + yyaccept = 0; + yych = *(YYMARKER = ++YYCURSOR); + if (yych <= '/') goto yy261; + if (yych <= '9') goto yy301; + goto yy261; + yy248: + YYDEBUG(248, *YYCURSOR); ++>>>>>>> PHP-5.6 yyaccept = 3; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '/') { if (yych <= 0x1F) { if (yych <= '\n') { ++<<<<<<< HEAD + if (yych <= 0x00) goto yy239; + if (yych <= 0x08) goto yy251; + } else { + if (yych != '\r') goto yy251; + } + } else { + if (yych <= ')') { + if (yych <= '"') goto yy239; + if (yych <= '%') goto yy251; + } else { + if (yych == '.') goto yy287; + goto yy251; ++======= + if (yych <= 0x00) goto yy249; + if (yych <= 0x08) goto yy261; + } else { + if (yych != '\r') goto yy261; + } + } else { + if (yych <= ')') { + if (yych <= '"') goto yy249; + if (yych <= '%') goto yy261; + } else { + if (yych == '.') goto yy297; + goto yy261; ++>>>>>>> PHP-5.6 } } } else { if (yych <= ']') { if (yych <= ';') { ++<<<<<<< HEAD + if (yych <= '9') goto yy289; + if (yych <= ':') goto yy251; + } else { + if (yych != '=') goto yy251; + } + } else { + if (yych <= '|') { + if (yych <= '^') goto yy239; + if (yych <= '{') goto yy251; + } else { + if (yych != '~') goto yy251; + } + } + } +yy239: + YYDEBUG(239, *YYCURSOR); ++======= + if (yych <= '9') goto yy299; + if (yych <= ':') goto yy261; + } else { + if (yych != '=') goto yy261; + } + } else { + if (yych <= '|') { + if (yych <= '^') goto yy249; + if (yych <= '{') goto yy261; + } else { + if (yych != '~') goto yy261; + } + } + } + yy249: + YYDEBUG(249, *YYCURSOR); ++>>>>>>> PHP-5.6 yyleng = YYCURSOR - SCNG(yy_text); -#line 550 "Zend/zend_ini_scanner.l" +#line 551 "Zend/zend_ini_scanner.l" { /* Get number option value as string */ RETURN_TOKEN(TC_NUMBER, yytext, yyleng); } ++<<<<<<< HEAD +#line 3080 "Zend/zend_ini_scanner.c" +yy240: + YYDEBUG(240, *YYCURSOR); + yyaccept = 2; + yych = *(YYMARKER = ++YYCURSOR); + goto yy283; +yy241: + YYDEBUG(241, *YYCURSOR); + ++YYCURSOR; + YYDEBUG(242, *YYCURSOR); ++======= + #line 3173 "Zend/zend_ini_scanner.c" + yy250: + YYDEBUG(250, *YYCURSOR); + yyaccept = 2; + yych = *(YYMARKER = ++YYCURSOR); + goto yy293; + yy251: + YYDEBUG(251, *YYCURSOR); + ++YYCURSOR; + YYDEBUG(252, *YYCURSOR); ++>>>>>>> PHP-5.6 yyleng = YYCURSOR - SCNG(yy_text); -#line 562 "Zend/zend_ini_scanner.l" +#line 563 "Zend/zend_ini_scanner.l" { /* Make = used in option value to trigger error */ yyless(0); BEGIN(INITIAL); return END_OF_LINE; } ++<<<<<<< HEAD +#line 3097 "Zend/zend_ini_scanner.c" +yy243: + YYDEBUG(243, *YYCURSOR); + yyaccept = 4; + yych = *(YYMARKER = ++YYCURSOR); + if (yybm[0+yych] & 4) { + goto yy252; ++======= + #line 3190 "Zend/zend_ini_scanner.c" + yy253: + YYDEBUG(253, *YYCURSOR); + yyaccept = 4; + yych = *(YYMARKER = ++YYCURSOR); + if (yybm[0+yych] & 4) { + goto yy262; ++>>>>>>> PHP-5.6 } if (yych <= ':') { if (yych <= '\r') { if (yych <= 0x08) { ++<<<<<<< HEAD + if (yych >= 0x01) goto yy251; + } else { + if (yych <= '\n') goto yy244; + if (yych <= '\f') goto yy251; + } + } else { + if (yych <= '"') { + if (yych <= 0x1F) goto yy251; + } else { + if (yych <= '%') goto yy251; + if (yych >= '*') goto yy251; ++======= + if (yych >= 0x01) goto yy261; + } else { + if (yych <= '\n') goto yy254; + if (yych <= '\f') goto yy261; + } + } else { + if (yych <= '"') { + if (yych <= 0x1F) goto yy261; + } else { + if (yych <= '%') goto yy261; + if (yych >= '*') goto yy261; ++>>>>>>> PHP-5.6 } } } else { if (yych <= '^') { if (yych <= '<') { ++<<<<<<< HEAD + if (yych >= '<') goto yy251; + } else { + if (yych <= '=') goto yy244; + if (yych <= ']') goto yy251; + } + } else { + if (yych <= '|') { + if (yych <= '{') goto yy251; + } else { + if (yych != '~') goto yy251; + } + } + } +yy244: + YYDEBUG(244, *YYCURSOR); ++======= + if (yych >= '<') goto yy261; + } else { + if (yych <= '=') goto yy254; + if (yych <= ']') goto yy261; + } + } else { + if (yych <= '|') { + if (yych <= '{') goto yy261; + } else { + if (yych != '~') goto yy261; + } + } + } + yy254: + YYDEBUG(254, *YYCURSOR); ++>>>>>>> PHP-5.6 yyleng = YYCURSOR - SCNG(yy_text); -#line 546 "Zend/zend_ini_scanner.l" +#line 547 "Zend/zend_ini_scanner.l" { /* Get constant option value */ RETURN_TOKEN(TC_CONSTANT, yytext, yyleng); } ++<<<<<<< HEAD +#line 3144 "Zend/zend_ini_scanner.c" +yy245: + YYDEBUG(245, *YYCURSOR); ++======= + #line 3237 "Zend/zend_ini_scanner.c" + yy255: + YYDEBUG(255, *YYCURSOR); ++>>>>>>> PHP-5.6 yyaccept = 4; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '<') { if (yych <= '"') { if (yych <= '\n') { ++<<<<<<< HEAD + if (yych <= 0x00) goto yy244; + if (yych <= 0x08) goto yy251; + goto yy244; + } else { + if (yych == '\r') goto yy244; + if (yych <= 0x1F) goto yy251; + goto yy244; + } + } else { + if (yych <= '/') { + if (yych <= '%') goto yy251; + if (yych <= ')') goto yy244; + goto yy251; + } else { + if (yych <= '9') goto yy252; + if (yych == ';') goto yy244; + goto yy251; ++======= + if (yych <= 0x00) goto yy254; + if (yych <= 0x08) goto yy261; + goto yy254; + } else { + if (yych == '\r') goto yy254; + if (yych <= 0x1F) goto yy261; + goto yy254; + } + } else { + if (yych <= '/') { + if (yych <= '%') goto yy261; + if (yych <= ')') goto yy254; + goto yy261; + } else { + if (yych <= '9') goto yy262; + if (yych == ';') goto yy254; + goto yy261; ++>>>>>>> PHP-5.6 + } + } + } else { + if (yych <= '_') { + if (yych <= 'A') { ++<<<<<<< HEAD + if (yych <= '=') goto yy244; + if (yych <= '@') goto yy251; + goto yy279; + } else { + if (yych <= 'Z') goto yy252; + if (yych <= ']') goto yy251; + if (yych <= '^') goto yy244; + goto yy252; + } + } else { + if (yych <= '{') { + if (yych <= '`') goto yy251; + if (yych <= 'a') goto yy279; + if (yych <= 'z') goto yy252; + goto yy251; + } else { + if (yych == '}') goto yy251; + if (yych <= '~') goto yy244; + goto yy251; } } - } else { - if (yych <= '_') { - if (yych <= 'A') { + } +yy246: + YYDEBUG(246, *YYCURSOR); ++======= + if (yych <= '=') goto yy254; + if (yych <= '@') goto yy261; + goto yy289; + } else { + if (yych <= 'Z') goto yy262; + if (yych <= ']') goto yy261; + if (yych <= '^') goto yy254; + goto yy262; + } + } else { + if (yych <= '{') { + if (yych <= '`') goto yy261; + if (yych <= 'a') goto yy289; + if (yych <= 'z') goto yy262; + goto yy261; + } else { + if (yych == '}') goto yy261; + if (yych <= '~') goto yy254; + goto yy261; + } + } + } + yy256: + YYDEBUG(256, *YYCURSOR); ++>>>>>>> PHP-5.6 yyaccept = 4; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'N') { if (yych <= '%') { if (yych <= '\f') { ++<<<<<<< HEAD + if (yych <= 0x00) goto yy244; + if (yych <= 0x08) goto yy251; + if (yych <= '\n') goto yy244; + goto yy251; + } else { + if (yych <= '\r') goto yy244; + if (yych <= 0x1F) goto yy251; + if (yych <= '"') goto yy244; + goto yy251; + } + } else { + if (yych <= ':') { + if (yych <= ')') goto yy244; + if (yych <= '/') goto yy251; + if (yych <= '9') goto yy252; + goto yy251; + } else { + if (yych <= '<') { + if (yych <= ';') goto yy244; + goto yy251; + } else { + if (yych <= '=') goto yy244; + if (yych <= '@') goto yy251; + goto yy252; ++======= + if (yych <= 0x00) goto yy254; + if (yych <= 0x08) goto yy261; + if (yych <= '\n') goto yy254; + goto yy261; + } else { + if (yych <= '\r') goto yy254; + if (yych <= 0x1F) goto yy261; + if (yych <= '"') goto yy254; + goto yy261; + } + } else { + if (yych <= ':') { + if (yych <= ')') goto yy254; + if (yych <= '/') goto yy261; + if (yych <= '9') goto yy262; + goto yy261; + } else { + if (yych <= '<') { + if (yych <= ';') goto yy254; + goto yy261; + } else { + if (yych <= '=') goto yy254; + if (yych <= '@') goto yy261; + goto yy262; ++>>>>>>> PHP-5.6 } } } } else { if (yych <= 'n') { if (yych <= 'Z') { ++<<<<<<< HEAD + if (yych <= 'O') goto yy271; + if (yych == 'U') goto yy272; + goto yy252; + } else { + if (yych <= '^') { + if (yych <= ']') goto yy251; + goto yy244; + } else { + if (yych == '`') goto yy251; + goto yy252; ++======= + if (yych <= 'O') goto yy281; + if (yych == 'U') goto yy282; + goto yy262; + } else { + if (yych <= '^') { + if (yych <= ']') goto yy261; + goto yy254; + } else { + if (yych == '`') goto yy261; + goto yy262; ++>>>>>>> PHP-5.6 } } } else { if (yych <= 'z') { ++<<<<<<< HEAD + if (yych <= 'o') goto yy271; + if (yych == 'u') goto yy272; + goto yy252; + } else { + if (yych <= '|') { + if (yych <= '{') goto yy251; + goto yy244; + } else { + if (yych == '~') goto yy244; + goto yy251; ++======= + if (yych <= 'o') goto yy281; + if (yych == 'u') goto yy282; + goto yy262; + } else { + if (yych <= '|') { + if (yych <= '{') goto yy261; + goto yy254; + } else { + if (yych == '~') goto yy254; + goto yy261; ++>>>>>>> PHP-5.6 } } } } ++<<<<<<< HEAD +yy247: + YYDEBUG(247, *YYCURSOR); ++======= + yy257: + YYDEBUG(257, *YYCURSOR); ++>>>>>>> PHP-5.6 yyaccept = 4; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'E') { if (yych <= '%') { if (yych <= '\f') { ++<<<<<<< HEAD + if (yych <= 0x00) goto yy244; + if (yych <= 0x08) goto yy251; + if (yych <= '\n') goto yy244; + goto yy251; + } else { + if (yych <= '\r') goto yy244; + if (yych <= 0x1F) goto yy251; + if (yych <= '"') goto yy244; + goto yy251; + } + } else { + if (yych <= ':') { + if (yych <= ')') goto yy244; + if (yych <= '/') goto yy251; + if (yych <= '9') goto yy252; + goto yy251; + } else { + if (yych <= '<') { + if (yych <= ';') goto yy244; + goto yy251; + } else { + if (yych <= '=') goto yy244; + if (yych <= '@') goto yy251; + goto yy252; ++======= + if (yych <= 0x00) goto yy254; + if (yych <= 0x08) goto yy261; + if (yych <= '\n') goto yy254; + goto yy261; + } else { + if (yych <= '\r') goto yy254; + if (yych <= 0x1F) goto yy261; + if (yych <= '"') goto yy254; + goto yy261; + } + } else { + if (yych <= ':') { + if (yych <= ')') goto yy254; + if (yych <= '/') goto yy261; + if (yych <= '9') goto yy262; + goto yy261; + } else { + if (yych <= '<') { + if (yych <= ';') goto yy254; + goto yy261; + } else { + if (yych <= '=') goto yy254; + if (yych <= '@') goto yy261; + goto yy262; ++>>>>>>> PHP-5.6 } } } } else { if (yych <= 'e') { if (yych <= 'Z') { ++<<<<<<< HEAD + if (yych <= 'F') goto yy266; + if (yych == 'N') goto yy260; + goto yy252; + } else { + if (yych <= '^') { + if (yych <= ']') goto yy251; + goto yy244; + } else { + if (yych == '`') goto yy251; + goto yy252; ++======= + if (yych <= 'F') goto yy276; + if (yych == 'N') goto yy270; + goto yy262; + } else { + if (yych <= '^') { + if (yych <= ']') goto yy261; + goto yy254; + } else { + if (yych == '`') goto yy261; + goto yy262; ++>>>>>>> PHP-5.6 } } } else { if (yych <= 'z') { ++<<<<<<< HEAD + if (yych <= 'f') goto yy266; + if (yych == 'n') goto yy260; + goto yy252; + } else { + if (yych <= '|') { + if (yych <= '{') goto yy251; + goto yy244; + } else { + if (yych == '~') goto yy244; + goto yy251; ++======= + if (yych <= 'f') goto yy276; + if (yych == 'n') goto yy270; + goto yy262; + } else { + if (yych <= '|') { + if (yych <= '{') goto yy261; + goto yy254; + } else { + if (yych == '~') goto yy254; + goto yy261; ++>>>>>>> PHP-5.6 } } } } ++<<<<<<< HEAD +yy248: + YYDEBUG(248, *YYCURSOR); ++======= + yy258: + YYDEBUG(258, *YYCURSOR); ++>>>>>>> PHP-5.6 yyaccept = 4; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '=') { if (yych <= '"') { if (yych <= '\n') { ++<<<<<<< HEAD + if (yych <= 0x00) goto yy244; + if (yych <= 0x08) goto yy251; + goto yy244; + } else { + if (yych == '\r') goto yy244; + if (yych <= 0x1F) goto yy251; + goto yy244; + } + } else { + if (yych <= '9') { + if (yych <= '%') goto yy251; + if (yych <= ')') goto yy244; + if (yych <= '/') goto yy251; + goto yy252; + } else { + if (yych == ';') goto yy244; + if (yych <= '<') goto yy251; + goto yy244; ++======= + if (yych <= 0x00) goto yy254; + if (yych <= 0x08) goto yy261; + goto yy254; + } else { + if (yych == '\r') goto yy254; + if (yych <= 0x1F) goto yy261; + goto yy254; + } + } else { + if (yych <= '9') { + if (yych <= '%') goto yy261; + if (yych <= ')') goto yy254; + if (yych <= '/') goto yy261; + goto yy262; + } else { + if (yych == ';') goto yy254; + if (yych <= '<') goto yy261; + goto yy254; ++>>>>>>> PHP-5.6 } } } else { if (yych <= '`') { if (yych <= 'Z') { ++<<<<<<< HEAD + if (yych <= '@') goto yy251; + if (yych == 'R') goto yy264; + goto yy252; + } else { + if (yych <= ']') goto yy251; + if (yych <= '^') goto yy244; + if (yych <= '_') goto yy252; + goto yy251; + } + } else { + if (yych <= '{') { + if (yych == 'r') goto yy264; + if (yych <= 'z') goto yy252; + goto yy251; + } else { + if (yych == '}') goto yy251; + if (yych <= '~') goto yy244; + goto yy251; + } + } + } +yy249: + YYDEBUG(249, *YYCURSOR); ++======= + if (yych <= '@') goto yy261; + if (yych == 'R') goto yy274; + goto yy262; + } else { + if (yych <= ']') goto yy261; + if (yych <= '^') goto yy254; + if (yych <= '_') goto yy262; + goto yy261; + } + } else { + if (yych <= '{') { + if (yych == 'r') goto yy274; + if (yych <= 'z') goto yy262; + goto yy261; + } else { + if (yych == '}') goto yy261; + if (yych <= '~') goto yy254; + goto yy261; + } + } + } + yy259: + YYDEBUG(259, *YYCURSOR); ++>>>>>>> PHP-5.6 yyaccept = 4; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '=') { if (yych <= '"') { if (yych <= '\n') { ++<<<<<<< HEAD + if (yych <= 0x00) goto yy244; + if (yych <= 0x08) goto yy251; + goto yy244; + } else { + if (yych == '\r') goto yy244; + if (yych <= 0x1F) goto yy251; + goto yy244; + } + } else { + if (yych <= '9') { + if (yych <= '%') goto yy251; + if (yych <= ')') goto yy244; + if (yych <= '/') goto yy251; + goto yy252; + } else { + if (yych == ';') goto yy244; + if (yych <= '<') goto yy251; + goto yy244; ++======= + if (yych <= 0x00) goto yy254; + if (yych <= 0x08) goto yy261; + goto yy254; + } else { + if (yych == '\r') goto yy254; + if (yych <= 0x1F) goto yy261; + goto yy254; + } + } else { + if (yych <= '9') { + if (yych <= '%') goto yy261; + if (yych <= ')') goto yy254; + if (yych <= '/') goto yy261; + goto yy262; + } else { + if (yych == ';') goto yy254; + if (yych <= '<') goto yy261; + goto yy254; ++>>>>>>> PHP-5.6 } } } else { if (yych <= '`') { if (yych <= 'Z') { ++<<<<<<< HEAD + if (yych <= '@') goto yy251; + if (yych == 'E') goto yy254; + goto yy252; + } else { + if (yych <= ']') goto yy251; + if (yych <= '^') goto yy244; + if (yych <= '_') goto yy252; + goto yy251; + } + } else { + if (yych <= '{') { + if (yych == 'e') goto yy254; + if (yych <= 'z') goto yy252; + goto yy251; + } else { + if (yych == '}') goto yy251; + if (yych <= '~') goto yy244; + goto yy251; + } + } + } +yy250: + YYDEBUG(250, *YYCURSOR); ++======= + if (yych <= '@') goto yy261; + if (yych == 'E') goto yy264; + goto yy262; + } else { + if (yych <= ']') goto yy261; + if (yych <= '^') goto yy254; + if (yych <= '_') goto yy262; + goto yy261; + } + } else { + if (yych <= '{') { + if (yych == 'e') goto yy264; + if (yych <= 'z') goto yy262; + goto yy261; + } else { + if (yych == '}') goto yy261; + if (yych <= '~') goto yy254; + goto yy261; + } + } + } + yy260: + YYDEBUG(260, *YYCURSOR); ++>>>>>>> PHP-5.6 yyaccept = 0; YYMARKER = ++YYCURSOR; YYFILL(1); yych = *YYCURSOR; ++<<<<<<< HEAD +yy251: + YYDEBUG(251, *YYCURSOR); + if (yybm[0+yych] & 2) { + goto yy250; + } + if (yych == '$') goto yy255; + goto yy224; +yy252: + YYDEBUG(252, *YYCURSOR); ++======= + yy261: + YYDEBUG(261, *YYCURSOR); + if (yybm[0+yych] & 2) { + goto yy260; + } + if (yych == '$') goto yy265; + goto yy234; + yy262: + YYDEBUG(262, *YYCURSOR); ++>>>>>>> PHP-5.6 yyaccept = 4; YYMARKER = ++YYCURSOR; YYFILL(1); yych = *YYCURSOR; ++<<<<<<< HEAD + YYDEBUG(253, *YYCURSOR); + if (yybm[0+yych] & 4) { + goto yy252; ++======= + YYDEBUG(263, *YYCURSOR); + if (yybm[0+yych] & 4) { + goto yy262; ++>>>>>>> PHP-5.6 } if (yych <= ')') { if (yych <= '\r') { if (yych <= 0x08) { ++<<<<<<< HEAD + if (yych <= 0x00) goto yy244; + goto yy250; + } else { + if (yych <= '\n') goto yy244; + if (yych <= '\f') goto yy250; + goto yy244; + } + } else { + if (yych <= '#') { + if (yych <= 0x1F) goto yy250; + if (yych <= '"') goto yy244; + goto yy250; + } else { + if (yych <= '$') goto yy255; + if (yych <= '%') goto yy250; + goto yy244; ++======= + if (yych <= 0x00) goto yy254; + goto yy260; + } else { + if (yych <= '\n') goto yy254; + if (yych <= '\f') goto yy260; + goto yy254; + } + } else { + if (yych <= '#') { + if (yych <= 0x1F) goto yy260; + if (yych <= '"') goto yy254; + goto yy260; + } else { + if (yych <= '$') goto yy265; + if (yych <= '%') goto yy260; + goto yy254; ++>>>>>>> PHP-5.6 } } } else { if (yych <= ']') { if (yych <= ';') { ++<<<<<<< HEAD + if (yych <= ':') goto yy250; + goto yy244; + } else { + if (yych == '=') goto yy244; + goto yy250; + } + } else { + if (yych <= '|') { + if (yych <= '^') goto yy244; + if (yych <= '{') goto yy250; + goto yy244; + } else { + if (yych == '~') goto yy244; + goto yy250; + } + } + } +yy254: + YYDEBUG(254, *YYCURSOR); ++======= + if (yych <= ':') goto yy260; + goto yy254; + } else { + if (yych == '=') goto yy254; + goto yy260; + } + } else { + if (yych <= '|') { + if (yych <= '^') goto yy254; + if (yych <= '{') goto yy260; + goto yy254; + } else { + if (yych == '~') goto yy254; + goto yy260; + } + } + } + yy264: + YYDEBUG(264, *YYCURSOR); ++>>>>>>> PHP-5.6 yyaccept = 4; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '=') { if (yych <= '"') { if (yych <= '\n') { ++<<<<<<< HEAD + if (yych <= 0x00) goto yy244; + if (yych <= 0x08) goto yy251; + goto yy244; + } else { + if (yych == '\r') goto yy244; + if (yych <= 0x1F) goto yy251; + goto yy244; + } + } else { + if (yych <= '9') { + if (yych <= '%') goto yy251; + if (yych <= ')') goto yy244; + if (yych <= '/') goto yy251; + goto yy252; + } else { + if (yych == ';') goto yy244; + if (yych <= '<') goto yy251; + goto yy244; ++======= + if (yych <= 0x00) goto yy254; + if (yych <= 0x08) goto yy261; + goto yy254; + } else { + if (yych == '\r') goto yy254; + if (yych <= 0x1F) goto yy261; + goto yy254; + } + } else { + if (yych <= '9') { + if (yych <= '%') goto yy261; + if (yych <= ')') goto yy254; + if (yych <= '/') goto yy261; + goto yy262; + } else { + if (yych == ';') goto yy254; + if (yych <= '<') goto yy261; + goto yy254; ++>>>>>>> PHP-5.6 } } } else { if (yych <= '`') { if (yych <= 'Z') { ++<<<<<<< HEAD + if (yych <= '@') goto yy251; + if (yych == 'S') goto yy260; + goto yy252; + } else { + if (yych <= ']') goto yy251; + if (yych <= '^') goto yy244; + if (yych <= '_') goto yy252; + goto yy251; + } + } else { + if (yych <= '{') { + if (yych == 's') goto yy260; + if (yych <= 'z') goto yy252; + goto yy251; + } else { + if (yych == '}') goto yy251; + if (yych <= '~') goto yy244; + goto yy251; + } + } + } +yy255: + YYDEBUG(255, *YYCURSOR); ++======= + if (yych <= '@') goto yy261; + if (yych == 'S') goto yy270; + goto yy262; + } else { + if (yych <= ']') goto yy261; + if (yych <= '^') goto yy254; + if (yych <= '_') goto yy262; + goto yy261; + } + } else { + if (yych <= '{') { + if (yych == 's') goto yy270; + if (yych <= 'z') goto yy262; + goto yy261; + } else { + if (yych == '}') goto yy261; + if (yych <= '~') goto yy254; + goto yy261; + } + } + } + yy265: + YYDEBUG(265, *YYCURSOR); ++>>>>>>> PHP-5.6 ++YYCURSOR; YYFILL(1); yych = *YYCURSOR; if (yych <= '\\') { ++<<<<<<< HEAD + if (yych <= 0x00) goto yy256; + if (yych <= '[') goto yy250; + goto yy257; + } else { + if (yych != '{') goto yy250; + } +yy256: + YYDEBUG(256, *YYCURSOR); ++======= + if (yych <= 0x00) goto yy266; + if (yych <= '[') goto yy260; + goto yy267; + } else { + if (yych != '{') goto yy260; + } + yy266: + YYDEBUG(266, *YYCURSOR); ++>>>>>>> PHP-5.6 YYCURSOR = YYMARKER; if (yyaccept <= 3) { if (yyaccept <= 1) { if (yyaccept <= 0) { ++<<<<<<< HEAD + goto yy224; + } else { + goto yy226; + } + } else { + if (yyaccept <= 2) { + goto yy222; + } else { + goto yy239; ++======= + goto yy234; + } else { + goto yy236; + } + } else { + if (yyaccept <= 2) { + goto yy232; + } else { + goto yy249; ++>>>>>>> PHP-5.6 } } } else { if (yyaccept <= 5) { if (yyaccept <= 4) { ++<<<<<<< HEAD + goto yy244; + } else { + goto yy261; + } + } else { + if (yyaccept <= 6) { + goto yy268; + } else { + goto yy275; + } + } + } +yy257: + YYDEBUG(257, *YYCURSOR); ++======= + goto yy254; + } else { + goto yy271; + } + } else { + if (yyaccept <= 6) { + goto yy278; + } else { + goto yy285; + } + } + } + yy267: + YYDEBUG(267, *YYCURSOR); ++>>>>>>> PHP-5.6 + ++YYCURSOR; + YYFILL(1); + yych = *YYCURSOR; + if (yybm[0+yych] & 8) { ++<<<<<<< HEAD + goto yy258; + } + goto yy250; +yy258: + YYDEBUG(258, *YYCURSOR); ++YYCURSOR; YYFILL(1); yych = *YYCURSOR; + YYDEBUG(259, *YYCURSOR); if (yybm[0+yych] & 8) { + goto yy258; + } + if (yych <= 0x00) goto yy224; + if (yych == '\\') goto yy257; + goto yy250; +yy260: + YYDEBUG(260, *YYCURSOR); + yyaccept = 5; + yych = *(YYMARKER = ++YYCURSOR); + if (yybm[0+yych] & 16) { + goto yy262; ++======= + goto yy268; + } + goto yy260; + yy268: + YYDEBUG(268, *YYCURSOR); + ++YYCURSOR; + YYFILL(1); + yych = *YYCURSOR; + YYDEBUG(269, *YYCURSOR); + if (yybm[0+yych] & 8) { + goto yy268; + } + if (yych <= 0x00) goto yy234; + if (yych == '\\') goto yy267; + goto yy260; + yy270: + YYDEBUG(270, *YYCURSOR); + yyaccept = 5; + yych = *(YYMARKER = ++YYCURSOR); + if (yybm[0+yych] & 16) { + goto yy272; ++>>>>>>> PHP-5.6 } if (yych <= ';') { if (yych <= ' ') { if (yych <= '\n') { ++<<<<<<< HEAD + if (yych <= 0x00) goto yy261; + if (yych <= '\t') goto yy251; + } else { + if (yych != '\r') goto yy251; + } + } else { + if (yych <= ')') { + if (yych <= '"') goto yy261; + if (yych <= '%') goto yy251; + } else { + if (yych <= '/') goto yy251; + if (yych <= '9') goto yy252; + if (yych <= ':') goto yy251; ++======= + if (yych <= 0x00) goto yy271; + if (yych <= '\t') goto yy261; + } else { + if (yych != '\r') goto yy261; + } + } else { + if (yych <= ')') { + if (yych <= '"') goto yy271; + if (yych <= '%') goto yy261; + } else { + if (yych <= '/') goto yy261; + if (yych <= '9') goto yy262; + if (yych <= ':') goto yy261; ++>>>>>>> PHP-5.6 } } } else { if (yych <= '_') { if (yych <= '@') { ++<<<<<<< HEAD + if (yych != '=') goto yy251; + } else { + if (yych <= 'Z') goto yy252; + if (yych <= ']') goto yy251; + if (yych >= '_') goto yy252; + } + } else { + if (yych <= '{') { + if (yych <= '`') goto yy251; + if (yych <= 'z') goto yy252; + goto yy251; + } else { + if (yych == '}') goto yy251; + if (yych >= 0x7F) goto yy251; + } + } + } +yy261: + YYDEBUG(261, *YYCURSOR); ++======= + if (yych != '=') goto yy261; + } else { + if (yych <= 'Z') goto yy262; + if (yych <= ']') goto yy261; + if (yych >= '_') goto yy262; + } + } else { + if (yych <= '{') { + if (yych <= '`') goto yy261; + if (yych <= 'z') goto yy262; + goto yy261; + } else { + if (yych == '}') goto yy261; + if (yych >= 0x7F) goto yy261; + } + } + } + yy271: + YYDEBUG(271, *YYCURSOR); ++>>>>>>> PHP-5.6 yyleng = YYCURSOR - SCNG(yy_text); -#line 468 "Zend/zend_ini_scanner.l" +#line 469 "Zend/zend_ini_scanner.l" { /* TRUE value (when used outside option value/offset this causes parse error!) */ RETURN_TOKEN(BOOL_TRUE, "1", 1); } ++<<<<<<< HEAD +#line 3660 "Zend/zend_ini_scanner.c" +yy262: + YYDEBUG(262, *YYCURSOR); + ++YYCURSOR; + YYFILL(1); + yych = *YYCURSOR; + YYDEBUG(263, *YYCURSOR); + if (yybm[0+yych] & 16) { + goto yy262; + } + goto yy261; +yy264: + YYDEBUG(264, *YYCURSOR); ++======= + #line 3753 "Zend/zend_ini_scanner.c" + yy272: + YYDEBUG(272, *YYCURSOR); + ++YYCURSOR; + YYFILL(1); + yych = *YYCURSOR; + YYDEBUG(273, *YYCURSOR); + if (yybm[0+yych] & 16) { + goto yy272; + } + goto yy271; + yy274: + YYDEBUG(274, *YYCURSOR); ++>>>>>>> PHP-5.6 yyaccept = 4; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '=') { if (yych <= '"') { if (yych <= '\n') { ++<<<<<<< HEAD + if (yych <= 0x00) goto yy244; + if (yych <= 0x08) goto yy251; + goto yy244; + } else { + if (yych == '\r') goto yy244; + if (yych <= 0x1F) goto yy251; + goto yy244; + } + } else { + if (yych <= '9') { + if (yych <= '%') goto yy251; + if (yych <= ')') goto yy244; + if (yych <= '/') goto yy251; + goto yy252; + } else { + if (yych == ';') goto yy244; + if (yych <= '<') goto yy251; + goto yy244; ++======= + if (yych <= 0x00) goto yy254; + if (yych <= 0x08) goto yy261; + goto yy254; + } else { + if (yych == '\r') goto yy254; + if (yych <= 0x1F) goto yy261; + goto yy254; + } + } else { + if (yych <= '9') { + if (yych <= '%') goto yy261; + if (yych <= ')') goto yy254; + if (yych <= '/') goto yy261; + goto yy262; + } else { + if (yych == ';') goto yy254; + if (yych <= '<') goto yy261; + goto yy254; ++>>>>>>> PHP-5.6 } } } else { if (yych <= '`') { if (yych <= 'Z') { ++<<<<<<< HEAD + if (yych <= '@') goto yy251; + if (yych != 'U') goto yy252; + } else { + if (yych <= ']') goto yy251; + if (yych <= '^') goto yy244; + if (yych <= '_') goto yy252; + goto yy251; + } + } else { + if (yych <= '{') { + if (yych == 'u') goto yy265; + if (yych <= 'z') goto yy252; + goto yy251; + } else { + if (yych == '}') goto yy251; + if (yych <= '~') goto yy244; + goto yy251; + } + } + } +yy265: + YYDEBUG(265, *YYCURSOR); ++======= + if (yych <= '@') goto yy261; + if (yych != 'U') goto yy262; + } else { + if (yych <= ']') goto yy261; + if (yych <= '^') goto yy254; + if (yych <= '_') goto yy262; + goto yy261; + } + } else { + if (yych <= '{') { + if (yych == 'u') goto yy275; + if (yych <= 'z') goto yy262; + goto yy261; + } else { + if (yych == '}') goto yy261; + if (yych <= '~') goto yy254; + goto yy261; + } + } + } + yy275: + YYDEBUG(275, *YYCURSOR); ++>>>>>>> PHP-5.6 yyaccept = 4; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '=') { if (yych <= '"') { if (yych <= '\n') { ++<<<<<<< HEAD + if (yych <= 0x00) goto yy244; + if (yych <= 0x08) goto yy251; + goto yy244; + } else { + if (yych == '\r') goto yy244; + if (yych <= 0x1F) goto yy251; + goto yy244; + } + } else { + if (yych <= '9') { + if (yych <= '%') goto yy251; + if (yych <= ')') goto yy244; + if (yych <= '/') goto yy251; + goto yy252; + } else { + if (yych == ';') goto yy244; + if (yych <= '<') goto yy251; + goto yy244; ++======= + if (yych <= 0x00) goto yy254; + if (yych <= 0x08) goto yy261; + goto yy254; + } else { + if (yych == '\r') goto yy254; + if (yych <= 0x1F) goto yy261; + goto yy254; + } + } else { + if (yych <= '9') { + if (yych <= '%') goto yy261; + if (yych <= ')') goto yy254; + if (yych <= '/') goto yy261; + goto yy262; + } else { + if (yych == ';') goto yy254; + if (yych <= '<') goto yy261; + goto yy254; ++>>>>>>> PHP-5.6 } } } else { if (yych <= '`') { if (yych <= 'Z') { ++<<<<<<< HEAD + if (yych <= '@') goto yy251; + if (yych == 'E') goto yy260; + goto yy252; + } else { + if (yych <= ']') goto yy251; + if (yych <= '^') goto yy244; + if (yych <= '_') goto yy252; + goto yy251; + } + } else { + if (yych <= '{') { + if (yych == 'e') goto yy260; + if (yych <= 'z') goto yy252; + goto yy251; + } else { + if (yych == '}') goto yy251; + if (yych <= '~') goto yy244; + goto yy251; + } + } + } +yy266: + YYDEBUG(266, *YYCURSOR); ++======= + if (yych <= '@') goto yy261; + if (yych == 'E') goto yy270; + goto yy262; + } else { + if (yych <= ']') goto yy261; + if (yych <= '^') goto yy254; + if (yych <= '_') goto yy262; + goto yy261; + } + } else { + if (yych <= '{') { + if (yych == 'e') goto yy270; + if (yych <= 'z') goto yy262; + goto yy261; + } else { + if (yych == '}') goto yy261; + if (yych <= '~') goto yy254; + goto yy261; + } + } + } + yy276: + YYDEBUG(276, *YYCURSOR); ++>>>>>>> PHP-5.6 yyaccept = 4; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '=') { if (yych <= '"') { if (yych <= '\n') { ++<<<<<<< HEAD + if (yych <= 0x00) goto yy244; + if (yych <= 0x08) goto yy251; + goto yy244; + } else { + if (yych == '\r') goto yy244; + if (yych <= 0x1F) goto yy251; + goto yy244; + } + } else { + if (yych <= '9') { + if (yych <= '%') goto yy251; + if (yych <= ')') goto yy244; + if (yych <= '/') goto yy251; + goto yy252; + } else { + if (yych == ';') goto yy244; + if (yych <= '<') goto yy251; + goto yy244; ++======= + if (yych <= 0x00) goto yy254; + if (yych <= 0x08) goto yy261; + goto yy254; + } else { + if (yych == '\r') goto yy254; + if (yych <= 0x1F) goto yy261; + goto yy254; + } + } else { + if (yych <= '9') { + if (yych <= '%') goto yy261; + if (yych <= ')') goto yy254; + if (yych <= '/') goto yy261; + goto yy262; + } else { + if (yych == ';') goto yy254; + if (yych <= '<') goto yy261; + goto yy254; ++>>>>>>> PHP-5.6 } } } else { if (yych <= '`') { if (yych <= 'Z') { ++<<<<<<< HEAD + if (yych <= '@') goto yy251; + if (yych != 'F') goto yy252; + } else { + if (yych <= ']') goto yy251; + if (yych <= '^') goto yy244; + if (yych <= '_') goto yy252; + goto yy251; + } + } else { + if (yych <= '{') { + if (yych == 'f') goto yy267; + if (yych <= 'z') goto yy252; + goto yy251; + } else { + if (yych == '}') goto yy251; + if (yych <= '~') goto yy244; + goto yy251; + } + } + } +yy267: + YYDEBUG(267, *YYCURSOR); + yyaccept = 6; + yych = *(YYMARKER = ++YYCURSOR); + if (yybm[0+yych] & 4) { + goto yy252; ++======= + if (yych <= '@') goto yy261; + if (yych != 'F') goto yy262; + } else { + if (yych <= ']') goto yy261; + if (yych <= '^') goto yy254; + if (yych <= '_') goto yy262; + goto yy261; + } + } else { + if (yych <= '{') { + if (yych == 'f') goto yy277; + if (yych <= 'z') goto yy262; + goto yy261; + } else { + if (yych == '}') goto yy261; + if (yych <= '~') goto yy254; + goto yy261; + } + } + } + yy277: + YYDEBUG(277, *YYCURSOR); + yyaccept = 6; + yych = *(YYMARKER = ++YYCURSOR); + if (yybm[0+yych] & 4) { + goto yy262; ++>>>>>>> PHP-5.6 } if (yych <= ')') { if (yych <= '\f') { if (yych <= 0x08) { ++<<<<<<< HEAD + if (yych >= 0x01) goto yy251; + } else { + if (yych <= '\t') goto yy269; + if (yych >= '\v') goto yy251; + } + } else { + if (yych <= ' ') { + if (yych <= '\r') goto yy268; + if (yych <= 0x1F) goto yy251; + goto yy269; + } else { + if (yych <= '"') goto yy268; + if (yych <= '%') goto yy251; ++======= + if (yych >= 0x01) goto yy261; + } else { + if (yych <= '\t') goto yy279; + if (yych >= '\v') goto yy261; + } + } else { + if (yych <= ' ') { + if (yych <= '\r') goto yy278; + if (yych <= 0x1F) goto yy261; + goto yy279; + } else { + if (yych <= '"') goto yy278; + if (yych <= '%') goto yy261; ++>>>>>>> PHP-5.6 } } } else { if (yych <= ']') { if (yych <= ';') { ++<<<<<<< HEAD + if (yych <= ':') goto yy251; + } else { + if (yych != '=') goto yy251; + } + } else { + if (yych <= '|') { + if (yych <= '^') goto yy268; + if (yych <= '{') goto yy251; + } else { + if (yych != '~') goto yy251; + } + } + } +yy268: + YYDEBUG(268, *YYCURSOR); ++======= + if (yych <= ':') goto yy261; + } else { + if (yych != '=') goto yy261; + } + } else { + if (yych <= '|') { + if (yych <= '^') goto yy278; + if (yych <= '{') goto yy261; + } else { + if (yych != '~') goto yy261; + } + } + } + yy278: + YYDEBUG(278, *YYCURSOR); ++>>>>>>> PHP-5.6 yyleng = YYCURSOR - SCNG(yy_text); -#line 472 "Zend/zend_ini_scanner.l" +#line 473 "Zend/zend_ini_scanner.l" { /* FALSE value (when used outside option value/offset this causes parse error!)*/ RETURN_TOKEN(BOOL_FALSE, "", 0); } ++<<<<<<< HEAD +#line 3870 "Zend/zend_ini_scanner.c" +yy269: + YYDEBUG(269, *YYCURSOR); + ++YYCURSOR; + YYFILL(1); + yych = *YYCURSOR; + YYDEBUG(270, *YYCURSOR); + if (yych == '\t') goto yy269; + if (yych == ' ') goto yy269; + goto yy268; +yy271: + YYDEBUG(271, *YYCURSOR); ++======= + #line 3963 "Zend/zend_ini_scanner.c" + yy279: + YYDEBUG(279, *YYCURSOR); + ++YYCURSOR; + YYFILL(1); + yych = *YYCURSOR; + YYDEBUG(280, *YYCURSOR); + if (yych == '\t') goto yy279; + if (yych == ' ') goto yy279; + goto yy278; + yy281: + YYDEBUG(281, *YYCURSOR); ++>>>>>>> PHP-5.6 yyaccept = 6; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '<') { if (yych <= ' ') { if (yych <= '\n') { ++<<<<<<< HEAD + if (yych <= 0x00) goto yy268; + if (yych <= 0x08) goto yy251; + if (yych <= '\t') goto yy269; + goto yy268; + } else { + if (yych == '\r') goto yy268; + if (yych <= 0x1F) goto yy251; + goto yy269; + } + } else { + if (yych <= '/') { + if (yych <= '"') goto yy268; + if (yych <= '%') goto yy251; + if (yych <= ')') goto yy268; + goto yy251; + } else { + if (yych <= '9') goto yy252; + if (yych == ';') goto yy268; + goto yy251; ++======= + if (yych <= 0x00) goto yy278; + if (yych <= 0x08) goto yy261; + if (yych <= '\t') goto yy279; + goto yy278; + } else { + if (yych == '\r') goto yy278; + if (yych <= 0x1F) goto yy261; + goto yy279; + } + } else { + if (yych <= '/') { + if (yych <= '"') goto yy278; + if (yych <= '%') goto yy261; + if (yych <= ')') goto yy278; + goto yy261; + } else { + if (yych <= '9') goto yy262; + if (yych == ';') goto yy278; + goto yy261; ++>>>>>>> PHP-5.6 } } } else { if (yych <= '_') { if (yych <= 'N') { ++<<<<<<< HEAD + if (yych <= '=') goto yy268; + if (yych <= '@') goto yy251; + if (yych <= 'M') goto yy252; + goto yy278; + } else { + if (yych <= 'Z') goto yy252; + if (yych <= ']') goto yy251; + if (yych <= '^') goto yy268; + goto yy252; + } + } else { + if (yych <= 'z') { + if (yych <= '`') goto yy251; + if (yych == 'n') goto yy278; + goto yy252; + } else { + if (yych <= '|') { + if (yych <= '{') goto yy251; + goto yy268; + } else { + if (yych == '~') goto yy268; + goto yy251; ++======= + if (yych <= '=') goto yy278; + if (yych <= '@') goto yy261; + if (yych <= 'M') goto yy262; + goto yy288; + } else { + if (yych <= 'Z') goto yy262; + if (yych <= ']') goto yy261; + if (yych <= '^') goto yy278; + goto yy262; + } + } else { + if (yych <= 'z') { + if (yych <= '`') goto yy261; + if (yych == 'n') goto yy288; + goto yy262; + } else { + if (yych <= '|') { + if (yych <= '{') goto yy261; + goto yy278; + } else { + if (yych == '~') goto yy278; + goto yy261; ++>>>>>>> PHP-5.6 } } } } ++<<<<<<< HEAD +yy272: + YYDEBUG(272, *YYCURSOR); ++======= + yy282: + YYDEBUG(282, *YYCURSOR); ++>>>>>>> PHP-5.6 yyaccept = 4; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '=') { if (yych <= '"') { if (yych <= '\n') { ++<<<<<<< HEAD + if (yych <= 0x00) goto yy244; + if (yych <= 0x08) goto yy251; + goto yy244; + } else { + if (yych == '\r') goto yy244; + if (yych <= 0x1F) goto yy251; + goto yy244; + } + } else { + if (yych <= '9') { + if (yych <= '%') goto yy251; + if (yych <= ')') goto yy244; + if (yych <= '/') goto yy251; + goto yy252; + } else { + if (yych == ';') goto yy244; + if (yych <= '<') goto yy251; + goto yy244; ++======= + if (yych <= 0x00) goto yy254; + if (yych <= 0x08) goto yy261; + goto yy254; + } else { + if (yych == '\r') goto yy254; + if (yych <= 0x1F) goto yy261; + goto yy254; + } + } else { + if (yych <= '9') { + if (yych <= '%') goto yy261; + if (yych <= ')') goto yy254; + if (yych <= '/') goto yy261; + goto yy262; + } else { + if (yych == ';') goto yy254; + if (yych <= '<') goto yy261; + goto yy254; ++>>>>>>> PHP-5.6 } } } else { if (yych <= '`') { if (yych <= 'Z') { ++<<<<<<< HEAD + if (yych <= '@') goto yy251; + if (yych != 'L') goto yy252; + } else { + if (yych <= ']') goto yy251; + if (yych <= '^') goto yy244; + if (yych <= '_') goto yy252; + goto yy251; + } + } else { + if (yych <= '{') { + if (yych == 'l') goto yy273; + if (yych <= 'z') goto yy252; + goto yy251; + } else { + if (yych == '}') goto yy251; + if (yych <= '~') goto yy244; + goto yy251; + } + } + } +yy273: + YYDEBUG(273, *YYCURSOR); ++======= + if (yych <= '@') goto yy261; + if (yych != 'L') goto yy262; + } else { + if (yych <= ']') goto yy261; + if (yych <= '^') goto yy254; + if (yych <= '_') goto yy262; + goto yy261; + } + } else { + if (yych <= '{') { + if (yych == 'l') goto yy283; + if (yych <= 'z') goto yy262; + goto yy261; + } else { + if (yych == '}') goto yy261; + if (yych <= '~') goto yy254; + goto yy261; + } + } + } + yy283: + YYDEBUG(283, *YYCURSOR); ++>>>>>>> PHP-5.6 yyaccept = 4; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '=') { if (yych <= '"') { if (yych <= '\n') { ++<<<<<<< HEAD + if (yych <= 0x00) goto yy244; + if (yych <= 0x08) goto yy251; + goto yy244; + } else { + if (yych == '\r') goto yy244; + if (yych <= 0x1F) goto yy251; + goto yy244; + } + } else { + if (yych <= '9') { + if (yych <= '%') goto yy251; + if (yych <= ')') goto yy244; + if (yych <= '/') goto yy251; + goto yy252; + } else { + if (yych == ';') goto yy244; + if (yych <= '<') goto yy251; + goto yy244; ++======= + if (yych <= 0x00) goto yy254; + if (yych <= 0x08) goto yy261; + goto yy254; + } else { + if (yych == '\r') goto yy254; + if (yych <= 0x1F) goto yy261; + goto yy254; + } + } else { + if (yych <= '9') { + if (yych <= '%') goto yy261; + if (yych <= ')') goto yy254; + if (yych <= '/') goto yy261; + goto yy262; + } else { + if (yych == ';') goto yy254; + if (yych <= '<') goto yy261; + goto yy254; ++>>>>>>> PHP-5.6 } } } else { if (yych <= '`') { if (yych <= 'Z') { ++<<<<<<< HEAD + if (yych <= '@') goto yy251; + if (yych != 'L') goto yy252; + } else { + if (yych <= ']') goto yy251; + if (yych <= '^') goto yy244; + if (yych <= '_') goto yy252; + goto yy251; + } + } else { + if (yych <= '{') { + if (yych == 'l') goto yy274; + if (yych <= 'z') goto yy252; + goto yy251; + } else { + if (yych == '}') goto yy251; + if (yych <= '~') goto yy244; + goto yy251; + } + } + } +yy274: + YYDEBUG(274, *YYCURSOR); + yyaccept = 7; + yych = *(YYMARKER = ++YYCURSOR); + if (yybm[0+yych] & 4) { + goto yy252; ++======= + if (yych <= '@') goto yy261; + if (yych != 'L') goto yy262; + } else { + if (yych <= ']') goto yy261; + if (yych <= '^') goto yy254; + if (yych <= '_') goto yy262; + goto yy261; + } + } else { + if (yych <= '{') { + if (yych == 'l') goto yy284; + if (yych <= 'z') goto yy262; + goto yy261; + } else { + if (yych == '}') goto yy261; + if (yych <= '~') goto yy254; + goto yy261; + } + } + } + yy284: + YYDEBUG(284, *YYCURSOR); + yyaccept = 7; + yych = *(YYMARKER = ++YYCURSOR); + if (yybm[0+yych] & 4) { + goto yy262; ++>>>>>>> PHP-5.6 } if (yych <= ')') { if (yych <= '\f') { if (yych <= 0x08) { ++<<<<<<< HEAD + if (yych >= 0x01) goto yy251; + } else { + if (yych <= '\t') goto yy276; + if (yych >= '\v') goto yy251; + } + } else { + if (yych <= ' ') { + if (yych <= '\r') goto yy275; + if (yych <= 0x1F) goto yy251; + goto yy276; + } else { + if (yych <= '"') goto yy275; + if (yych <= '%') goto yy251; ++======= + if (yych >= 0x01) goto yy261; + } else { + if (yych <= '\t') goto yy286; + if (yych >= '\v') goto yy261; + } + } else { + if (yych <= ' ') { + if (yych <= '\r') goto yy285; + if (yych <= 0x1F) goto yy261; + goto yy286; + } else { + if (yych <= '"') goto yy285; + if (yych <= '%') goto yy261; ++>>>>>>> PHP-5.6 } } } else { if (yych <= ']') { if (yych <= ';') { ++<<<<<<< HEAD + if (yych <= ':') goto yy251; + } else { + if (yych != '=') goto yy251; + } + } else { + if (yych <= '|') { + if (yych <= '^') goto yy275; + if (yych <= '{') goto yy251; + } else { + if (yych != '~') goto yy251; + } + } + } +yy275: + YYDEBUG(275, *YYCURSOR); ++======= + if (yych <= ':') goto yy261; + } else { + if (yych != '=') goto yy261; + } + } else { + if (yych <= '|') { + if (yych <= '^') goto yy285; + if (yych <= '{') goto yy261; + } else { + if (yych != '~') goto yy261; + } + } + } + yy285: + YYDEBUG(285, *YYCURSOR); ++>>>>>>> PHP-5.6 yyleng = YYCURSOR - SCNG(yy_text); -#line 476 "Zend/zend_ini_scanner.l" +#line 477 "Zend/zend_ini_scanner.l" { RETURN_TOKEN(NULL_NULL, "", 0); } ++<<<<<<< HEAD +#line 4085 "Zend/zend_ini_scanner.c" +yy276: + YYDEBUG(276, *YYCURSOR); + ++YYCURSOR; + YYFILL(1); + yych = *YYCURSOR; + YYDEBUG(277, *YYCURSOR); + if (yych == '\t') goto yy276; + if (yych == ' ') goto yy276; + goto yy275; +yy278: + YYDEBUG(278, *YYCURSOR); ++======= + #line 4178 "Zend/zend_ini_scanner.c" + yy286: + YYDEBUG(286, *YYCURSOR); + ++YYCURSOR; + YYFILL(1); + yych = *YYCURSOR; + YYDEBUG(287, *YYCURSOR); + if (yych == '\t') goto yy286; + if (yych == ' ') goto yy286; + goto yy285; + yy288: + YYDEBUG(288, *YYCURSOR); ++>>>>>>> PHP-5.6 yyaccept = 4; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '=') { if (yych <= '"') { if (yych <= '\n') { ++<<<<<<< HEAD + if (yych <= 0x00) goto yy244; + if (yych <= 0x08) goto yy251; + goto yy244; + } else { + if (yych == '\r') goto yy244; + if (yych <= 0x1F) goto yy251; + goto yy244; + } + } else { + if (yych <= '9') { + if (yych <= '%') goto yy251; + if (yych <= ')') goto yy244; + if (yych <= '/') goto yy251; + goto yy252; + } else { + if (yych == ';') goto yy244; + if (yych <= '<') goto yy251; + goto yy244; ++======= + if (yych <= 0x00) goto yy254; + if (yych <= 0x08) goto yy261; + goto yy254; + } else { + if (yych == '\r') goto yy254; + if (yych <= 0x1F) goto yy261; + goto yy254; + } + } else { + if (yych <= '9') { + if (yych <= '%') goto yy261; + if (yych <= ')') goto yy254; + if (yych <= '/') goto yy261; + goto yy262; + } else { + if (yych == ';') goto yy254; + if (yych <= '<') goto yy261; + goto yy254; ++>>>>>>> PHP-5.6 } } } else { if (yych <= '`') { if (yych <= 'Z') { ++<<<<<<< HEAD + if (yych <= '@') goto yy251; + if (yych == 'E') goto yy267; + goto yy252; + } else { + if (yych <= ']') goto yy251; + if (yych <= '^') goto yy244; + if (yych <= '_') goto yy252; + goto yy251; + } + } else { + if (yych <= '{') { + if (yych == 'e') goto yy267; + if (yych <= 'z') goto yy252; + goto yy251; + } else { + if (yych == '}') goto yy251; + if (yych <= '~') goto yy244; + goto yy251; + } + } + } +yy279: + YYDEBUG(279, *YYCURSOR); ++======= + if (yych <= '@') goto yy261; + if (yych == 'E') goto yy277; + goto yy262; + } else { + if (yych <= ']') goto yy261; + if (yych <= '^') goto yy254; + if (yych <= '_') goto yy262; + goto yy261; + } + } else { + if (yych <= '{') { + if (yych == 'e') goto yy277; + if (yych <= 'z') goto yy262; + goto yy261; + } else { + if (yych == '}') goto yy261; + if (yych <= '~') goto yy254; + goto yy261; + } + } + } + yy289: + YYDEBUG(289, *YYCURSOR); ++>>>>>>> PHP-5.6 yyaccept = 4; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '=') { if (yych <= '"') { if (yych <= '\n') { ++<<<<<<< HEAD + if (yych <= 0x00) goto yy244; + if (yych <= 0x08) goto yy251; + goto yy244; + } else { + if (yych == '\r') goto yy244; + if (yych <= 0x1F) goto yy251; + goto yy244; + } + } else { + if (yych <= '9') { + if (yych <= '%') goto yy251; + if (yych <= ')') goto yy244; + if (yych <= '/') goto yy251; + goto yy252; + } else { + if (yych == ';') goto yy244; + if (yych <= '<') goto yy251; + goto yy244; ++======= + if (yych <= 0x00) goto yy254; + if (yych <= 0x08) goto yy261; + goto yy254; + } else { + if (yych == '\r') goto yy254; + if (yych <= 0x1F) goto yy261; + goto yy254; + } + } else { + if (yych <= '9') { + if (yych <= '%') goto yy261; + if (yych <= ')') goto yy254; + if (yych <= '/') goto yy261; + goto yy262; + } else { + if (yych == ';') goto yy254; + if (yych <= '<') goto yy261; + goto yy254; ++>>>>>>> PHP-5.6 } } } else { if (yych <= '`') { if (yych <= 'Z') { ++<<<<<<< HEAD + if (yych <= '@') goto yy251; + if (yych != 'L') goto yy252; + } else { + if (yych <= ']') goto yy251; + if (yych <= '^') goto yy244; + if (yych <= '_') goto yy252; + goto yy251; + } + } else { + if (yych <= '{') { + if (yych == 'l') goto yy280; + if (yych <= 'z') goto yy252; + goto yy251; + } else { + if (yych == '}') goto yy251; + if (yych <= '~') goto yy244; + goto yy251; + } + } + } +yy280: + YYDEBUG(280, *YYCURSOR); ++======= + if (yych <= '@') goto yy261; + if (yych != 'L') goto yy262; + } else { + if (yych <= ']') goto yy261; + if (yych <= '^') goto yy254; + if (yych <= '_') goto yy262; + goto yy261; + } + } else { + if (yych <= '{') { + if (yych == 'l') goto yy290; + if (yych <= 'z') goto yy262; + goto yy261; + } else { + if (yych == '}') goto yy261; + if (yych <= '~') goto yy254; + goto yy261; + } + } + } + yy290: + YYDEBUG(290, *YYCURSOR); ++>>>>>>> PHP-5.6 yyaccept = 4; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '=') { if (yych <= '"') { if (yych <= '\n') { ++<<<<<<< HEAD + if (yych <= 0x00) goto yy244; + if (yych <= 0x08) goto yy251; + goto yy244; + } else { + if (yych == '\r') goto yy244; + if (yych <= 0x1F) goto yy251; + goto yy244; + } + } else { + if (yych <= '9') { + if (yych <= '%') goto yy251; + if (yych <= ')') goto yy244; + if (yych <= '/') goto yy251; + goto yy252; + } else { + if (yych == ';') goto yy244; + if (yych <= '<') goto yy251; + goto yy244; ++======= + if (yych <= 0x00) goto yy254; + if (yych <= 0x08) goto yy261; + goto yy254; + } else { + if (yych == '\r') goto yy254; + if (yych <= 0x1F) goto yy261; + goto yy254; + } + } else { + if (yych <= '9') { + if (yych <= '%') goto yy261; + if (yych <= ')') goto yy254; + if (yych <= '/') goto yy261; + goto yy262; + } else { + if (yych == ';') goto yy254; + if (yych <= '<') goto yy261; + goto yy254; ++>>>>>>> PHP-5.6 } } } else { if (yych <= '`') { if (yych <= 'Z') { ++<<<<<<< HEAD + if (yych <= '@') goto yy251; + if (yych != 'S') goto yy252; + } else { + if (yych <= ']') goto yy251; + if (yych <= '^') goto yy244; + if (yych <= '_') goto yy252; + goto yy251; + } + } else { + if (yych <= '{') { + if (yych == 's') goto yy281; + if (yych <= 'z') goto yy252; + goto yy251; + } else { + if (yych == '}') goto yy251; + if (yych <= '~') goto yy244; + goto yy251; + } + } + } +yy281: + YYDEBUG(281, *YYCURSOR); ++======= + if (yych <= '@') goto yy261; + if (yych != 'S') goto yy262; + } else { + if (yych <= ']') goto yy261; + if (yych <= '^') goto yy254; + if (yych <= '_') goto yy262; + goto yy261; + } + } else { + if (yych <= '{') { + if (yych == 's') goto yy291; + if (yych <= 'z') goto yy262; + goto yy261; + } else { + if (yych == '}') goto yy261; + if (yych <= '~') goto yy254; + goto yy261; + } + } + } + yy291: + YYDEBUG(291, *YYCURSOR); ++>>>>>>> PHP-5.6 yyaccept = 4; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '=') { if (yych <= '"') { if (yych <= '\n') { ++<<<<<<< HEAD + if (yych <= 0x00) goto yy244; + if (yych <= 0x08) goto yy251; + goto yy244; + } else { + if (yych == '\r') goto yy244; + if (yych <= 0x1F) goto yy251; + goto yy244; + } + } else { + if (yych <= '9') { + if (yych <= '%') goto yy251; + if (yych <= ')') goto yy244; + if (yych <= '/') goto yy251; + goto yy252; + } else { + if (yych == ';') goto yy244; + if (yych <= '<') goto yy251; + goto yy244; ++======= + if (yych <= 0x00) goto yy254; + if (yych <= 0x08) goto yy261; + goto yy254; + } else { + if (yych == '\r') goto yy254; + if (yych <= 0x1F) goto yy261; + goto yy254; + } + } else { + if (yych <= '9') { + if (yych <= '%') goto yy261; + if (yych <= ')') goto yy254; + if (yych <= '/') goto yy261; + goto yy262; + } else { + if (yych == ';') goto yy254; + if (yych <= '<') goto yy261; + goto yy254; ++>>>>>>> PHP-5.6 } } } else { if (yych <= '`') { if (yych <= 'Z') { ++<<<<<<< HEAD + if (yych <= '@') goto yy251; + if (yych == 'E') goto yy267; + goto yy252; + } else { + if (yych <= ']') goto yy251; + if (yych <= '^') goto yy244; + if (yych <= '_') goto yy252; + goto yy251; + } + } else { + if (yych <= '{') { + if (yych == 'e') goto yy267; + if (yych <= 'z') goto yy252; + goto yy251; + } else { + if (yych == '}') goto yy251; + if (yych <= '~') goto yy244; + goto yy251; + } + } + } +yy282: + YYDEBUG(282, *YYCURSOR); + ++YYCURSOR; + YYFILL(2); + yych = *YYCURSOR; +yy283: + YYDEBUG(283, *YYCURSOR); + if (yybm[0+yych] & 32) { + goto yy282; + } + if (yych >= '\r') goto yy286; +yy284: + YYDEBUG(284, *YYCURSOR); + ++YYCURSOR; +yy285: + YYDEBUG(285, *YYCURSOR); ++======= + if (yych <= '@') goto yy261; + if (yych == 'E') goto yy277; + goto yy262; + } else { + if (yych <= ']') goto yy261; + if (yych <= '^') goto yy254; + if (yych <= '_') goto yy262; + goto yy261; + } + } else { + if (yych <= '{') { + if (yych == 'e') goto yy277; + if (yych <= 'z') goto yy262; + goto yy261; + } else { + if (yych == '}') goto yy261; + if (yych <= '~') goto yy254; + goto yy261; + } + } + } + yy292: + YYDEBUG(292, *YYCURSOR); + ++YYCURSOR; + YYFILL(2); + yych = *YYCURSOR; + yy293: + YYDEBUG(293, *YYCURSOR); + if (yybm[0+yych] & 32) { + goto yy292; + } + if (yych >= '\r') goto yy296; + yy294: + YYDEBUG(294, *YYCURSOR); + ++YYCURSOR; + yy295: + YYDEBUG(295, *YYCURSOR); ++>>>>>>> PHP-5.6 yyleng = YYCURSOR - SCNG(yy_text); -#line 636 "Zend/zend_ini_scanner.l" +#line 637 "Zend/zend_ini_scanner.l" { /* Comment */ BEGIN(INITIAL); SCNG(lineno)++; return END_OF_LINE; } ++<<<<<<< HEAD +#line 4320 "Zend/zend_ini_scanner.c" +yy286: + YYDEBUG(286, *YYCURSOR); + yych = *++YYCURSOR; + if (yych == '\n') goto yy284; + goto yy285; +yy287: + YYDEBUG(287, *YYCURSOR); ++======= + #line 4413 "Zend/zend_ini_scanner.c" + yy296: + YYDEBUG(296, *YYCURSOR); + yych = *++YYCURSOR; + if (yych == '\n') goto yy294; + goto yy295; + yy297: + YYDEBUG(297, *YYCURSOR); ++>>>>>>> PHP-5.6 yyaccept = 3; YYMARKER = ++YYCURSOR; YYFILL(1); yych = *YYCURSOR; ++<<<<<<< HEAD + YYDEBUG(288, *YYCURSOR); + if (yybm[0+yych] & 64) { + goto yy287; ++======= + YYDEBUG(298, *YYCURSOR); + if (yybm[0+yych] & 64) { + goto yy297; ++>>>>>>> PHP-5.6 } if (yych <= ')') { if (yych <= '\r') { if (yych <= 0x08) { ++<<<<<<< HEAD + if (yych <= 0x00) goto yy239; + goto yy250; + } else { + if (yych <= '\n') goto yy239; + if (yych <= '\f') goto yy250; + goto yy239; + } + } else { + if (yych <= '#') { + if (yych <= 0x1F) goto yy250; + if (yych <= '"') goto yy239; + goto yy250; + } else { + if (yych <= '$') goto yy255; + if (yych <= '%') goto yy250; + goto yy239; ++======= + if (yych <= 0x00) goto yy249; + goto yy260; + } else { + if (yych <= '\n') goto yy249; + if (yych <= '\f') goto yy260; + goto yy249; + } + } else { + if (yych <= '#') { + if (yych <= 0x1F) goto yy260; + if (yych <= '"') goto yy249; + goto yy260; + } else { + if (yych <= '$') goto yy265; + if (yych <= '%') goto yy260; + goto yy249; ++>>>>>>> PHP-5.6 } } } else { if (yych <= ']') { if (yych <= ';') { ++<<<<<<< HEAD + if (yych <= ':') goto yy250; + goto yy239; + } else { + if (yych == '=') goto yy239; + goto yy250; + } + } else { + if (yych <= '|') { + if (yych <= '^') goto yy239; + if (yych <= '{') goto yy250; + goto yy239; + } else { + if (yych == '~') goto yy239; + goto yy250; + } + } + } +yy289: + YYDEBUG(289, *YYCURSOR); ++======= + if (yych <= ':') goto yy260; + goto yy249; + } else { + if (yych == '=') goto yy249; + goto yy260; + } + } else { + if (yych <= '|') { + if (yych <= '^') goto yy249; + if (yych <= '{') goto yy260; + goto yy249; + } else { + if (yych == '~') goto yy249; + goto yy260; + } + } + } + yy299: + YYDEBUG(299, *YYCURSOR); ++>>>>>>> PHP-5.6 yyaccept = 3; YYMARKER = ++YYCURSOR; YYFILL(1); yych = *YYCURSOR; ++<<<<<<< HEAD + YYDEBUG(290, *YYCURSOR); + if (yych <= '.') { + if (yych <= 0x1F) { + if (yych <= '\n') { + if (yych <= 0x00) goto yy239; + if (yych <= 0x08) goto yy250; + goto yy239; + } else { + if (yych == '\r') goto yy239; + goto yy250; + } + } else { + if (yych <= '$') { + if (yych <= '"') goto yy239; + if (yych <= '#') goto yy250; + goto yy255; + } else { + if (yych <= '%') goto yy250; + if (yych <= ')') goto yy239; + if (yych <= '-') goto yy250; + goto yy287; ++======= + YYDEBUG(300, *YYCURSOR); + if (yych <= '.') { + if (yych <= 0x1F) { + if (yych <= '\n') { + if (yych <= 0x00) goto yy249; + if (yych <= 0x08) goto yy260; + goto yy249; + } else { + if (yych == '\r') goto yy249; + goto yy260; + } + } else { + if (yych <= '$') { + if (yych <= '"') goto yy249; + if (yych <= '#') goto yy260; + goto yy265; + } else { + if (yych <= '%') goto yy260; + if (yych <= ')') goto yy249; + if (yych <= '-') goto yy260; + goto yy297; ++>>>>>>> PHP-5.6 } } } else { if (yych <= '=') { if (yych <= ':') { ++<<<<<<< HEAD + if (yych <= '/') goto yy250; + if (yych <= '9') goto yy289; + goto yy250; + } else { + if (yych == '<') goto yy250; + goto yy239; + } + } else { + if (yych <= '{') { + if (yych == '^') goto yy239; + goto yy250; + } else { + if (yych == '}') goto yy250; + if (yych <= '~') goto yy239; + goto yy250; + } + } + } +yy291: + YYDEBUG(291, *YYCURSOR); ++======= + if (yych <= '/') goto yy260; + if (yych <= '9') goto yy299; + goto yy260; + } else { + if (yych == '<') goto yy260; + goto yy249; + } + } else { + if (yych <= '{') { + if (yych == '^') goto yy249; + goto yy260; + } else { + if (yych == '}') goto yy260; + if (yych <= '~') goto yy249; + goto yy260; + } + } + } + yy301: + YYDEBUG(301, *YYCURSOR); ++>>>>>>> PHP-5.6 yyaccept = 3; YYMARKER = ++YYCURSOR; YYFILL(1); yych = *YYCURSOR; ++<<<<<<< HEAD + YYDEBUG(292, *YYCURSOR); + if (yych <= '/') { + if (yych <= 0x1F) { + if (yych <= '\n') { + if (yych <= 0x00) goto yy239; + if (yych <= 0x08) goto yy250; + goto yy239; + } else { + if (yych == '\r') goto yy239; + goto yy250; + } + } else { + if (yych <= '$') { + if (yych <= '"') goto yy239; + if (yych <= '#') goto yy250; + goto yy255; + } else { + if (yych <= '%') goto yy250; + if (yych <= ')') goto yy239; + goto yy250; ++======= + YYDEBUG(302, *YYCURSOR); + if (yych <= '/') { + if (yych <= 0x1F) { + if (yych <= '\n') { + if (yych <= 0x00) goto yy249; + if (yych <= 0x08) goto yy260; + goto yy249; + } else { + if (yych == '\r') goto yy249; + goto yy260; + } + } else { + if (yych <= '$') { + if (yych <= '"') goto yy249; + if (yych <= '#') goto yy260; + goto yy265; + } else { + if (yych <= '%') goto yy260; + if (yych <= ')') goto yy249; + goto yy260; ++>>>>>>> PHP-5.6 } } } else { if (yych <= ']') { if (yych <= ';') { ++<<<<<<< HEAD + if (yych <= '9') goto yy291; + if (yych <= ':') goto yy250; + goto yy239; + } else { + if (yych == '=') goto yy239; + goto yy250; + } + } else { + if (yych <= '|') { + if (yych <= '^') goto yy239; + if (yych <= '{') goto yy250; + goto yy239; + } else { + if (yych == '~') goto yy239; + goto yy250; + } + } + } +yy293: + YYDEBUG(293, *YYCURSOR); ++======= + if (yych <= '9') goto yy301; + if (yych <= ':') goto yy260; + goto yy249; + } else { + if (yych == '=') goto yy249; + goto yy260; + } + } else { + if (yych <= '|') { + if (yych <= '^') goto yy249; + if (yych <= '{') goto yy260; + goto yy249; + } else { + if (yych == '~') goto yy249; + goto yy260; + } + } + } + yy303: + YYDEBUG(303, *YYCURSOR); ++>>>>>>> PHP-5.6 yyaccept = 3; YYMARKER = ++YYCURSOR; YYFILL(1); yych = *YYCURSOR; ++<<<<<<< HEAD + YYDEBUG(294, *YYCURSOR); + if (yych <= '/') { + if (yych <= 0x1F) { + if (yych <= '\n') { + if (yych <= 0x00) goto yy239; + if (yych <= 0x08) goto yy250; + goto yy239; + } else { + if (yych == '\r') goto yy239; + goto yy250; + } + } else { + if (yych <= '$') { + if (yych <= '"') goto yy239; + if (yych <= '#') goto yy250; + goto yy255; + } else { + if (yych <= '%') goto yy250; + if (yych <= ')') goto yy239; + goto yy250; ++======= + YYDEBUG(304, *YYCURSOR); + if (yych <= '/') { + if (yych <= 0x1F) { + if (yych <= '\n') { + if (yych <= 0x00) goto yy249; + if (yych <= 0x08) goto yy260; + goto yy249; + } else { + if (yych == '\r') goto yy249; + goto yy260; + } + } else { + if (yych <= '$') { + if (yych <= '"') goto yy249; + if (yych <= '#') goto yy260; + goto yy265; + } else { + if (yych <= '%') goto yy260; + if (yych <= ')') goto yy249; + goto yy260; ++>>>>>>> PHP-5.6 } } } else { if (yych <= ']') { if (yych <= ';') { ++<<<<<<< HEAD + if (yych <= '9') goto yy293; + if (yych <= ':') goto yy250; + goto yy239; + } else { + if (yych == '=') goto yy239; + goto yy250; + } + } else { + if (yych <= '|') { + if (yych <= '^') goto yy239; + if (yych <= '{') goto yy250; + goto yy239; + } else { + if (yych == '~') goto yy239; + goto yy250; + } + } + } +yy295: + YYDEBUG(295, *YYCURSOR); + ++YYCURSOR; + YYFILL(1); + yych = *YYCURSOR; + YYDEBUG(296, *YYCURSOR); + if (yybm[0+yych] & 128) { + goto yy295; + } + YYDEBUG(297, *YYCURSOR); + ++YYCURSOR; + YYDEBUG(298, *YYCURSOR); ++======= + if (yych <= '9') goto yy303; + if (yych <= ':') goto yy260; + goto yy249; + } else { + if (yych == '=') goto yy249; + goto yy260; + } + } else { + if (yych <= '|') { + if (yych <= '^') goto yy249; + if (yych <= '{') goto yy260; + goto yy249; + } else { + if (yych == '~') goto yy249; + goto yy260; + } + } + } + yy305: + YYDEBUG(305, *YYCURSOR); + ++YYCURSOR; + YYFILL(1); + yych = *YYCURSOR; + YYDEBUG(306, *YYCURSOR); + if (yybm[0+yych] & 128) { + goto yy305; + } + YYDEBUG(307, *YYCURSOR); + ++YYCURSOR; + YYDEBUG(308, *YYCURSOR); ++>>>>>>> PHP-5.6 yyleng = YYCURSOR - SCNG(yy_text); -#line 415 "Zend/zend_ini_scanner.l" +#line 416 "Zend/zend_ini_scanner.l" { /* Raw string */ /* Eat leading and trailing single quotes */ if (yytext[0] == '\'' && yytext[yyleng - 1] == '\'') { @@@ -4543,66 -4636,66 +7993,125 @@@ } RETURN_TOKEN(TC_RAW, yytext, yyleng); } ++<<<<<<< HEAD +#line 4547 "Zend/zend_ini_scanner.c" +yy299: + YYDEBUG(299, *YYCURSOR); + ++YYCURSOR; + YYDEBUG(300, *YYCURSOR); ++======= + #line 4640 "Zend/zend_ini_scanner.c" + yy309: + YYDEBUG(309, *YYCURSOR); + ++YYCURSOR; + YYDEBUG(310, *YYCURSOR); ++>>>>>>> PHP-5.6 yyleng = YYCURSOR - SCNG(yy_text); -#line 448 "Zend/zend_ini_scanner.l" +#line 449 "Zend/zend_ini_scanner.l" { /* Variable start */ - yy_push_state(ST_VARNAME TSRMLS_CC); + yy_push_state(ST_VARNAME); return TC_DOLLAR_CURLY; } ++<<<<<<< HEAD +#line 4558 "Zend/zend_ini_scanner.c" +yy301: + YYDEBUG(301, *YYCURSOR); + ++YYCURSOR; + YYFILL(1); + yych = *YYCURSOR; +yy302: + YYDEBUG(302, *YYCURSOR); + if (yych == '\t') goto yy301; + if (yych == ' ') goto yy301; + goto yy231; +yy303: + YYDEBUG(303, *YYCURSOR); + yych = *++YYCURSOR; + goto yy228; +yy304: + YYDEBUG(304, *YYCURSOR); ++======= + #line 4651 "Zend/zend_ini_scanner.c" + yy311: + YYDEBUG(311, *YYCURSOR); + ++YYCURSOR; + YYFILL(1); + yych = *YYCURSOR; + yy312: + YYDEBUG(312, *YYCURSOR); + if (yych == '\t') goto yy311; + if (yych == ' ') goto yy311; + goto yy241; + yy313: + YYDEBUG(313, *YYCURSOR); + yych = *++YYCURSOR; + goto yy238; + yy314: + YYDEBUG(314, *YYCURSOR); ++>>>>>>> PHP-5.6 yyaccept = 1; YYMARKER = ++YYCURSOR; YYFILL(2); yych = *YYCURSOR; ++<<<<<<< HEAD +yy305: + YYDEBUG(305, *YYCURSOR); + if (yych <= 0x1F) { + if (yych <= '\n') { + if (yych <= 0x08) goto yy226; + if (yych <= '\t') goto yy304; + goto yy303; + } else { + if (yych == '\r') goto yy307; + goto yy226; + } + } else { + if (yych <= '"') { + if (yych <= ' ') goto yy304; + if (yych <= '!') goto yy226; + } else { + if (yych == ';') goto yy282; + goto yy226; + } + } + YYDEBUG(306, *YYCURSOR); + yych = *++YYCURSOR; + goto yy233; +yy307: + YYDEBUG(307, *YYCURSOR); + ++YYCURSOR; + if ((yych = *YYCURSOR) == '\n') goto yy303; + goto yy228; ++======= + yy315: + YYDEBUG(315, *YYCURSOR); + if (yych <= 0x1F) { + if (yych <= '\n') { + if (yych <= 0x08) goto yy236; + if (yych <= '\t') goto yy314; + goto yy313; + } else { + if (yych == '\r') goto yy317; + goto yy236; + } + } else { + if (yych <= '"') { + if (yych <= ' ') goto yy314; + if (yych <= '!') goto yy236; + } else { + if (yych == ';') goto yy292; + goto yy236; + } + } + YYDEBUG(316, *YYCURSOR); + yych = *++YYCURSOR; + goto yy243; + yy317: + YYDEBUG(317, *YYCURSOR); + ++YYCURSOR; + if ((yych = *YYCURSOR) == '\n') goto yy313; + goto yy238; ++>>>>>>> PHP-5.6 } /* *********************************** */ yyc_ST_VARNAME: @@@ -4641,51 -4734,51 +8150,93 @@@ 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, }; ++<<<<<<< HEAD + YYDEBUG(308, *YYCURSOR); ++======= + YYDEBUG(318, *YYCURSOR); ++>>>>>>> PHP-5.6 YYFILL(2); yych = *YYCURSOR; if (yych <= ')') { if (yych <= '"') { if (yych <= '\f') { ++<<<<<<< HEAD + if (yych <= 0x08) goto yy310; + if (yych <= '\n') goto yy312; + } else { + if (yych <= '\r') goto yy312; + if (yych >= '!') goto yy312; + } + } else { + if (yych <= '%') { + if (yych == '$') goto yy312; + } else { + if (yych != '\'') goto yy312; ++======= + if (yych <= 0x08) goto yy320; + if (yych <= '\n') goto yy322; + } else { + if (yych <= '\r') goto yy322; + if (yych >= '!') goto yy322; + } + } else { + if (yych <= '%') { + if (yych == '$') goto yy322; + } else { + if (yych != '\'') goto yy322; ++>>>>>>> PHP-5.6 } } } else { if (yych <= '[') { if (yych <= '<') { ++<<<<<<< HEAD + if (yych == ';') goto yy312; + } else { + if (yych <= '=') goto yy312; + if (yych >= '[') goto yy312; + } + } else { + if (yych <= 'z') { + if (yych == '^') goto yy312; + } else { + if (yych == '}') goto yy314; + if (yych <= '~') goto yy312; + } + } + } +yy310: + YYDEBUG(310, *YYCURSOR); + ++YYCURSOR; + yych = *YYCURSOR; + goto yy317; +yy311: + YYDEBUG(311, *YYCURSOR); ++======= + if (yych == ';') goto yy322; + } else { + if (yych <= '=') goto yy322; + if (yych >= '[') goto yy322; + } + } else { + if (yych <= 'z') { + if (yych == '^') goto yy322; + } else { + if (yych == '}') goto yy324; + if (yych <= '~') goto yy322; + } + } + } + yy320: + YYDEBUG(320, *YYCURSOR); + ++YYCURSOR; + yych = *YYCURSOR; + goto yy327; + yy321: + YYDEBUG(321, *YYCURSOR); ++>>>>>>> PHP-5.6 yyleng = YYCURSOR - SCNG(yy_text); -#line 453 "Zend/zend_ini_scanner.l" +#line 454 "Zend/zend_ini_scanner.l" { /* Variable name */ /* Eat leading whitespace */ EAT_LEADING_WHITESPACE(); @@@ -4695,41 -4788,41 +8246,72 @@@ RETURN_TOKEN(TC_VARNAME, yytext, yyleng); } ++<<<<<<< HEAD +#line 4699 "Zend/zend_ini_scanner.c" +yy312: + YYDEBUG(312, *YYCURSOR); + ++YYCURSOR; + YYDEBUG(313, *YYCURSOR); ++======= + #line 4792 "Zend/zend_ini_scanner.c" + yy322: + YYDEBUG(322, *YYCURSOR); + ++YYCURSOR; + YYDEBUG(323, *YYCURSOR); ++>>>>>>> PHP-5.6 yyleng = YYCURSOR - SCNG(yy_text); -#line 654 "Zend/zend_ini_scanner.l" +#line 648 "Zend/zend_ini_scanner.l" { return 0; } ++<<<<<<< HEAD +#line 4709 "Zend/zend_ini_scanner.c" +yy314: + YYDEBUG(314, *YYCURSOR); + ++YYCURSOR; + YYDEBUG(315, *YYCURSOR); ++======= + #line 4802 "Zend/zend_ini_scanner.c" + yy324: + YYDEBUG(324, *YYCURSOR); + ++YYCURSOR; + YYDEBUG(325, *YYCURSOR); ++>>>>>>> PHP-5.6 yyleng = YYCURSOR - SCNG(yy_text); -#line 463 "Zend/zend_ini_scanner.l" +#line 464 "Zend/zend_ini_scanner.l" { /* Variable end */ - yy_pop_state(TSRMLS_C); + yy_pop_state(); return '}'; } ++<<<<<<< HEAD +#line 4720 "Zend/zend_ini_scanner.c" +yy316: + YYDEBUG(316, *YYCURSOR); + ++YYCURSOR; + YYFILL(1); + yych = *YYCURSOR; +yy317: + YYDEBUG(317, *YYCURSOR); + if (yybm[0+yych] & 128) { + goto yy316; + } + goto yy311; ++======= + #line 4813 "Zend/zend_ini_scanner.c" + yy326: + YYDEBUG(326, *YYCURSOR); + ++YYCURSOR; + YYFILL(1); + yych = *YYCURSOR; + yy327: + YYDEBUG(327, *YYCURSOR); + if (yybm[0+yych] & 128) { + goto yy326; + } + goto yy321; ++>>>>>>> PHP-5.6 } } -#line 658 "Zend/zend_ini_scanner.l" +#line 652 "Zend/zend_ini_scanner.l" }