From 09eae5ceb2e9e7e509864091e2400af4ca3bfce1 Mon Sep 17 00:00:00 2001 From: "Yukihiro \"Matz\" Matsumoto" Date: Sat, 13 Apr 2013 10:03:34 +0900 Subject: move no block check to mrb_yield_internal --- src/kernel.c | 3 --- src/vm.c | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/kernel.c b/src/kernel.c index e578918af..54c90dfc0 100644 --- a/src/kernel.c +++ b/src/kernel.c @@ -507,9 +507,6 @@ mrb_obj_instance_eval(mrb_state *mrb, mrb_value self) if (mrb_get_args(mrb, "|S&", &a, &b) == 1) { mrb_raise(mrb, E_NOTIMP_ERROR, "instance_eval with string not implemented"); } - if (mrb_nil_p(b)) { - mrb_raise(mrb, E_ARGUMENT_ERROR, "no block given"); - } switch (mrb_type(self)) { case MRB_TT_SYMBOL: case MRB_TT_FIXNUM: diff --git a/src/vm.c b/src/vm.c index 13058fc28..9224c7a40 100644 --- a/src/vm.c +++ b/src/vm.c @@ -392,6 +392,9 @@ mrb_yield_internal(mrb_state *mrb, mrb_value b, int argc, mrb_value *argv, mrb_v int n = mrb->ci->nregs; mrb_value val; + if (mrb_nil_p(b)) { + mrb_raise(mrb, E_ARGUMENT_ERROR, "no block given"); + } p = mrb_proc_ptr(b); ci = cipush(mrb); ci->mid = mid; -- cgit v1.2.3