]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0'
authorNikita Popov <nikic@php.net>
Fri, 11 Mar 2016 21:28:50 +0000 (22:28 +0100)
committerNikita Popov <nikic@php.net>
Fri, 11 Mar 2016 21:28:50 +0000 (22:28 +0100)
1  2 
Zend/zend_language_parser.y

index fd45f6275a1acccdaa894d21c96f206741bf789f,804ed37473b4d846fb7db8770534258ccf417222..754c50215dac5f22e4f5cd709fac97d74d2f8faa
@@@ -701,14 -701,14 +701,14 @@@ class_statement_list
  class_statement:
                variable_modifiers property_list ';'
                        { $$ = $2; $$->attr = $1; }
 -      |       T_CONST class_const_list ';'
 -                      { $$ = $2; RESET_DOC_COMMENT(); }
 +      |       method_modifiers T_CONST class_const_list ';'
 +                      { $$ = $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: