fix Issue 13664 - Grammar does not allow @<template_instance> UDAs

dlang · Nov 2, 2014 · 03ef546 · 03ef546
1 parent adef07a
commit 03ef546
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/attribute.dd b/attribute.dd
@@ -715,9 +715,11 @@ $(SECTION3 $(LNAME2 uda, User Defined Attributes),
 
 $(GRAMMAR
 $(GNAME UserDefinedAttribute):
-    $(D @ $(LPAREN)) $(GLINK2 grammar, ArgumentList) $(D $(RPAREN))
+    $(D @ $(LPAREN)) $(GLINK2 expression, ArgumentList) $(D $(RPAREN))
     $(D @) $(I Identifier)
-    $(D @) $(I Identifier) $(D $(LPAREN)) $(GLINK2 grammar, ArgumentList)$(OPT) $(D $(RPAREN))
+    $(D @) $(I Identifier) $(D $(LPAREN)) $(GLINK2 expression, ArgumentList)$(OPT) $(D $(RPAREN))
+    $(D @) $(GLINK2 template, TemplateInstance)
+    $(D @) $(GLINK2 template, TemplateInstance) $(D $(LPAREN)) $(GLINK2 expression, ArgumentList)$(OPT) $(D $(RPAREN))
 )
         $(P
             And looks like:

diff --git a/grammar.dd b/grammar.dd
@@ -1622,6 +1622,8 @@ $(GNAME UserDefinedAttribute):
     $(D @ $(LPAREN)) $(GLINK ArgumentList) $(D $(RPAREN))
     $(D @) $(I Identifier)
     $(D @) $(I Identifier) $(D $(LPAREN)) $(GLINK ArgumentList)$(OPT) $(D $(RPAREN))
+    $(D @) $(GLINK TemplateInstance)
+    $(D @) $(GLINK TemplateInstance) $(D $(LPAREN)) $(GLINK ArgumentList)$(OPT) $(D $(RPAREN))
 )
 
 $(GRAMMAR