kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

hash.c: support key swapping in Hash#transform_keys!

Browse source 
* hash.c (rb_hash_transform_keys_bang): support key swapping in
  Hash#transform_keys!
  [Bug #14380] [ruby-core:84951]

* test/ruby/test_hash.rb (test_transform_keys_bang):
  add assertions for this change

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@62042 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
mrkn 2018-01-26 01:33:45 +00:00
parent d00ef6b3cd
commit 52bb93c25a
2 changed files with 18 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

16
hash.c
View file

@ -1917,6 +1917,8 @@ rb_hash_transform_keys(VALUE hash)
return result; return result;
} }
static VALUE rb_hash_flatten(int argc, VALUE *argv, VALUE hash);
/* /*
* call-seq: * call-seq:
* hsh.transform_keys! {|key| block } -> hsh * hsh.transform_keys! {|key| block } -> hsh
@ -1940,12 +1942,14 @@ rb_hash_transform_keys_bang(VALUE hash)
RETURN_SIZED_ENUMERATOR(hash, 0, 0, hash_enum_size); RETURN_SIZED_ENUMERATOR(hash, 0, 0, hash_enum_size);
rb_hash_modify_check(hash); rb_hash_modify_check(hash);
if (RHASH(hash)->ntbl) { if (RHASH(hash)->ntbl) {
long i; long i;
VALUE keys = rb_hash_keys(hash); VALUE pairs = rb_hash_flatten(0, NULL, hash);
for (i = 0; i < RARRAY_LEN(keys); ++i) { rb_hash_clear(hash);
VALUE key = RARRAY_AREF(keys, i), new_key = rb_yield(key); for (i = 0; i < RARRAY_LEN(pairs); i += 2) {
rb_hash_aset(hash, new_key, rb_hash_delete(hash, key)); VALUE key = RARRAY_AREF(pairs, i), new_key = rb_yield(key),
} val = RARRAY_AREF(pairs, i+1);
rb_hash_aset(hash, new_key, val);
}
} }
return hash; return hash;
} }

8
test/ruby/test_hash.rb
View file

@ -1576,6 +1576,14 @@ class TestHash < Test::Unit::TestCase
x.transform_keys!.with_index {|k, i| "#{k}.#{i}" } x.transform_keys!.with_index {|k, i| "#{k}.#{i}" }
assert_equal(%w(a!.0 b!.1 c!.2), x.keys) assert_equal(%w(a!.0 b!.1 c!.2), x.keys)
x = @cls[1 => :a, -1 => :b]
x.transform_keys! {|k| -k }
assert_equal([-1, :a, 1, :b], x.flatten)
x = @cls[true => :a, false => :b]
x.transform_keys! {|k| !k }
assert_equal([false, :a, true, :b], x.flatten)
end end
def test_transform_values def test_transform_values