diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-08-10 00:32:12 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-08-10 00:32:12 +0000 |
| commit | 0e80f17181d370f834df31a0d3d8e7d6a063fda2 (patch) | |
| tree | e6edfb06c48b9cf9df1c559f58dc0274bf26544e /vm_args.c | |
| parent | 76412329f421857e954ddeb64b8586329219e307 (diff) | |
| download | ruby-0e80f17181d370f834df31a0d3d8e7d6a063fda2.tar.gz | |
vm_args.c: prefer optarg to keyword splat
* vm_args.c (setup_parameters_complex): prefer optional argument
to splat keyword arguments for backward compatibility.
[ruby-core:82280] [Bug #13791]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@59554 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'vm_args.c')
| -rw-r--r-- | vm_args.c | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -616,7 +616,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_rest && (ci->flag & VM_CALL_KW_SPLAT))) && + (!iseq->body->param.flags.has_rest && given_argc > max_argc && + (ci->flag & VM_CALL_KW_SPLAT))) && args->kw_argv == NULL) { if (args_pop_keyword_hash(args, &keyword_hash, th)) { given_argc--; |