com php-src: Partial NS port (semicolon, no errors): Zend/zend_ast.h Zend/zend_compile.c Zend/zend_lan guage_parser.y Zend/zend_language_scanner.c
Zend/ zend_language_scanner.l

From: Date: Tue, 22 Jul 2014 10:45:44 +0000
Subject: com php-src: Partial NS port (semicolon, no errors): Zend/zend_ast.h Zend/zend_compile.c Zend/zend_lan guage_parser.y Zend/zend_language_scanner.c
Zend/ zend_language_scanner.l
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-80943@lists.php.net to get a copy of this message
Commit: 8a2ff6b53dd84bd8bff20469fd283f76ae6e60a4 Author: Nikita Popov <nikic@php.net> Tue, 22 Jul 2014 12:45:44 +0200 Parents: b6c9eb21d46200648c01205cc8ac87941a08b802 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=8a2ff6b53dd84bd8bff20469fd283f76ae6e60a4 Log: Partial NS port (semicolon, no errors) Changed paths: M Zend/zend_ast.h M Zend/zend_compile.c M Zend/zend_language_parser.y M Zend/zend_language_scanner.c M Zend/zend_language_scanner.l

diff --git a/Zend/zend_ast.h b/Zend/zend_ast.h index c992e3e..7d72d4e 100644 --- a/Zend/zend_ast.h +++ b/Zend/zend_ast.h @@ -122,6 +122,7 @@ enum _zend_ast_kind { ZEND_AST_USE, ZEND_AST_USE_ELEM, + ZEND_AST_NAMESPACE, }; typedef unsigned short zend_ast_kind; diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 6c2b7b6..7c0c97c 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -6449,6 +6449,68 @@ void zend_compile_const_decl(zend_ast *ast TSRMLS_DC) { } } +static void zend_reset_import_tables(TSRMLS_D) { + if (CG(current_import)) { + zend_hash_destroy(CG(current_import)); + efree(CG(current_import)); + CG(current_import) = NULL; + } + + if (CG(current_import_function)) { + zend_hash_destroy(CG(current_import_function)); + efree(CG(current_import_function)); + CG(current_import_function) = NULL; + } + + if (CG(current_import_const)) { + zend_hash_destroy(CG(current_import_const)); + efree(CG(current_import_const)); + CG(current_import_const) = NULL; + } +} + +void zend_compile_namespace(zend_ast *ast TSRMLS_DC) { + zend_ast *name_ast = ast->child[0]; + zend_ast *stmt_ast = ast->child[1]; + zend_string *name; + + // TODO.AST errors! + + if (Z_TYPE(CG(current_namespace)) != IS_UNDEF) { + zval_dtor(&CG(current_namespace)); + } + + if (name_ast) { + name = Z_STR_P(zend_ast_get_zval(name_ast)); + + if (ZEND_FETCH_CLASS_DEFAULT != zend_get_class_fetch_type(name->val, name->len)) { + zend_error_noreturn(E_COMPILE_ERROR, "Cannot use '%s' as namespace name", name->val); + } + + ZVAL_STR(&CG(current_namespace), STR_COPY(name)); + } else { + ZVAL_UNDEF(&CG(current_namespace)); + } + + zend_reset_import_tables(TSRMLS_C); + + // TODO.AST reset doc comment + + CG(in_namespace) = 1; + + if (stmt_ast) { + zend_compile_stmt(stmt_ast TSRMLS_CC); + + CG(in_namespace) = 0; + zend_reset_import_tables(TSRMLS_C); + + if (Z_TYPE(CG(current_namespace)) != IS_UNDEF) { + zval_dtor(&CG(current_namespace)); + ZVAL_UNDEF(&CG(current_namespace)); + } + } +} + void zend_compile_binary_op(znode *result, zend_ast *ast TSRMLS_DC) { zend_ast *left_ast = ast->child[0]; zend_ast *right_ast = ast->child[1]; @@ -7092,6 +7154,13 @@ zend_bool zend_try_ct_compile_magic_const(zval *zv, zend_ast *ast TSRMLS_DC) { ZVAL_EMPTY_STRING(zv); } break; + case T_NS_C: + if (Z_TYPE(CG(current_namespace)) != IS_UNDEF) { + ZVAL_DUP(zv, &CG(current_namespace)); + } else { + ZVAL_EMPTY_STRING(zv); + } + break; EMPTY_SWITCH_DEFAULT_CASE() } @@ -7365,6 +7434,9 @@ void zend_compile_stmt(zend_ast *ast TSRMLS_DC) { case ZEND_AST_CONST_DECL: zend_compile_const_decl(ast TSRMLS_CC); break; + case ZEND_AST_NAMESPACE: + zend_compile_namespace(ast TSRMLS_CC); + break; default: { znode result; diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y index 5ecdfb8..278a885 100644 --- a/Zend/zend_language_parser.y +++ b/Zend/zend_language_parser.y @@ -250,7 +250,8 @@ top_statement: | function_declaration_statement { AS($1); zend_verify_namespace(TSRMLS_C); zend_do_early_binding(TSRMLS_C); } | class_declaration_statement { AS($1); zend_verify_namespace(TSRMLS_C); zend_do_early_binding(TSRMLS_C); } | T_HALT_COMPILER '(' ')' ';' { zend_do_halt_compiler_register(TSRMLS_C); YYACCEPT; } - | T_NAMESPACE namespace_name ';' { zend_do_begin_namespace(&$2, 0 TSRMLS_CC); } + | T_NAMESPACE namespace_name ';' + { $$.u.ast = zend_ast_create_binary(ZEND_AST_NAMESPACE, AST_ZVAL(&$2), NULL); AS($$); } | T_NAMESPACE namespace_name '{' { zend_do_begin_namespace(&$2, 1 TSRMLS_CC); } top_statement_list '}' { zend_do_end_namespace(TSRMLS_C); } | T_NAMESPACE '{' { zend_do_begin_namespace(NULL, 1 TSRMLS_CC); } @@ -963,7 +964,7 @@ scalar: | T_TRAIT_C { $$.u.ast = zend_ast_create_ex(0, ZEND_AST_MAGIC_CONST, T_TRAIT_C); } | T_METHOD_C { $$.u.ast = zend_ast_create_ex(0, ZEND_AST_MAGIC_CONST, T_METHOD_C); } | T_FUNC_C { $$.u.ast = zend_ast_create_ex(0, ZEND_AST_MAGIC_CONST, T_FUNC_C); } - | T_NS_C { $$.u.ast = AST_ZVAL(&$1); } + | T_NS_C { $$.u.ast = zend_ast_create_ex(0, ZEND_AST_MAGIC_CONST, T_NS_C); } | T_CLASS_C { $$.u.ast = zend_ast_create_ex(0, ZEND_AST_MAGIC_CONST, T_CLASS_C); } | T_START_HEREDOC T_ENCAPSED_AND_WHITESPACE T_END_HEREDOC { $$.u.ast = AST_ZVAL(&$2); } | T_START_HEREDOC T_END_HEREDOC diff --git a/Zend/zend_language_scanner.c b/Zend/zend_language_scanner.c index d6ef79a..cd39be3 100644 --- a/Zend/zend_language_scanner.c +++ b/Zend/zend_language_scanner.c @@ -1115,7 +1115,7 @@ yyc_INITIAL: yy3: YYDEBUG(3, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1726 "Zend/zend_language_scanner.l" +#line 1721 "Zend/zend_language_scanner.l" { if (YYCURSOR > YYLIMIT) { return 0; @@ -1194,7 +1194,7 @@ yy5: yy6: YYDEBUG(6, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1716 "Zend/zend_language_scanner.l" +#line 1711 "Zend/zend_language_scanner.l" { if (CG(short_tags)) { DUMMY_STRINGL(zendlval, yytext, yyleng); @@ -1211,7 +1211,7 @@ yy7: if ((yych = *YYCURSOR) == '=') goto yy43; YYDEBUG(8, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1697 "Zend/zend_language_scanner.l" +#line 1692 "Zend/zend_language_scanner.l" { if (CG(asp_tags)) { DUMMY_STRINGL(zendlval, yytext, yyleng); @@ -1407,7 +1407,7 @@ yy35: ++YYCURSOR; YYDEBUG(38, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1663 "Zend/zend_language_scanner.l" +#line 1658 "Zend/zend_language_scanner.l" { YYCTYPE *bracket = (YYCTYPE*)zend_memrchr(yytext, '<', yyleng - (sizeof("script language=php>") - 1)); @@ -1449,7 +1449,7 @@ yy43: ++YYCURSOR; YYDEBUG(44, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1679 "Zend/zend_language_scanner.l" +#line 1674 "Zend/zend_language_scanner.l" { if (CG(asp_tags)) { DUMMY_STRINGL(zendlval, yytext, yyleng); @@ -1465,7 +1465,7 @@ yy45: ++YYCURSOR; YYDEBUG(46, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1690 "Zend/zend_language_scanner.l" +#line 1685 "Zend/zend_language_scanner.l" { DUMMY_STRINGL(zendlval, yytext, yyleng); BEGIN(ST_IN_SCRIPTING); @@ -1498,7 +1498,7 @@ yy50: yy51: YYDEBUG(51, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1708 "Zend/zend_language_scanner.l" +#line 1703 "Zend/zend_language_scanner.l" { DUMMY_STRINGL(zendlval, yytext, yyleng); HANDLE_NEWLINE(yytext[yyleng-1]); @@ -1576,7 +1576,7 @@ yyc_ST_BACKQUOTE: yy56: YYDEBUG(56, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2169 "Zend/zend_language_scanner.l" +#line 2164 "Zend/zend_language_scanner.l" { if (YYCURSOR > YYLIMIT) { return 0; @@ -1628,7 +1628,7 @@ yy58: ++YYCURSOR; YYDEBUG(59, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2113 "Zend/zend_language_scanner.l" +#line 2108 "Zend/zend_language_scanner.l" { BEGIN(ST_IN_SCRIPTING); return '`'; @@ -1643,7 +1643,7 @@ yy61: ++YYCURSOR; YYDEBUG(62, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2100 "Zend/zend_language_scanner.l" +#line 2095 "Zend/zend_language_scanner.l" { Z_LVAL_P(zendlval) = (long) '{'; yy_push_state(ST_IN_SCRIPTING TSRMLS_CC); @@ -1666,7 +1666,7 @@ yy63: yy65: YYDEBUG(65, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1807 "Zend/zend_language_scanner.l" +#line 1802 "Zend/zend_language_scanner.l" { zend_copy_value(zendlval, (yytext+1), (yyleng-1)); return T_VARIABLE; @@ -1696,7 +1696,7 @@ yy70: ++YYCURSOR; YYDEBUG(71, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1800 "Zend/zend_language_scanner.l" +#line 1795 "Zend/zend_language_scanner.l" { yyless(yyleng - 1); yy_push_state(ST_VAR_OFFSET TSRMLS_CC); @@ -1721,7 +1721,7 @@ yy73: ++YYCURSOR; YYDEBUG(74, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1791 "Zend/zend_language_scanner.l" +#line 1786 "Zend/zend_language_scanner.l" { yyless(yyleng - 3); yy_push_state(ST_LOOKING_FOR_PROPERTY TSRMLS_CC); @@ -1796,7 +1796,7 @@ yy77: yy78: YYDEBUG(78, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2119 "Zend/zend_language_scanner.l" +#line 2114 "Zend/zend_language_scanner.l" { if (GET_DOUBLE_QUOTES_SCANNED_LENGTH()) { YYCURSOR += GET_DOUBLE_QUOTES_SCANNED_LENGTH() - 1; @@ -1856,7 +1856,7 @@ yy80: ++YYCURSOR; YYDEBUG(81, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2108 "Zend/zend_language_scanner.l" +#line 2103 "Zend/zend_language_scanner.l" { BEGIN(ST_IN_SCRIPTING); return '"'; @@ -1871,7 +1871,7 @@ yy83: ++YYCURSOR; YYDEBUG(84, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2100 "Zend/zend_language_scanner.l" +#line 2095 "Zend/zend_language_scanner.l" { Z_LVAL_P(zendlval) = (long) '{'; yy_push_state(ST_IN_SCRIPTING TSRMLS_CC); @@ -1894,7 +1894,7 @@ yy85: yy87: YYDEBUG(87, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1807 "Zend/zend_language_scanner.l" +#line 1802 "Zend/zend_language_scanner.l" { zend_copy_value(zendlval, (yytext+1), (yyleng-1)); return T_VARIABLE; @@ -1924,7 +1924,7 @@ yy92: ++YYCURSOR; YYDEBUG(93, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1800 "Zend/zend_language_scanner.l" +#line 1795 "Zend/zend_language_scanner.l" { yyless(yyleng - 1); yy_push_state(ST_VAR_OFFSET TSRMLS_CC); @@ -1949,7 +1949,7 @@ yy95: ++YYCURSOR; YYDEBUG(96, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1791 "Zend/zend_language_scanner.l" +#line 1786 "Zend/zend_language_scanner.l" { yyless(yyleng - 3); yy_push_state(ST_LOOKING_FOR_PROPERTY TSRMLS_CC); @@ -1967,7 +1967,7 @@ yyc_ST_END_HEREDOC: ++YYCURSOR; YYDEBUG(100, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2086 "Zend/zend_language_scanner.l" +#line 2081 "Zend/zend_language_scanner.l" { zend_heredoc_label *heredoc_label = zend_ptr_stack_pop(&SCNG(heredoc_label_stack)); @@ -2042,7 +2042,7 @@ yy103: yy104: YYDEBUG(104, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2211 "Zend/zend_language_scanner.l" +#line 2206 "Zend/zend_language_scanner.l" { int newline = 0; @@ -2130,7 +2130,7 @@ yy107: ++YYCURSOR; YYDEBUG(108, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2100 "Zend/zend_language_scanner.l" +#line 2095 "Zend/zend_language_scanner.l" { Z_LVAL_P(zendlval) = (long) '{'; yy_push_state(ST_IN_SCRIPTING TSRMLS_CC); @@ -2153,7 +2153,7 @@ yy109: yy111: YYDEBUG(111, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1807 "Zend/zend_language_scanner.l" +#line 1802 "Zend/zend_language_scanner.l" { zend_copy_value(zendlval, (yytext+1), (yyleng-1)); return T_VARIABLE; @@ -2183,7 +2183,7 @@ yy116: ++YYCURSOR; YYDEBUG(117, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1800 "Zend/zend_language_scanner.l" +#line 1795 "Zend/zend_language_scanner.l" { yyless(yyleng - 1); yy_push_state(ST_VAR_OFFSET TSRMLS_CC); @@ -2208,7 +2208,7 @@ yy119: ++YYCURSOR; YYDEBUG(120, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1791 "Zend/zend_language_scanner.l" +#line 1786 "Zend/zend_language_scanner.l" { yyless(yyleng - 3); yy_push_state(ST_LOOKING_FOR_PROPERTY TSRMLS_CC); @@ -2398,7 +2398,7 @@ yy123: yy124: YYDEBUG(124, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1829 "Zend/zend_language_scanner.l" +#line 1824 "Zend/zend_language_scanner.l" { zend_copy_value(zendlval, yytext, yyleng); return T_STRING; @@ -2996,7 +2996,7 @@ yy176: yy177: YYDEBUG(177, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1835 "Zend/zend_language_scanner.l" +#line 1830 "Zend/zend_language_scanner.l" { while (YYCURSOR < YYLIMIT) { switch (*YYCURSOR++) { @@ -3037,7 +3037,7 @@ yy178: yy179: YYDEBUG(179, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1921 "Zend/zend_language_scanner.l" +#line 1916 "Zend/zend_language_scanner.l" { register char *s, *t; char *end; @@ -3112,7 +3112,7 @@ yy180: yy181: YYDEBUG(181, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1990 "Zend/zend_language_scanner.l" +#line 1985 "Zend/zend_language_scanner.l" { int bprefix = (yytext[0] != '"') ? 1 : 0; @@ -3159,7 +3159,7 @@ yy182: ++YYCURSOR; YYDEBUG(183, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2080 "Zend/zend_language_scanner.l" +#line 2075 "Zend/zend_language_scanner.l" { BEGIN(ST_BACKQUOTE); return '`'; @@ -3170,7 +3170,7 @@ yy184: ++YYCURSOR; YYDEBUG(185, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2342 "Zend/zend_language_scanner.l" +#line 2337 "Zend/zend_language_scanner.l" { if (YYCURSOR > YYLIMIT) { return 0; @@ -3370,7 +3370,7 @@ yy206: yy207: YYDEBUG(207, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1902 "Zend/zend_language_scanner.l" +#line 1897 "Zend/zend_language_scanner.l" { DUMMY_STRINGL(zendlval, yytext, yyleng); BEGIN(INITIAL); @@ -3410,7 +3410,7 @@ yy210: yy212: YYDEBUG(212, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1807 "Zend/zend_language_scanner.l" +#line 1802 "Zend/zend_language_scanner.l" { zend_copy_value(zendlval, (yytext+1), (yyleng-1)); return T_VARIABLE; @@ -3505,7 +3505,7 @@ yy228: yy229: YYDEBUG(229, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1909 "Zend/zend_language_scanner.l" +#line 1904 "Zend/zend_language_scanner.l" { if (CG(asp_tags)) { BEGIN(INITIAL); @@ -3544,7 +3544,7 @@ yy234: yy235: YYDEBUG(235, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1869 "Zend/zend_language_scanner.l" +#line 1864 "Zend/zend_language_scanner.l" { int doc_com; @@ -3872,7 +3872,7 @@ yy279: yy280: YYDEBUG(280, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2032 "Zend/zend_language_scanner.l" +#line 2027 "Zend/zend_language_scanner.l" { char *s; int bprefix = (yytext[0] != '<') ? 1 : 0; @@ -4169,14 +4169,9 @@ yy317: yyleng = YYCURSOR - SCNG(yy_text); #line 1654 "Zend/zend_language_scanner.l" { - if (Z_TYPE(CG(current_namespace)) != IS_UNDEF) { - ZVAL_DUP(zendlval, &CG(current_namespace)); - } else { - ZVAL_EMPTY_STRING(zendlval); - } return T_NS_C; } -#line 4180 "Zend/zend_language_scanner.c" +#line 4175 "Zend/zend_language_scanner.c" yy321: YYDEBUG(321, *YYCURSOR); yych = *++YYCURSOR; @@ -4221,7 +4216,7 @@ yy322: ZVAL_STR(zendlval, dirname); return T_DIR; } -#line 4225 "Zend/zend_language_scanner.c" +#line 4220 "Zend/zend_language_scanner.c" yy326: YYDEBUG(326, *YYCURSOR); yych = *++YYCURSOR; @@ -4251,7 +4246,7 @@ yy328: ZVAL_LONG(zendlval, CG(zend_lineno)); return T_LINE; } -#line 4255 "Zend/zend_language_scanner.c" +#line 4250 "Zend/zend_language_scanner.c" yy332: YYDEBUG(332, *YYCURSOR); yych = *++YYCURSOR; @@ -4290,7 +4285,7 @@ yy336: { return T_METHOD_C; } -#line 4294 "Zend/zend_language_scanner.c" +#line 4289 "Zend/zend_language_scanner.c" yy340: YYDEBUG(340, *YYCURSOR); yych = *++YYCURSOR; @@ -4345,7 +4340,7 @@ yy347: { return T_FUNC_C; } -#line 4349 "Zend/zend_language_scanner.c" +#line 4344 "Zend/zend_language_scanner.c" yy351: YYDEBUG(351, *YYCURSOR); yych = *++YYCURSOR; @@ -4376,7 +4371,7 @@ yy352: } return T_FILE; } -#line 4380 "Zend/zend_language_scanner.c" +#line 4375 "Zend/zend_language_scanner.c" yy356: YYDEBUG(356, *YYCURSOR); yych = *++YYCURSOR; @@ -4410,7 +4405,7 @@ yy359: { return T_TRAIT_C; } -#line 4414 "Zend/zend_language_scanner.c" +#line 4409 "Zend/zend_language_scanner.c" yy363: YYDEBUG(363, *YYCURSOR); yych = *++YYCURSOR; @@ -4444,7 +4439,7 @@ yy366: { return T_CLASS_C; } -#line 4448 "Zend/zend_language_scanner.c" +#line 4443 "Zend/zend_language_scanner.c" yy370: YYDEBUG(370, *YYCURSOR); yych = *++YYCURSOR; @@ -4510,7 +4505,7 @@ yy381: { return T_HALT_COMPILER; } -#line 4514 "Zend/zend_language_scanner.c" +#line 4509 "Zend/zend_language_scanner.c" yy383: YYDEBUG(383, *YYCURSOR); yych = *++YYCURSOR; @@ -4534,7 +4529,7 @@ yy385: { return T_USE; } -#line 4538 "Zend/zend_language_scanner.c" +#line 4533 "Zend/zend_language_scanner.c" yy387: YYDEBUG(387, *YYCURSOR); yych = *++YYCURSOR; @@ -4557,7 +4552,7 @@ yy389: { return T_UNSET; } -#line 4561 "Zend/zend_language_scanner.c" +#line 4556 "Zend/zend_language_scanner.c" yy391: YYDEBUG(391, *YYCURSOR); ++YYCURSOR; @@ -4733,7 +4728,7 @@ yy406: { return T_INT_CAST; } -#line 4737 "Zend/zend_language_scanner.c" +#line 4732 "Zend/zend_language_scanner.c" yy409: YYDEBUG(409, *YYCURSOR); yych = *++YYCURSOR; @@ -4781,7 +4776,7 @@ yy414: { return T_DOUBLE_CAST; } -#line 4785 "Zend/zend_language_scanner.c" +#line 4780 "Zend/zend_language_scanner.c" yy418: YYDEBUG(418, *YYCURSOR); yych = *++YYCURSOR; @@ -4855,7 +4850,7 @@ yy428: { return T_STRING_CAST; } -#line 4859 "Zend/zend_language_scanner.c" +#line 4854 "Zend/zend_language_scanner.c" yy432: YYDEBUG(432, *YYCURSOR); yych = *++YYCURSOR; @@ -4892,7 +4887,7 @@ yy435: { return T_ARRAY_CAST; } -#line 4896 "Zend/zend_language_scanner.c" +#line 4891 "Zend/zend_language_scanner.c" yy439: YYDEBUG(439, *YYCURSOR); yych = *++YYCURSOR; @@ -4934,7 +4929,7 @@ yy443: { return T_OBJECT_CAST; } -#line 4938 "Zend/zend_language_scanner.c" +#line 4933 "Zend/zend_language_scanner.c" yy447: YYDEBUG(447, *YYCURSOR); yych = *++YYCURSOR; @@ -4979,7 +4974,7 @@ yy452: { return T_BOOL_CAST; } -#line 4983 "Zend/zend_language_scanner.c" +#line 4978 "Zend/zend_language_scanner.c" yy455: YYDEBUG(455, *YYCURSOR); yych = *++YYCURSOR; @@ -5043,7 +5038,7 @@ yy463: { return T_UNSET_CAST; } -#line 5047 "Zend/zend_language_scanner.c" +#line 5042 "Zend/zend_language_scanner.c" yy467: YYDEBUG(467, *YYCURSOR); yych = *++YYCURSOR; @@ -5061,7 +5056,7 @@ yy468: { return T_VAR; } -#line 5065 "Zend/zend_language_scanner.c" +#line 5060 "Zend/zend_language_scanner.c" yy470: YYDEBUG(470, *YYCURSOR); yych = *++YYCURSOR; @@ -5085,7 +5080,7 @@ yy472: { return T_NEW; } -#line 5089 "Zend/zend_language_scanner.c" +#line 5084 "Zend/zend_language_scanner.c" yy474: YYDEBUG(474, *YYCURSOR); yych = *++YYCURSOR; @@ -5128,7 +5123,7 @@ yy480: { return T_NAMESPACE; } -#line 5132 "Zend/zend_language_scanner.c" +#line 5127 "Zend/zend_language_scanner.c" yy482: YYDEBUG(482, *YYCURSOR); yyaccept = 3; @@ -5154,7 +5149,7 @@ yy484: { return T_CONCAT_EQUAL; } -#line 5158 "Zend/zend_language_scanner.c" +#line 5153 "Zend/zend_language_scanner.c" yy486: YYDEBUG(486, *YYCURSOR); yych = *++YYCURSOR; @@ -5167,7 +5162,7 @@ yy486: { return T_ELLIPSIS; } -#line 5171 "Zend/zend_language_scanner.c" +#line 5166 "Zend/zend_language_scanner.c" yy489: YYDEBUG(489, *YYCURSOR); ++YYCURSOR; @@ -5177,7 +5172,7 @@ yy489: { return T_PAAMAYIM_NEKUDOTAYIM; } -#line 5181 "Zend/zend_language_scanner.c" +#line 5176 "Zend/zend_language_scanner.c" yy491: YYDEBUG(491, *YYCURSOR); ++YYCURSOR; @@ -5203,7 +5198,7 @@ yy493: { return T_MINUS_EQUAL; } -#line 5207 "Zend/zend_language_scanner.c" +#line 5202 "Zend/zend_language_scanner.c" yy495: YYDEBUG(495, *YYCURSOR); ++YYCURSOR; @@ -5213,7 +5208,7 @@ yy495: { return T_DEC; } -#line 5217 "Zend/zend_language_scanner.c" +#line 5212 "Zend/zend_language_scanner.c" yy497: YYDEBUG(497, *YYCURSOR); ++YYCURSOR; @@ -5224,7 +5219,7 @@ yy497: yy_push_state(ST_LOOKING_FOR_PROPERTY TSRMLS_CC); return T_OBJECT_OPERATOR; } -#line 5228 "Zend/zend_language_scanner.c" +#line 5223 "Zend/zend_language_scanner.c" yy499: YYDEBUG(499, *YYCURSOR); yych = *++YYCURSOR; @@ -5273,7 +5268,7 @@ yy504: { return T_PUBLIC; } -#line 5277 "Zend/zend_language_scanner.c" +#line 5272 "Zend/zend_language_scanner.c" yy506: YYDEBUG(506, *YYCURSOR); yych = *++YYCURSOR; @@ -5332,7 +5327,7 @@ yy513: { return T_PROTECTED; } -#line 5336 "Zend/zend_language_scanner.c" +#line 5331 "Zend/zend_language_scanner.c" yy515: YYDEBUG(515, *YYCURSOR); yych = *++YYCURSOR; @@ -5366,7 +5361,7 @@ yy519: { return T_PRIVATE; } -#line 5370 "Zend/zend_language_scanner.c" +#line 5365 "Zend/zend_language_scanner.c" yy521: YYDEBUG(521, *YYCURSOR); ++YYCURSOR; @@ -5379,7 +5374,7 @@ yy521: { return T_PRINT; } -#line 5383 "Zend/zend_language_scanner.c" +#line 5378 "Zend/zend_language_scanner.c" yy523: YYDEBUG(523, *YYCURSOR); yych = *++YYCURSOR; @@ -5408,7 +5403,7 @@ yy526: { return T_GOTO; } -#line 5412 "Zend/zend_language_scanner.c" +#line 5407 "Zend/zend_language_scanner.c" yy528: YYDEBUG(528, *YYCURSOR); yych = *++YYCURSOR; @@ -5436,7 +5431,7 @@ yy531: { return T_GLOBAL; } -#line 5440 "Zend/zend_language_scanner.c" +#line 5435 "Zend/zend_language_scanner.c" yy533: YYDEBUG(533, *YYCURSOR); yych = *++YYCURSOR; @@ -5477,7 +5472,7 @@ yy539: { return T_BREAK; } -#line 5481 "Zend/zend_language_scanner.c" +#line 5476 "Zend/zend_language_scanner.c" yy541: YYDEBUG(541, *YYCURSOR); yych = *++YYCURSOR; @@ -5521,7 +5516,7 @@ yy547: { return T_SWITCH; } -#line 5525 "Zend/zend_language_scanner.c" +#line 5520 "Zend/zend_language_scanner.c" yy549: YYDEBUG(549, *YYCURSOR); yych = *++YYCURSOR; @@ -5549,7 +5544,7 @@ yy552: { return T_STATIC; } -#line 5553 "Zend/zend_language_scanner.c" +#line 5548 "Zend/zend_language_scanner.c" yy554: YYDEBUG(554, *YYCURSOR); yych = *++YYCURSOR; @@ -5580,7 +5575,7 @@ yy557: { return T_AS; } -#line 5584 "Zend/zend_language_scanner.c" +#line 5579 "Zend/zend_language_scanner.c" yy559: YYDEBUG(559, *YYCURSOR); yych = *++YYCURSOR; @@ -5603,7 +5598,7 @@ yy561: { return T_ARRAY; } -#line 5607 "Zend/zend_language_scanner.c" +#line 5602 "Zend/zend_language_scanner.c" yy563: YYDEBUG(563, *YYCURSOR); ++YYCURSOR; @@ -5616,7 +5611,7 @@ yy563: { return T_LOGICAL_AND; } -#line 5620 "Zend/zend_language_scanner.c" +#line 5615 "Zend/zend_language_scanner.c" yy565: YYDEBUG(565, *YYCURSOR); yych = *++YYCURSOR; @@ -5654,7 +5649,7 @@ yy570: { return T_ABSTRACT; } -#line 5658 "Zend/zend_language_scanner.c" +#line 5653 "Zend/zend_language_scanner.c" yy572: YYDEBUG(572, *YYCURSOR); yych = *++YYCURSOR; @@ -5682,7 +5677,7 @@ yy575: { return T_WHILE; } -#line 5686 "Zend/zend_language_scanner.c" +#line 5681 "Zend/zend_language_scanner.c" yy577: YYDEBUG(577, *YYCURSOR); ++YYCURSOR; @@ -5695,7 +5690,7 @@ yy577: { return T_IF; } -#line 5699 "Zend/zend_language_scanner.c" +#line 5694 "Zend/zend_language_scanner.c" yy579: YYDEBUG(579, *YYCURSOR); yych = *++YYCURSOR; @@ -5751,7 +5746,7 @@ yy584: { return T_ISSET; } -#line 5755 "Zend/zend_language_scanner.c" +#line 5750 "Zend/zend_language_scanner.c" yy586: YYDEBUG(586, *YYCURSOR); yych = *++YYCURSOR; @@ -5809,7 +5804,7 @@ yy593: { return T_INCLUDE; } -#line 5813 "Zend/zend_language_scanner.c" +#line 5808 "Zend/zend_language_scanner.c" yy594: YYDEBUG(594, *YYCURSOR); yych = *++YYCURSOR; @@ -5842,7 +5837,7 @@ yy598: { return T_INCLUDE_ONCE; } -#line 5846 "Zend/zend_language_scanner.c" +#line 5841 "Zend/zend_language_scanner.c" yy600: YYDEBUG(600, *YYCURSOR); yych = *++YYCURSOR; @@ -5880,7 +5875,7 @@ yy605: { return T_INTERFACE; } -#line 5884 "Zend/zend_language_scanner.c" +#line 5879 "Zend/zend_language_scanner.c" yy607: YYDEBUG(607, *YYCURSOR); yych = *++YYCURSOR; @@ -5934,7 +5929,7 @@ yy613: { return T_INSTEADOF; } -#line 5938 "Zend/zend_language_scanner.c" +#line 5933 "Zend/zend_language_scanner.c" yy615: YYDEBUG(615, *YYCURSOR); yych = *++YYCURSOR; @@ -5967,7 +5962,7 @@ yy619: { return T_INSTANCEOF; } -#line 5971 "Zend/zend_language_scanner.c" +#line 5966 "Zend/zend_language_scanner.c" yy621: YYDEBUG(621, *YYCURSOR); yych = *++YYCURSOR; @@ -6015,7 +6010,7 @@ yy628: { return T_IMPLEMENTS; } -#line 6019 "Zend/zend_language_scanner.c" +#line 6014 "Zend/zend_language_scanner.c" yy630: YYDEBUG(630, *YYCURSOR); yych = *++YYCURSOR; @@ -6047,7 +6042,7 @@ yy631: { return T_TRY; } -#line 6051 "Zend/zend_language_scanner.c" +#line 6046 "Zend/zend_language_scanner.c" yy634: YYDEBUG(634, *YYCURSOR); yych = *++YYCURSOR; @@ -6070,7 +6065,7 @@ yy636: { return T_TRAIT; } -#line 6074 "Zend/zend_language_scanner.c" +#line 6069 "Zend/zend_language_scanner.c" yy638: YYDEBUG(638, *YYCURSOR); yych = *++YYCURSOR; @@ -6093,7 +6088,7 @@ yy640: { return T_THROW; } -#line 6097 "Zend/zend_language_scanner.c" +#line 6092 "Zend/zend_language_scanner.c" yy642: YYDEBUG(642, *YYCURSOR); yych = *++YYCURSOR; @@ -6121,7 +6116,7 @@ yy645: { return T_YIELD; } -#line 6125 "Zend/zend_language_scanner.c" +#line 6120 "Zend/zend_language_scanner.c" yy647: YYDEBUG(647, *YYCURSOR); yych = *++YYCURSOR; @@ -6186,7 +6181,7 @@ yy654: { return T_REQUIRE; } -#line 6190 "Zend/zend_language_scanner.c" +#line 6185 "Zend/zend_language_scanner.c" yy655: YYDEBUG(655, *YYCURSOR); yych = *++YYCURSOR; @@ -6219,7 +6214,7 @@ yy659: { return T_REQUIRE_ONCE; } -#line 6223 "Zend/zend_language_scanner.c" +#line 6218 "Zend/zend_language_scanner.c" yy661: YYDEBUG(661, *YYCURSOR); yych = *++YYCURSOR; @@ -6242,7 +6237,7 @@ yy663: { return T_RETURN; } -#line 6246 "Zend/zend_language_scanner.c" +#line 6241 "Zend/zend_language_scanner.c" yy665: YYDEBUG(665, *YYCURSOR); yych = *++YYCURSOR; @@ -6336,7 +6331,7 @@ yy674: { return T_CONTINUE; } -#line 6340 "Zend/zend_language_scanner.c" +#line 6335 "Zend/zend_language_scanner.c" yy676: YYDEBUG(676, *YYCURSOR); ++YYCURSOR; @@ -6349,7 +6344,7 @@ yy676: { return T_CONST; } -#line 6353 "Zend/zend_language_scanner.c" +#line 6348 "Zend/zend_language_scanner.c" yy678: YYDEBUG(678, *YYCURSOR); yych = *++YYCURSOR; @@ -6378,7 +6373,7 @@ yy681: { return T_CLONE; } -#line 6382 "Zend/zend_language_scanner.c" +#line 6377 "Zend/zend_language_scanner.c" yy683: YYDEBUG(683, *YYCURSOR); yych = *++YYCURSOR; @@ -6396,7 +6391,7 @@ yy684: { return T_CLASS; } -#line 6400 "Zend/zend_language_scanner.c" +#line 6395 "Zend/zend_language_scanner.c" yy686: YYDEBUG(686, *YYCURSOR); yych = *++YYCURSOR; @@ -6446,7 +6441,7 @@ yy693: { return T_CALLABLE; } -#line 6450 "Zend/zend_language_scanner.c" +#line 6445 "Zend/zend_language_scanner.c" yy695: YYDEBUG(695, *YYCURSOR); ++YYCURSOR; @@ -6459,7 +6454,7 @@ yy695: { return T_CASE; } -#line 6463 "Zend/zend_language_scanner.c" +#line 6458 "Zend/zend_language_scanner.c" yy697: YYDEBUG(697, *YYCURSOR); yych = *++YYCURSOR; @@ -6477,7 +6472,7 @@ yy698: { return T_CATCH; } -#line 6481 "Zend/zend_language_scanner.c" +#line 6476 "Zend/zend_language_scanner.c" yy700: YYDEBUG(700, *YYCURSOR); yych = *++YYCURSOR; @@ -6532,7 +6527,7 @@ yy708: { return T_FUNCTION; } -#line 6536 "Zend/zend_language_scanner.c" +#line 6531 "Zend/zend_language_scanner.c" yy710: YYDEBUG(710, *YYCURSOR); ++YYCURSOR; @@ -6560,7 +6555,7 @@ yy711: { return T_FOR; } -#line 6564 "Zend/zend_language_scanner.c" +#line 6559 "Zend/zend_language_scanner.c" yy712: YYDEBUG(712, *YYCURSOR); yych = *++YYCURSOR; @@ -6588,7 +6583,7 @@ yy715: { return T_FOREACH; } -#line 6592 "Zend/zend_language_scanner.c" +#line 6587 "Zend/zend_language_scanner.c" yy717: YYDEBUG(717, *YYCURSOR); yych = *++YYCURSOR; @@ -6626,7 +6621,7 @@ yy720: { return T_FINAL; } -#line 6630 "Zend/zend_language_scanner.c" +#line 6625 "Zend/zend_language_scanner.c" yy721: YYDEBUG(721, *YYCURSOR); yych = *++YYCURSOR; @@ -6644,7 +6639,7 @@ yy722: { return T_FINALLY; } -#line 6648 "Zend/zend_language_scanner.c" +#line 6643 "Zend/zend_language_scanner.c" yy724: YYDEBUG(724, *YYCURSOR); yych = *++YYCURSOR; @@ -6679,7 +6674,7 @@ yy726: { return T_DO; } -#line 6683 "Zend/zend_language_scanner.c" +#line 6678 "Zend/zend_language_scanner.c" yy728: YYDEBUG(728, *YYCURSOR); ++YYCURSOR; @@ -6692,7 +6687,7 @@ yy728: { return T_EXIT; } -#line 6696 "Zend/zend_language_scanner.c" +#line 6691 "Zend/zend_language_scanner.c" yy730: YYDEBUG(730, *YYCURSOR); yych = *++YYCURSOR; @@ -6731,7 +6726,7 @@ yy735: { return T_DEFAULT; } -#line 6735 "Zend/zend_language_scanner.c" +#line 6730 "Zend/zend_language_scanner.c" yy737: YYDEBUG(737, *YYCURSOR); yych = *++YYCURSOR; @@ -6759,7 +6754,7 @@ yy740: { return T_DECLARE; } -#line 6763 "Zend/zend_language_scanner.c" +#line 6758 "Zend/zend_language_scanner.c" yy742: YYDEBUG(742, *YYCURSOR); yych = *++YYCURSOR; @@ -6843,7 +6838,7 @@ yy753: { return T_EXTENDS; } -#line 6847 "Zend/zend_language_scanner.c" +#line 6842 "Zend/zend_language_scanner.c" yy755: YYDEBUG(755, *YYCURSOR); ++YYCURSOR; @@ -6856,7 +6851,7 @@ yy755: { return T_EXIT; } -#line 6860 "Zend/zend_language_scanner.c" +#line 6855 "Zend/zend_language_scanner.c" yy757: YYDEBUG(757, *YYCURSOR); yych = *++YYCURSOR; @@ -6874,7 +6869,7 @@ yy758: { return T_EVAL; } -#line 6878 "Zend/zend_language_scanner.c" +#line 6873 "Zend/zend_language_scanner.c" yy760: YYDEBUG(760, *YYCURSOR); yych = *++YYCURSOR; @@ -6948,7 +6943,7 @@ yy769: { return T_ENDWHILE; } -#line 6952 "Zend/zend_language_scanner.c" +#line 6947 "Zend/zend_language_scanner.c" yy771: YYDEBUG(771, *YYCURSOR); yych = *++YYCURSOR; @@ -6981,7 +6976,7 @@ yy775: { return T_ENDSWITCH; } -#line 6985 "Zend/zend_language_scanner.c" +#line 6980 "Zend/zend_language_scanner.c" yy777: YYDEBUG(777, *YYCURSOR); ++YYCURSOR; @@ -6994,7 +6989,7 @@ yy777: { return T_ENDIF; } -#line 6998 "Zend/zend_language_scanner.c" +#line 6993 "Zend/zend_language_scanner.c" yy779: YYDEBUG(779, *YYCURSOR); yych = *++YYCURSOR; @@ -7027,7 +7022,7 @@ yy781: { return T_ENDFOR; } -#line 7031 "Zend/zend_language_scanner.c" +#line 7026 "Zend/zend_language_scanner.c" yy782: YYDEBUG(782, *YYCURSOR); yych = *++YYCURSOR; @@ -7055,7 +7050,7 @@ yy785: { return T_ENDFOREACH; } -#line 7059 "Zend/zend_language_scanner.c" +#line 7054 "Zend/zend_language_scanner.c" yy787: YYDEBUG(787, *YYCURSOR); yych = *++YYCURSOR; @@ -7093,7 +7088,7 @@ yy792: { return T_ENDDECLARE; } -#line 7097 "Zend/zend_language_scanner.c" +#line 7092 "Zend/zend_language_scanner.c" yy794: YYDEBUG(794, *YYCURSOR); yych = *++YYCURSOR; @@ -7116,7 +7111,7 @@ yy796: { return T_EMPTY; } -#line 7120 "Zend/zend_language_scanner.c" +#line 7115 "Zend/zend_language_scanner.c" yy798: YYDEBUG(798, *YYCURSOR); yych = *++YYCURSOR; @@ -7149,7 +7144,7 @@ yy800: { return T_ELSE; } -#line 7153 "Zend/zend_language_scanner.c" +#line 7148 "Zend/zend_language_scanner.c" yy801: YYDEBUG(801, *YYCURSOR); yych = *++YYCURSOR; @@ -7167,7 +7162,7 @@ yy802: { return T_ELSEIF; } -#line 7171 "Zend/zend_language_scanner.c" +#line 7166 "Zend/zend_language_scanner.c" yy804: YYDEBUG(804, *YYCURSOR); yych = *++YYCURSOR; @@ -7185,7 +7180,7 @@ yy805: { return T_ECHO; } -#line 7189 "Zend/zend_language_scanner.c" +#line 7184 "Zend/zend_language_scanner.c" } /* *********************************** */ yyc_ST_LOOKING_FOR_PROPERTY: @@ -7264,7 +7259,7 @@ yy810: HANDLE_NEWLINES(yytext, yyleng); return T_WHITESPACE; } -#line 7268 "Zend/zend_language_scanner.c" +#line 7263 "Zend/zend_language_scanner.c" yy811: YYDEBUG(811, *YYCURSOR); ++YYCURSOR; @@ -7278,7 +7273,7 @@ yy812: yy_pop_state(TSRMLS_C); goto restart; } -#line 7282 "Zend/zend_language_scanner.c" +#line 7277 "Zend/zend_language_scanner.c" yy813: YYDEBUG(813, *YYCURSOR); ++YYCURSOR; @@ -7293,7 +7288,7 @@ yy814: zend_copy_value(zendlval, yytext, yyleng); return T_STRING; } -#line 7297 "Zend/zend_language_scanner.c" +#line 7292 "Zend/zend_language_scanner.c" yy815: YYDEBUG(815, *YYCURSOR); yych = *++YYCURSOR; @@ -7318,7 +7313,7 @@ yy818: { return T_OBJECT_OPERATOR; } -#line 7322 "Zend/zend_language_scanner.c" +#line 7317 "Zend/zend_language_scanner.c" yy820: YYDEBUG(820, *YYCURSOR); ++YYCURSOR; @@ -7410,7 +7405,7 @@ yy825: yy_push_state(ST_IN_SCRIPTING TSRMLS_CC); goto restart; } -#line 7414 "Zend/zend_language_scanner.c" +#line 7409 "Zend/zend_language_scanner.c" yy826: YYDEBUG(826, *YYCURSOR); yych = *++YYCURSOR; @@ -7443,7 +7438,7 @@ yy830: yy_push_state(ST_IN_SCRIPTING TSRMLS_CC); return T_STRING_VARNAME; } -#line 7447 "Zend/zend_language_scanner.c" +#line 7442 "Zend/zend_language_scanner.c" } /* *********************************** */ yyc_ST_NOWDOC: @@ -7454,7 +7449,7 @@ yyc_ST_NOWDOC: ++YYCURSOR; YYDEBUG(835, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2285 "Zend/zend_language_scanner.l" +#line 2280 "Zend/zend_language_scanner.l" { int newline = 0; @@ -7510,7 +7505,7 @@ nowdoc_scan_done: HANDLE_NEWLINES(yytext, yyleng - newline); return T_ENCAPSED_AND_WHITESPACE; } -#line 7514 "Zend/zend_language_scanner.c" +#line 7509 "Zend/zend_language_scanner.c" /* *********************************** */ yyc_ST_VAR_OFFSET: { @@ -7626,7 +7621,7 @@ yy839: } return T_NUM_STRING; } -#line 7630 "Zend/zend_language_scanner.c" +#line 7625 "Zend/zend_language_scanner.c" yy840: YYDEBUG(840, *YYCURSOR); yych = *++YYCURSOR; @@ -7646,23 +7641,23 @@ yy841: yy842: YYDEBUG(842, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1817 "Zend/zend_language_scanner.l" +#line 1812 "Zend/zend_language_scanner.l" { /* Only '[' can be valid, but returning other tokens will allow a more explicit parse error */ return yytext[0]; } -#line 7655 "Zend/zend_language_scanner.c" +#line 7650 "Zend/zend_language_scanner.c" yy843: YYDEBUG(843, *YYCURSOR); ++YYCURSOR; YYDEBUG(844, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1812 "Zend/zend_language_scanner.l" +#line 1807 "Zend/zend_language_scanner.l" { yy_pop_state(TSRMLS_C); return ']'; } -#line 7666 "Zend/zend_language_scanner.c" +#line 7661 "Zend/zend_language_scanner.c" yy845: YYDEBUG(845, *YYCURSOR); yych = *++YYCURSOR; @@ -7672,14 +7667,14 @@ yy846: ++YYCURSOR; YYDEBUG(847, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1822 "Zend/zend_language_scanner.l" +#line 1817 "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 7683 "Zend/zend_language_scanner.c" +#line 7678 "Zend/zend_language_scanner.c" yy848: YYDEBUG(848, *YYCURSOR); ++YYCURSOR; @@ -7688,18 +7683,18 @@ yy848: yy849: YYDEBUG(849, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1829 "Zend/zend_language_scanner.l" +#line 1824 "Zend/zend_language_scanner.l" { zend_copy_value(zendlval, yytext, yyleng); return T_STRING; } -#line 7697 "Zend/zend_language_scanner.c" +#line 7692 "Zend/zend_language_scanner.c" yy850: YYDEBUG(850, *YYCURSOR); ++YYCURSOR; YYDEBUG(851, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 2342 "Zend/zend_language_scanner.l" +#line 2337 "Zend/zend_language_scanner.l" { if (YYCURSOR > YYLIMIT) { return 0; @@ -7708,7 +7703,7 @@ yy850: zend_error(E_COMPILE_WARNING,"Unexpected character in input: '%c' (ASCII=%d) state=%d", yytext[0], yytext[0], YYSTATE); goto restart; } -#line 7712 "Zend/zend_language_scanner.c" +#line 7707 "Zend/zend_language_scanner.c" yy852: YYDEBUG(852, *YYCURSOR); ++YYCURSOR; @@ -7744,12 +7739,12 @@ yy854: yy856: YYDEBUG(856, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); -#line 1807 "Zend/zend_language_scanner.l" +#line 1802 "Zend/zend_language_scanner.l" { zend_copy_value(zendlval, (yytext+1), (yyleng-1)); return T_VARIABLE; } -#line 7753 "Zend/zend_language_scanner.c" +#line 7748 "Zend/zend_language_scanner.c" yy857: YYDEBUG(857, *YYCURSOR); ++YYCURSOR; @@ -7794,7 +7789,7 @@ yy864: ZVAL_STRINGL(zendlval, yytext, yyleng); return T_NUM_STRING; } -#line 7798 "Zend/zend_language_scanner.c" +#line 7793 "Zend/zend_language_scanner.c" yy865: YYDEBUG(865, *YYCURSOR); ++YYCURSOR; @@ -7817,6 +7812,6 @@ yy867: goto yy864; } } -#line 2351 "Zend/zend_language_scanner.l" +#line 2346 "Zend/zend_language_scanner.l" } diff --git a/Zend/zend_language_scanner.l b/Zend/zend_language_scanner.l index 4a4dc48..8d148e6 100644 --- a/Zend/zend_language_scanner.l +++ b/Zend/zend_language_scanner.l @@ -1652,11 +1652,6 @@ NEWLINE ("\r"|"\n"|"\r\n") } <ST_IN_SCRIPTING>"__NAMESPACE__" { - if (Z_TYPE(CG(current_namespace)) != IS_UNDEF) { - ZVAL_DUP(zendlval, &CG(current_namespace)); - } else { - ZVAL_EMPTY_STRING(zendlval); - } return T_NS_C; }
« previous php.cvs (#80943) next »