]> granicus.if.org Git - php/commitdiff
Temporarily disable complex variables in new expressions
authorNikita Popov <nikic@php.net>
Fri, 30 May 2014 19:11:25 +0000 (21:11 +0200)
committerNikita Popov <nikic@php.net>
Fri, 30 May 2014 19:11:25 +0000 (21:11 +0200)
Zend/zend_language_parser.y

index 886eff03dbc2877c9a113e746e618b38db11c696..206c290977ad08eb09d8a89af0ebbbc85b79aeab 100644 (file)
@@ -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: