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

return (and break) should handle splat correctly; fix #3472

Browse Source
This commit is contained in:
Yukihiro "Matz" Matsumoto
2017-02-28 11:34:54 +09:00
parent 22eb41ab20
commit fb3243e096
1 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mrbgems/mruby-compiler/core/codegen.c
+18 -4
View File
@@ -1220,6 +1220,22 @@ readint_mrb_int(codegen_scope *s, const char *p, int base, mrb_bool neg, mrb_boo
return result;
}
static void
gen_retval(codegen_scope *s, node *tree)
{
if ((intptr_t)tree->car == NODE_SPLAT) {
genop(s, MKOP_ABC(OP_ARRAY, cursp(), cursp(), 0));
push();
codegen(s, tree, VAL);
pop(); pop();
genop(s, MKOP_AB(OP_ARYCAT, cursp(), cursp()+1));
}
else {
codegen(s, tree, VAL);
pop();
}
}
static void
codegen(codegen_scope *s, node *tree, int val)
{
@@ -1965,8 +1981,7 @@ codegen(codegen_scope *s, node *tree, int val)
case NODE_RETURN:
if (tree) {
codegen(s, tree, VAL);
pop();
gen_retval(s, tree);
}
else {
genop(s, MKOP_A(OP_LOADNIL, cursp()));
@@ -2893,8 +2908,7 @@ loop_break(codegen_scope *s, node *tree)
struct loopinfo *loop;
if (tree) {
codegen(s, tree, VAL);
pop();
gen_retval(s, tree);
}
loop = s->loop;