diff options
| author | mame <mame@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-05-30 10:50:41 +0000 |
|---|---|---|
| committer | mame <mame@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-05-30 10:50:41 +0000 |
| commit | 6f9f8d2ef7d9c19e39194e6914e4cf39eaa5d473 (patch) | |
| tree | 08d2c0458a56d611569f611a2b89257db0d9fd3e /vm_insnhelper.c | |
| parent | 89a452c7c1883607f16ae20e940ec537b69a67df (diff) | |
* vm_insnhelper.c (vm_callee_setup_keyword_arg,
vm_callee_setup_arg_complex): consider a hash argument for keyword
only when the number of arguments is more than the expected
mandatory parameters. [ruby-core:53199] [ruby-trunk - Bug #8040]
* test/ruby/test_keyword.rb: update a test for above.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@40992 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'vm_insnhelper.c')
| -rw-r--r-- | vm_insnhelper.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/vm_insnhelper.c b/vm_insnhelper.c index 8f33425b56..1d901c22e8 100644 --- a/vm_insnhelper.c +++ b/vm_insnhelper.c @@ -1097,12 +1097,12 @@ extract_keywords(VALUE *orighash) } static inline int -vm_callee_setup_keyword_arg(const rb_iseq_t *iseq, int argc, VALUE *orig_argv, VALUE *kwd) +vm_callee_setup_keyword_arg(const rb_iseq_t *iseq, int argc, int m, VALUE *orig_argv, VALUE *kwd) { VALUE keyword_hash, orig_hash; int i, j; - if (argc > 0 && + if (argc > m && !NIL_P(orig_hash = rb_check_hash_type(orig_argv[argc-1])) && (keyword_hash = extract_keywords(&orig_hash)) != 0) { if (!orig_hash) { @@ -1167,7 +1167,7 @@ vm_callee_setup_arg_complex(rb_thread_t *th, rb_call_info_t *ci, const rb_iseq_t /* keyword argument */ if (iseq->arg_keyword != -1) { - argc = vm_callee_setup_keyword_arg(iseq, argc, orig_argv, &keyword_hash); + argc = vm_callee_setup_keyword_arg(iseq, argc, m, orig_argv, &keyword_hash); } /* mandatory */ @@ -2195,7 +2195,7 @@ vm_yield_setup_block_args(rb_thread_t *th, const rb_iseq_t * iseq, /* keyword argument */ if (iseq->arg_keyword != -1) { - argc = vm_callee_setup_keyword_arg(iseq, argc, argv, &keyword_hash); + argc = vm_callee_setup_keyword_arg(iseq, argc, m, argv, &keyword_hash); } /* |