зеркало из https://github.com/github/ruby.git
Make rb_vm_invoke_bmethod() static
This commit is contained in:
Родитель
68a419d749
Коммит
057c53f771
10
vm.c
10
vm.c
|
@ -371,7 +371,7 @@ static void vm_collect_usage_register(int reg, int isset);
|
|||
#endif
|
||||
|
||||
static VALUE vm_make_env_object(const rb_execution_context_t *ec, rb_control_frame_t *cfp);
|
||||
extern VALUE rb_vm_invoke_bmethod(rb_execution_context_t *ec, rb_proc_t *proc, VALUE self,
|
||||
static VALUE vm_invoke_bmethod(rb_execution_context_t *ec, rb_proc_t *proc, VALUE self,
|
||||
int argc, const VALUE *argv, int kw_splat, VALUE block_handler,
|
||||
const rb_callable_method_entry_t *me);
|
||||
static VALUE vm_invoke_proc(rb_execution_context_t *ec, rb_proc_t *proc, VALUE self, int argc, const VALUE *argv, int kw_splat, VALUE block_handler);
|
||||
|
@ -1719,8 +1719,8 @@ vm_invoke_proc(rb_execution_context_t *ec, rb_proc_t *proc, VALUE self,
|
|||
return invoke_block_from_c_proc(ec, proc, self, argc, argv, kw_splat, passed_block_handler, proc->is_lambda, NULL);
|
||||
}
|
||||
|
||||
VALUE
|
||||
rb_vm_invoke_bmethod(rb_execution_context_t *ec, rb_proc_t *proc, VALUE self,
|
||||
static VALUE
|
||||
vm_invoke_bmethod(rb_execution_context_t *ec, rb_proc_t *proc, VALUE self,
|
||||
int argc, const VALUE *argv, int kw_splat, VALUE block_handler, const rb_callable_method_entry_t *me)
|
||||
{
|
||||
return invoke_block_from_c_proc(ec, proc, self, argc, argv, kw_splat, block_handler, TRUE, me);
|
||||
|
@ -1734,7 +1734,7 @@ rb_vm_invoke_proc(rb_execution_context_t *ec, rb_proc_t *proc,
|
|||
vm_block_handler_verify(passed_block_handler);
|
||||
|
||||
if (proc->is_from_method) {
|
||||
return rb_vm_invoke_bmethod(ec, proc, self, argc, argv, kw_splat, passed_block_handler, NULL);
|
||||
return vm_invoke_bmethod(ec, proc, self, argc, argv, kw_splat, passed_block_handler, NULL);
|
||||
}
|
||||
else {
|
||||
return vm_invoke_proc(ec, proc, self, argc, argv, kw_splat, passed_block_handler);
|
||||
|
@ -1748,7 +1748,7 @@ rb_vm_invoke_proc_with_self(rb_execution_context_t *ec, rb_proc_t *proc, VALUE s
|
|||
vm_block_handler_verify(passed_block_handler);
|
||||
|
||||
if (proc->is_from_method) {
|
||||
return rb_vm_invoke_bmethod(ec, proc, self, argc, argv, kw_splat, passed_block_handler, NULL);
|
||||
return vm_invoke_bmethod(ec, proc, self, argc, argv, kw_splat, passed_block_handler, NULL);
|
||||
}
|
||||
else {
|
||||
return vm_invoke_proc(ec, proc, self, argc, argv, kw_splat, passed_block_handler);
|
||||
|
|
|
@ -4002,7 +4002,7 @@ vm_call_bmethod_body(rb_execution_context_t *ec, struct rb_calling_info *calling
|
|||
|
||||
/* control block frame */
|
||||
GetProcPtr(procv, proc);
|
||||
val = rb_vm_invoke_bmethod(ec, proc, calling->recv, CALLING_ARGC(calling), argv, calling->kw_splat, calling->block_handler, vm_cc_cme(cc));
|
||||
val = vm_invoke_bmethod(ec, proc, calling->recv, CALLING_ARGC(calling), argv, calling->kw_splat, calling->block_handler, vm_cc_cme(cc));
|
||||
|
||||
return val;
|
||||
}
|
||||
|
|
Загрузка…
Ссылка в новой задаче