rename mrb_yield_internal to mrb_yield_with_class since it's no longer internal

parent 2f4eed25
...@@ -364,7 +364,7 @@ void mrb_print_error(mrb_state *mrb); ...@@ -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(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_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); void mrb_gc_protect(mrb_state *mrb, mrb_value obj);
mrb_value mrb_to_int(mrb_state *mrb, mrb_value val); mrb_value mrb_to_int(mrb_state *mrb, mrb_value val);
......
...@@ -84,7 +84,7 @@ mrb_obj_instance_exec(mrb_state *mrb, mrb_value self) ...@@ -84,7 +84,7 @@ mrb_obj_instance_exec(mrb_state *mrb, mrb_value self)
break; break;
} }
return mrb_yield_internal(mrb, blk, argc, argv, self, c); return mrb_yield_with_class(mrb, blk, argc, argv, self, c);
} }
void void
......
...@@ -382,7 +382,7 @@ mrb_struct_s_def(mrb_state *mrb, mrb_value klass) ...@@ -382,7 +382,7 @@ mrb_struct_s_def(mrb_state *mrb, mrb_value klass)
} }
st = make_struct(mrb, name, rest, struct_class(mrb)); st = make_struct(mrb, name, rest, struct_class(mrb));
if (!mrb_nil_p(b)) { 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; return st;
......
...@@ -964,7 +964,7 @@ mrb_mod_module_eval(mrb_state *mrb, mrb_value mod) ...@@ -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"); mrb_raise(mrb, E_NOTIMP_ERROR, "module_eval/class_eval with string not implemented");
} }
c = mrb_class_ptr(mod); 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 mrb_value
......
...@@ -497,7 +497,7 @@ mrb_obj_instance_eval(mrb_state *mrb, mrb_value self) ...@@ -497,7 +497,7 @@ mrb_obj_instance_eval(mrb_state *mrb, mrb_value self)
c = mrb_class_ptr(cv); c = mrb_class_ptr(cv);
break; break;
} }
return mrb_yield_internal(mrb, b, 0, 0, self, c); return mrb_yield_with_class(mrb, b, 0, 0, self, c);
} }
mrb_bool mrb_bool
......
...@@ -487,7 +487,7 @@ mrb_f_send(mrb_state *mrb, mrb_value self) ...@@ -487,7 +487,7 @@ mrb_f_send(mrb_state *mrb, mrb_value self)
} }
mrb_value 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; struct RProc *p;
mrb_sym mid = mrb->c->ci->mid; 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) ...@@ -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); 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 mrb_value
...@@ -545,7 +545,7 @@ mrb_yield(mrb_state *mrb, mrb_value b, mrb_value arg) ...@@ -545,7 +545,7 @@ mrb_yield(mrb_state *mrb, mrb_value b, mrb_value arg)
{ {
struct RProc *p = mrb_proc_ptr(b); 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 { typedef enum {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment