diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2012-12-25 10:23:08 +0400 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2012-12-25 10:23:08 +0400 |
| commit | 3f8c729e693c432b438cd33679182260d8732e30 (patch) | |
| tree | 685b406e52f3a30d1a6cdfd5939a9d0cf0002df1 /Zend/zend_language_parser.y | |
| parent | 3f0dcc08e0bd748b8ea6c6d8d2e6245515e014d5 (diff) | |
| download | php-git-3f8c729e693c432b438cd33679182260d8732e30.tar.gz | |
Traits refactoring
Diffstat (limited to 'Zend/zend_language_parser.y')
| -rw-r--r-- | Zend/zend_language_parser.y | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y index 9a0b3209e5..92f25f06ed 100644 --- a/Zend/zend_language_parser.y +++ b/Zend/zend_language_parser.y @@ -585,8 +585,8 @@ trait_use_statement: ; trait_list: - fully_qualified_class_name { zend_do_implements_trait(&$1 TSRMLS_CC); } - | trait_list ',' fully_qualified_class_name { zend_do_implements_trait(&$3 TSRMLS_CC); } + fully_qualified_class_name { zend_do_use_trait(&$1 TSRMLS_CC); } + | trait_list ',' fully_qualified_class_name { zend_do_use_trait(&$3 TSRMLS_CC); } ; trait_adaptations: @@ -605,12 +605,12 @@ non_empty_trait_adaptation_list: ; trait_adaptation_statement: - trait_precedence ';' { zend_add_trait_precedence(&$1 TSRMLS_CC); } - | trait_alias ';' { zend_add_trait_alias(&$1 TSRMLS_CC); } + trait_precedence ';' + | trait_alias ';' ; trait_precedence: - trait_method_reference_fully_qualified T_INSTEADOF trait_reference_list { zend_prepare_trait_precedence(&$$, &$1, &$3 TSRMLS_CC); } + trait_method_reference_fully_qualified T_INSTEADOF trait_reference_list { zend_add_trait_precedence(&$1, &$3 TSRMLS_CC); } ; trait_reference_list: @@ -628,8 +628,8 @@ trait_method_reference_fully_qualified: ; trait_alias: - trait_method_reference T_AS trait_modifiers T_STRING { zend_prepare_trait_alias(&$$, &$1, &$3, &$4 TSRMLS_CC); } - | trait_method_reference T_AS member_modifier { zend_prepare_trait_alias(&$$, &$1, &$3, NULL TSRMLS_CC); } + trait_method_reference T_AS trait_modifiers T_STRING { zend_add_trait_alias(&$1, &$3, &$4 TSRMLS_CC); } + | trait_method_reference T_AS member_modifier { zend_add_trait_alias(&$1, &$3, NULL TSRMLS_CC); } ; trait_modifiers: |