From fb3243e09616652c037b7392b9c54af74f15d423 Mon Sep 17 00:00:00 2001 From: "Yukihiro \"Matz\" Matsumoto" Date: Tue, 28 Feb 2017 11:34:54 +0900 Subject: `return` (and `break`) should handle splat correctly; fix #3472 --- mrbgems/mruby-compiler/core/codegen.c | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/mrbgems/mruby-compiler/core/codegen.c b/mrbgems/mruby-compiler/core/codegen.c index f198dbd5b..ad4da12f7 100644 --- a/mrbgems/mruby-compiler/core/codegen.c +++ b/mrbgems/mruby-compiler/core/codegen.c @@ -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; -- cgit v1.2.3