From 5ac8f2a3d7667e5136b0d79486a7ea62f97d72b4 Mon Sep 17 00:00:00 2001 From: nobu Date: Sat, 5 Aug 2017 06:58:44 +0000 Subject: splat keyword hash * compile.c (compile_array_keyword_arg): set keyword splat flag if explicitly splatted. [ruby-core:68124] [Bug #10856] * vm_args.c (setup_parameters_complex): try keyword hash splat if given. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@59519 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- vm_args.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'vm_args.c') diff --git a/vm_args.c b/vm_args.c index 898301ce49..b505292e68 100644 --- a/vm_args.c +++ b/vm_args.c @@ -615,7 +615,8 @@ setup_parameters_complex(rb_thread_t * const th, const rb_iseq_t * const iseq, } if (given_argc > min_argc && - (iseq->body->param.flags.has_kw || iseq->body->param.flags.has_kwrest) && + (iseq->body->param.flags.has_kw || iseq->body->param.flags.has_kwrest || + (!iseq->body->param.flags.has_rest && (ci->flag & VM_CALL_KW_SPLAT))) && args->kw_argv == NULL) { if (args_pop_keyword_hash(args, &keyword_hash, th)) { given_argc--; @@ -676,6 +677,9 @@ setup_parameters_complex(rb_thread_t * const th, const rb_iseq_t * const iseq, else if (iseq->body->param.flags.has_kwrest) { args_setup_kw_rest_parameter(keyword_hash, locals + iseq->body->param.keyword->rest_start); } + else if (!NIL_P(keyword_hash) && RHASH_SIZE(keyword_hash) > 0) { + argument_kw_error(th, iseq, "unknown", rb_hash_keys(keyword_hash)); + } if (iseq->body->param.flags.has_block) { args_setup_block_parameter(th, calling, locals + iseq->body->param.block_start); -- cgit v1.2.3