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

Keep non evaluated keys in Hash#transform_keys! [Bug #17735]

Browse source
This commit is contained in:
Kenichi Kamiya 2021-03-28 09:14:57 +09:00 committed by GitHub
parent e398a0e53a
commit 31e0382723
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
Notes: git 2021-03-28 09:15:18 +09:00 
Merged: https://github.com/ruby/ruby/pull/4294

Merged-By: nobu <nobu@ruby-lang.org>
3 changed files with 24 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
hash.c
View file

@ -3268,8 +3268,8 @@ rb_hash_transform_keys_bang(int argc, VALUE *argv, VALUE hash)
rb_hash_modify_check(hash);
if (!RHASH_TABLE_EMPTY_P(hash)) {
long i;
VALUE new_keys = hash_alloc(0);
VALUE pairs = rb_hash_flatten(0, NULL, hash);
rb_hash_clear(hash);
for (i = 0; i < RARRAY_LEN(pairs); i += 2) {
VALUE key = RARRAY_AREF(pairs, i), new_key, val;
@ -3286,7 +3286,11 @@ rb_hash_transform_keys_bang(int argc, VALUE *argv, VALUE hash)
new_key = key;
}
val = RARRAY_AREF(pairs, i+1);
if (!hash_stlike_lookup(new_keys, key, NULL)) {
rb_hash_stlike_delete(hash, &key, NULL);
}
rb_hash_aset(hash, new_key, val);
rb_hash_aset(new_keys, new_key, Qnil);
}
}
return hash;

12
spec/ruby/core/hash/transform_keys_spec.rb
View file

@ -84,7 +84,7 @@ describe "Hash#transform_keys!" do
end
end
ruby_version_is "2.5.1" do
ruby_version_is "2.5.1"..."3.1" do
it "returns the processed keys if we broke from the block" do
@hash.transform_keys! do |v|
break if v == :c
@ -94,6 +94,16 @@ describe "Hash#transform_keys!" do
end
end
ruby_version_is "3.1" do
it "returns the processed keys and non evaluated keys if we broke from the block" do
@hash.transform_keys! do |v|
break if v == :c
v.succ
end
@hash.should == { b: 1, c: 2, d: 4 }
end
end
it "keeps later pair if new keys conflict" do
@hash.transform_keys! { |_| :a }.should == { a: 4 }
end

8
test/ruby/test_hash.rb
View file

@ -1765,6 +1765,10 @@ class TestHash < Test::Unit::TestCase
x.transform_keys! {|k| -k }
assert_equal([-1, :a, 1, :b], x.flatten)
x = @cls[a: 1, b: 2, c: 3]
x.transform_keys! { |k| k == :b && break }
assert_equal({false => 1, b: 2, c: 3}, x)
x = @cls[true => :a, false => :b]
x.transform_keys! {|k| !k }
assert_equal([false, :a, true, :b], x.flatten)
@ -1800,6 +1804,10 @@ class TestHash < Test::Unit::TestCase
assert_equal([1, 4, 9], y.values_at(:a, :b, :c))
assert_same(x, y)
x = @cls[a: 1, b: 2, c: 3]
x.transform_values! { |v| v == 2 && break }
assert_equal({a: false, b: 2, c: 3}, x)
x = @cls[a: 1, b: 2, c: 3]
y = x.transform_values!.with_index {|v, i| "#{v}.#{i}" }
assert_equal(%w(1.0 2.1 3.2), y.values_at(:a, :b, :c))