Move AggregateDeclaration to declaration.dd

Author: ntrel

spec/declaration.dd

@@ -10,14 +10,22 @@ $(GNAME Declaration):
     $(GLINK VarDeclarations)
     $(GLINK AliasDeclaration)
     $(GLINK AliasAssign)
-    $(GLINK2 struct, AggregateDeclaration)
+    $(GLINK AggregateDeclaration)
     $(GLINK2 enum, EnumDeclaration)
     $(GLINK2 module, ImportDeclaration)
     $(GLINK2 version, ConditionalDeclaration)
     $(GLINK2 version, StaticForeachDeclaration)
     $(GLINK2 version, StaticAssert)
 )
 
+$(GRAMMAR
+$(GNAME AggregateDeclaration):
+    $(GLINK2 class, ClassDeclaration)
+    $(GLINK2 interface, InterfaceDeclaration)
+    $(GLINK2 struct, StructDeclaration)
+    $(GLINK2 struct, UnionDeclaration)
+)
+
 $(GRAMMAR
 $(GNAME VarDeclarations):
     $(GLINK StorageClasses)$(OPT) $(GLINK2 type, BasicType) $(GLINK Declarators) $(D ;)

spec/struct.dd

@@ -12,12 +12,6 @@ $(H2 $(LNAME2 intro, Introduction))
     )
 
 $(GRAMMAR
-$(GNAME AggregateDeclaration):
-    $(GLINK2 class, ClassDeclaration)
-    $(GLINK2 interface, InterfaceDeclaration)
-    $(GLINK StructDeclaration)
-    $(GLINK UnionDeclaration)
-
 $(GNAME StructDeclaration):
     $(D struct) $(GLINK_LEX Identifier) $(D ;)
     $(D struct) $(GLINK_LEX Identifier) $(GLINK AggregateBody)