admin/mruby-mruby
1
0
Fork 0
mirror of https://github.com/mruby/mruby synced 2026-06-08 16:11:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Changed evaluation order of yield; ref #3613

Browse Source 
So that `yield expr_with_error` will cause the error from the
argument rather than `LocalJumpError` when no block is given.
This commit is contained in:
Yukihiro "Matz" Matsumoto
2017-04-18 12:00:52 +09:00
parent f6c70bc6e8
commit f4119f518f
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mrbgems/mruby-compiler/core/codegen.c
+1 -1
View File
@@ -2017,7 +2017,6 @@ codegen(codegen_scope *s, node *tree, int val)
if (!s2) break;
}
if (s2) ainfo = s2->ainfo;
genop(s, MKOP_ABx(OP_BLKPUSH, cursp(), (ainfo<<4)|(lv & 0xf)));
push();
if (tree) {
n = gen_values(s, tree, VAL, 0);
@@ -2027,6 +2026,7 @@ codegen(codegen_scope *s, node *tree, int val)
}
}
pop_n(n+1);
genop(s, MKOP_ABx(OP_BLKPUSH, cursp(), (ainfo<<4)|(lv & 0xf)));
if (sendv) n = CALL_MAXARGS;
genop(s, MKOP_ABC(OP_SEND, cursp(), new_msym(s, mrb_intern_lit(s->mrb, "call")), n));
if (val) push();