From 2392c12bd183241e8d255aa882f53ebd845b7dd8 Mon Sep 17 00:00:00 2001 From: nagachika Date: Tue, 4 Jun 2013 14:30:28 +0000 Subject: [PATCH] merge revision(s) 40992: [Backport #8040] * 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/branches/ruby_2_0_0@41063 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 9 +++++++++ test/ruby/test_keyword.rb | 12 +++++++++++- version.h | 2 +- vm_insnhelper.c | 8 ++++---- 4 files changed, 25 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 20a71d25a1..37fa3d7771 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +Tue Jun 4 23:27:24 2013 Yusuke Endoh + + * 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. + Tue Jun 4 00:46:05 2013 Nobuyoshi Nakada * win32/win32.c (setup_overlapped, finish_overlapped): extract from diff --git a/test/ruby/test_keyword.rb b/test/ruby/test_keyword.rb index 5f53483918..05b3e06de1 100644 --- a/test/ruby/test_keyword.rb +++ b/test/ruby/test_keyword.rb @@ -22,7 +22,6 @@ class TestKeywordArguments < Test::Unit::TestCase def test_f2 assert_equal([:xyz, "foo", 424242], f2(:xyz)) - assert_raise(ArgumentError) { f2({}) } # [ruby-dev:46712] [Bug #7529] assert_equal([{"bar"=>42}, "foo", 424242], f2("bar"=>42)) end @@ -342,4 +341,15 @@ class TestKeywordArguments < Test::Unit::TestCase end assert_equal({:bar=>"x"}, a.new.foo(bar: "x"), bug8416) end + + def test_precedence_of_keyword_arguments + bug8040 = '[ruby-core:53199] [Bug #8040]' + a = Class.new do + def foo(x, **h) + [x, h] + end + end + assert_equal([{}, {}], a.new.foo({})) + assert_equal([{}, {:bar=>"x"}], a.new.foo({}, bar: "x")) + end end diff --git a/version.h b/version.h index ba8d1a0590..8ea58eae91 100644 --- a/version.h +++ b/version.h @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.0.0" #define RUBY_RELEASE_DATE "2013-06-04" -#define RUBY_PATCHLEVEL 201 +#define RUBY_PATCHLEVEL 202 #define RUBY_RELEASE_YEAR 2013 #define RUBY_RELEASE_MONTH 6 diff --git a/vm_insnhelper.c b/vm_insnhelper.c index 0c52774ca8..769e6c6c23 100644 --- a/vm_insnhelper.c +++ b/vm_insnhelper.c @@ -1091,12 +1091,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) { @@ -1140,7 +1140,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 */ @@ -2168,7 +2168,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); } /*