Merge pull request #1086 from 9rnsr/fix14745

Issue 14745 - Qualifiers rejected for delegate literals
dlang · Sep 2, 2015 · d8330a1 · d8330a1
2 parents 64d7096 + 82b23ac
commit d8330a1
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 12 deletions.
diff --git a/expression.dd b/expression.dd
@@ -1402,14 +1402,16 @@ $(H4 Function Literals)
 $(GRAMMAR
 $(GNAME FunctionLiteral):
     $(D function) $(GLINK2 declaration, Type)$(OPT) $(GLINK ParameterAttributes) $(OPT) $(GLINK FunctionLiteralBody)
-    $(D delegate) $(GLINK2 declaration, Type)$(OPT) $(GLINK ParameterAttributes) $(OPT) $(GLINK FunctionLiteralBody)
-    $(GLINK ParameterAttributes) $(GLINK FunctionLiteralBody)
+    $(D delegate) $(GLINK2 declaration, Type)$(OPT) $(GLINK ParameterMemberAttributes) $(OPT) $(GLINK FunctionLiteralBody)
+    $(GLINK ParameterMemberAttributes) $(GLINK FunctionLiteralBody)
     $(GLINK FunctionLiteralBody)
     $(GLINK Lambda)
 
 $(GNAME ParameterAttributes):
-    $(GLINK2 function, Parameters)
-    $(GLINK2 function, Parameters) $(GLINK2 function, FunctionAttributes)
+    $(GLINK2 function, Parameters) $(GLINK2 function, FunctionAttributes)$(OPT)
+
+$(GNAME ParameterMemberAttributes):
+    $(GLINK2 function, Parameters) $(GLINK2 function, MemberFunctionAttributes)$(OPT)
 
 $(GNAME FunctionLiteralBody):
     $(GLINK2 statement, BlockStatement)
@@ -1559,8 +1561,8 @@ $(H4 Lambdas)
 $(GRAMMAR
 $(GNAME Lambda):
     $(D function) $(GLINK2 declaration, Type)$(OPT) $(GLINK ParameterAttributes) $(D =>) $(GLINK AssignExpression)
-    $(D delegate) $(GLINK2 declaration, Type)$(OPT) $(GLINK ParameterAttributes) $(D =>) $(GLINK AssignExpression)
-    $(GLINK ParameterAttributes) $(D =>) $(GLINK AssignExpression)
+    $(D delegate) $(GLINK2 declaration, Type)$(OPT) $(GLINK ParameterMemberAttributes) $(D =>) $(GLINK AssignExpression)
+    $(GLINK ParameterMemberAttributes) $(D =>) $(GLINK AssignExpression)
     $(IDENTIFIER) $(D =>) $(GLINK AssignExpression)
 )
 

diff --git a/grammar.dd b/grammar.dd
@@ -377,25 +377,27 @@ $(GNAME ValueExpression):
 $(GRAMMAR
 $(GNAME FunctionLiteral):
     $(D function) $(GLINK Type)$(OPT) $(GLINK ParameterAttributes) $(OPT) $(GLINK FunctionLiteralBody)
-    $(D delegate) $(GLINK Type)$(OPT) $(GLINK ParameterAttributes) $(OPT) $(GLINK FunctionLiteralBody)
-    $(GLINK ParameterAttributes) $(GLINK FunctionLiteralBody)
+    $(D delegate) $(GLINK Type)$(OPT) $(GLINK ParameterMemberAttributes) $(OPT) $(GLINK FunctionLiteralBody)
+    $(GLINK ParameterMemberAttributes) $(GLINK FunctionLiteralBody)
     $(GLINK FunctionLiteralBody)
     $(GLINK Lambda)
 )
 
 $(GRAMMAR
 $(GNAME ParameterAttributes):
-    $(GLINK Parameters)
-    $(GLINK Parameters) $(GLINK FunctionAttributes)
+    $(GLINK Parameters) $(GLINK FunctionAttributes)$(OPT)
+
+$(GNAME ParameterMemberAttributes):
+    $(GLINK Parameters) $(GLINK MemberFunctionAttributes)$(OPT)
 
 $(GNAME FunctionLiteralBody):
     $(GLINK BlockStatement)
     $(GLINK FunctionContracts)$(OPT) $(GLINK BodyStatement)
 
 $(GNAME Lambda):
     $(D function) $(GLINK Type)$(OPT) $(GLINK ParameterAttributes) $(D =>) $(GLINK AssignExpression)
-    $(D delegate) $(GLINK Type)$(OPT) $(GLINK ParameterAttributes) $(D =>) $(GLINK AssignExpression)
-    $(GLINK ParameterAttributes) $(D =>) $(GLINK AssignExpression)
+    $(D delegate) $(GLINK Type)$(OPT) $(GLINK ParameterMemberAttributes) $(D =>) $(GLINK AssignExpression)
+    $(GLINK ParameterMemberAttributes) $(D =>) $(GLINK AssignExpression)
     $(IDENTIFIER) $(D =>) $(GLINK AssignExpression)
 )