com php-src: Handle class const doc comment: Zend/zend_compil e.c Zend/zend_language_parser.y
| From: | Nikita Popov | Date: | Sat, 19 Jul 2014 13:20:35 +0000 |
| Subject: | com php-src: Handle class const doc comment: Zend/zend_compil e.c Zend/zend_language_parser.y | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-80970@lists.php.net to get a copy of this message | ||
Commit: fd7387a7619a6fab09bc63ac4bfae77eb6ca9ebc
Author: Nikita Popov <nikic@php.net> Sat, 19 Jul 2014 15:18:06 +0200
Parents: 222430d99cd6dc8e31228a9c91e615a2c2987b6d
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=fd7387a7619a6fab09bc63ac4bfae77eb6ca9ebc
Log:
Handle class const doc comment
Property doc comments not yet handled
Changed paths:
M Zend/zend_compile.c
M Zend/zend_language_parser.y
Diff:
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
index 66eb470..d19e377 100644
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@ -6545,8 +6545,6 @@ void zend_compile_class_const_decl(zend_ast *ast TSRMLS_DC) {
zend_error_noreturn(E_COMPILE_ERROR, "Cannot redefine class constant %s::%s",
ce->name->val, name);
}
-
- // TODO.AST doc comment
}
}
diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y
index e2018e5..7380949 100644
--- a/Zend/zend_language_parser.y
+++ b/Zend/zend_language_parser.y
@@ -628,7 +628,10 @@ class_statement_list:
class_statement:
variable_modifiers property_list ';'
{ $$.u.ast = $2.u.ast; $$.u.ast->attr = Z_LVAL($1.u.constant); AS($$); }
- | class_const_list ';' { $$.u.ast = $1.u.ast; AS($$); }
+ | class_const_list ';'
+ { $$.u.ast = $1.u.ast;
+ if (CG(doc_comment)) { STR_RELEASE(CG(doc_comment)); CG(doc_comment) = NULL; }
+ AS($$); }
| trait_use_statement
| method_modifiers function returns_ref T_STRING '(' parameter_list ')'
method_body
{ $$.u.ast = zend_ast_create_func_decl(ZEND_AST_METHOD, $3.EA | Z_LVAL($1.u.constant),