diff options
| author | Nikita Popov <nikic@php.net> | 2016-03-11 22:28:50 +0100 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2016-03-11 22:28:50 +0100 |
| commit | d9f0c8429db8f25d3e1d768ad4db69ee4c4a277c (patch) | |
| tree | 5b893adc43c63baa985ce9fdca7a32950bfc49df /Zend | |
| parent | 7f80514aa19b11851adc1c434220b8707b92c11d (diff) | |
| parent | ccc5150f15c747fe5e9b5a17fcb135e7989d0181 (diff) | |
| download | php-git-d9f0c8429db8f25d3e1d768ad4db69ee4c4a277c.tar.gz | |
Merge branch 'PHP-7.0'
Diffstat (limited to 'Zend')
| -rw-r--r-- | Zend/tests/grammar/regression_004.phpt | 2 | ||||
| -rw-r--r-- | Zend/zend_language_parser.y | 32 |
2 files changed, 17 insertions, 17 deletions
diff --git a/Zend/tests/grammar/regression_004.phpt b/Zend/tests/grammar/regression_004.phpt index e95674d8c9..edb32032ea 100644 --- a/Zend/tests/grammar/regression_004.phpt +++ b/Zend/tests/grammar/regression_004.phpt @@ -12,4 +12,4 @@ class Obj function echo(){} // not valid --EXPECTF-- -Parse error: syntax error, unexpected 'echo' (T_ECHO), expecting identifier (T_STRING) or '(' in %s on line 9 +Parse error: syntax error, unexpected 'echo' (T_ECHO), expecting %s in %s on line 9 diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y index fd45f6275a..754c50215d 100644 --- a/Zend/zend_language_parser.y +++ b/Zend/zend_language_parser.y @@ -473,10 +473,10 @@ unset_variable: ; function_declaration_statement: - function returns_ref T_STRING '(' parameter_list ')' return_type - backup_doc_comment '{' inner_statement_list '}' - { $$ = zend_ast_create_decl(ZEND_AST_FUNC_DECL, $2, $1, $8, - zend_ast_get_str($3), $5, NULL, $10, $7); } + function returns_ref T_STRING backup_doc_comment '(' parameter_list ')' return_type + '{' inner_statement_list '}' + { $$ = zend_ast_create_decl(ZEND_AST_FUNC_DECL, $2, $1, $4, + zend_ast_get_str($3), $6, NULL, $10, $8); } ; is_reference: @@ -705,10 +705,10 @@ class_statement: { $$ = $3; $$->attr = $1; } | T_USE name_list trait_adaptations { $$ = zend_ast_create(ZEND_AST_USE_TRAIT, $2, $3); } - | method_modifiers function returns_ref identifier '(' parameter_list ')' - return_type backup_doc_comment method_body - { $$ = zend_ast_create_decl(ZEND_AST_METHOD, $3 | $1, $2, $9, - zend_ast_get_str($4), $6, NULL, $10, $8); } + | method_modifiers function returns_ref identifier backup_doc_comment '(' parameter_list ')' + return_type method_body + { $$ = zend_ast_create_decl(ZEND_AST_METHOD, $3 | $1, $2, $5, + zend_ast_get_str($4), $7, NULL, $10, $9); } ; name_list: @@ -959,16 +959,16 @@ expr_without_variable: | T_YIELD expr { $$ = zend_ast_create(ZEND_AST_YIELD, $2, NULL); } | T_YIELD expr T_DOUBLE_ARROW expr { $$ = zend_ast_create(ZEND_AST_YIELD, $4, $2); } | T_YIELD_FROM expr { $$ = zend_ast_create(ZEND_AST_YIELD_FROM, $2); } - | function returns_ref '(' parameter_list ')' lexical_vars return_type - backup_doc_comment '{' inner_statement_list '}' - { $$ = zend_ast_create_decl(ZEND_AST_CLOSURE, $2, $1, $8, + | function returns_ref backup_doc_comment '(' parameter_list ')' lexical_vars return_type + '{' inner_statement_list '}' + { $$ = zend_ast_create_decl(ZEND_AST_CLOSURE, $2, $1, $3, zend_string_init("{closure}", sizeof("{closure}") - 1, 0), - $4, $6, $10, $7); } - | T_STATIC function returns_ref '(' parameter_list ')' lexical_vars - return_type backup_doc_comment '{' inner_statement_list '}' - { $$ = zend_ast_create_decl(ZEND_AST_CLOSURE, $3 | ZEND_ACC_STATIC, $2, $9, + $5, $7, $10, $8); } + | T_STATIC function returns_ref backup_doc_comment '(' parameter_list ')' lexical_vars + return_type '{' inner_statement_list '}' + { $$ = zend_ast_create_decl(ZEND_AST_CLOSURE, $3 | ZEND_ACC_STATIC, $2, $4, zend_string_init("{closure}", sizeof("{closure}") - 1, 0), - $5, $7, $11, $8); } + $6, $8, $11, $9); } ; function: |