archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-17 09:33:59 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

merge revision(s) 49088: [Backport #10685]

Browse source 
* vm_args.c (keyword_hash_p): fix non-symbol keys hash.
	  rb_extract_keywords() returns 0 not Qnil when no symbol keys is
	  included.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@49273 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2015-01-16 05:21:00 +00:00
parent d40ee82b18
commit 81f257aa10
4 changed files with 17 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
Fri Jan 16 14:20:52 2015 Nobuyoshi Nakada <nobu@ruby-lang.org>
* vm_args.c (keyword_hash_p): fix non-symbol keys hash.
rb_extract_keywords() returns 0 not Qnil when no symbol keys is
included.
Fri Jan 16 11:06:17 2015 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> Fri Jan 16 11:06:17 2015 SHIBATA Hiroshi <shibata.hiroshi@gmail.com>
* lib/unicode_normalize.rb: typo fix. [ci skip] * lib/unicode_normalize.rb: typo fix. [ci skip]

7
test/ruby/test_keyword.rb
View file

@ -559,4 +559,11 @@ class TestKeywordArguments < Test::Unit::TestCase
assert_equal({:bar => "bar"}, obj.foo, bug10659) assert_equal({:bar => "bar"}, obj.foo, bug10659)
} }
end end
def m(a) yield a end
def test_nonsymbol_key
result = m(["a" => 10]) { |a = nil, **b| [a, b] }
assert_equal([{"a" => 10}, {}], result)
end
end end

2
version.h
View file

@ -1,6 +1,6 @@
#define RUBY_VERSION "2.2.0" #define RUBY_VERSION "2.2.0"
#define RUBY_RELEASE_DATE "2015-01-16" #define RUBY_RELEASE_DATE "2015-01-16"
#define RUBY_PATCHLEVEL 9 #define RUBY_PATCHLEVEL 10
#define RUBY_RELEASE_YEAR 2015 #define RUBY_RELEASE_YEAR 2015
#define RUBY_RELEASE_MONTH 1 #define RUBY_RELEASE_MONTH 1

4
vm_args.c
View file

@ -179,7 +179,9 @@ keyword_hash_p(VALUE *kw_hash_ptr, VALUE *rest_hash_ptr, rb_thread_t *th, const
th->mark_stack_len = msl; th->mark_stack_len = msl;
if (!NIL_P(*rest_hash_ptr)) { if (!NIL_P(*rest_hash_ptr)) {
*kw_hash_ptr = rb_extract_keywords(rest_hash_ptr); VALUE hash = rb_extract_keywords(rest_hash_ptr);
if (!hash) hash = Qnil;
*kw_hash_ptr = hash;
return TRUE; return TRUE;
} }
else { else {