com php-src: Remove reference_variable indirection: Zen d/zend_language_parser.y

From: Date: Fri, 30 May 2014 21:36:30 +0000
Subject: com php-src: Remove reference_variable indirection: Zen d/zend_language_parser.y
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-81084@lists.php.net to get a copy of this message
Commit: 067fca0e89cbb9feb2ac21464f36a6d6cc16eddf Author: Nikita Popov <nikic@php.net> Fri, 30 May 2014 23:36:30 +0200 Parents: e89958a6340201f9c0e00f9fac7d1d00c5e30e84 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=067fca0e89cbb9feb2ac21464f36a6d6cc16eddf Log: Remove reference_variable indirection Changed paths: M Zend/zend_language_parser.y Diff: diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y index 41c2bc3..9758983 100644 --- a/Zend/zend_language_parser.y +++ b/Zend/zend_language_parser.y @@ -1081,10 +1081,6 @@ rw_variable: zend_check_writable_variable(&$1); } ; -variable: - reference_variable { $$ = $1; } -; - variable_property: T_OBJECT_OPERATOR object_property { zend_do_push_object(&$2 TSRMLS_CC); } method_or_not { $$.EA = $4.EA; } ; @@ -1106,7 +1102,7 @@ method_or_not: ; variable_without_objects: - reference_variable { $$ = $1; } + variable { $$ = $1; } ; static_member: @@ -1116,7 +1112,7 @@ static_member: ; variable_class_name: - reference_variable { zend_do_end_variable_parse(&$1, BP_VAR_R, 0 TSRMLS_CC); $$=$1;; } + variable { zend_do_end_variable_parse(&$1, BP_VAR_R, 0 TSRMLS_CC); $$=$1;; } ; array_function_dereference: @@ -1126,9 +1122,9 @@ array_function_dereference: ; directly_callable_variable: - reference_variable '[' dim_offset ']' + variable '[' dim_offset ']' { fetch_array_dim(&$$, &$1, &$3 TSRMLS_CC); $$.EA = ZEND_PARSED_VARIABLE; } - | reference_variable '{' expr '}' + | variable '{' expr '}' { fetch_string_offset(&$$, &$1, &$3 TSRMLS_CC); $$.EA = ZEND_PARSED_VARIABLE; } | simple_variable { zend_do_begin_variable_parse(TSRMLS_C); @@ -1146,7 +1142,7 @@ directly_callable_variable: $$ = $1; $$.EA = ZEND_PARSED_FUNCTION_CALL; } ; -reference_variable: +variable: directly_callable_variable { $$ = $1; } | static_member { $$ = $1; $$.EA = ZEND_PARSED_STATIC_MEMBER; } | variable T_OBJECT_OPERATOR object_member

« previous php.cvs (#81084) next »