mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-29 04:46:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove reference_variable indirection

Browse Source
This commit is contained in:
Nikita Popov 2014-05-30 23:36:30 +02:00
parent e89958a634
commit 067fca0e89
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Zend/zend_language_parser.y
View File

@ -1081,10 +1081,6 @@ rw_variable:
zend_check_writable_variable(&$1); } zend_check_writable_variable(&$1); }
; ;
variable:
reference_variable { $$ = $1; }
;
variable_property: variable_property:
T_OBJECT_OPERATOR object_property { zend_do_push_object(&$2 TSRMLS_CC); } method_or_not { $$.EA = $4.EA; } 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: variable_without_objects:
reference_variable { $$ = $1; } variable { $$ = $1; }
; ;
static_member: static_member:
@ -1116,7 +1112,7 @@ static_member:
; ;
variable_class_name: 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: array_function_dereference:
@ -1126,9 +1122,9 @@ array_function_dereference:
; ;
directly_callable_variable: directly_callable_variable:
reference_variable '[' dim_offset ']' variable '[' dim_offset ']'
{ fetch_array_dim(&$$, &$1, &$3 TSRMLS_CC); $$.EA = ZEND_PARSED_VARIABLE; } { 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; } { fetch_string_offset(&$$, &$1, &$3 TSRMLS_CC); $$.EA = ZEND_PARSED_VARIABLE; }
| simple_variable | simple_variable
{ zend_do_begin_variable_parse(TSRMLS_C); { zend_do_begin_variable_parse(TSRMLS_C);
@ -1146,7 +1142,7 @@ directly_callable_variable:
$$ = $1; $$.EA = ZEND_PARSED_FUNCTION_CALL; } $$ = $1; $$.EA = ZEND_PARSED_FUNCTION_CALL; }
; ;
reference_variable: variable:
directly_callable_variable { $$ = $1; } directly_callable_variable { $$ = $1; }
| static_member { $$ = $1; $$.EA = ZEND_PARSED_STATIC_MEMBER; } | static_member { $$ = $1; $$.EA = ZEND_PARSED_STATIC_MEMBER; }
| variable T_OBJECT_OPERATOR object_member | variable T_OBJECT_OPERATOR object_member