Separate new and instanceof class name productions

nikic · nikic · commit f775bd92cb3b · 2020-01-06T18:47:35.000+01:00
diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y
@@ -238,7 +238,7 @@ static YYSIZE_T zend_yytnamerr(char*, const char*);
 %type <ast> extends_from parameter optional_type argument global_var
 %type <ast> static_var class_statement trait_adaptation trait_precedence trait_alias
 %type <ast> absolute_trait_method_reference trait_method_reference property echo_expr
-%type <ast> new_expr anonymous_class class_name class_name_reference simple_variable
+%type <ast> new_expr anonymous_class class_name new_class_name instanceof_class_name simple_variable
 %type <ast> internal_functions_in_yacc
 %type <ast> exit_expr scalar backticks_expr lexical_var function_call member_name property_name
 %type <ast> variable_class_name dereferencable_scalar constant class_constant
@@ -876,7 +876,7 @@ anonymous_class:
 ;
 
 new_expr:
-		T_NEW class_name_reference ctor_arguments
+		T_NEW new_class_name ctor_arguments
 			{ $$ = zend_ast_create(ZEND_AST_NEW, $2, $3); }
 	|	T_NEW anonymous_class
 			{ $$ = $2; }
@@ -968,7 +968,7 @@ expr:
 			{ $$ = zend_ast_create(ZEND_AST_GREATER_EQUAL, $1, $3); }
 	|	expr T_SPACESHIP expr
 			{ $$ = zend_ast_create_binary_op(ZEND_SPACESHIP, $1, $3); }
-	|	expr T_INSTANCEOF class_name_reference
+	|	expr T_INSTANCEOF instanceof_class_name
 			{ $$ = zend_ast_create(ZEND_AST_INSTANCEOF, $1, $3); }
 	|	'(' expr ')' {
 			$$ = $2;
@@ -1075,7 +1075,13 @@ class_name:
 	|	name { $$ = $1; }
 ;
 
-class_name_reference:
+instanceof_class_name:
+		class_name		{ $$ = $1; }
+	|	new_variable	{ $$ = $1; }
+	|	'{' expr '}'	{ $$ = $2; }
+;
+
+new_class_name:
 		class_name		{ $$ = $1; }
 	|	new_variable	{ $$ = $1; }
 	|	'{' expr '}'	{ $$ = $2; }
