diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/class.c | 2 | ||||
| -rw-r--r-- | src/kernel.c | 35 | ||||
| -rw-r--r-- | src/vm.c | 1 |
3 files changed, 26 insertions, 12 deletions
diff --git a/src/class.c b/src/class.c index 77a7050da..30faa85e9 100644 --- a/src/class.c +++ b/src/class.c @@ -436,7 +436,6 @@ mrb_define_method_raw(mrb_state *mrb, struct RClass *c, mrb_sym mid, struct RPro k = kh_put(mt, mrb, h, mid); kh_value(h, k) = p; if (p) { - p->flags |= MRB_PROC_SCOPE; p->c = NULL; mrb_field_write_barrier(mrb, (struct RBasic*)c, (struct RBasic*)p); MRB_PROC_SET_TARGET_CLASS(p, c); @@ -453,6 +452,7 @@ mrb_define_method_id(mrb_state *mrb, struct RClass *c, mrb_sym mid, mrb_func_t f p = mrb_proc_new_cfunc(mrb, func); MRB_PROC_SET_TARGET_CLASS(p, c); + p->flags |= MRB_PROC_SCOPE; mrb_define_method_raw(mrb, c, mid, p); mrb_gc_arena_restore(mrb, ai); } diff --git a/src/kernel.c b/src/kernel.c index 929ffd26a..ec95b04ba 100644 --- a/src/kernel.c +++ b/src/kernel.c @@ -134,25 +134,32 @@ mrb_obj_id_m(mrb_state *mrb, mrb_value self) static mrb_value mrb_f_block_given_p_m(mrb_state *mrb, mrb_value self) { - mrb_callinfo *ci = mrb->c->ci; + mrb_callinfo *ci = &mrb->c->ci[-1]; + mrb_callinfo *cibase = mrb->c->cibase; mrb_value *bp; struct RProc *p; - bp = ci->stackent + 1; - ci--; - if (ci <= mrb->c->cibase) { + if (ci <= cibase) { + /* toplevel does not have block */ return mrb_false_value(); } - /* block_given? called within block; check upper scope */ p = ci->proc; + /* search method/class/module proc */ while (p) { if (MRB_PROC_SCOPE_P(p)) break; p = p->upper; } - /* top-level does not have block slot (always false) */ if (p == NULL) return mrb_false_value(); - if (MRB_PROC_ENV_P(p)) { - struct REnv *e = MRB_PROC_ENV(p); + /* search ci corresponding to proc */ + while (cibase < ci) { + if (ci->proc == p) break; + ci--; + } + if (ci == cibase) { + return mrb_false_value(); + } + else if (ci->env) { + struct REnv *e = ci->env; int bidx; /* top-level does not have block slot (always false) */ @@ -165,8 +172,14 @@ mrb_f_block_given_p_m(mrb_state *mrb, mrb_value self) return mrb_false_value(); bp = &e->stack[bidx]; } - else if (ci && ci->argc > 0) { - bp += ci->argc; + else { + bp = ci[1].stackent+1; + if (ci->argc >= 0) { + bp += ci->argc; + } + else { + bp++; + } } if (mrb_nil_p(*bp)) return mrb_false_value(); @@ -1175,7 +1188,7 @@ mrb_local_variables(mrb_state *mrb, mrb_value self) } if (!MRB_PROC_ENV_P(proc)) break; proc = proc->upper; - // if (MRB_PROC_SCOPE_P(proc)) break; + //if (MRB_PROC_SCOPE_P(proc)) break; if (!proc->c) break; } @@ -2651,6 +2651,7 @@ RETRY_TRY_BLOCK: } else { p = mrb_proc_new(mrb, nirep); + p->flags |= MRB_PROC_SCOPE; } if (c & OP_L_STRICT) p->flags |= MRB_PROC_STRICT; regs[a] = mrb_obj_value(p); |