diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/parse.y | 4 | ||||
| -rw-r--r-- | src/vm.c | 12 |
2 files changed, 12 insertions, 4 deletions
diff --git a/src/parse.y b/src/parse.y index b3f5f6664..c6795fb65 100644 --- a/src/parse.y +++ b/src/parse.y @@ -5522,6 +5522,7 @@ load_exec(mrb_state *mrb, parser_state *p, mrbc_context *c) struct RClass *target = mrb->object_class; struct RProc *proc; mrb_value v; + unsigned int keep = 0; if (!p) { return mrb_undef_value(); @@ -5555,12 +5556,13 @@ load_exec(mrb_state *mrb, parser_state *p, mrbc_context *c) if (c->target_class) { target = c->target_class; } + keep = c->slen + 1; } proc->target_class = target; if (mrb->c->ci) { mrb->c->ci->target_class = target; } - v = mrb_toplevel_run(mrb, proc); + v = mrb_toplevel_run_keep(mrb, proc, keep); if (mrb->exc) return mrb_nil_value(); return v; } @@ -2402,19 +2402,25 @@ mrb_run(mrb_state *mrb, struct RProc *proc, mrb_value self) } mrb_value -mrb_toplevel_run(mrb_state *mrb, struct RProc *proc) +mrb_toplevel_run_keep(mrb_state *mrb, struct RProc *proc, unsigned int stack_keep) { mrb_callinfo *ci; mrb_value v; if (!mrb->c->cibase || mrb->c->ci == mrb->c->cibase) { - return mrb_context_run(mrb, proc, mrb_top_self(mrb), 0); + return mrb_context_run(mrb, proc, mrb_top_self(mrb), stack_keep); } ci = cipush(mrb); ci->acc = CI_ACC_SKIP; ci->target_class = mrb->object_class; - v = mrb_context_run(mrb, proc, mrb_top_self(mrb), 0); + v = mrb_context_run(mrb, proc, mrb_top_self(mrb), stack_keep); cipop(mrb); return v; } + +mrb_value +mrb_toplevel_run(mrb_state *mrb, struct RProc *proc) +{ + return mrb_toplevel_run_keep(mrb, proc, 0); +} |