From c4f488d6d48fc1d7aac0408b6e74eee54856bcdc Mon Sep 17 00:00:00 2001 From: ko1 Date: Mon, 5 Jun 2017 06:15:28 +0000 Subject: rename functions and clean parameters. * internal.h (rb_yield_lambda): rename to rb_yield_force_blockarg() because this function prohibt lambda arg setup (strict setup). * vm.c (invoke_iseq_block_from_c): remove splattable argument because it is not used. * vm.c (invoke_block_from_c_splattable): rename to invoke_block_from_c_bh() because `splattable` doesn't make sense on current this function. Also accept `force_blockarg' parameter instead of `splattable` parameter. It is more clear. * vm.c (invoke_block_from_c_unsplattable): rename to invoke_block_from_c_proc() and accept `proc` instead of `block'. This function is used only by proc block invocation. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@59016 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- vm_eval.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'vm_eval.c') diff --git a/vm_eval.c b/vm_eval.c index bf7d47c4a8..0a4580688a 100644 --- a/vm_eval.c +++ b/vm_eval.c @@ -19,7 +19,7 @@ static inline VALUE method_missing(VALUE obj, ID id, int argc, const VALUE *argv static inline VALUE vm_yield_with_cref(rb_thread_t *th, int argc, const VALUE *argv, const rb_cref_t *cref, int is_lambda); static inline VALUE vm_yield(rb_thread_t *th, int argc, const VALUE *argv); static inline VALUE vm_yield_with_block(rb_thread_t *th, int argc, const VALUE *argv, VALUE block_handler); -static inline VALUE vm_yield_lambda_splattable(rb_thread_t *th, VALUE args); +static inline VALUE vm_yield_force_blockarg(rb_thread_t *th, VALUE args); static VALUE vm_exec(rb_thread_t *th); static void vm_set_eval_stack(rb_thread_t * th, const rb_iseq_t *iseq, const rb_cref_t *cref, const struct rb_block *base_block); static int vm_collect_local_variables_in_heap(rb_thread_t *th, const VALUE *dfp, const struct local_var_list *vars); @@ -1067,9 +1067,9 @@ rb_yield_splat(VALUE values) } VALUE -rb_yield_lambda(VALUE values) +rb_yield_force_blockarg(VALUE values) { - return vm_yield_lambda_splattable(GET_THREAD(), values); + return vm_yield_force_blockarg(GET_THREAD(), values); } VALUE -- cgit v1.2.3