Reduce variability in attribute declarations

Author: beberlei

Zend/tests/attributes_001.phpt

@@ -42,13 +42,18 @@ $r2 = $r->getProperty("x");
 dump_attributes($r2->getAttributes());
 
 // Multiple attributes with multiple values
-<<a1,a2(1),a3(1,2)>>
+<<a1>>
+<<a2(1)>>
+<<a3(1,2)>>
 function f1() {}
 $r = new ReflectionFunction("f1");
 dump_attributes($r->getAttributes());
 
 // Attributes with AST
-<<a1,a2(1+1),a3(1+3,2+2),a4(["a"=>1,"b"=>2])>>
+<<a1>>
+<<a2(1+1)>>
+<<a3(1+3,2+2)>>
+<<a4(["a"=>1,"b"=>2])>>
 function f2() {}
 $r = new ReflectionFunction("f2");
 dump_attributes($r->getAttributes());

Zend/zend_language_parser.y

@@ -319,15 +319,13 @@ attribute_values:
 	|	attribute_values ',' expr	{ $$ = zend_ast_add_attribute_value($1, $3); }
 ;
 
-attribute_list:
+attribute_decl:
 		class_name_reference												{ zend_ast_add_attribute($1, NULL); }
 	|	class_name_reference '(' attribute_values ')'						{ zend_ast_add_attribute($1, $3); }
-	|	attribute_list ',' class_name_reference								{ zend_ast_add_attribute($3, NULL); }
-	|	attribute_list ',' class_name_reference '(' attribute_values ')'	{ zend_ast_add_attribute($3, $5); }
 ;
 
 attribute:
-		T_SL attribute_list T_SR
+		T_SL attribute_decl T_SR
 ;
 
 attributes: