summaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorDaniel Bovensiepen <[email protected]>2012-11-23 22:50:38 +0800
committerDaniel Bovensiepen <[email protected]>2012-11-23 22:50:38 +0800
commitb6a102481a588e73d0f74c4973c9ceeb8d0bb7ba (patch)
tree03492585d830981a01e57d05bcfb710fc80e0714 /src
parentcc382f9bacf43e901ec2c87616c987c7f0a3e686 (diff)
parent32bacb21a2d51e9466b54bc5e30a832e68077c78 (diff)
downloadmruby-b6a102481a588e73d0f74c4973c9ceeb8d0bb7ba.tar.gz
mruby-b6a102481a588e73d0f74c4973c9ceeb8d0bb7ba.zip
Merge remote-tracking branch 'upstream/master' into mrbgems
Diffstat (limited to 'src')
-rw-r--r--src/codegen.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/codegen.c b/src/codegen.c
index f37a9e331..fd41e3cb8 100644
--- a/src/codegen.c
+++ b/src/codegen.c
@@ -1501,7 +1501,7 @@ codegen(codegen_scope *s, node *tree, int val)
case NODE_RETURN:
codegen(s, tree, VAL);
pop();
- if (s->loop && s->loop->type != LOOP_NORMAL) {
+ if (s->loop) {
genop(s, MKOP_AB(OP_RETURN, cursp(), OP_R_RETURN));
}
else {