Merge pull request #892 from 9rnsr/fix7453

Issue 7453 - Can't return value from within opApply
dlang · Apr 20, 2012 · 03e8c26 · 03e8c26
2 parents 79f502a + 4d28102
commit 03e8c26
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 1 deletion.
diff --git a/src/statement.c b/src/statement.c
@@ -3627,6 +3627,7 @@ ReturnStatement::ReturnStatement(Loc loc, Expression *exp)
     : Statement(loc)
 {
     this->exp = exp;
+    this->implicit0 = 0;
 }
 
 Statement *ReturnStatement::syntaxCopy()
@@ -3644,7 +3645,6 @@ Statement *ReturnStatement::semantic(Scope *sc)
 
     FuncDeclaration *fd = sc->parent->isFuncDeclaration();
     Scope *scx = sc;
-    int implicit0 = 0;
     Expression *eorg = NULL;
 
     if (fd->fes)

diff --git a/src/statement.h b/src/statement.h
@@ -604,6 +604,7 @@ struct SwitchErrorStatement : Statement
 struct ReturnStatement : Statement
 {
     Expression *exp;
+    int implicit0;
 
     ReturnStatement(Loc loc, Expression *exp);
     Statement *syntaxCopy();

diff --git a/test/runnable/test7453.d b/test/runnable/test7453.d
@@ -0,0 +1,14 @@
+struct S
+{
+    int opApply(int delegate(string) dg)
+    {
+        return 0;
+    }
+}
+void main()
+{
+    foreach (_; S())
+    {
+        return;
+    }
+}