Simplify argument production

nikic · nikic · commit 7722d2c58464 · 2014-08-29T18:42:05.000+02:00
diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y
@@ -579,10 +579,8 @@ non_empty_argument_list:
 ;
 
 argument:
-		expr_without_variable	{ $$ = $1; }
-	|	variable				{ $$ = $1; }
-	/*|	'&' variable 			{ ZEND_ASSERT(0); } */
-	|	T_ELLIPSIS expr			{ $$ = zend_ast_create(ZEND_AST_UNPACK, $2); }
+		expr			{ $$ = $1; }
+	|	T_ELLIPSIS expr	{ $$ = zend_ast_create(ZEND_AST_UNPACK, $2); }
 ;
 
 global_var_list:

Original file line number	Diff line number	Diff line change
`@@ -579,10 +579,8 @@ non_empty_argument_list:`
`579`	`579`	`;`
`580`	`580`
`581`	`581`	`argument:`
`582`		`- expr_without_variable { $$ = $1; }`
`583`		`- \| variable { $$ = $1; }`
`584`		`- /\| '&' variable { ZEND_ASSERT(0); } /`
`585`		`- \| T_ELLIPSIS expr { $$ = zend_ast_create(ZEND_AST_UNPACK, $2); }`
	`582`	`+ expr { $$ = $1; }`
	`583`	`+ \| T_ELLIPSIS expr { $$ = zend_ast_create(ZEND_AST_UNPACK, $2); }`
`586`	`584`	`;`
`587`	`585`
`588`	`586`	`global_var_list:`