From 06c7ede25923582b7f61c85920cd195b3c0447ce Mon Sep 17 00:00:00 2001 From: nobu Date: Sat, 1 Jun 2013 08:21:39 +0000 Subject: vm_insnhelper.c: extract keyword arguments after splat * vm_insnhelper.c (vm_yield_setup_block_args): split single parameter if any keyword arguments exist, and then extract keyword arguments. [ruby-core:55203] [Bug #8463] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@41020 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- vm_insnhelper.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'vm_insnhelper.c') diff --git a/vm_insnhelper.c b/vm_insnhelper.c index b519670370..5a3a14d5ac 100644 --- a/vm_insnhelper.c +++ b/vm_insnhelper.c @@ -2193,11 +2193,6 @@ vm_yield_setup_block_args(rb_thread_t *th, const rb_iseq_t * iseq, th->mark_stack_len = argc; - /* keyword argument */ - if (iseq->arg_keyword != -1) { - argc = vm_callee_setup_keyword_arg(iseq, argc, m, argv, &keyword_hash); - } - /* * yield [1, 2] * => {|a|} => a = [1, 2] @@ -2207,6 +2202,7 @@ vm_yield_setup_block_args(rb_thread_t *th, const rb_iseq_t * iseq, if (!(iseq->arg_simple & 0x02) && /* exclude {|a|} */ ((m + iseq->arg_post_len) > 0 || /* positional arguments exist */ iseq->arg_opts > 2 || /* multiple optional arguments exist */ + iseq->arg_keyword != -1 || /* any keyword arguments */ 0) && argc == 1 && !NIL_P(ary = rb_check_array_type(arg0))) { /* rhs is only an array */ th->mark_stack_len = argc = RARRAY_LENINT(ary); @@ -2216,6 +2212,11 @@ vm_yield_setup_block_args(rb_thread_t *th, const rb_iseq_t * iseq, MEMCPY(argv, RARRAY_PTR(ary), VALUE, argc); } + /* keyword argument */ + if (iseq->arg_keyword != -1) { + argc = vm_callee_setup_keyword_arg(iseq, argc, m, argv, &keyword_hash); + } + for (i=argc; i