Merge pull request #661 from 9rnsr/fix13525

Issue 13525 - Redundant SpecialKeyword grammar listd in DefaultInitializerExpression
dlang · Oct 1, 2014 · 01a407c · 01a407c
2 parents fcf7fc6 + 0b4db24
commit 01a407c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 10 deletions.
diff --git a/function.dd b/function.dd
@@ -30,7 +30,7 @@ $(GNAME ParameterList):
 $(GNAME Parameter):
     $(I InOut)$(OPT) $(GLINK2 declaration, BasicType) $(GLINK2 declaration, Declarator)
     $(I InOut)$(OPT) $(GLINK2 declaration, BasicType) $(GLINK2 declaration, Declarator) $(D ...)
-    $(I InOut)$(OPT) $(GLINK2 declaration, BasicType) $(GLINK2 declaration, Declarator) = $(GLINK DefaultInitializerExpression)
+    $(I InOut)$(OPT) $(GLINK2 declaration, BasicType) $(GLINK2 declaration, Declarator) = $(ASSIGNEXPRESSION)
     $(I InOut)$(OPT) $(GLINK2 declaration, Type)
     $(I InOut)$(OPT) $(GLINK2 declaration, Type) $(D ...)
 
@@ -67,10 +67,6 @@ $(GNAME MemberFunctionAttribute):
     $(D inout)
     $(D shared)
     $(GLINK FunctionAttribute)
-
-$(GNAME DefaultInitializerExpression):
-    $(ASSIGNEXPRESSION)
-    $(GLINK2 traits, SpecialKeyword)
 )
 
 $(GRAMMAR

diff --git a/grammar.dd b/grammar.dd
@@ -1145,7 +1145,7 @@ $(GNAME ParameterList):
 $(GNAME Parameter):
     $(I InOut)$(OPT) $(GLINK BasicType) $(GLINK Declarator)
     $(I InOut)$(OPT) $(GLINK BasicType) $(GLINK Declarator) $(D ...)
-    $(I InOut)$(OPT) $(GLINK BasicType) $(GLINK Declarator) = $(GLINK DefaultInitializerExpression)
+    $(I InOut)$(OPT) $(GLINK BasicType) $(GLINK Declarator) = $(ASSIGNEXPRESSION)
     $(I InOut)$(OPT) $(GLINK Type)
     $(I InOut)$(OPT) $(GLINK Type) $(D ...)
 
@@ -1182,10 +1182,6 @@ $(GNAME MemberFunctionAttribute):
     $(D inout)
     $(D shared)
     $(GLINK FunctionAttribute)
-
-$(GNAME DefaultInitializerExpression):
-    $(ASSIGNEXPRESSION)
-    $(GLINK SpecialKeyword)
 )
 
 $(GRAMMAR