summaryrefslogtreecommitdiff
path: root/Zend/zend_language_parser.y
diff options
context:
space:
mode:
authorGuilherme Blanco <guilhermeblanco@hotmail.com>2014-12-05 17:09:49 +0000
committerJulien Pauli <jpauli@php.net>2015-01-09 15:45:02 +0100
commitd51fb69c0125a144cacb8c59df89fea3f8ae7f4b (patch)
treefa054d097845ba51af8e4c361461beac686f4b21 /Zend/zend_language_parser.y
parentf48c2327403ce76a870e74f31a069a64dfb711a2 (diff)
downloadphp-git-d51fb69c0125a144cacb8c59df89fea3f8ae7f4b.tar.gz
Removed parsing support traits to have extends and implements.
Diffstat (limited to 'Zend/zend_language_parser.y')
-rw-r--r--Zend/zend_language_parser.y4
1 files changed, 2 insertions, 2 deletions
diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y
index 1d18ae9d7e..276e478b90 100644
--- a/Zend/zend_language_parser.y
+++ b/Zend/zend_language_parser.y
@@ -445,8 +445,8 @@ class_modifier:
trait_declaration_statement:
T_TRAIT { $<num>$ = CG(zend_lineno); }
- T_STRING extends_from implements_list backup_doc_comment '{' class_statement_list '}'
- { $$ = zend_ast_create_decl(ZEND_AST_CLASS, ZEND_ACC_TRAIT, $<num>2, $6, zend_ast_get_str($3), $4, $5, $8); }
+ T_STRING backup_doc_comment '{' class_statement_list '}'
+ { $$ = zend_ast_create_decl(ZEND_AST_CLASS, ZEND_ACC_TRAIT, $<num>2, $4, zend_ast_get_str($3), NULL, NULL, $6); }
;
interface_declaration_statement: