From: Nikita Popov <nikic@php.net>
Date: Fri, 30 May 2014 19:11:25 +0000 (+0200)
Subject: Temporarily disable complex variables in new expressions
X-Git-Tag: POST_AST_MERGE^2~235
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e2be2cee97ade5169d4502c862360f67f5544e6e;p=php

Temporarily disable complex variables in new expressions
---

diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y
index 886eff03db..206c290977 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: