diff options
| author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-03-21 14:04:23 +0000 |
|---|---|---|
| committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-03-21 14:04:23 +0000 |
| commit | 539ab3056902c5946291433cb807ad7c5b8fea4c (patch) | |
| tree | 03aa4991fd8cbc51cce4c813ef1cf7a964edadbd /vm_eval.c | |
| parent | dd6be57da8054b95855c01d1ebedd21d4a91cd68 (diff) | |
merge revision(s) 57192,57464,58016,58018,58019: [Backport #12705]
[Bug #12705]
add a ticket number.
test_lambda.rb: refine test
* test/ruby/test_lambda.rb (test_lambda_as_iterator): refine a
test for the intention of the original report.
[ruby-core:61340] [Bug #9605]
test_lambda.rb: remove duplcate tests
vm_args.c: arity check of lambda
* vm_eval.c (rb_yield_lambda): new function which yields an array
to a proc and splat to a lambda. mainly for Enumerable only.
* vm_args.c (setup_parameters_complex): remove special lambda
splatting for [Bug #9605]. [ruby-core:77065] [Bug #12705]
* vm_insnhelper.c (vm_callee_setup_block_arg): ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_4@58045 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'vm_eval.c')
| -rw-r--r-- | vm_eval.c | 7 |
1 files changed, 7 insertions, 0 deletions
@@ -19,6 +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 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); @@ -1068,6 +1069,12 @@ rb_yield_splat(VALUE values) } VALUE +rb_yield_lambda(VALUE values) +{ + return vm_yield_lambda_splattable(GET_THREAD(), values); +} + +VALUE rb_yield_block(VALUE val, VALUE arg, int argc, const VALUE *argv, VALUE blockarg) { return vm_yield_with_block(GET_THREAD(), argc, argv, |