Merge pull request #773 from Hackerpilot/issue-13979

Issue 13979 - ForeachType grammar does not allow 'ref' to appear after t...
dlang · Jan 18, 2015 · adf4faf · adf4faf
2 parents d054391 + 3fb2218
commit adf4faf
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 4 deletions.
diff --git a/grammar.dd b/grammar.dd
@@ -663,8 +663,16 @@ $(GNAME ForeachTypeList):
     $(GLINK ForeachType) , $(I ForeachTypeList)
 
 $(GNAME ForeachType):
-    $(D ref)$(OPT) $(GLINK TypeCtors)$(OPT) $(GLINK BasicType) $(GLINK Declarator)
-    $(D ref)$(OPT) $(GLINK TypeCtors)$(OPT) $(I Identifier)
+    $(GLINK ForeachTypeAttributes)$(OPT) $(GLINK2 declaration, BasicType) $(GLINK2 declaration, Declarator)
+    $(GLINK ForeachTypeAttributes)$(OPT) $(I Identifier)
+
+$(GNAME ForeachTypeAttributes)
+    $(GLINK ForeachTypeAttribute)
+    $(GLINK ForeachTypeAttribute) $(GLINK ForeachTypeAttributes)$(OPT)
+
+$(GNAME ForeachTypeAttribute):
+    $(D ref)
+    $(GLINK2 declaration, TypeCtor)
 
 $(GNAME ForeachAggregate):
     $(EXPRESSION)

diff --git a/statement.dd b/statement.dd
@@ -426,8 +426,16 @@ $(GNAME ForeachTypeList):
     $(GLINK ForeachType) , $(I ForeachTypeList)
 
 $(GNAME ForeachType):
-    $(D ref)$(OPT) $(GLINK2 declaration, TypeCtors)$(OPT) $(GLINK2 declaration, BasicType) $(GLINK2 declaration, Declarator)
-    $(D ref)$(OPT) $(GLINK2 declaration, TypeCtors)$(OPT) $(I Identifier)
+    $(GLINK ForeachTypeAttributes)$(OPT) $(GLINK2 declaration, BasicType) $(GLINK2 declaration, Declarator)
+    $(GLINK ForeachTypeAttributes)$(OPT) $(I Identifier)
+
+$(GNAME ForeachTypeAttributes)
+    $(GLINK ForeachTypeAttribute)
+    $(GLINK ForeachTypeAttribute) $(GLINK ForeachTypeAttributes)$(OPT)
+
+$(GNAME ForeachTypeAttribute):
+    $(D ref)
+    $(GLINK2 declaration, TypeCtor)
 
 $(GNAME ForeachAggregate):
     $(EXPRESSION)