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_insnhelper.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_insnhelper.c')
| -rw-r--r-- | vm_insnhelper.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/vm_insnhelper.c b/vm_insnhelper.c index 3bb9b83449..b11c5a61e4 100644 --- a/vm_insnhelper.c +++ b/vm_insnhelper.c @@ -2522,12 +2522,6 @@ vm_callee_setup_block_arg(rb_thread_t *th, struct rb_calling_info *calling, cons calling->argc = iseq->body->param.lead_num; /* simply truncate arguments */ } } - else if (arg_setup_type == arg_setup_lambda && - calling->argc == 1 && - !NIL_P(arg0 = vm_callee_setup_block_arg_arg0_check(argv)) && - RARRAY_LEN(arg0) == iseq->body->param.lead_num) { - calling->argc = vm_callee_setup_block_arg_arg0_splat(cfp, iseq, argv, arg0); - } else { argument_arity_error(th, iseq, calling->argc, iseq->body->param.lead_num, iseq->body->param.lead_num); } |