Grammar fixes identified while validating the grammar against the DMD "compilable" test suite

spec/attribute.dd

@@ -80,6 +80,7 @@ $(H2 $(LNAME2 linkage, Linkage Attribute))
 $(GRAMMAR
 $(GNAME LinkageAttribute):
     $(D extern) $(D $(LPAREN)) $(GLINK LinkageType) $(D $(RPAREN))
+    $(D extern) $(D $(LPAREN)) $(D C++) $(D ,) $(D $(RPAREN))
     $(D extern) $(D $(LPAREN)) $(D C++) $(D ,) $(GLINK2 type, QualifiedIdentifier) $(D $(RPAREN))
     $(D extern) $(D $(LPAREN)) $(D C++) $(D ,) $(GLINK NamespaceList) $(D $(RPAREN))
 

spec/class.dd

@@ -32,11 +32,10 @@ $(GNAME ClassDeclaration):
     $(GLINK2 template, ClassTemplateDeclaration)
 
 $(GNAME BaseClassList):
-    $(D :) $(GLINK SuperClass)
-    $(D :) $(GLINK SuperClass) $(D ,) $(GLINK Interfaces)
-    $(D :) $(GLINK Interfaces)
+    $(D :) $(GLINK SuperClassOrInterface)
+    $(D :) $(GLINK SuperClassOrInterface) $(D ,) $(GLINK Interfaces)
 
-$(GNAME SuperClass):
+$(GNAME SuperClassOrInterface):
     $(GLINK2 type, BasicType)
 
 $(GNAME Interfaces):
@@ -315,7 +314,6 @@ $(H2 $(LNAME2 constructors, Constructors))
 
 $(GRAMMAR
 $(GNAME Constructor):
-    $(D this) $(GLINK2 function, Parameters) $(GLINK2 function, MemberFunctionAttributes)$(OPT) $(D ;)
     $(D this) $(GLINK2 function, Parameters) $(GLINK2 function, MemberFunctionAttributes)$(OPT) $(GLINK2 function, FunctionBody)
     $(GLINK2 template, ConstructorTemplate)
 )
@@ -678,7 +676,6 @@ $(H2 $(LNAME2 destructors, Destructors))
 
 $(GRAMMAR
 $(GNAME Destructor):
-    $(D ~ this ( )) $(GLINK2 function, MemberFunctionAttributes)$(OPT) $(D ;)
     $(D ~ this ( )) $(GLINK2 function, MemberFunctionAttributes)$(OPT) $(GLINK2 function, FunctionBody)
 )
 
@@ -905,13 +902,13 @@ $(GNAME SharedStaticDestructor):
 $(H2 $(LNAME2 invariants, Class Invariants))
 
 $(GRAMMAR
-$(GNAME ClassInvariant):
+$(GNAME Invariant):
     $(D invariant $(LPAREN) $(RPAREN)) $(GLINK2 statement, BlockStatement)
     $(D invariant) $(GLINK2 statement, BlockStatement)
     $(D invariant $(LPAREN)) $(GLINK2 expression, AssertArguments) $(D $(RPAREN) ;)
 )
 
-    $(P $(I ClassInvariant) specify the relationships among the members of a class instance.
+    $(P Class $(I Invariant)s specify the relationships among the members of a class instance.
     Those relationships must hold for any interactions with the instance from its
     public interface.
     )
@@ -927,10 +924,10 @@ $(GNAME ClassInvariant):
 
     $(P There may be multiple invariants in a class. They are applied in lexical order.)
 
-    $(P $(I ClassInvariant)s must hold at the exit of the class constructor (if any),
+    $(P Class $(I Invariant)s must hold at the exit of the class constructor (if any),
     at the entry of the class destructor (if any).)
 
-    $(P $(I ClassInvariant)s must hold
+    $(P Class $(I Invariant)s must hold
     at the entry and exit of all public or exported non-static member functions.
     The order of application of invariants is:
     $(OL
@@ -986,7 +983,7 @@ $(GNAME ClassInvariant):
 
     $(IMPLEMENTATION_DEFINED
     $(OL
-    $(LI Whether the $(I Class Invariant) is executed at runtime or not. This is typically
+    $(LI Whether the class $(I Invariant) is executed at runtime or not. This is typically
     controlled with a compiler switch.)
     $(LI The behavior when the invariant does not hold is typically the same as
     for when $(GLINK2 expression, AssertExpression)s fail.)
@@ -1009,7 +1006,6 @@ $(H2 $(LNAME2 allocators, Class Allocators))
 $(B Note): Class allocators are deprecated in D2.
 $(GRAMMAR
 $(GNAME Allocator):
-    $(D new) $(GLINK2 function, Parameters) $(D ;)
     $(D new) $(GLINK2 function, Parameters) $(GLINK2 function, FunctionBody)
 )
 
@@ -1089,7 +1085,6 @@ assert(foo.x == int.init);  // object is still accessible
 
 $(GRAMMAR
 $(GNAME Deallocator):
-    $(D delete) $(GLINK2 function, Parameters) $(D ;)
     $(D delete) $(GLINK2 function, Parameters) $(GLINK2 function, FunctionBody)
 )
 
@@ -1534,7 +1529,7 @@ $(H3 $(LNAME2 anonymous, Anonymous Nested Classes))
 
 $(GRAMMAR
 $(GNAME NewAnonClassExpression):
-    $(D new) $(GLINK2 expression, AllocatorArguments)$(OPT) $(D class) $(GLINK ConstructorArgs)$(OPT) $(GLINK SuperClass)$(OPT) $(GLINK Interfaces)$(OPT) $(GLINK2 struct, AggregateBody)
+    $(D new) $(GLINK2 expression, AllocatorArguments)$(OPT) $(D class) $(GLINK ConstructorArgs)$(OPT) $(GLINK SuperClassOrInterface)$(OPT) $(GLINK Interfaces)$(OPT) $(GLINK2 struct, AggregateBody)
 
 $(GNAME ConstructorArgs):
     $(D $(LPAREN)) $(GLINK2 expression, ArgumentList)$(OPT) $(D $(RPAREN))
@@ -1543,7 +1538,7 @@ $(GNAME ConstructorArgs):
 which is equivalent to:
 
 $(GRAMMAR_INFORMATIVE
-$(D class) $(GLINK_LEX Identifier) $(D :) $(I SuperClass) $(I Interfaces) $(I AggregateBody)
+$(D class) $(GLINK_LEX Identifier) $(D :) $(I SuperClassOrInterface) $(I Interfaces) $(I AggregateBody)
 // ...
 $(D new) $(I AllocatorArguments) $(I Identifier) $(I ConstructorArgs)
 )

spec/contracts.dd

@@ -34,7 +34,7 @@ $(H2 $(LNAME2 pre_post_contracts, Pre and Post Contracts))
 
 $(H2 $(LNAME2 Invariants, Invariants))
 
-        $(P See $(DDSUBLINK struct, StructInvariant, Struct Invariants) and $(DDSUBLINK class, invariants, Class Invariants).)
+        $(P See $(DDSUBLINK struct, Invariant, Struct Invariants) and $(DDSUBLINK class, invariants, Class Invariants).)
 
 
 $(H2 $(LNAME2 references, References))

spec/declaration.dd

@@ -90,6 +90,7 @@ $(GNAME StorageClasses):
 $(GNAME StorageClass):
 $(MULTICOLS 5,     $(GLINK2 attribute, LinkageAttribute)
     $(GLINK2 attribute, AlignAttribute)
+    $(GLINK2 attribute, AtAttribute)
     $(D deprecated)
     $(D enum)
     $(D static)
@@ -434,7 +435,7 @@ $(H2 $(LNAME2 AliasAssign, Alias Assign))
 
 $(GRAMMAR
 $(GNAME AliasAssign):
-    $(I Identifier) $(D =) $(GLINK Type)
+    $(GLINK_LEX Identifier) $(D =) $(GLINK2 type, Type)
 )
 
         $(P An $(GLINK AliasDeclaration) can have a new value assigned to it with an
@@ -501,12 +502,12 @@ pragma(msg, TK); // prints tuple(3, (const(uint)), (int))
 
 $(H2 $(LNAME2 alias-reassignment, Alias Reassignment))
 
-        $(GRAMMAR
-        $(GNAME AliasReassignment):
-            $(GLINK_LEX Identifier) $(D =) $(GLINK StorageClasses)$(OPT) $(GLINK Type)
-            $(GLINK_LEX Identifier) $(D =) $(GLINK2 expression, FunctionLiteral)
-            $(GLINK_LEX Identifier) $(D =) $(GLINK StorageClasses)$(OPT) $(GLINK BasicType) $(GLINK2 function, Parameters) $(GLINK2 function, MemberFunctionAttributes)$(OPT)
-        )
+$(GRAMMAR
+$(GNAME AliasReassignment):
+    $(GLINK_LEX Identifier) $(D =) $(GLINK StorageClasses)$(OPT) $(GLINK2 type, Type)
+    $(GLINK_LEX Identifier) $(D =) $(GLINK2 expression, FunctionLiteral)
+    $(GLINK_LEX Identifier) $(D =) $(GLINK StorageClasses)$(OPT) $(GLINK2 type, BasicType) $(GLINK2 function, Parameters) $(GLINK2 function, MemberFunctionAttributes)$(OPT)
+)
 
         $(P An alias declaration inside a template can be reassigned a new value.)
 

spec/expression.dd

@@ -874,8 +874,6 @@ $(GNAME UnaryExpression):
     $(D +) $(GSELF UnaryExpression)
     $(D !) $(GSELF UnaryExpression)
     $(GLINK ComplementExpression)
-    $(D $(LPAREN)) $(GLINK2 type, Type) $(D $(RPAREN) .) $(IDENTIFIER)
-    $(D $(LPAREN)) $(GLINK2 type, Type) $(D $(RPAREN) .) $(GLINK2 template, TemplateInstance)
     $(GLINK DeleteExpression)
     $(GLINK CastExpression)
     $(GLINK PowExpression)
@@ -1372,6 +1370,8 @@ $(GNAME PrimaryExpression):
     $(GLINK ImportExpression)
     $(GLINK NewExpression)
     $(GLINK2 type, FundamentalType) $(D .) $(IDENTIFIER)
+    $(D $(LPAREN)) $(GLINK2 type, Type) $(D $(RPAREN) .) $(IDENTIFIER)
+    $(D $(LPAREN)) $(GLINK2 type, Type) $(D $(RPAREN) .) $(GLINK2 template, TemplateInstance)
     $(GLINK2 type, FundamentalType) $(D $(LPAREN)) $(GLINK ArgumentList)$(OPT) $(D $(RPAREN))
     $(GLINK2 type, TypeCtor) $(D $(LPAREN)) $(GLINK2 type, Type) $(D $(RPAREN)) $(D .) $(IDENTIFIER)
     $(GLINK2 type, TypeCtor) $(D $(LPAREN)) $(GLINK2 type, Type) $(D $(RPAREN)) $(D $(LPAREN)) $(GLINK ArgumentList)$(OPT) $(D $(RPAREN))
@@ -1933,11 +1933,11 @@ $(GNAME AssertArguments):
     )
 
     $(P If the first $(I AssignExpression) is a reference to a class instance for
-    which a $(DDSUBLINK spec/class, invariants, Class Invariant) exists, the $(I Class Invariant) must hold.
+    which a $(DDSUBLINK spec/class, invariants, class Invariant) exists, the class $(I Invariant) must hold.
     )
 
     $(P If the first $(I AssignExpression) is a pointer to a struct instance for
-    which a $(I Struct Invariant) exists, the $(I Struct Invariant) must hold.
+    which a struct $(I Invariant) exists, the struct $(I Invariant) must hold.
     )
 
     $(P The type of an $(I AssertExpression) is $(D void).

spec/function.dd

@@ -32,15 +32,17 @@ $(GNAME Parameters):
 
 $(GNAME ParameterList):
     $(GLINK Parameter)
+    $(GLINK Parameter) $(D ,)
     $(GLINK Parameter) $(D ,) $(GSELF ParameterList)
-    $(GLINK VariadicArgumentsAttributes) $(D ...)
+    $(GLINK VariadicArgumentsAttributes)$(OPT) $(D ...)
 
 $(GNAME Parameter):
     $(GLINK ParameterAttributes)$(OPT) $(GLINK2 type, BasicType) $(GLINK2 declaration, Declarator)
     $(GLINK ParameterAttributes)$(OPT) $(GLINK2 type, BasicType) $(GLINK2 declaration, Declarator) $(D ...)
     $(GLINK ParameterAttributes)$(OPT) $(GLINK2 type, BasicType) $(GLINK2 declaration, Declarator) $(D =) $(ASSIGNEXPRESSION)
     $(GLINK ParameterAttributes)$(OPT) $(GLINK2 type, Type)
     $(GLINK ParameterAttributes)$(OPT) $(GLINK2 type, Type) $(D ...)
+    $(GLINK ParameterAttributes)$(OPT) $(GLINK2 type, Type) $(D =) $(ASSIGNEXPRESSION)
 
 $(GNAME ParameterAttributes):
     $(GLINK InOut)
@@ -56,7 +58,7 @@ $(GNAME InOut):
     $(D lazy)
     $(D out)
     $(D ref)
-    $(RELATIVE_LINK2 return-ref-parameters, $(D return ref))
+    $(RELATIVE_LINK2 return-ref-parameters, $(D return))
     $(D scope)
 
 $(GNAME VariadicArgumentsAttributes):
@@ -81,6 +83,7 @@ $(GNAME FunctionAttributes):
 $(GNAME FunctionAttribute):
     $(GLINK2 attribute, FunctionAttributeKwd)
     $(GLINK2 attribute, Property)
+    $(GLINK2 attribute, AtAttribute)
 
 $(GNAME MemberFunctionAttributes):
     $(GLINK MemberFunctionAttribute)
@@ -91,6 +94,7 @@ $(GNAME MemberFunctionAttribute):
     $(D immutable)
     $(D inout)
     $(D return)
+    $(D scope)
     $(D shared)
     $(GLINK FunctionAttribute)
 )
@@ -118,6 +122,7 @@ $(GNAME MissingFunctionBody):
 
 $(GNAME ShortenedFunctionBody):
     $(D =>) $(GLINK2 expression, AssignExpression) $(D ;)
+    $(GLINK FunctionContracts)$(OPT) $(GLINK InOutContractExpression) $(D =>) $(GLINK2 expression, AssignExpression) $(D ;)
 )
 
         $(P Examples:)