From 9084e035563a6a2ee312defd912f12acdebbdeec Mon Sep 17 00:00:00 2001 From: "Yukihiro \"Matz\" Matsumoto" Date: Wed, 19 Mar 2014 08:57:54 +0900 Subject: rename mrb_yield_internal to mrb_yield_with_class since it's no longer internal --- include/mruby.h | 2 +- mrbgems/mruby-object-ext/src/object.c | 2 +- mrbgems/mruby-struct/src/struct.c | 2 +- src/class.c | 2 +- src/kernel.c | 2 +- src/vm.c | 6 +++--- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/include/mruby.h b/include/mruby.h index 3eda0193f..2b2412a46 100644 --- a/include/mruby.h +++ b/include/mruby.h @@ -364,7 +364,7 @@ void mrb_print_error(mrb_state *mrb); mrb_value mrb_yield(mrb_state *mrb, mrb_value b, mrb_value arg); mrb_value mrb_yield_argv(mrb_state *mrb, mrb_value b, int argc, mrb_value *argv); -mrb_value mrb_yield_internal(mrb_state *mrb, mrb_value b, int argc, mrb_value *argv, mrb_value self, struct RClass *c); +mrb_value mrb_yield_with_class(mrb_state *mrb, mrb_value b, int argc, mrb_value *argv, mrb_value self, struct RClass *c); void mrb_gc_protect(mrb_state *mrb, mrb_value obj); mrb_value mrb_to_int(mrb_state *mrb, mrb_value val); diff --git a/mrbgems/mruby-object-ext/src/object.c b/mrbgems/mruby-object-ext/src/object.c index 3f30dfa12..2bc9cbf4f 100644 --- a/mrbgems/mruby-object-ext/src/object.c +++ b/mrbgems/mruby-object-ext/src/object.c @@ -84,7 +84,7 @@ mrb_obj_instance_exec(mrb_state *mrb, mrb_value self) break; } - return mrb_yield_internal(mrb, blk, argc, argv, self, c); + return mrb_yield_with_class(mrb, blk, argc, argv, self, c); } void diff --git a/mrbgems/mruby-struct/src/struct.c b/mrbgems/mruby-struct/src/struct.c index 05fc2485d..f8c1d12da 100644 --- a/mrbgems/mruby-struct/src/struct.c +++ b/mrbgems/mruby-struct/src/struct.c @@ -382,7 +382,7 @@ mrb_struct_s_def(mrb_state *mrb, mrb_value klass) } st = make_struct(mrb, name, rest, struct_class(mrb)); if (!mrb_nil_p(b)) { - mrb_yield_internal(mrb, b, 1, &st, st, mrb_class_ptr(klass)); + mrb_yield_with_class(mrb, b, 1, &st, st, mrb_class_ptr(klass)); } return st; diff --git a/src/class.c b/src/class.c index e9ce74221..30d376648 100644 --- a/src/class.c +++ b/src/class.c @@ -964,7 +964,7 @@ mrb_mod_module_eval(mrb_state *mrb, mrb_value mod) mrb_raise(mrb, E_NOTIMP_ERROR, "module_eval/class_eval with string not implemented"); } c = mrb_class_ptr(mod); - return mrb_yield_internal(mrb, b, 0, 0, mod, c); + return mrb_yield_with_class(mrb, b, 0, 0, mod, c); } mrb_value diff --git a/src/kernel.c b/src/kernel.c index a2331dcc2..f4ee6bd9d 100644 --- a/src/kernel.c +++ b/src/kernel.c @@ -497,7 +497,7 @@ mrb_obj_instance_eval(mrb_state *mrb, mrb_value self) c = mrb_class_ptr(cv); break; } - return mrb_yield_internal(mrb, b, 0, 0, self, c); + return mrb_yield_with_class(mrb, b, 0, 0, self, c); } mrb_bool diff --git a/src/vm.c b/src/vm.c index dc32ae7c8..2ed82a27b 100644 --- a/src/vm.c +++ b/src/vm.c @@ -487,7 +487,7 @@ mrb_f_send(mrb_state *mrb, mrb_value self) } mrb_value -mrb_yield_internal(mrb_state *mrb, mrb_value b, int argc, mrb_value *argv, mrb_value self, struct RClass *c) +mrb_yield_with_class(mrb_state *mrb, mrb_value b, int argc, mrb_value *argv, mrb_value self, struct RClass *c) { struct RProc *p; mrb_sym mid = mrb->c->ci->mid; @@ -537,7 +537,7 @@ mrb_yield_argv(mrb_state *mrb, mrb_value b, int argc, mrb_value *argv) { struct RProc *p = mrb_proc_ptr(b); - return mrb_yield_internal(mrb, b, argc, argv, p->env->stack[0], p->target_class); + return mrb_yield_with_class(mrb, b, argc, argv, p->env->stack[0], p->target_class); } mrb_value @@ -545,7 +545,7 @@ mrb_yield(mrb_state *mrb, mrb_value b, mrb_value arg) { struct RProc *p = mrb_proc_ptr(b); - return mrb_yield_internal(mrb, b, 1, &arg, p->env->stack[0], p->target_class); + return mrb_yield_with_class(mrb, b, 1, &arg, p->env->stack[0], p->target_class); } typedef enum { -- cgit v1.2.3