diff options
| author | Márcio Almada <marcio3w@gmail.com> | 2015-10-06 17:32:23 -0300 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2015-10-07 16:25:59 +0200 |
| commit | ddb6d7801e5dfc2f196b549b8ad51376cdc1bc90 (patch) | |
| tree | 2f97cc5f33933881499f10d047972e8753d4c1cc /Zend/zend_language_parser.y | |
| parent | f9e3461c02068c599ea9fbf6455860c8cc956bc6 (diff) | |
| download | php-git-ddb6d7801e5dfc2f196b549b8ad51376cdc1bc90.tar.gz | |
Fix bug #70650
Diffstat (limited to 'Zend/zend_language_parser.y')
| -rw-r--r-- | Zend/zend_language_parser.y | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y index c52c252f6c..dde76351e9 100644 --- a/Zend/zend_language_parser.y +++ b/Zend/zend_language_parser.y @@ -700,7 +700,7 @@ class_statement_list: class_statement: variable_modifiers property_list ';' - { $$ = zend_ast_append_doc_comment($2); $$->attr = $1; } + { $$ = $2; $$->attr = $1; } | T_CONST class_const_list ';' { $$ = $2; RESET_DOC_COMMENT(); } | T_USE name_list trait_adaptations @@ -798,9 +798,10 @@ property_list: ; property: - T_VARIABLE { $$ = zend_ast_create(ZEND_AST_PROP_ELEM, $1, NULL); } - | T_VARIABLE '=' expr - { $$ = zend_ast_create(ZEND_AST_PROP_ELEM, $1, $3); } + T_VARIABLE backup_doc_comment + { $$ = zend_ast_create(ZEND_AST_PROP_ELEM, $1, NULL, ($2 ? zend_ast_create_zval_from_str($2) : NULL)); } + | T_VARIABLE '=' expr backup_doc_comment + { $$ = zend_ast_create(ZEND_AST_PROP_ELEM, $1, $3, ($4 ? zend_ast_create_zval_from_str($4) : NULL)); } ; class_const_list: |