com php-src: Temporarily disable complex variables in new expressions: Zend/zend_language_parser.y
| From: | Nikita Popov | Date: | Fri, 30 May 2014 19:11:25 +0000 |
| Subject: | com php-src: Temporarily disable complex variables in new expressions: Zend/zend_language_parser.y | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-81090@lists.php.net to get a copy of this message | ||
Commit: e2be2cee97ade5169d4502c862360f67f5544e6e
Author: Nikita Popov <nikic@php.net> Fri, 30 May 2014 21:11:25 +0200
Parents: 95a3a126577aae761a93b06b051b23322d9a6e41
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=e2be2cee97ade5169d4502c862360f67f5544e6e
Log:
Temporarily disable complex variables in new expressions
Changed paths:
M Zend/zend_language_parser.y
Diff:
diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y
index 886eff0..206c290 100644
--- a/Zend/zend_language_parser.y
+++ b/Zend/zend_language_parser.y
@@ -930,21 +930,7 @@ class_name_reference:
dynamic_class_name_reference:
- base_variable T_OBJECT_OPERATOR { zend_do_push_object(&$1 TSRMLS_CC); }
- object_property { zend_do_push_object(&$4 TSRMLS_CC); }
dynamic_class_name_variable_properties
- { zend_do_pop_object(&$$ TSRMLS_CC); $$.EA = ZEND_PARSED_MEMBER; }
- | base_variable { $$ = $1; }
-;
-
-
-dynamic_class_name_variable_properties:
- dynamic_class_name_variable_properties dynamic_class_name_variable_property
- | /* empty */
-;
-
-
-dynamic_class_name_variable_property:
- T_OBJECT_OPERATOR object_property { zend_do_push_object(&$2 TSRMLS_CC); }
+ simple_variable { zend_do_begin_variable_parse(TSRMLS_C); fetch_simple_variable(&$$,
&$1, 1 TSRMLS_CC); }
;
exit_expr: