summaryrefslogtreecommitdiff
path: root/vm_args.c
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-03-21 14:04:23 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-03-21 14:04:23 +0000
commit539ab3056902c5946291433cb807ad7c5b8fea4c (patch)
tree03aa4991fd8cbc51cce4c813ef1cf7a964edadbd /vm_args.c
parentdd6be57da8054b95855c01d1ebedd21d4a91cd68 (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_args.c')
-rw-r--r--vm_args.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/vm_args.c b/vm_args.c
index 9249984d80..6df30a40e1 100644
--- a/vm_args.c
+++ b/vm_args.c
@@ -596,13 +596,7 @@ setup_parameters_complex(rb_thread_t * const th, const rb_iseq_t * const iseq,
}
break;
case arg_setup_lambda:
- if (given_argc == 1 &&
- given_argc != iseq->body->param.lead_num &&
- !iseq->body->param.flags.has_opt &&
- !iseq->body->param.flags.has_rest &&
- args_check_block_arg0(args, th)) {
- given_argc = RARRAY_LENINT(args->rest);
- }
+ break;
}
/* argc check */