archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-18 01:54:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

merge revision(s) 40992: [Backport #8040]

Browse source 
* 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
This commit is contained in:
nagachika 2013-06-04 14:30:28 +00:00
parent e377d3bb75
commit 2392c12bd1
4 changed files with 25 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -1,3 +1,12 @@
Tue Jun 4 23:27:24 2013 Yusuke Endoh <mame@tsg.ne.jp>
* 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 <nobu@ruby-lang.org> Tue Jun 4 00:46:05 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
* win32/win32.c (setup_overlapped, finish_overlapped): extract from * win32/win32.c (setup_overlapped, finish_overlapped): extract from

12
test/ruby/test_keyword.rb
View file

@ -22,7 +22,6 @@ class TestKeywordArguments < Test::Unit::TestCase
def test_f2 def test_f2
assert_equal([:xyz, "foo", 424242], f2(:xyz)) 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)) assert_equal([{"bar"=>42}, "foo", 424242], f2("bar"=>42))
end end
@ -342,4 +341,15 @@ class TestKeywordArguments < Test::Unit::TestCase
end end
assert_equal({:bar=>"x"}, a.new.foo(bar: "x"), bug8416) assert_equal({:bar=>"x"}, a.new.foo(bar: "x"), bug8416)
end 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 end

2
version.h
View file

@ -1,6 +1,6 @@
#define RUBY_VERSION "2.0.0" #define RUBY_VERSION "2.0.0"
#define RUBY_RELEASE_DATE "2013-06-04" #define RUBY_RELEASE_DATE "2013-06-04"
#define RUBY_PATCHLEVEL 201 #define RUBY_PATCHLEVEL 202
#define RUBY_RELEASE_YEAR 2013 #define RUBY_RELEASE_YEAR 2013
#define RUBY_RELEASE_MONTH 6 #define RUBY_RELEASE_MONTH 6

8
vm_insnhelper.c
View file

@ -1091,12 +1091,12 @@ extract_keywords(VALUE *orighash)
} }
static inline int 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; VALUE keyword_hash, orig_hash;
int i, j; int i, j;
if (argc > 0 && if (argc > m &&
!NIL_P(orig_hash = rb_check_hash_type(orig_argv[argc-1])) && !NIL_P(orig_hash = rb_check_hash_type(orig_argv[argc-1])) &&
(keyword_hash = extract_keywords(&orig_hash)) != 0) { (keyword_hash = extract_keywords(&orig_hash)) != 0) {
if (!orig_hash) { 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 */ /* keyword argument */
if (iseq->arg_keyword != -1) { 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 */ /* mandatory */
@ -2168,7 +2168,7 @@ vm_yield_setup_block_args(rb_thread_t *th, const rb_iseq_t * iseq,
/* keyword argument */ /* keyword argument */
if (iseq->arg_keyword != -1) { 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);
} }
/* /*