com php-src: Get rid of base_variable_with_function_cal ls: Zend/zend_language_parser.y

From: Date: Fri, 30 May 2014 19:14:18 +0000
Subject: com php-src: Get rid of base_variable_with_function_cal ls: Zend/zend_language_parser.y
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-81089@lists.php.net to get a copy of this message
Commit: 46e35e3d5dd6447245a4d80ddde21f4e348c98d5 Author: Nikita Popov <nikic@php.net> Fri, 30 May 2014 21:14:18 +0200 Parents: e2be2cee97ade5169d4502c862360f67f5544e6e Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=46e35e3d5dd6447245a4d80ddde21f4e348c98d5 Log: Get rid of base_variable_with_function_calls Changed paths: M Zend/zend_language_parser.y Diff: diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y index 206c290..1fd580e 100644 --- a/Zend/zend_language_parser.y +++ b/Zend/zend_language_parser.y @@ -1082,10 +1082,10 @@ rw_variable: ; variable: - base_variable_with_function_calls T_OBJECT_OPERATOR { zend_do_push_object(&$1 TSRMLS_CC); } + base_variable T_OBJECT_OPERATOR { zend_do_push_object(&$1 TSRMLS_CC); } object_property { zend_do_push_object(&$4 TSRMLS_CC); } method_or_not variable_properties { zend_do_pop_object(&$$ TSRMLS_CC); $$.EA = $1.EA | ($7.EA ? $7.EA : $6.EA); } - | base_variable_with_function_calls { $$ = $1; } + | base_variable { $$ = $1; } ; variable_properties: @@ -1134,16 +1134,11 @@ array_function_dereference: '[' dim_offset ']' { fetch_array_dim(&$$, &$1, &$4 TSRMLS_CC); } ; -base_variable_with_function_calls: - base_variable { $$ = $1; } - | array_function_dereference { $$ = $1; } - | function_call { zend_do_begin_variable_parse(TSRMLS_C); $$ = $1; $$.EA = ZEND_PARSED_FUNCTION_CALL; } -; - - base_variable: reference_variable { $$ = $1; $$.EA = ZEND_PARSED_VARIABLE; } | static_member { $$ = $1; $$.EA = ZEND_PARSED_STATIC_MEMBER; } + | array_function_dereference { $$ = $1; } + | function_call { zend_do_begin_variable_parse(TSRMLS_C); $$ = $1; $$.EA = ZEND_PARSED_FUNCTION_CALL; } ; reference_variable:

« previous php.cvs (#81089) next »