ruby-changes:57967
From: Jeremy <ko1@a...>
Date: Fri, 27 Sep 2019 07:31:11 +0900 (JST)
Subject: [ruby-changes:57967] dd2068ac8d (master): Add rb_adjust_argv_kw_splat to internal.h
https://git.ruby-lang.org/ruby.git/commit/?id=dd2068ac8d From dd2068ac8d4016f43c1f3cc1aa81decb504db5b6 Mon Sep 17 00:00:00 2001 From: Jeremy Evans <code@j...> Date: Thu, 26 Sep 2019 09:09:30 -0700 Subject: Add rb_adjust_argv_kw_splat to internal.h We are calling this in a few other files, it is better to have it in a header than adding prototypes to the other files. diff --git a/cont.c b/cont.c index fe2bcb6..61f42b3 100644 --- a/cont.c +++ b/cont.c @@ -1779,7 +1779,6 @@ rb_fiber_new(rb_block_call_func_t func, VALUE obj) https://github.com/ruby/ruby/blob/trunk/cont.c#L1779 static void rb_fiber_terminate(rb_fiber_t *fiber, int need_interrupt); #define PASS_KW_SPLAT (rb_empty_keyword_given_p() ? RB_PASS_EMPTY_KEYWORDS : rb_keyword_given_p()) -extern VALUE rb_adjust_argv_kw_splat(int *argc, const VALUE **argv, int *kw_splat); void rb_fiber_start(void) diff --git a/internal.h b/internal.h index 7de0077..2346703 100644 --- a/internal.h +++ b/internal.h @@ -2294,6 +2294,7 @@ void rb_print_backtrace(void); https://github.com/ruby/ruby/blob/trunk/internal.h#L2294 /* vm_eval.c */ void Init_vm_eval(void); +VALUE rb_adjust_argv_kw_splat(int *, const VALUE **, int *); VALUE rb_current_realfilepath(void); VALUE rb_check_block_call(VALUE, ID, int, const VALUE *, rb_block_call_func_t, VALUE); typedef void rb_check_funcall_hook(int, VALUE, ID, int, const VALUE *, VALUE); diff --git a/proc.c b/proc.c index 91f5878..f03e470 100644 --- a/proc.c +++ b/proc.c @@ -954,8 +954,6 @@ proc_to_block_handler(VALUE procval) https://github.com/ruby/ruby/blob/trunk/proc.c#L954 return NIL_P(procval) ? VM_BLOCK_HANDLER_NONE : procval; } -extern VALUE rb_adjust_argv_kw_splat(int *argc, const VALUE **argv, int *kw_splat); - VALUE rb_proc_call_with_block_kw(VALUE self, int argc, const VALUE *argv, VALUE passed_procval, int kw_splat) { diff --git a/thread.c b/thread.c index 9301e41..901667e 100644 --- a/thread.c +++ b/thread.c @@ -662,8 +662,6 @@ rb_vm_proc_local_ep(VALUE proc) https://github.com/ruby/ruby/blob/trunk/thread.c#L662 } } -extern VALUE rb_adjust_argv_kw_splat(int *argc, const VALUE **argv, int *kw_splat); - static void thread_do_start(rb_thread_t *th) { diff --git a/vm_args.c b/vm_args.c index d128f91..f0bc7a8 100644 --- a/vm_args.c +++ b/vm_args.c @@ -14,7 +14,6 @@ NORETURN(static void argument_kw_error(rb_execution_context_t *ec, const rb_iseq https://github.com/ruby/ruby/blob/trunk/vm_args.c#L14 VALUE rb_keyword_error_new(const char *error, VALUE keys); /* class.c */ static VALUE method_missing(VALUE obj, ID id, int argc, const VALUE *argv, enum method_missing_reason call_status, int kw_splat); -extern VALUE rb_adjust_argv_kw_splat(int *argc, const VALUE **argv, int *kw_splat); struct args_info { /* basic args info */ -- cgit v0.10.2 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/