com php-src: Use recursion for property fetches: Zend/zend_la nguage_parser.y
| From: | Nikita Popov | Date: | Fri, 30 May 2014 20:04:39 +0000 |
| Subject: | com php-src: Use recursion for property fetches: Zend/zend_la nguage_parser.y | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-81088@lists.php.net to get a copy of this message | ||
Commit: b8b3b355be4ac5c537dd5fc60c929f9f15c5c636
Author: Nikita Popov <nikic@php.net> Fri, 30 May 2014 22:03:24 +0200
Parents: 46e35e3d5dd6447245a4d80ddde21f4e348c98d5
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=b8b3b355be4ac5c537dd5fc60c929f9f15c5c636
Log:
Use recursion for property fetches
Changed paths:
M Zend/zend_language_parser.y
Diff:
diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y
index 1fd580e...08c3ffe 100644
--- a/Zend/zend_language_parser.y
+++ b/Zend/zend_language_parser.y
@@ -1082,18 +1082,15 @@ rw_variable:
;
variable:
- 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 { $$ = $1; }
-;
-
-variable_properties:
- variable_properties variable_property { $$.EA = $2.EA; }
- | /* empty */ { $$.EA = 0; }
+ variable T_OBJECT_OPERATOR { zend_do_push_object(&$1 TSRMLS_CC); }
+ object_property { zend_do_push_object(&$4 TSRMLS_CC); } method_or_not
+ { zend_do_pop_object(&$$ TSRMLS_CC); $$.EA = $6.EA; }
+ | 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; }
;
-
variable_property:
T_OBJECT_OPERATOR object_property { zend_do_push_object(&$2 TSRMLS_CC); } method_or_not {
$$.EA = $4.EA; }
;
@@ -1134,13 +1131,6 @@ array_function_dereference:
'[' dim_offset ']' { fetch_array_dim(&$$, &$1, &$4 TSRMLS_CC); }
;
-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:
reference_variable '[' dim_offset ']' { fetch_array_dim(&$$, &$1,
&$3 TSRMLS_CC); }
| reference_variable '{' expr '}' { fetch_string_offset(&$$, &$1,
&$3 TSRMLS_CC); }