Remove no longer necessary class parsing workaround

This was split to work around the attribute assignment bug fixed in the previous commit, and as such is no longer necessary.
nikic · Dec 20, 2020 · 7284a4d · 7284a4d
1 parent d3d1ee4
commit 7284a4d
Show file tree

Hide file tree

Showing 2 changed files with 873 additions and 878 deletions.
diff --git a/grammar/php7.y b/grammar/php7.y
@@ -348,10 +348,7 @@ function_declaration_statement:
 ;
 
 class_declaration_statement:
-      class_entry_type identifier extends_from implements_list '{' class_statement_list '}'
-          { $$ = Stmt\Class_[$2, ['type' => $1, 'extends' => $3, 'implements' => $4, 'stmts' => $6, 'attrGroups' => []]];
-            $this->checkClass($$, #2); }
-    | attributes class_entry_type identifier extends_from implements_list '{' class_statement_list '}'
+      optional_attributes class_entry_type identifier extends_from implements_list '{' class_statement_list '}'
           { $$ = Stmt\Class_[$3, ['type' => $2, 'extends' => $4, 'implements' => $5, 'stmts' => $7, 'attrGroups' => $1]];
             $this->checkClass($$, #3); }
     | optional_attributes T_INTERFACE identifier interface_extends_list '{' class_statement_list '}'