1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix hash to keyword warning to apply in all cases

Browse Source 
Previously, it only applied if the call had more positional
arguments than the method it was calling accepted.
This commit is contained in:
Jeremy Evans 2019-04-07 11:38:21 -07:00
parent 334b41a46b
commit 3f67fcd3d5
Notes: git 2019-08-31 04:40:18 +09:00 
Merged: https://github.com/ruby/ruby/pull/2395
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
vm_args.c
View File

@ -676,18 +676,16 @@ setup_parameters_complex(rb_execution_context_t * const ec, const rb_iseq_t * co
given_argc--;
}
}
else if (given_argc > max_argc && max_argc >= 0) {
if (args_pop_keyword_hash(args, &keyword_hash)) {
/* Warn the following:
* def foo(k:1) p [k]; end
* foo({k:42}) #=> 42
*/
if (ec->cfp->iseq) {
/* called from Ruby level */
rb_warn_last_hash_to_keyword(calling, ci);
}
given_argc--;
else if (args_pop_keyword_hash(args, &keyword_hash)) {
/* Warn the following:
* def foo(k:1) p [k]; end
* foo({k:42}) #=> 42
*/
if (ec->cfp->iseq) {
/* called from Ruby level */
rb_warn_last_hash_to_keyword(calling, ci);
}
given_argc--;
}
}