diff options
author | Felipe Pena <felipe@php.net> | 2010-06-29 11:37:13 +0000 |
---|---|---|
committer | Felipe Pena <felipe@php.net> | 2010-06-29 11:37:13 +0000 |
commit | 96bb25e8e7e12ce7186e5417c322f90e09a77b58 (patch) | |
tree | 2feb9faa1681fab4a1077a6d600dc3a2a4acd856 | |
parent | 865f85718fae288c2a2023c537000c9d1a9356ed (diff) | |
download | php-git-96bb25e8e7e12ce7186e5417c322f90e09a77b58.tar.gz |
- Reverted fix for bug #48930 (due binary compatibility breakage)
-rw-r--r-- | NEWS | 1 | ||||
-rw-r--r-- | Zend/zend_globals.h | 1 | ||||
-rw-r--r-- | Zend/zend_language_scanner.c | 669 | ||||
-rw-r--r-- | Zend/zend_language_scanner.l | 3 | ||||
-rw-r--r-- | Zend/zend_language_scanner_defs.h | 2 | ||||
-rw-r--r-- | sapi/cgi/cgi_main.c | 2 | ||||
-rw-r--r-- | sapi/cli/php_cli.c | 3 |
7 files changed, 336 insertions, 345 deletions
@@ -17,7 +17,6 @@ PHP NEWS (Felipe) - Fixed bug #52115 (mysqli_result::fetch_all returns null, not an empty array). (Andrey) -- Fixed bug #48930 (__COMPILER_HALT_OFFSET__ incorrect in PHP >= 5.3). (Felipe) 17 Jun 2010, PHP 5.3.3 RC1 - Upgraded bundled sqlite to version 3.6.23.1. (Ilia) diff --git a/Zend/zend_globals.h b/Zend/zend_globals.h index 9f6dea0466..368e88ec39 100644 --- a/Zend/zend_globals.h +++ b/Zend/zend_globals.h @@ -88,7 +88,6 @@ struct _zend_compiler_globals { char *compiled_filename; int zend_lineno; - int shebang_len; char *heredoc; int heredoc_len; diff --git a/Zend/zend_language_scanner.c b/Zend/zend_language_scanner.c index 84637bb86c..7b18ba1cf3 100644 --- a/Zend/zend_language_scanner.c +++ b/Zend/zend_language_scanner.c @@ -1,4 +1,4 @@ -/* Generated by re2c 0.13.5 on Sun Jun 27 18:29:37 2010 */ +/* Generated by re2c 0.13.5 on Tue Jun 29 08:18:52 2010 */ #line 1 "Zend/zend_language_scanner.l" /* +----------------------------------------------------------------------+ @@ -301,7 +301,6 @@ ZEND_API int open_file_for_scanning(zend_file_handle *file_handle TSRMLS_DC) CG(start_lineno) = 0; } else { CG(zend_lineno) = 1; - CG(shebang_len) = 0; } CG(increment_lineno) = 0; @@ -445,7 +444,7 @@ ZEND_API int zend_prepare_string_for_scanning(zval *str, char *filename TSRMLS_D ZEND_API size_t zend_get_scanned_file_offset(TSRMLS_D) { - size_t offset = (SCNG(yy_cursor) - SCNG(yy_start)) + CG(shebang_len); + size_t offset = SCNG(yy_cursor) - SCNG(yy_start); #ifdef ZEND_MULTIBYTE if (SCNG(input_filter)) { size_t original_offset = offset, length = 0; do { @@ -835,7 +834,7 @@ restart: yymore_restart: -#line 839 "Zend/zend_language_scanner.c" +#line 838 "Zend/zend_language_scanner.c" { YYCTYPE yych; unsigned int yyaccept = 0; @@ -934,7 +933,7 @@ yyc_INITIAL: yy3: YYDEBUG(3, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1563 "Zend/zend_language_scanner.l" +#line 1562 "Zend/zend_language_scanner.l" { if (YYCURSOR > YYLIMIT) { return 0; @@ -999,7 +998,7 @@ inline_html: HANDLE_NEWLINES(yytext, yyleng); return T_INLINE_HTML; } -#line 1003 "Zend/zend_language_scanner.c" +#line 1002 "Zend/zend_language_scanner.c" yy4: YYDEBUG(4, *YYCURSOR); yych = *++YYCURSOR; @@ -1017,7 +1016,7 @@ yy5: yy6: YYDEBUG(6, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1551 "Zend/zend_language_scanner.l" +#line 1550 "Zend/zend_language_scanner.l" { if (CG(short_tags)) { zendlval->value.str.val = yytext; /* no copying - intentional */ @@ -1029,14 +1028,14 @@ yy6: goto inline_char_handler; } } -#line 1033 "Zend/zend_language_scanner.c" +#line 1032 "Zend/zend_language_scanner.c" yy7: YYDEBUG(7, *YYCURSOR); ++YYCURSOR; if ((yych = *YYCURSOR) == '=') goto yy43; YYDEBUG(8, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1528 "Zend/zend_language_scanner.l" +#line 1527 "Zend/zend_language_scanner.l" { if (CG(asp_tags)) { zendlval->value.str.val = yytext; /* no copying - intentional */ @@ -1048,7 +1047,7 @@ yy7: goto inline_char_handler; } } -#line 1052 "Zend/zend_language_scanner.c" +#line 1051 "Zend/zend_language_scanner.c" yy9: YYDEBUG(9, *YYCURSOR); yych = *++YYCURSOR; @@ -1234,7 +1233,7 @@ yy35: ++YYCURSOR; YYDEBUG(38, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1484 "Zend/zend_language_scanner.l" +#line 1483 "Zend/zend_language_scanner.l" { YYCTYPE *bracket = zend_memrchr(yytext, '<', yyleng - (sizeof("script language=php>") - 1)); @@ -1251,7 +1250,7 @@ yy35: BEGIN(ST_IN_SCRIPTING); return T_OPEN_TAG; } -#line 1255 "Zend/zend_language_scanner.c" +#line 1254 "Zend/zend_language_scanner.c" yy39: YYDEBUG(39, *YYCURSOR); yych = *++YYCURSOR; @@ -1278,7 +1277,7 @@ yy43: ++YYCURSOR; YYDEBUG(44, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1502 "Zend/zend_language_scanner.l" +#line 1501 "Zend/zend_language_scanner.l" { if (CG(asp_tags)) { zendlval->value.str.val = yytext; /* no copying - intentional */ @@ -1290,13 +1289,13 @@ yy43: goto inline_char_handler; } } -#line 1294 "Zend/zend_language_scanner.c" +#line 1293 "Zend/zend_language_scanner.c" yy45: YYDEBUG(45, *YYCURSOR); ++YYCURSOR; YYDEBUG(46, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1515 "Zend/zend_language_scanner.l" +#line 1514 "Zend/zend_language_scanner.l" { if (CG(short_tags)) { zendlval->value.str.val = yytext; /* no copying - intentional */ @@ -1308,7 +1307,7 @@ yy45: goto inline_char_handler; } } -#line 1312 "Zend/zend_language_scanner.c" +#line 1311 "Zend/zend_language_scanner.c" yy47: YYDEBUG(47, *YYCURSOR); yych = *++YYCURSOR; @@ -1335,7 +1334,7 @@ yy50: yy51: YYDEBUG(51, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1541 "Zend/zend_language_scanner.l" +#line 1540 "Zend/zend_language_scanner.l" { zendlval->value.str.val = yytext; /* no copying - intentional */ zendlval->value.str.len = yyleng; @@ -1344,7 +1343,7 @@ yy51: BEGIN(ST_IN_SCRIPTING); return T_OPEN_TAG; } -#line 1348 "Zend/zend_language_scanner.c" +#line 1347 "Zend/zend_language_scanner.c" yy52: YYDEBUG(52, *YYCURSOR); ++YYCURSOR; @@ -1415,7 +1414,7 @@ yyc_ST_BACKQUOTE: yy56: YYDEBUG(56, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2021 "Zend/zend_language_scanner.l" +#line 2020 "Zend/zend_language_scanner.l" { if (YYCURSOR > YYLIMIT) { return 0; @@ -1456,7 +1455,7 @@ yy56: zend_scan_escape_string(zendlval, yytext, yyleng, '`' TSRMLS_CC); return T_ENCAPSED_AND_WHITESPACE; } -#line 1460 "Zend/zend_language_scanner.c" +#line 1459 "Zend/zend_language_scanner.c" yy57: YYDEBUG(57, *YYCURSOR); yych = *++YYCURSOR; @@ -1467,12 +1466,12 @@ yy58: ++YYCURSOR; YYDEBUG(59, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1965 "Zend/zend_language_scanner.l" +#line 1964 "Zend/zend_language_scanner.l" { BEGIN(ST_IN_SCRIPTING); return '`'; } -#line 1476 "Zend/zend_language_scanner.c" +#line 1475 "Zend/zend_language_scanner.c" yy60: YYDEBUG(60, *YYCURSOR); yych = *++YYCURSOR; @@ -1482,14 +1481,14 @@ yy61: ++YYCURSOR; YYDEBUG(62, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1952 "Zend/zend_language_scanner.l" +#line 1951 "Zend/zend_language_scanner.l" { zendlval->value.lval = (long) '{'; yy_push_state(ST_IN_SCRIPTING TSRMLS_CC); yyless(1); return T_CURLY_OPEN; } -#line 1493 "Zend/zend_language_scanner.c" +#line 1492 "Zend/zend_language_scanner.c" yy63: YYDEBUG(63, *YYCURSOR); yyaccept = 0; @@ -1505,24 +1504,24 @@ yy63: yy65: YYDEBUG(65, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1650 "Zend/zend_language_scanner.l" +#line 1649 "Zend/zend_language_scanner.l" { zend_copy_value(zendlval, (yytext+1), (yyleng-1)); zendlval->type = IS_STRING; return T_VARIABLE; } -#line 1515 "Zend/zend_language_scanner.c" +#line 1514 "Zend/zend_language_scanner.c" yy66: YYDEBUG(66, *YYCURSOR); ++YYCURSOR; YYDEBUG(67, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1277 "Zend/zend_language_scanner.l" +#line 1276 "Zend/zend_language_scanner.l" { yy_push_state(ST_LOOKING_FOR_VARNAME TSRMLS_CC); return T_DOLLAR_OPEN_CURLY_BRACES; } -#line 1526 "Zend/zend_language_scanner.c" +#line 1525 "Zend/zend_language_scanner.c" yy68: YYDEBUG(68, *YYCURSOR); yych = *++YYCURSOR; @@ -1536,7 +1535,7 @@ yy70: ++YYCURSOR; YYDEBUG(71, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1642 "Zend/zend_language_scanner.l" +#line 1641 "Zend/zend_language_scanner.l" { yyless(yyleng - 1); yy_push_state(ST_VAR_OFFSET TSRMLS_CC); @@ -1544,7 +1543,7 @@ yy70: zendlval->type = IS_STRING; return T_VARIABLE; } -#line 1548 "Zend/zend_language_scanner.c" +#line 1547 "Zend/zend_language_scanner.c" yy72: YYDEBUG(72, *YYCURSOR); yych = *++YYCURSOR; @@ -1562,7 +1561,7 @@ yy73: ++YYCURSOR; YYDEBUG(74, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1632 "Zend/zend_language_scanner.l" +#line 1631 "Zend/zend_language_scanner.l" { yyless(yyleng - 3); yy_push_state(ST_LOOKING_FOR_PROPERTY TSRMLS_CC); @@ -1570,7 +1569,7 @@ yy73: zendlval->type = IS_STRING; return T_VARIABLE; } -#line 1574 "Zend/zend_language_scanner.c" +#line 1573 "Zend/zend_language_scanner.c" } /* *********************************** */ yyc_ST_DOUBLE_QUOTES: @@ -1638,7 +1637,7 @@ yy77: yy78: YYDEBUG(78, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1971 "Zend/zend_language_scanner.l" +#line 1970 "Zend/zend_language_scanner.l" { if (GET_DOUBLE_QUOTES_SCANNED_LENGTH()) { YYCURSOR += GET_DOUBLE_QUOTES_SCANNED_LENGTH() - 1; @@ -1687,7 +1686,7 @@ double_quotes_scan_done: zend_scan_escape_string(zendlval, yytext, yyleng, '"' TSRMLS_CC); return T_ENCAPSED_AND_WHITESPACE; } -#line 1691 "Zend/zend_language_scanner.c" +#line 1690 "Zend/zend_language_scanner.c" yy79: YYDEBUG(79, *YYCURSOR); yych = *++YYCURSOR; @@ -1698,12 +1697,12 @@ yy80: ++YYCURSOR; YYDEBUG(81, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1960 "Zend/zend_language_scanner.l" +#line 1959 "Zend/zend_language_scanner.l" { BEGIN(ST_IN_SCRIPTING); return '"'; } -#line 1707 "Zend/zend_language_scanner.c" +#line 1706 "Zend/zend_language_scanner.c" yy82: YYDEBUG(82, *YYCURSOR); yych = *++YYCURSOR; @@ -1713,14 +1712,14 @@ yy83: ++YYCURSOR; YYDEBUG(84, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1952 "Zend/zend_language_scanner.l" +#line 1951 "Zend/zend_language_scanner.l" { zendlval->value.lval = (long) '{'; yy_push_state(ST_IN_SCRIPTING TSRMLS_CC); yyless(1); return T_CURLY_OPEN; } -#line 1724 "Zend/zend_language_scanner.c" +#line 1723 "Zend/zend_language_scanner.c" yy85: YYDEBUG(85, *YYCURSOR); yyaccept = 0; @@ -1736,24 +1735,24 @@ yy85: yy87: YYDEBUG(87, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1650 "Zend/zend_language_scanner.l" +#line 1649 "Zend/zend_language_scanner.l" { zend_copy_value(zendlval, (yytext+1), (yyleng-1)); zendlval->type = IS_STRING; return T_VARIABLE; } -#line 1746 "Zend/zend_language_scanner.c" +#line 1745 "Zend/zend_language_scanner.c" yy88: YYDEBUG(88, *YYCURSOR); ++YYCURSOR; YYDEBUG(89, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1277 "Zend/zend_language_scanner.l" +#line 1276 "Zend/zend_language_scanner.l" { yy_push_state(ST_LOOKING_FOR_VARNAME TSRMLS_CC); return T_DOLLAR_OPEN_CURLY_BRACES; } -#line 1757 "Zend/zend_language_scanner.c" +#line 1756 "Zend/zend_language_scanner.c" yy90: YYDEBUG(90, *YYCURSOR); yych = *++YYCURSOR; @@ -1767,7 +1766,7 @@ yy92: ++YYCURSOR; YYDEBUG(93, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1642 "Zend/zend_language_scanner.l" +#line 1641 "Zend/zend_language_scanner.l" { yyless(yyleng - 1); yy_push_state(ST_VAR_OFFSET TSRMLS_CC); @@ -1775,7 +1774,7 @@ yy92: zendlval->type = IS_STRING; return T_VARIABLE; } -#line 1779 "Zend/zend_language_scanner.c" +#line 1778 "Zend/zend_language_scanner.c" yy94: YYDEBUG(94, *YYCURSOR); yych = *++YYCURSOR; @@ -1793,7 +1792,7 @@ yy95: ++YYCURSOR; YYDEBUG(96, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1632 "Zend/zend_language_scanner.l" +#line 1631 "Zend/zend_language_scanner.l" { yyless(yyleng - 3); yy_push_state(ST_LOOKING_FOR_PROPERTY TSRMLS_CC); @@ -1801,7 +1800,7 @@ yy95: zendlval->type = IS_STRING; return T_VARIABLE; } -#line 1805 "Zend/zend_language_scanner.c" +#line 1804 "Zend/zend_language_scanner.c" } /* *********************************** */ yyc_ST_END_HEREDOC: @@ -1812,7 +1811,7 @@ yyc_ST_END_HEREDOC: ++YYCURSOR; YYDEBUG(100, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1939 "Zend/zend_language_scanner.l" +#line 1938 "Zend/zend_language_scanner.l" { YYCURSOR += CG(heredoc_len) - 1; yyleng = CG(heredoc_len); @@ -1824,7 +1823,7 @@ yyc_ST_END_HEREDOC: BEGIN(ST_IN_SCRIPTING); return T_END_HEREDOC; } -#line 1828 "Zend/zend_language_scanner.c" +#line 1827 "Zend/zend_language_scanner.c" /* *********************************** */ yyc_ST_HEREDOC: { @@ -1886,7 +1885,7 @@ yy103: yy104: YYDEBUG(104, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2063 "Zend/zend_language_scanner.l" +#line 2062 "Zend/zend_language_scanner.l" { int newline = 0; @@ -1957,7 +1956,7 @@ heredoc_scan_done: zend_scan_escape_string(zendlval, yytext, yyleng - newline, 0 TSRMLS_CC); return T_ENCAPSED_AND_WHITESPACE; } -#line 1961 "Zend/zend_language_scanner.c" +#line 1960 "Zend/zend_language_scanner.c" yy105: YYDEBUG(105, *YYCURSOR); yych = *++YYCURSOR; @@ -1972,14 +1971,14 @@ yy107: ++YYCURSOR; YYDEBUG(108, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1952 "Zend/zend_language_scanner.l" +#line 1951 "Zend/zend_language_scanner.l" { zendlval->value.lval = (long) '{'; yy_push_state(ST_IN_SCRIPTING TSRMLS_CC); yyless(1); return T_CURLY_OPEN; } -#line 1983 "Zend/zend_language_scanner.c" +#line 1982 "Zend/zend_language_scanner.c" yy109: YYDEBUG(109, *YYCURSOR); yyaccept = 0; @@ -1995,24 +1994,24 @@ yy109: yy111: YYDEBUG(111, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1650 "Zend/zend_language_scanner.l" +#line 1649 "Zend/zend_language_scanner.l" { zend_copy_value(zendlval, (yytext+1), (yyleng-1)); zendlval->type = IS_STRING; return T_VARIABLE; } -#line 2005 "Zend/zend_language_scanner.c" +#line 2004 "Zend/zend_language_scanner.c" yy112: YYDEBUG(112, *YYCURSOR); ++YYCURSOR; YYDEBUG(113, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1277 "Zend/zend_language_scanner.l" +#line 1276 "Zend/zend_language_scanner.l" { yy_push_state(ST_LOOKING_FOR_VARNAME TSRMLS_CC); return T_DOLLAR_OPEN_CURLY_BRACES; } -#line 2016 "Zend/zend_language_scanner.c" +#line 2015 "Zend/zend_language_scanner.c" yy114: YYDEBUG(114, *YYCURSOR); yych = *++YYCURSOR; @@ -2026,7 +2025,7 @@ yy116: ++YYCURSOR; YYDEBUG(117, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1642 "Zend/zend_language_scanner.l" +#line 1641 "Zend/zend_language_scanner.l" { yyless(yyleng - 1); yy_push_state(ST_VAR_OFFSET TSRMLS_CC); @@ -2034,7 +2033,7 @@ yy116: zendlval->type = IS_STRING; return T_VARIABLE; } -#line 2038 "Zend/zend_language_scanner.c" +#line 2037 "Zend/zend_language_scanner.c" yy118: YYDEBUG(118, *YYCURSOR); yych = *++YYCURSOR; @@ -2052,7 +2051,7 @@ yy119: ++YYCURSOR; YYDEBUG(120, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1632 "Zend/zend_language_scanner.l" +#line 1631 "Zend/zend_language_scanner.l" { yyless(yyleng - 3); yy_push_state(ST_LOOKING_FOR_PROPERTY TSRMLS_CC); @@ -2060,7 +2059,7 @@ yy119: zendlval->type = IS_STRING; return T_VARIABLE; } -#line 2064 "Zend/zend_language_scanner.c" +#line 2063 "Zend/zend_language_scanner.c" } /* *********************************** */ yyc_ST_IN_SCRIPTING: @@ -2241,13 +2240,13 @@ yy123: yy124: YYDEBUG(124, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1673 "Zend/zend_language_scanner.l" +#line 1672 "Zend/zend_language_scanner.l" { zend_copy_value(zendlval, yytext, yyleng); zendlval->type = IS_STRING; return T_STRING; } -#line 2251 "Zend/zend_language_scanner.c" +#line 2250 "Zend/zend_language_scanner.c" yy125: YYDEBUG(125, *YYCURSOR); yych = *++YYCURSOR; @@ -2473,11 +2472,11 @@ yy137: yy138: YYDEBUG(138, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1266 "Zend/zend_language_scanner.l" +#line 1265 "Zend/zend_language_scanner.l" { return yytext[0]; } -#line 2481 "Zend/zend_language_scanner.c" +#line 2480 "Zend/zend_language_scanner.c" yy139: YYDEBUG(139, *YYCURSOR); ++YYCURSOR; @@ -2486,7 +2485,7 @@ yy139: yy140: YYDEBUG(140, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1001 "Zend/zend_language_scanner.l" +#line 1000 "Zend/zend_language_scanner.l" { zendlval->value.str.val = yytext; /* no copying - intentional */ zendlval->value.str.len = yyleng; @@ -2494,7 +2493,7 @@ yy140: HANDLE_NEWLINES(yytext, yyleng); return T_WHITESPACE; } -#line 2498 "Zend/zend_language_scanner.c" +#line 2497 "Zend/zend_language_scanner.c" yy141: YYDEBUG(141, *YYCURSOR); yych = *++YYCURSOR; @@ -2505,11 +2504,11 @@ yy142: ++YYCURSOR; YYDEBUG(143, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1030 "Zend/zend_language_scanner.l" +#line 1029 "Zend/zend_language_scanner.l" { return T_NS_SEPARATOR; } -#line 2513 "Zend/zend_language_scanner.c" +#line 2512 "Zend/zend_language_scanner.c" yy144: YYDEBUG(144, *YYCURSOR); yych = *++YYCURSOR; @@ -2737,18 +2736,18 @@ yy167: ++YYCURSOR; YYDEBUG(168, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1271 "Zend/zend_language_scanner.l" +#line 1270 "Zend/zend_language_scanner.l" { yy_push_state(ST_IN_SCRIPTING TSRMLS_CC); return '{'; } -#line 2746 "Zend/zend_language_scanner.c" +#line 2745 "Zend/zend_language_scanner.c" yy169: YYDEBUG(169, *YYCURSOR); ++YYCURSOR; YYDEBUG(170, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1283 "Zend/zend_language_scanner.l" +#line 1282 "Zend/zend_language_scanner.l" { RESET_DOC_COMMENT(); if (!zend_stack_is_empty(&SCNG(state_stack))) { @@ -2756,7 +2755,7 @@ yy169: } return '}'; } -#line 2760 "Zend/zend_language_scanner.c" +#line 2759 "Zend/zend_language_scanner.c" yy171: YYDEBUG(171, *YYCURSOR); yyaccept = 2; @@ -2779,7 +2778,7 @@ yy171: yy172: YYDEBUG(172, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1309 "Zend/zend_language_scanner.l" +#line 1308 "Zend/zend_language_scanner.l" { if (yyleng < MAX_LENGTH_OF_LONG - 1) { /* Won't overflow */ zendlval->value.lval = strtol(yytext, NULL, 0); @@ -2800,7 +2799,7 @@ yy172: zendlval->type = IS_LONG; return T_LNUMBER; } -#line 2804 "Zend/zend_language_scanner.c" +#line 2803 "Zend/zend_language_scanner.c" yy173: YYDEBUG(173, *YYCURSOR); yyaccept = 2; @@ -2828,7 +2827,7 @@ yy175: yy176: YYDEBUG(176, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1680 "Zend/zend_language_scanner.l" +#line 1679 "Zend/zend_language_scanner.l" { while (YYCURSOR < YYLIMIT) { switch (*YYCURSOR++) { @@ -2862,14 +2861,14 @@ yy176: return T_COMMENT; } -#line 2866 "Zend/zend_language_scanner.c" +#line 2865 "Zend/zend_language_scanner.c" yy177: YYDEBUG(177, *YYCURSOR); ++YYCURSOR; yy178: YYDEBUG(178, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1771 "Zend/zend_language_scanner.l" +#line 1770 "Zend/zend_language_scanner.l" { register char *s, *t; char *end; @@ -2939,14 +2938,14 @@ yy178: #endif /* ZEND_MULTIBYTE */ return T_CONSTANT_ENCAPSED_STRING; } -#line 2943 "Zend/zend_language_scanner.c" +#line 2942 "Zend/zend_language_scanner.c" yy179: YYDEBUG(179, *YYCURSOR); ++YYCURSOR; yy180: YYDEBUG(180, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1842 "Zend/zend_language_scanner.l" +#line 1841 "Zend/zend_language_scanner.l" { int bprefix = (yytext[0] != '"') ? 1 : 0; @@ -2987,24 +2986,24 @@ yy180: BEGIN(ST_DOUBLE_QUOTES); return '"'; } -#line 2991 "Zend/zend_language_scanner.c" +#line 2990 "Zend/zend_language_scanner.c" yy181: YYDEBUG(181, *YYCURSOR); ++YYCURSOR; YYDEBUG(182, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1933 "Zend/zend_language_scanner.l" +#line 1932 "Zend/zend_language_scanner.l" { BEGIN(ST_BACKQUOTE); return '`'; } -#line 3002 "Zend/zend_language_scanner.c" +#line 3001 "Zend/zend_language_scanner.c" yy183: YYDEBUG(183, *YYCURSOR); ++YYCURSOR; YYDEBUG(184, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2191 "Zend/zend_language_scanner.l" +#line 2190 "Zend/zend_language_scanner.l" { if (YYCURSOR > YYLIMIT) { return 0; @@ -3013,7 +3012,7 @@ yy183: zend_error(E_COMPILE_WARNING,"Unexpected character in input: '%c' (ASCII=%d) state=%d", yytext[0], yytext[0], YYSTATE); goto restart; } -#line 3017 "Zend/zend_language_scanner.c" +#line 3016 "Zend/zend_language_scanner.c" yy185: YYDEBUG(185, *YYCURSOR); ++YYCURSOR; @@ -3040,13 +3039,13 @@ yy187: yy189: YYDEBUG(189, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1370 "Zend/zend_language_scanner.l" +#line 1369 "Zend/zend_language_scanner.l" { zendlval->value.dval = zend_strtod(yytext, NULL); zendlval->type = IS_DOUBLE; return T_DNUMBER; } -#line 3050 "Zend/zend_language_scanner.c" +#line 3049 "Zend/zend_language_scanner.c" yy190: YYDEBUG(190, *YYCURSOR); yyaccept = 2; @@ -3131,7 +3130,7 @@ yy198: } YYDEBUG(200, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1330 "Zend/zend_language_scanner.l" +#line 1329 "Zend/zend_language_scanner.l" { char *hex = yytext + 2; /* Skip "0x" */ int len = yyleng - 2; @@ -3152,7 +3151,7 @@ yy198: return T_DNUMBER; } } -#line 3156 "Zend/zend_language_scanner.c" +#line 3155 "Zend/zend_language_scanner.c" yy201: YYDEBUG(201, *YYCURSOR); ++YYCURSOR; @@ -3161,7 +3160,7 @@ yy201: yy202: YYDEBUG(202, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1748 "Zend/zend_language_scanner.l" +#line 1747 "Zend/zend_language_scanner.l" { zendlval->value.str.val = yytext; /* no copying - intentional */ zendlval->value.str.len = yyleng; @@ -3169,7 +3168,7 @@ yy202: BEGIN(INITIAL); return T_CLOSE_TAG; /* implicit ';' at php-end tag */ } -#line 3173 "Zend/zend_language_scanner.c" +#line 3172 "Zend/zend_language_scanner.c" yy203: YYDEBUG(203, *YYCURSOR); yych = *++YYCURSOR; @@ -3203,13 +3202,13 @@ yy205: yy207: YYDEBUG(207, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1650 "Zend/zend_language_scanner.l" +#line 1649 "Zend/zend_language_scanner.l" { zend_copy_value(zendlval, (yytext+1), (yyleng-1)); zendlval->type = IS_STRING; return T_VARIABLE; } -#line 3213 "Zend/zend_language_scanner.c" +#line 3212 "Zend/zend_language_scanner.c" yy208: YYDEBUG(208, *YYCURSOR); yych = *++YYCURSOR; @@ -3223,11 +3222,11 @@ yy209: } YYDEBUG(210, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1254 "Zend/zend_language_scanner.l" +#line 1253 "Zend/zend_language_scanner.l" { return T_LOGICAL_XOR; } -#line 3231 "Zend/zend_language_scanner.c" +#line 3230 "Zend/zend_language_scanner.c" yy211: YYDEBUG(211, *YYCURSOR); ++YYCURSOR; @@ -3236,61 +3235,61 @@ yy211: } YYDEBUG(212, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1246 "Zend/zend_language_scanner.l" +#line 1245 "Zend/zend_language_scanner.l" { return T_LOGICAL_OR; } -#line 3244 "Zend/zend_language_scanner.c" +#line 3243 "Zend/zend_language_scanner.c" yy213: YYDEBUG(213, *YYCURSOR); ++YYCURSOR; YYDEBUG(214, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1234 "Zend/zend_language_scanner.l" +#line 1233 "Zend/zend_language_scanner.l" { return T_XOR_EQUAL; } -#line 3254 "Zend/zend_language_scanner.c" +#line 3253 "Zend/zend_language_scanner.c" yy215: YYDEBUG(215, *YYCURSOR); ++YYCURSOR; YYDEBUG(216, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1238 "Zend/zend_language_scanner.l" +#line 1237 "Zend/zend_language_scanner.l" { return T_BOOLEAN_OR; } -#line 3264 "Zend/zend_language_scanner.c" +#line 3263 "Zend/zend_language_scanner.c" yy217: YYDEBUG(217, *YYCURSOR); ++YYCURSOR; YYDEBUG(218, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1230 "Zend/zend_language_scanner.l" +#line 1229 "Zend/zend_language_scanner.l" { return T_OR_EQUAL; } -#line 3274 "Zend/zend_language_scanner.c" +#line 3273 "Zend/zend_language_scanner.c" yy219: YYDEBUG(219, *YYCURSOR); ++YYCURSOR; YYDEBUG(220, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1242 "Zend/zend_language_scanner.l" +#line 1241 "Zend/zend_language_scanner.l" { return T_BOOLEAN_AND; } -#line 3284 "Zend/zend_language_scanner.c" +#line 3283 "Zend/zend_language_scanner.c" yy221: YYDEBUG(221, *YYCURSOR); ++YYCURSOR; YYDEBUG(222, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1226 "Zend/zend_language_scanner.l" +#line 1225 "Zend/zend_language_scanner.l" { return T_AND_EQUAL; } -#line 3294 "Zend/zend_language_scanner.c" +#line 3293 "Zend/zend_language_scanner.c" yy223: YYDEBUG(223, *YYCURSOR); ++YYCURSOR; @@ -3299,7 +3298,7 @@ yy223: yy224: YYDEBUG(224, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1757 "Zend/zend_language_scanner.l" +#line 1756 "Zend/zend_language_scanner.l" { if (CG(asp_tags)) { BEGIN(INITIAL); @@ -3312,17 +3311,17 @@ yy224: return yytext[0]; } } -#line 3316 "Zend/zend_language_scanner.c" +#line 3315 "Zend/zend_language_scanner.c" yy225: YYDEBUG(225, *YYCURSOR); ++YYCURSOR; YYDEBUG(226, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1214 "Zend/zend_language_scanner.l" +#line 1213 "Zend/zend_language_scanner.l" { return T_MOD_EQUAL; } -#line 3326 "Zend/zend_language_scanner.c" +#line 3325 "Zend/zend_language_scanner.c" yy227: YYDEBUG(227, *YYCURSOR); yych = *++YYCURSOR; @@ -3353,11 +3352,11 @@ yy231: ++YYCURSOR; YYDEBUG(232, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1210 "Zend/zend_language_scanner.l" +#line 1209 "Zend/zend_language_scanner.l" { return T_CONCAT_EQUAL; } -#line 3361 "Zend/zend_language_scanner.c" +#line 3360 "Zend/zend_language_scanner.c" yy233: YYDEBUG(233, *YYCURSOR); yyaccept = 4; @@ -3366,7 +3365,7 @@ yy233: yy234: YYDEBUG(234, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1714 "Zend/zend_language_scanner.l" +#line 1713 "Zend/zend_language_scanner.l" { int doc_com; @@ -3400,7 +3399,7 @@ yy234: return T_COMMENT; } -#line 3404 "Zend/zend_language_scanner.c" +#line 3403 "Zend/zend_language_scanner.c" yy235: YYDEBUG(235, *YYCURSOR); yych = *++YYCURSOR; @@ -3410,11 +3409,11 @@ yy236: ++YYCURSOR; YYDEBUG(237, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1206 "Zend/zend_language_scanner.l" +#line 1205 "Zend/zend_language_scanner.l" { return T_DIV_EQUAL; } -#line 3418 "Zend/zend_language_scanner.c" +#line 3417 "Zend/zend_language_scanner.c" yy238: YYDEBUG(238, *YYCURSOR); yych = *++YYCURSOR; @@ -3437,42 +3436,42 @@ yy241: ++YYCURSOR; YYDEBUG(242, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1202 "Zend/zend_language_scanner.l" +#line 1201 "Zend/zend_language_scanner.l" { return T_MUL_EQUAL; } -#line 3445 "Zend/zend_language_scanner.c" +#line 3444 "Zend/zend_language_scanner.c" yy243: YYDEBUG(243, *YYCURSOR); ++YYCURSOR; if ((yych = *YYCURSOR) == '=') goto yy247; YYDEBUG(244, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1262 "Zend/zend_language_scanner.l" +#line 1261 "Zend/zend_language_scanner.l" { return T_SR; } -#line 3456 "Zend/zend_language_scanner.c" +#line 3455 "Zend/zend_language_scanner.c" yy245: YYDEBUG(245, *YYCURSOR); ++YYCURSOR; YYDEBUG(246, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1190 "Zend/zend_language_scanner.l" +#line 1189 "Zend/zend_language_scanner.l" { return T_IS_GREATER_OR_EQUAL; } -#line 3466 "Zend/zend_language_scanner.c" +#line 3465 "Zend/zend_language_scanner.c" yy247: YYDEBUG(247, *YYCURSOR); ++YYCURSOR; YYDEBUG(248, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1222 "Zend/zend_language_scanner.l" +#line 1221 "Zend/zend_language_scanner.l" { return T_SR_EQUAL; } -#line 3476 "Zend/zend_language_scanner.c" +#line 3475 "Zend/zend_language_scanner.c" yy249: YYDEBUG(249, *YYCURSOR); yyaccept = 5; @@ -3483,11 +3482,11 @@ yy249: yy250: YYDEBUG(250, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1258 "Zend/zend_language_scanner.l" +#line 1257 "Zend/zend_language_scanner.l" { return T_SL; } -#line 3491 "Zend/zend_language_scanner.c" +#line 3490 "Zend/zend_language_scanner.c" yy251: YYDEBUG(251, *YYCURSOR); yych = *++YYCURSOR; @@ -3499,22 +3498,22 @@ yy252: ++YYCURSOR; YYDEBUG(253, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1186 "Zend/zend_language_scanner.l" +#line 1185 "Zend/zend_language_scanner.l" { return T_IS_SMALLER_OR_EQUAL; } -#line 3507 "Zend/zend_language_scanner.c" +#line 3506 "Zend/zend_language_scanner.c" yy254: YYDEBUG(254, *YYCURSOR); ++YYCURSOR; yy255: YYDEBUG(255, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1182 "Zend/zend_language_scanner.l" +#line 1181 "Zend/zend_language_scanner.l" { return T_IS_NOT_EQUAL; } -#line 3518 "Zend/zend_language_scanner.c" +#line 3517 "Zend/zend_language_scanner.c" yy256: YYDEBUG(256, *YYCURSOR); yych = *++YYCURSOR; @@ -3565,11 +3564,11 @@ yy263: ++YYCURSOR; YYDEBUG(264, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1218 "Zend/zend_language_scanner.l" +#line 1217 "Zend/zend_language_scanner.l" { return T_SL_EQUAL; } -#line 3573 "Zend/zend_language_scanner.c" +#line 3572 "Zend/zend_language_scanner.c" yy265: YYDEBUG(265, *YYCURSOR); ++YYCURSOR; @@ -3674,7 +3673,7 @@ yy274: yy275: YYDEBUG(275, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1884 "Zend/zend_language_scanner.l" +#line 1883 "Zend/zend_language_scanner.l" { char *s; int bprefix = (yytext[0] != '<') ? 1 : 0; @@ -3722,7 +3721,7 @@ yy275: return T_START_HEREDOC; } -#line 3726 "Zend/zend_language_scanner.c" +#line 3725 "Zend/zend_language_scanner.c" yy276: YYDEBUG(276, *YYCURSOR); yych = *++YYCURSOR; @@ -3762,31 +3761,31 @@ yy279: ++YYCURSOR; YYDEBUG(281, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1174 "Zend/zend_language_scanner.l" +#line 1173 "Zend/zend_language_scanner.l" { return T_IS_NOT_IDENTICAL; } -#line 3770 "Zend/zend_language_scanner.c" +#line 3769 "Zend/zend_language_scanner.c" yy282: YYDEBUG(282, *YYCURSOR); ++YYCURSOR; YYDEBUG(283, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1194 "Zend/zend_language_scanner.l" +#line 1193 "Zend/zend_language_scanner.l" { return T_PLUS_EQUAL; } -#line 3780 "Zend/zend_language_scanner.c" +#line 3779 "Zend/zend_language_scanner.c" yy284: YYDEBUG(284, *YYCURSOR); ++YYCURSOR; YYDEBUG(285, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1162 "Zend/zend_language_scanner.l" +#line 1161 "Zend/zend_language_scanner.l" { return T_INC; } -#line 3790 "Zend/zend_language_scanner.c" +#line 3789 "Zend/zend_language_scanner.c" yy286: YYDEBUG(286, *YYCURSOR); yych = *++YYCURSOR; @@ -3805,42 +3804,42 @@ yy288: } YYDEBUG(289, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1154 "Zend/zend_language_scanner.l" +#line 1153 "Zend/zend_language_scanner.l" { return T_LIST; } -#line 3813 "Zend/zend_language_scanner.c" +#line 3812 "Zend/zend_language_scanner.c" yy290: YYDEBUG(290, *YYCURSOR); ++YYCURSOR; if ((yych = *YYCURSOR) == '=') goto yy294; YYDEBUG(291, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1178 "Zend/zend_language_scanner.l" +#line 1177 "Zend/zend_language_scanner.l" { return T_IS_EQUAL; } -#line 3824 "Zend/zend_language_scanner.c" +#line 3823 "Zend/zend_language_scanner.c" yy292: YYDEBUG(292, *YYCURSOR); ++YYCURSOR; YYDEBUG(293, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1150 "Zend/zend_language_scanner.l" +#line 1149 "Zend/zend_language_scanner.l" { return T_DOUBLE_ARROW; } -#line 3834 "Zend/zend_language_scanner.c" +#line 3833 "Zend/zend_language_scanner.c" yy294: YYDEBUG(294, *YYCURSOR); ++YYCURSOR; YYDEBUG(295, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1170 "Zend/zend_language_scanner.l" +#line 1169 "Zend/zend_language_scanner.l" { return T_IS_IDENTICAL; } -#line 3844 "Zend/zend_language_scanner.c" +#line 3843 "Zend/zend_language_scanner.c" yy296: YYDEBUG(296, *YYCURSOR); yych = *++YYCURSOR; @@ -3962,7 +3961,7 @@ yy311: } YYDEBUG(314, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1474 "Zend/zend_language_scanner.l" +#line 1473 "Zend/zend_language_scanner.l" { if (CG(current_namespace)) { *zendlval = *CG(current_namespace); @@ -3972,7 +3971,7 @@ yy311: } return T_NS_C; } -#line 3976 "Zend/zend_language_scanner.c" +#line 3975 "Zend/zend_language_scanner.c" yy315: YYDEBUG(315, *YYCURSOR); yych = *++YYCURSOR; @@ -3992,7 +3991,7 @@ yy316: } YYDEBUG(319, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1447 "Zend/zend_language_scanner.l" +#line 1446 "Zend/zend_language_scanner.l" { char *filename = zend_get_compiled_filename(TSRMLS_C); const size_t filename_len = strlen(filename); @@ -4019,7 +4018,7 @@ yy316: zendlval->type = IS_STRING; return T_DIR; } -#line 4023 "Zend/zend_language_scanner.c" +#line 4022 "Zend/zend_language_scanner.c" yy320: YYDEBUG(320, *YYCURSOR); yych = *++YYCURSOR; @@ -4044,13 +4043,13 @@ yy322: } YYDEBUG(325, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1429 "Zend/zend_language_scanner.l" +#line 1428 "Zend/zend_language_scanner.l" { zendlval->value.lval = CG(zend_lineno); zendlval->type = IS_LONG; return T_LINE; } -#line 4054 "Zend/zend_language_scanner.c" +#line 4053 "Zend/zend_language_scanner.c" yy326: YYDEBUG(326, *YYCURSOR); yych = *++YYCURSOR; @@ -4085,7 +4084,7 @@ yy330: } YYDEBUG(333, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1408 "Zend/zend_language_scanner.l" +#line 1407 "Zend/zend_language_scanner.l" { char *class_name = CG(active_class_entry) ? CG(active_class_entry)->name : NULL; char *func_name = CG(active_op_array)? CG(active_op_array)->function_name : NULL; @@ -4106,7 +4105,7 @@ yy330: zendlval->type = IS_STRING; return T_METHOD_C; } -#line 4110 "Zend/zend_language_scanner.c" +#line 4109 "Zend/zend_language_scanner.c" yy334: YYDEBUG(334, *YYCURSOR); yych = *++YYCURSOR; @@ -4157,7 +4156,7 @@ yy341: } YYDEBUG(344, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1392 "Zend/zend_language_scanner.l" +#line 1391 "Zend/zend_language_scanner.l" { char *func_name = NULL; @@ -4173,7 +4172,7 @@ yy341: zendlval->type = IS_STRING; return T_FUNC_C; } -#line 4177 "Zend/zend_language_scanner.c" +#line 4176 "Zend/zend_language_scanner.c" yy345: YYDEBUG(345, *YYCURSOR); yych = *++YYCURSOR; @@ -4193,7 +4192,7 @@ yy346: } YYDEBUG(349, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1435 "Zend/zend_language_scanner.l" +#line 1434 "Zend/zend_language_scanner.l" { char *filename = zend_get_compiled_filename(TSRMLS_C); @@ -4205,7 +4204,7 @@ yy346: zendlval->type = IS_STRING; return T_FILE; } -#line 4209 "Zend/zend_language_scanner.c" +#line 4208 "Zend/zend_language_scanner.c" yy350: YYDEBUG(350, *YYCURSOR); yych = *++YYCURSOR; @@ -4235,7 +4234,7 @@ yy353: } YYDEBUG(356, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1376 "Zend/zend_language_scanner.l" +#line 1375 "Zend/zend_language_scanner.l" { char *class_name = NULL; @@ -4251,7 +4250,7 @@ yy353: zendlval->type = IS_STRING; return T_CLASS_C; } -#line 4255 "Zend/zend_language_scanner.c" +#line 4254 "Zend/zend_language_scanner.c" yy357: YYDEBUG(357, *YYCURSOR); yych = *++YYCURSOR; @@ -4313,11 +4312,11 @@ yy368: } YYDEBUG(369, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1118 "Zend/zend_language_scanner.l" +#line 1117 "Zend/zend_language_scanner.l" { return T_HALT_COMPILER; } -#line 4321 "Zend/zend_language_scanner.c" +#line 4320 "Zend/zend_language_scanner.c" yy370: YYDEBUG(370, *YYCURSOR); yych = *++YYCURSOR; @@ -4337,11 +4336,11 @@ yy372: } YYDEBUG(373, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1102 "Zend/zend_language_scanner.l" +#line 1101 "Zend/zend_language_scanner.l" { return T_USE; } -#line 4345 "Zend/zend_language_scanner.c" +#line 4344 "Zend/zend_language_scanner.c" yy374: YYDEBUG(374, *YYCURSOR); yych = *++YYCURSOR; @@ -4360,11 +4359,11 @@ yy376: } YYDEBUG(377, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1146 "Zend/zend_language_scanner.l" +#line 1145 "Zend/zend_language_scanner.l" { return T_UNSET; } -#line 4368 "Zend/zend_language_scanner.c" +#line 4367 "Zend/zend_language_scanner.c" yy378: YYDEBUG(378, *YYCURSOR); ++YYCURSOR; @@ -4536,11 +4535,11 @@ yy393: ++YYCURSOR; YYDEBUG(395, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1046 "Zend/zend_language_scanner.l" +#line 1045 "Zend/zend_language_scanner.l" { return T_INT_CAST; } -#line 4544 "Zend/zend_language_scanner.c" +#line 4543 "Zend/zend_language_scanner.c" yy396: YYDEBUG(396, *YYCURSOR); yych = *++YYCURSOR; @@ -4584,11 +4583,11 @@ yy401: ++YYCURSOR; YYDEBUG(404, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1050 "Zend/zend_language_scanner.l" +#line 1049 "Zend/zend_language_scanner.l" { return T_DOUBLE_CAST; } -#line 4592 "Zend/zend_language_scanner.c" +#line 4591 "Zend/zend_language_scanner.c" yy405: YYDEBUG(405, *YYCURSOR); yych = *++YYCURSOR; @@ -4658,11 +4657,11 @@ yy415: ++YYCURSOR; YYDEBUG(418, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1054 "Zend/zend_language_scanner.l" +#line 1053 "Zend/zend_language_scanner.l" { return T_STRING_CAST; } -#line 4666 "Zend/zend_language_scanner.c" +#line 4665 "Zend/zend_language_scanner.c" yy419: YYDEBUG(419, *YYCURSOR); yych = *++YYCURSOR; @@ -4695,11 +4694,11 @@ yy422: ++YYCURSOR; YYDEBUG(425, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1062 "Zend/zend_language_scanner.l" +#line 1061 "Zend/zend_language_scanner.l" { return T_ARRAY_CAST; } -#line 4703 "Zend/zend_language_scanner.c" +#line 4702 "Zend/zend_language_scanner.c" yy426: YYDEBUG(426, *YYCURSOR); yych = *++YYCURSOR; @@ -4737,11 +4736,11 @@ yy430: ++YYCURSOR; YYDEBUG(433, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1066 "Zend/zend_language_scanner.l" +#line 1065 "Zend/zend_language_scanner.l" { return T_OBJECT_CAST; } -#line 4745 "Zend/zend_language_scanner.c" +#line 4744 "Zend/zend_language_scanner.c" yy434: YYDEBUG(434, *YYCURSOR); yych = *++YYCURSOR; @@ -4782,11 +4781,11 @@ yy439: ++YYCURSOR; YYDEBUG(441, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1070 "Zend/zend_language_scanner.l" +#line 1069 "Zend/zend_language_scanner.l" { return T_BOOL_CAST; } -#line 4790 "Zend/zend_language_scanner.c" +#line 4789 "Zend/zend_language_scanner.c" yy442: YYDEBUG(442, *YYCURSOR); yych = *++YYCURSOR; @@ -4830,11 +4829,11 @@ yy447: ++YYCURSOR; YYDEBUG(450, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1058 "Zend/zend_language_scanner.l" +#line 1057 "Zend/zend_language_scanner.l" { return T_STRING_CAST; } -#line 4838 "Zend/zend_language_scanner.c" +#line 4837 "Zend/zend_language_scanner.c" yy451: YYDEBUG(451, *YYCURSOR); yych = *++YYCURSOR; @@ -4867,11 +4866,11 @@ yy454: ++YYCURSOR; YYDEBUG(457, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1074 "Zend/zend_language_scanner.l" +#line 1073 "Zend/zend_language_scanner.l" { return T_UNSET_CAST; } -#line 4875 "Zend/zend_language_scanner.c" +#line 4874 "Zend/zend_language_scanner.c" yy458: YYDEBUG(458, *YYCURSOR); yych = *++YYCURSOR; @@ -4885,11 +4884,11 @@ yy459: } YYDEBUG(460, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1042 "Zend/zend_language_scanner.l" +#line 1041 "Zend/zend_language_scanner.l" { return T_VAR; } -#line 4893 "Zend/zend_language_scanner.c" +#line 4892 "Zend/zend_language_scanner.c" yy461: YYDEBUG(461, *YYCURSOR); yych = *++YYCURSOR; @@ -4909,11 +4908,11 @@ yy463: } YYDEBUG(464, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1034 "Zend/zend_language_scanner.l" +#line 1033 "Zend/zend_language_scanner.l" { return T_NEW; } -#line 4917 "Zend/zend_language_scanner.c" +#line 4916 "Zend/zend_language_scanner.c" yy465: YYDEBUG(465, *YYCURSOR); yych = *++YYCURSOR; @@ -4952,21 +4951,21 @@ yy471: } YYDEBUG(472, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1098 "Zend/zend_language_scanner.l" +#line 1097 "Zend/zend_language_scanner.l" { return T_NAMESPACE; } -#line 4960 "Zend/zend_language_scanner.c" +#line 4959 "Zend/zend_language_scanner.c" yy473: YYDEBUG(473, *YYCURSOR); ++YYCURSOR; YYDEBUG(474, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1026 "Zend/zend_language_scanner.l" +#line 1025 "Zend/zend_language_scanner.l" { return T_PAAMAYIM_NEKUDOTAYIM; } -#line 4970 "Zend/zend_language_scanner.c" +#line 4969 "Zend/zend_language_scanner.c" yy475: YYDEBUG(475, *YYCURSOR); ++YYCURSOR; @@ -4988,32 +4987,32 @@ yy477: ++YYCURSOR; YYDEBUG(478, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1198 "Zend/zend_language_scanner.l" +#line 1197 "Zend/zend_language_scanner.l" { return T_MINUS_EQUAL; } -#line 4996 "Zend/zend_language_scanner.c" +#line 4995 "Zend/zend_language_scanner.c" yy479: YYDEBUG(479, *YYCURSOR); ++YYCURSOR; YYDEBUG(480, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1166 "Zend/zend_language_scanner.l" +#line 1165 "Zend/zend_language_scanner.l" { return T_DEC; } -#line 5006 "Zend/zend_language_scanner.c" +#line 5005 "Zend/zend_language_scanner.c" yy481: YYDEBUG(481, *YYCURSOR); ++YYCURSOR; YYDEBUG(482, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 996 "Zend/zend_language_scanner.l" +#line 995 "Zend/zend_language_scanner.l" { yy_push_state(ST_LOOKING_FOR_PROPERTY TSRMLS_CC); return T_OBJECT_OPERATOR; } -#line 5017 "Zend/zend_language_scanner.c" +#line 5016 "Zend/zend_language_scanner.c" yy483: YYDEBUG(483, *YYCURSOR); yych = *++YYCURSOR; @@ -5058,11 +5057,11 @@ yy488: } YYDEBUG(489, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1142 "Zend/zend_language_scanner.l" +#line 1141 "Zend/zend_language_scanner.l" { return T_PUBLIC; } -#line 5066 "Zend/zend_language_scanner.c" +#line 5065 "Zend/zend_language_scanner.c" yy490: YYDEBUG(490, *YYCURSOR); yych = *++YYCURSOR; @@ -5117,11 +5116,11 @@ yy497: } YYDEBUG(498, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1138 "Zend/zend_language_scanner.l" +#line 1137 "Zend/zend_language_scanner.l" { return T_PROTECTED; } -#line 5125 "Zend/zend_language_scanner.c" +#line 5124 "Zend/zend_language_scanner.c" yy499: YYDEBUG(499, *YYCURSOR); yych = *++YYCURSOR; @@ -5151,11 +5150,11 @@ yy503: } YYDEBUG(504, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1134 "Zend/zend_language_scanner.l" +#line 1133 "Zend/zend_language_scanner.l" { return T_PRIVATE; } -#line 5159 "Zend/zend_language_scanner.c" +#line 5158 "Zend/zend_language_scanner.c" yy505: YYDEBUG(505, *YYCURSOR); ++YYCURSOR; @@ -5164,11 +5163,11 @@ yy505: } YYDEBUG(506, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 976 "Zend/zend_language_scanner.l" +#line 975 "Zend/zend_language_scanner.l" { return T_PRINT; } -#line 5172 "Zend/zend_language_scanner.c" +#line 5171 "Zend/zend_language_scanner.c" yy507: YYDEBUG(507, *YYCURSOR); yych = *++YYCURSOR; @@ -5193,11 +5192,11 @@ yy510: } YYDEBUG(511, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 968 "Zend/zend_language_scanner.l" +#line 967 "Zend/zend_language_scanner.l" { return T_GOTO; } -#line 5201 "Zend/zend_language_scanner.c" +#line 5200 "Zend/zend_language_scanner.c" yy512: YYDEBUG(512, *YYCURSOR); yych = *++YYCURSOR; @@ -5221,11 +5220,11 @@ yy515: } YYDEBUG(516, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1106 "Zend/zend_language_scanner.l" +#line 1105 "Zend/zend_language_scanner.l" { return T_GLOBAL; } -#line 5229 "Zend/zend_language_scanner.c" +#line 5228 "Zend/zend_language_scanner.c" yy517: YYDEBUG(517, *YYCURSOR); yych = *++YYCURSOR; @@ -5262,11 +5261,11 @@ yy523: } YYDEBUG(524, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 960 "Zend/zend_language_scanner.l" +#line 959 "Zend/zend_language_scanner.l" { return T_BREAK; } -#line 5270 "Zend/zend_language_scanner.c" +#line 5269 "Zend/zend_language_scanner.c" yy525: YYDEBUG(525, *YYCURSOR); yych = *++YYCURSOR; @@ -5306,11 +5305,11 @@ yy531: } YYDEBUG(532, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 944 "Zend/zend_language_scanner.l" +#line 943 "Zend/zend_language_scanner.l" { return T_SWITCH; } -#line 5314 "Zend/zend_language_scanner.c" +#line 5313 "Zend/zend_language_scanner.c" yy533: YYDEBUG(533, *YYCURSOR); yych = *++YYCURSOR; @@ -5334,11 +5333,11 @@ yy536: } YYDEBUG(537, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1122 "Zend/zend_language_scanner.l" +#line 1121 "Zend/zend_language_scanner.l" { return T_STATIC; } -#line 5342 "Zend/zend_language_scanner.c" +#line 5341 "Zend/zend_language_scanner.c" yy538: YYDEBUG(538, *YYCURSOR); yych = *++YYCURSOR; @@ -5365,11 +5364,11 @@ yy541: } YYDEBUG(542, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 940 "Zend/zend_language_scanner.l" +#line 939 "Zend/zend_language_scanner.l" { return T_AS; } -#line 5373 "Zend/zend_language_scanner.c" +#line 5372 "Zend/zend_language_scanner.c" yy543: YYDEBUG(543, *YYCURSOR); yych = *++YYCURSOR; @@ -5388,11 +5387,11 @@ yy545: } YYDEBUG(546, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1158 "Zend/zend_language_scanner.l" +#line 1157 "Zend/zend_language_scanner.l" { return T_ARRAY; } -#line 5396 "Zend/zend_language_scanner.c" +#line 5395 "Zend/zend_language_scanner.c" yy547: YYDEBUG(547, *YYCURSOR); ++YYCURSOR; @@ -5401,11 +5400,11 @@ yy547: } YYDEBUG(548, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1250 "Zend/zend_language_scanner.l" +#line 1249 "Zend/zend_language_scanner.l" { return T_LOGICAL_AND; } -#line 5409 "Zend/zend_language_scanner.c" +#line 5408 "Zend/zend_language_scanner.c" yy549: YYDEBUG(549, *YYCURSOR); yych = *++YYCURSOR; @@ -5439,11 +5438,11 @@ yy554: } YYDEBUG(555, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1126 "Zend/zend_language_scanner.l" +#line 1125 "Zend/zend_language_scanner.l" { return T_ABSTRACT; } -#line 5447 "Zend/zend_language_scanner.c" +#line 5446 "Zend/zend_language_scanner.c" yy556: YYDEBUG(556, *YYCURSOR); yych = *++YYCURSOR; @@ -5467,11 +5466,11 @@ yy559: } YYDEBUG(560, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 900 "Zend/zend_language_scanner.l" +#line 899 "Zend/zend_language_scanner.l" { return T_WHILE; } -#line 5475 "Zend/zend_language_scanner.c" +#line 5474 "Zend/zend_language_scanner.c" yy561: YYDEBUG(561, *YYCURSOR); ++YYCURSOR; @@ -5480,11 +5479,11 @@ yy561: } YYDEBUG(562, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 884 "Zend/zend_language_scanner.l" +#line 883 "Zend/zend_language_scanner.l" { return T_IF; } -#line 5488 "Zend/zend_language_scanner.c" +#line 5487 "Zend/zend_language_scanner.c" yy563: YYDEBUG(563, *YYCURSOR); yych = *++YYCURSOR; @@ -5536,11 +5535,11 @@ yy568: } YYDEBUG(569, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1110 "Zend/zend_language_scanner.l" +#line 1109 "Zend/zend_language_scanner.l" { return T_ISSET; } -#line 5544 "Zend/zend_language_scanner.c" +#line 5543 "Zend/zend_language_scanner.c" yy570: YYDEBUG(570, *YYCURSOR); yych = *++YYCURSOR; @@ -5594,11 +5593,11 @@ yy576: yy577: YYDEBUG(577, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1082 "Zend/zend_language_scanner.l" +#line 1081 "Zend/zend_language_scanner.l" { return T_INCLUDE; } -#line 5602 "Zend/zend_language_scanner.c" +#line 5601 "Zend/zend_language_scanner.c" yy578: YYDEBUG(578, *YYCURSOR); yych = *++YYCURSOR; @@ -5627,11 +5626,11 @@ yy582: } YYDEBUG(583, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1086 "Zend/zend_language_scanner.l" +#line 1085 "Zend/zend_language_scanner.l" { return T_INCLUDE_ONCE; } -#line 5635 "Zend/zend_language_scanner.c" +#line 5634 "Zend/zend_language_scanner.c" yy584: YYDEBUG(584, *YYCURSOR); yych = *++YYCURSOR; @@ -5665,11 +5664,11 @@ yy589: } YYDEBUG(590, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 984 "Zend/zend_language_scanner.l" +#line 983 "Zend/zend_language_scanner.l" { return T_INTERFACE; } -#line 5673 "Zend/zend_language_scanner.c" +#line 5672 "Zend/zend_language_scanner.c" yy591: YYDEBUG(591, *YYCURSOR); yych = *++YYCURSOR; @@ -5708,11 +5707,11 @@ yy597: } YYDEBUG(598, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 936 "Zend/zend_language_scanner.l" +#line 935 "Zend/zend_language_scanner.l" { return T_INSTANCEOF; } -#line 5716 "Zend/zend_language_scanner.c" +#line 5715 "Zend/zend_language_scanner.c" yy599: YYDEBUG(599, *YYCURSOR); yych = *++YYCURSOR; @@ -5756,11 +5755,11 @@ yy606: } YYDEBUG(607, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 992 "Zend/zend_language_scanner.l" +#line 991 "Zend/zend_language_scanner.l" { return T_IMPLEMENTS; } -#line 5764 "Zend/zend_language_scanner.c" +#line 5763 "Zend/zend_language_scanner.c" yy608: YYDEBUG(608, *YYCURSOR); yych = *++YYCURSOR; @@ -5780,11 +5779,11 @@ yy610: } YYDEBUG(611, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 872 "Zend/zend_language_scanner.l" +#line 871 "Zend/zend_language_scanner.l" { return T_TRY; } -#line 5788 "Zend/zend_language_scanner.c" +#line 5787 "Zend/zend_language_scanner.c" yy612: YYDEBUG(612, *YYCURSOR); yych = *++YYCURSOR; @@ -5803,11 +5802,11 @@ yy614: } YYDEBUG(615, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 880 "Zend/zend_language_scanner.l" +#line 879 "Zend/zend_language_scanner.l" { return T_THROW; } -#line 5811 "Zend/zend_language_scanner.c" +#line 5810 "Zend/zend_language_scanner.c" yy616: YYDEBUG(616, *YYCURSOR); yych = *++YYCURSOR; @@ -5868,11 +5867,11 @@ yy622: yy623: YYDEBUG(623, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1090 "Zend/zend_language_scanner.l" +#line 1089 "Zend/zend_language_scanner.l" { return T_REQUIRE; } -#line 5876 "Zend/zend_language_scanner.c" +#line 5875 "Zend/zend_language_scanner.c" yy624: YYDEBUG(624, *YYCURSOR); yych = *++YYCURSOR; @@ -5901,11 +5900,11 @@ yy628: } YYDEBUG(629, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1094 "Zend/zend_language_scanner.l" +#line 1093 "Zend/zend_language_scanner.l" { return T_REQUIRE_ONCE; } -#line 5909 "Zend/zend_language_scanner.c" +#line 5908 "Zend/zend_language_scanner.c" yy630: YYDEBUG(630, *YYCURSOR); yych = *++YYCURSOR; @@ -5924,11 +5923,11 @@ yy632: } YYDEBUG(633, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 868 "Zend/zend_language_scanner.l" +#line 867 "Zend/zend_language_scanner.l" { return T_RETURN; } -#line 5932 "Zend/zend_language_scanner.c" +#line 5931 "Zend/zend_language_scanner.c" yy634: YYDEBUG(634, *YYCURSOR); yych = *++YYCURSOR; @@ -6009,11 +6008,11 @@ yy643: } YYDEBUG(644, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 964 "Zend/zend_language_scanner.l" +#line 963 "Zend/zend_language_scanner.l" { return T_CONTINUE; } -#line 6017 "Zend/zend_language_scanner.c" +#line 6016 "Zend/zend_language_scanner.c" yy645: YYDEBUG(645, *YYCURSOR); ++YYCURSOR; @@ -6022,11 +6021,11 @@ yy645: } YYDEBUG(646, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 864 "Zend/zend_language_scanner.l" +#line 863 "Zend/zend_language_scanner.l" { return T_CONST; } -#line 6030 "Zend/zend_language_scanner.c" +#line 6029 "Zend/zend_language_scanner.c" yy647: YYDEBUG(647, *YYCURSOR); yych = *++YYCURSOR; @@ -6051,11 +6050,11 @@ yy650: } YYDEBUG(651, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1038 "Zend/zend_language_scanner.l" +#line 1037 "Zend/zend_language_scanner.l" { return T_CLONE; } -#line 6059 "Zend/zend_language_scanner.c" +#line 6058 "Zend/zend_language_scanner.c" yy652: YYDEBUG(652, *YYCURSOR); yych = *++YYCURSOR; @@ -6069,11 +6068,11 @@ yy653: } YYDEBUG(654, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 980 "Zend/zend_language_scanner.l" +#line 979 "Zend/zend_language_scanner.l" { return T_CLASS; } -#line 6077 "Zend/zend_language_scanner.c" +#line 6076 "Zend/zend_language_scanner.c" yy655: YYDEBUG(655, *YYCURSOR); yych = *++YYCURSOR; @@ -6093,11 +6092,11 @@ yy657: } YYDEBUG(658, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 952 "Zend/zend_language_scanner.l" +#line 951 "Zend/zend_language_scanner.l" { return T_CASE; } -#line 6101 "Zend/zend_language_scanner.c" +#line 6100 "Zend/zend_language_scanner.c" yy659: YYDEBUG(659, *YYCURSOR); yych = *++YYCURSOR; @@ -6111,11 +6110,11 @@ yy660: } YYDEBUG(661, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 876 "Zend/zend_language_scanner.l" +#line 875 "Zend/zend_language_scanner.l" { return T_CATCH; } -#line 6119 "Zend/zend_language_scanner.c" +#line 6118 "Zend/zend_language_scanner.c" yy662: YYDEBUG(662, *YYCURSOR); yych = *++YYCURSOR; @@ -6166,11 +6165,11 @@ yy670: } YYDEBUG(671, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 860 "Zend/zend_language_scanner.l" +#line 859 "Zend/zend_language_scanner.l" { return T_FUNCTION; } -#line 6174 "Zend/zend_language_scanner.c" +#line 6173 "Zend/zend_language_scanner.c" yy672: YYDEBUG(672, *YYCURSOR); ++YYCURSOR; @@ -6194,11 +6193,11 @@ yy672: yy673: YYDEBUG(673, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 912 "Zend/zend_language_scanner.l" +#line 911 "Zend/zend_language_scanner.l" { return T_FOR; } -#line 6202 "Zend/zend_language_scanner.c" +#line 6201 "Zend/zend_language_scanner.c" yy674: YYDEBUG(674, *YYCURSOR); yych = *++YYCURSOR; @@ -6222,11 +6221,11 @@ yy677: } YYDEBUG(678, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 920 "Zend/zend_language_scanner.l" +#line 919 "Zend/zend_language_scanner.l" { return T_FOREACH; } -#line 6230 "Zend/zend_language_scanner.c" +#line 6229 "Zend/zend_language_scanner.c" yy679: YYDEBUG(679, *YYCURSOR); yych = *++YYCURSOR; @@ -6245,11 +6244,11 @@ yy681: } YYDEBUG(682, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1130 "Zend/zend_language_scanner.l" +#line 1129 "Zend/zend_language_scanner.l" { return T_FINAL; } -#line 6253 "Zend/zend_language_scanner.c" +#line 6252 "Zend/zend_language_scanner.c" yy683: YYDEBUG(683, *YYCURSOR); yych = *++YYCURSOR; @@ -6280,11 +6279,11 @@ yy685: } YYDEBUG(686, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 908 "Zend/zend_language_scanner.l" +#line 907 "Zend/zend_language_scanner.l" { return T_DO; } -#line 6288 "Zend/zend_language_scanner.c" +#line 6287 "Zend/zend_language_scanner.c" yy687: YYDEBUG(687, *YYCURSOR); ++YYCURSOR; @@ -6293,11 +6292,11 @@ yy687: } YYDEBUG(688, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 856 "Zend/zend_language_scanner.l" +#line 855 "Zend/zend_language_scanner.l" { return T_EXIT; } -#line 6301 "Zend/zend_language_scanner.c" +#line 6300 "Zend/zend_language_scanner.c" yy689: YYDEBUG(689, *YYCURSOR); yych = *++YYCURSOR; @@ -6332,11 +6331,11 @@ yy694: } YYDEBUG(695, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 956 "Zend/zend_language_scanner.l" +#line 955 "Zend/zend_language_scanner.l" { return T_DEFAULT; } -#line 6340 "Zend/zend_language_scanner.c" +#line 6339 "Zend/zend_language_scanner.c" yy696: YYDEBUG(696, *YYCURSOR); yych = *++YYCURSOR; @@ -6360,11 +6359,11 @@ yy699: } YYDEBUG(700, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 928 "Zend/zend_language_scanner.l" +#line 927 "Zend/zend_language_scanner.l" { return T_DECLARE; } -#line 6368 "Zend/zend_language_scanner.c" +#line 6367 "Zend/zend_language_scanner.c" yy701: YYDEBUG(701, *YYCURSOR); yych = *++YYCURSOR; @@ -6444,11 +6443,11 @@ yy712: } YYDEBUG(713, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 988 "Zend/zend_language_scanner.l" +#line 987 "Zend/zend_language_scanner.l" { return T_EXTENDS; } -#line 6452 "Zend/zend_language_scanner.c" +#line 6451 "Zend/zend_language_scanner.c" yy714: YYDEBUG(714, *YYCURSOR); ++YYCURSOR; @@ -6457,11 +6456,11 @@ yy714: } YYDEBUG(715, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 852 "Zend/zend_language_scanner.l" +#line 851 "Zend/zend_language_scanner.l" { return T_EXIT; } -#line 6465 "Zend/zend_language_scanner.c" +#line 6464 "Zend/zend_language_scanner.c" yy716: YYDEBUG(716, *YYCURSOR); yych = *++YYCURSOR; @@ -6475,11 +6474,11 @@ yy717: } YYDEBUG(718, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1078 "Zend/zend_language_scanner.l" +#line 1077 "Zend/zend_language_scanner.l" { return T_EVAL; } -#line 6483 "Zend/zend_language_scanner.c" +#line 6482 "Zend/zend_language_scanner.c" yy719: YYDEBUG(719, *YYCURSOR); yych = *++YYCURSOR; @@ -6549,11 +6548,11 @@ yy728: } YYDEBUG(729, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 904 "Zend/zend_language_scanner.l" +#line 903 "Zend/zend_language_scanner.l" { return T_ENDWHILE; } -#line 6557 "Zend/zend_language_scanner.c" +#line 6556 "Zend/zend_language_scanner.c" yy730: YYDEBUG(730, *YYCURSOR); yych = *++YYCURSOR; @@ -6582,11 +6581,11 @@ yy734: } YYDEBUG(735, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 948 "Zend/zend_language_scanner.l" +#line 947 "Zend/zend_language_scanner.l" { return T_ENDSWITCH; } -#line 6590 "Zend/zend_language_scanner.c" +#line 6589 "Zend/zend_language_scanner.c" yy736: YYDEBUG(736, *YYCURSOR); ++YYCURSOR; @@ -6595,11 +6594,11 @@ yy736: } YYDEBUG(737, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 892 "Zend/zend_language_scanner.l" +#line 891 "Zend/zend_language_scanner.l" { return T_ENDIF; } -#line 6603 "Zend/zend_language_scanner.c" +#line 6602 "Zend/zend_language_scanner.c" yy738: YYDEBUG(738, *YYCURSOR); yych = *++YYCURSOR; @@ -6628,11 +6627,11 @@ yy739: yy740: YYDEBUG(740, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 916 "Zend/zend_language_scanner.l" +#line 915 "Zend/zend_language_scanner.l" { return T_ENDFOR; } -#line 6636 "Zend/zend_language_scanner.c" +#line 6635 "Zend/zend_language_scanner.c" yy741: YYDEBUG(741, *YYCURSOR); yych = *++YYCURSOR; @@ -6656,11 +6655,11 @@ yy744: } YYDEBUG(745, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 924 "Zend/zend_language_scanner.l" +#line 923 "Zend/zend_language_scanner.l" { return T_ENDFOREACH; } -#line 6664 "Zend/zend_language_scanner.c" +#line 6663 "Zend/zend_language_scanner.c" yy746: YYDEBUG(746, *YYCURSOR); yych = *++YYCURSOR; @@ -6694,11 +6693,11 @@ yy751: } YYDEBUG(752, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 932 "Zend/zend_language_scanner.l" +#line 931 "Zend/zend_language_scanner.l" { return T_ENDDECLARE; } -#line 6702 "Zend/zend_language_scanner.c" +#line 6701 "Zend/zend_language_scanner.c" yy753: YYDEBUG(753, *YYCURSOR); yych = *++YYCURSOR; @@ -6717,11 +6716,11 @@ yy755: } YYDEBUG(756, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1114 "Zend/zend_language_scanner.l" +#line 1113 "Zend/zend_language_scanner.l" { return T_EMPTY; } -#line 6725 "Zend/zend_language_scanner.c" +#line 6724 "Zend/zend_language_scanner.c" yy757: YYDEBUG(757, *YYCURSOR); yych = *++YYCURSOR; @@ -6750,11 +6749,11 @@ yy758: yy759: YYDEBUG(759, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 896 "Zend/zend_language_scanner.l" +#line 895 "Zend/zend_language_scanner.l" { return T_ELSE; } -#line 6758 "Zend/zend_language_scanner.c" +#line 6757 "Zend/zend_language_scanner.c" yy760: YYDEBUG(760, *YYCURSOR); yych = *++YYCURSOR; @@ -6768,11 +6767,11 @@ yy761: } YYDEBUG(762, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 888 "Zend/zend_language_scanner.l" +#line 887 "Zend/zend_language_scanner.l" { return T_ELSEIF; } -#line 6776 "Zend/zend_language_scanner.c" +#line 6775 "Zend/zend_language_scanner.c" yy763: YYDEBUG(763, *YYCURSOR); yych = *++YYCURSOR; @@ -6786,11 +6785,11 @@ yy764: } YYDEBUG(765, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 972 "Zend/zend_language_scanner.l" +#line 971 "Zend/zend_language_scanner.l" { return T_ECHO; } -#line 6794 "Zend/zend_language_scanner.c" +#line 6793 "Zend/zend_language_scanner.c" } /* *********************************** */ yyc_ST_LOOKING_FOR_PROPERTY: @@ -6863,7 +6862,7 @@ yy768: yy769: YYDEBUG(769, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1001 "Zend/zend_language_scanner.l" +#line 1000 "Zend/zend_language_scanner.l" { zendlval->value.str.val = yytext; /* no copying - intentional */ zendlval->value.str.len = yyleng; @@ -6871,7 +6870,7 @@ yy769: HANDLE_NEWLINES(yytext, yyleng); return T_WHITESPACE; } -#line 6875 "Zend/zend_language_scanner.c" +#line 6874 "Zend/zend_language_scanner.c" yy770: YYDEBUG(770, *YYCURSOR); ++YYCURSOR; @@ -6879,13 +6878,13 @@ yy770: yy771: YYDEBUG(771, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1020 "Zend/zend_language_scanner.l" +#line 1019 "Zend/zend_language_scanner.l" { yyless(0); yy_pop_state(TSRMLS_C); goto restart; } -#line 6889 "Zend/zend_language_scanner.c" +#line 6888 "Zend/zend_language_scanner.c" yy772: YYDEBUG(772, *YYCURSOR); ++YYCURSOR; @@ -6894,14 +6893,14 @@ yy772: yy773: YYDEBUG(773, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1013 "Zend/zend_language_scanner.l" +#line 1012 "Zend/zend_language_scanner.l" { yy_pop_state(TSRMLS_C); zend_copy_value(zendlval, yytext, yyleng); zendlval->type = IS_STRING; return T_STRING; } -#line 6905 "Zend/zend_language_scanner.c" +#line 6904 "Zend/zend_language_scanner.c" yy774: YYDEBUG(774, *YYCURSOR); yych = *++YYCURSOR; @@ -6922,11 +6921,11 @@ yy777: ++YYCURSOR; YYDEBUG(778, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1009 "Zend/zend_language_scanner.l" +#line 1008 "Zend/zend_language_scanner.l" { return T_OBJECT_OPERATOR; } -#line 6930 "Zend/zend_language_scanner.c" +#line 6929 "Zend/zend_language_scanner.c" yy779: YYDEBUG(779, *YYCURSOR); ++YYCURSOR; @@ -6996,7 +6995,7 @@ yy783: yy784: YYDEBUG(784, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1292 "Zend/zend_language_scanner.l" +#line 1291 "Zend/zend_language_scanner.l" { zend_copy_value(zendlval, yytext, yyleng); zendlval->type = IS_STRING; @@ -7004,20 +7003,20 @@ yy784: yy_push_state(ST_IN_SCRIPTING TSRMLS_CC); return T_STRING_VARNAME; } -#line 7008 "Zend/zend_language_scanner.c" +#line 7007 "Zend/zend_language_scanner.c" yy785: YYDEBUG(785, *YYCURSOR); ++YYCURSOR; YYDEBUG(786, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1301 "Zend/zend_language_scanner.l" +#line 1300 "Zend/zend_language_scanner.l" { yyless(0); yy_pop_state(TSRMLS_C); yy_push_state(ST_IN_SCRIPTING TSRMLS_CC); goto restart; } -#line 7021 "Zend/zend_language_scanner.c" +#line 7020 "Zend/zend_language_scanner.c" yy787: YYDEBUG(787, *YYCURSOR); ++YYCURSOR; @@ -7039,7 +7038,7 @@ yyc_ST_NOWDOC: ++YYCURSOR; YYDEBUG(792, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2135 "Zend/zend_language_scanner.l" +#line 2134 "Zend/zend_language_scanner.l" { int newline = 0; @@ -7094,7 +7093,7 @@ nowdoc_scan_done: HANDLE_NEWLINES(yytext, yyleng - newline); return T_ENCAPSED_AND_WHITESPACE; } -#line 7098 "Zend/zend_language_scanner.c" +#line 7097 "Zend/zend_language_scanner.c" /* *********************************** */ yyc_ST_VAR_OFFSET: { @@ -7194,7 +7193,7 @@ yy795: yy796: YYDEBUG(796, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1351 "Zend/zend_language_scanner.l" +#line 1350 "Zend/zend_language_scanner.l" { /* Offset could be treated as a long */ if (yyleng < MAX_LENGTH_OF_LONG - 1 || (yyleng == MAX_LENGTH_OF_LONG - 1 && strcmp(yytext, long_min_digits) < 0)) { zendlval->value.lval = strtol(yytext, NULL, 10); @@ -7206,7 +7205,7 @@ yy796: } return T_NUM_STRING; } -#line 7210 "Zend/zend_language_scanner.c" +#line 7209 "Zend/zend_language_scanner.c" yy797: YYDEBUG(797, *YYCURSOR); yych = *++YYCURSOR; @@ -7226,23 +7225,23 @@ yy798: yy799: YYDEBUG(799, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1661 "Zend/zend_language_scanner.l" +#line 1660 "Zend/zend_language_scanner.l" { /* Only '[' can be valid, but returning other tokens will allow a more explicit parse error */ return yytext[0]; } -#line 7235 "Zend/zend_language_scanner.c" +#line 7234 "Zend/zend_language_scanner.c" yy800: YYDEBUG(800, *YYCURSOR); ++YYCURSOR; YYDEBUG(801, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1656 "Zend/zend_language_scanner.l" +#line 1655 "Zend/zend_language_scanner.l" { yy_pop_state(TSRMLS_C); return ']'; } -#line 7246 "Zend/zend_language_scanner.c" +#line 7245 "Zend/zend_language_scanner.c" yy802: YYDEBUG(802, *YYCURSOR); yych = *++YYCURSOR; @@ -7252,14 +7251,14 @@ yy803: ++YYCURSOR; YYDEBUG(804, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1666 "Zend/zend_language_scanner.l" +#line 1665 "Zend/zend_language_scanner.l" { /* Invalid rule to return a more explicit parse error with proper line number */ yyless(0); yy_pop_state(TSRMLS_C); return T_ENCAPSED_AND_WHITESPACE; } -#line 7263 "Zend/zend_language_scanner.c" +#line 7262 "Zend/zend_language_scanner.c" yy805: YYDEBUG(805, *YYCURSOR); ++YYCURSOR; @@ -7268,19 +7267,19 @@ yy805: yy806: YYDEBUG(806, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1673 "Zend/zend_language_scanner.l" +#line 1672 "Zend/zend_language_scanner.l" { zend_copy_value(zendlval, yytext, yyleng); zendlval->type = IS_STRING; return T_STRING; } -#line 7278 "Zend/zend_language_scanner.c" +#line 7277 "Zend/zend_language_scanner.c" yy807: YYDEBUG(807, *YYCURSOR); ++YYCURSOR; YYDEBUG(808, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2191 "Zend/zend_language_scanner.l" +#line 2190 "Zend/zend_language_scanner.l" { if (YYCURSOR > YYLIMIT) { return 0; @@ -7289,7 +7288,7 @@ yy807: zend_error(E_COMPILE_WARNING,"Unexpected character in input: '%c' (ASCII=%d) state=%d", yytext[0], yytext[0], YYSTATE); goto restart; } -#line 7293 "Zend/zend_language_scanner.c" +#line 7292 "Zend/zend_language_scanner.c" yy809: YYDEBUG(809, *YYCURSOR); ++YYCURSOR; @@ -7325,13 +7324,13 @@ yy811: yy813: YYDEBUG(813, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1650 "Zend/zend_language_scanner.l" +#line 1649 "Zend/zend_language_scanner.l" { zend_copy_value(zendlval, (yytext+1), (yyleng-1)); zendlval->type = IS_STRING; return T_VARIABLE; } -#line 7335 "Zend/zend_language_scanner.c" +#line 7334 "Zend/zend_language_scanner.c" yy814: YYDEBUG(814, *YYCURSOR); ++YYCURSOR; @@ -7363,14 +7362,14 @@ yy818: yy820: YYDEBUG(820, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1363 "Zend/zend_language_scanner.l" +#line 1362 "Zend/zend_language_scanner.l" { /* Offset must be treated as a string */ zendlval->value.str.val = (char *)estrndup(yytext, yyleng); zendlval->value.str.len = yyleng; zendlval->type = IS_STRING; return T_NUM_STRING; } -#line 7374 "Zend/zend_language_scanner.c" +#line 7373 "Zend/zend_language_scanner.c" yy821: YYDEBUG(821, *YYCURSOR); ++YYCURSOR; @@ -7383,6 +7382,6 @@ yy821: goto yy820; } } -#line 2200 "Zend/zend_language_scanner.l" +#line 2199 "Zend/zend_language_scanner.l" } diff --git a/Zend/zend_language_scanner.l b/Zend/zend_language_scanner.l index e0a9cf1292..a4faff3825 100644 --- a/Zend/zend_language_scanner.l +++ b/Zend/zend_language_scanner.l @@ -299,7 +299,6 @@ ZEND_API int open_file_for_scanning(zend_file_handle *file_handle TSRMLS_DC) CG(start_lineno) = 0; } else { CG(zend_lineno) = 1; - CG(shebang_len) = 0; } CG(increment_lineno) = 0; @@ -443,7 +442,7 @@ ZEND_API int zend_prepare_string_for_scanning(zval *str, char *filename TSRMLS_D ZEND_API size_t zend_get_scanned_file_offset(TSRMLS_D) { - size_t offset = (SCNG(yy_cursor) - SCNG(yy_start)) + CG(shebang_len); + size_t offset = SCNG(yy_cursor) - SCNG(yy_start); #ifdef ZEND_MULTIBYTE if (SCNG(input_filter)) { size_t original_offset = offset, length = 0; do { diff --git a/Zend/zend_language_scanner_defs.h b/Zend/zend_language_scanner_defs.h index 020966a853..55b23d6cd1 100644 --- a/Zend/zend_language_scanner_defs.h +++ b/Zend/zend_language_scanner_defs.h @@ -1,4 +1,4 @@ -/* Generated by re2c 0.13.5 on Mon Jan 11 14:20:20 2010 */ +/* Generated by re2c 0.13.5 on Tue Jun 29 08:18:52 2010 */ #line 3 "Zend/zend_language_scanner_defs.h" enum YYCONDTYPE { diff --git a/sapi/cgi/cgi_main.c b/sapi/cgi/cgi_main.c index e7b9874591..da8fed108f 100644 --- a/sapi/cgi/cgi_main.c +++ b/sapi/cgi/cgi_main.c @@ -2084,7 +2084,6 @@ consult the installation file that came with this distribution, or visit \n\ } } - CG(shebang_len) = 0; if (CGIG(check_shebang_line) && file_handle.handle.fp && (file_handle.handle.fp != stdin)) { /* #!php support */ c = fgetc(file_handle.handle.fp); @@ -2099,7 +2098,6 @@ consult the installation file that came with this distribution, or visit \n\ fseek(file_handle.handle.fp, pos - 1, SEEK_SET); } } - CG(shebang_len) = ftell(file_handle.handle.fp); CG(start_lineno) = 2; } else { rewind(file_handle.handle.fp); diff --git a/sapi/cli/php_cli.c b/sapi/cli/php_cli.c index d303f80756..635445e92f 100644 --- a/sapi/cli/php_cli.c +++ b/sapi/cli/php_cli.c @@ -627,7 +627,6 @@ static int cli_seek_file_begin(zend_file_handle *file_handle, char *script_file, fseek(file_handle->handle.fp, pos - 1, SEEK_SET); } } - CG(shebang_len) = ftell(file_handle->handle.fp); *lineno = 2; } else { rewind(file_handle->handle.fp); @@ -1059,7 +1058,6 @@ int main(int argc, char *argv[]) script_file=argv[php_optind]; php_optind++; } - CG(shebang_len) = 0; if (script_file) { if (cli_seek_file_begin(&file_handle, script_file, &lineno TSRMLS_CC) != SUCCESS) { goto err; @@ -1268,7 +1266,6 @@ int main(int argc, char *argv[]) exit_status=254; } } else { - CG(shebang_len) = 0; if (script_file) { if (cli_seek_file_begin(&file_handle, script_file, &lineno TSRMLS_CC) != SUCCESS) { exit_status = 1; |