Merge pull request #656 from 9rnsr/fix13451

Issue 13451 - Lambda syntax with explicit return type not documented
dlang · Sep 23, 2014 · d4c0a53 · d4c0a53
2 parents e362a54 + 54a1e7e
commit d4c0a53
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/expression.dd b/expression.dd
@@ -1439,9 +1439,10 @@ $(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)
     $(IDENTIFIER) $(D =>) $(GLINK AssignExpression)
-    $(D function)$(OPT) $(GLINK ParameterAttributes) $(D =>) $(GLINK AssignExpression)
-    $(D delegate)$(OPT) $(GLINK ParameterAttributes) $(D =>) $(GLINK AssignExpression)
 )
 
         $(P $(I Lambda)s are a shorthand syntax for $(GLINK FunctionLiteral)s.)

diff --git a/grammar.dd b/grammar.dd
@@ -386,9 +386,10 @@ $(GNAME FunctionLiteralBody):
     $(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)
     $(IDENTIFIER) $(D =>) $(GLINK AssignExpression)
-    $(D function)$(OPT) $(GLINK ParameterAttributes) $(D =>) $(GLINK AssignExpression)
-    $(D delegate)$(OPT) $(GLINK ParameterAttributes) $(D =>) $(GLINK AssignExpression)
 )
 
 $(GRAMMAR