Merge pull request #439 from masamitsu-murase/modify_ci_nregs_in_yield

ci->nregs for ruby proc.
This commit is contained in:
Yukihiro "Matz" Matsumoto
2012-08-25 19:52:53 -07:00
+12 -2
View File
@@ -267,7 +267,12 @@ mrb_funcall_with_block(mrb_state *mrb, mrb_value self, mrb_sym mid, int argc, mr
ci->stackidx = mrb->stack - mrb->stbase;
ci->argc = argc;
ci->target_class = p->target_class;
ci->nregs = argc + 2;
if (MRB_PROC_CFUNC_P(p)) {
ci->nregs = argc + 2;
}
else {
ci->nregs = p->body.irep->nregs + 2;
}
ci->acc = -1;
mrb->stack = mrb->stack + n;
@@ -318,7 +323,12 @@ mrb_yield_internal(mrb_state *mrb, mrb_value b, int argc, mrb_value *argv, mrb_v
ci->stackidx = mrb->stack - mrb->stbase;
ci->argc = argc;
ci->target_class = c;
ci->nregs = argc + 2;
if (MRB_PROC_CFUNC_P(p)) {
ci->nregs = argc + 2;
}
else {
ci->nregs = p->body.irep->nregs + 2;
}
ci->acc = -1;
mrb->stack = mrb->stack + n;