Remove superfluous macros

Author: wilzbach

spec/declaration.dd

@@ -74,7 +74,7 @@ $(GNAME AltDeclaratorSuffixes):
 
 $(GNAME AltDeclaratorSuffix):
     $(D [ ])
-    $(D [) $(VEXPRESSION) $(D ])
+    $(D [) $($(GLINK2 expression, AssignExpression)) $(D ])
     $(D [) $(GLINK Type) $(D ])
 
 $(GNAME AltFuncDeclaratorSuffix):
@@ -135,8 +135,8 @@ $(GNAME BasicType2):
 $(GNAME BasicType2X):
     $(D *)
     $(D [ ])
-    $(D [) $(VEXPRESSION) $(D ])
-    $(D [) $(VEXPRESSION) .. $(VEXPRESSION) $(D ])
+    $(D [) $($(GLINK2 expression, AssignExpression)) $(D ])
+    $(D [) $($(GLINK2 expression, AssignExpression)) .. $($(GLINK2 expression, AssignExpression)) $(D ])
     $(D [) $(GLINK Type) $(D ])
     $(D delegate) $(GLINK2 function, Parameters) $(GLINK2 function, MemberFunctionAttributes)$(OPT)
     $(D function) $(GLINK2 function, Parameters) $(GLINK2 function, FunctionAttributes)$(OPT)
@@ -146,7 +146,7 @@ $(GNAME IdentifierList):
     $(I Identifier) $(D .) $(I IdentifierList)
     $(GLINK2 template, TemplateInstance)
     $(GLINK2 template, TemplateInstance) $(D .) $(I IdentifierList)
-    $(I Identifier) $(D [) $(ASSIGNEXPRESSION) $(D].) $(I IdentifierList)
+    $(I Identifier) $(D [) $($(GLINK2 expression, AssignExpression)) $(D].) $(I IdentifierList)
 )
 
 $(GRAMMAR
@@ -189,7 +189,7 @@ $(GNAME NonVoidInitializer):
     $(GLINK StructInitializer)
 
 $(GNAME ExpInitializer):
-    $(ASSIGNEXPRESSION)
+    $($(GLINK2 expression, AssignExpression))
 
 $(GNAME ArrayInitializer):
     $(D [) $(GLINK ArrayMemberInitializations)$(OPT) $(D ])
@@ -201,7 +201,7 @@ $(GNAME ArrayMemberInitializations):
 
 $(GNAME ArrayMemberInitialization):
     $(GLINK NonVoidInitializer)
-    $(ASSIGNEXPRESSION) $(D :) $(GLINK NonVoidInitializer)
+    $($(GLINK2 expression, AssignExpression)) $(D :) $(GLINK NonVoidInitializer)
 
 $(GNAME StructInitializer):
     $(D {) $(GLINK StructMemberInitializers)$(OPT) $(D })
@@ -501,7 +501,7 @@ $(H2 $(LNAME2 typeof, $(D typeof)))
 
 $(GRAMMAR
 $(GNAME Typeof):
-    $(D typeof $(LPAREN)) $(EXPRESSION) $(D $(RPAREN))
+    $(D typeof $(LPAREN)) $(GLINK2 expression, Expression) $(D $(RPAREN))
     $(D typeof $(LPAREN)) $(D return) $(D $(RPAREN))
 )
 
@@ -748,7 +748,3 @@ $(SPEC_SUBNAV_PREV_NEXT module, Modules, type, Types)
 Macros:
         CHAPTER=5
         TITLE=Declarations
-        ASSIGNEXPRESSION=$(GLINK2 expression, AssignExpression)
-        EXPRESSION=$(GLINK2 expression, Expression)
-        VEXPRESSION=$(ASSIGNEXPRESSION)
-        _=

spec/template-mixin.dd

@@ -10,10 +10,10 @@ $(HEADERNAV_TOC)
 
 $(GRAMMAR
 $(GNAME TemplateMixinDeclaration):
-    $(D mixin) $(D template) $(I Identifier) $(TEMPLATEPARAMETERS) $(GLINK2 template, Constraint)$(OPT) $(D {) $(GLINK2 module, DeclDefs)$(OPT) $(D })
+    $(D mixin) $(D template) $(I Identifier) $(GLINK2 template, TemplateParameters) $(GLINK2 template, Constraint)$(OPT) $(D {) $(GLINK2 module, DeclDefs)$(OPT) $(D })
 
 $(GNAME TemplateMixin):
-    $(D mixin) $(GLINK MixinTemplateName) $(TEMPLATEARGUMENTS)$(OPT) $(I Identifier)$(OPT) $(D ;)
+    $(D mixin) $(GLINK MixinTemplateName) $(GLINK2 template, TemplateArguments)$(OPT) $(I Identifier)$(OPT) $(D ;)
 
 $(GNAME MixinTemplateName):
     $(D .) $(GLINK QualifiedIdentifierList)
@@ -339,6 +339,4 @@ $(SPEC_SUBNAV_PREV_NEXT template, Templates, contracts, Contract Programming)
 Macros:
         CHAPTER=22
         TITLE=Template Mixins
-        TEMPLATEPARAMETERS=$(GLINK2 template, TemplateParameters)
-        TEMPLATEARGUMENTS=$(GLINK2 template, TemplateArguments)
         _=