1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* hash.c (initialize_copy): duping should rehash the hash.

Browse Source 
* test/ruby/test_hash.rb: added a test to ensure rehash.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37248 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
tenderlove 2012-10-18 00:24:00 +00:00
parent bff930ccf4
commit a34a3c2caa
3 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
Thu Oct 18 09:23:03 2012 Aaron Patterson <aaron@tenderlovemaking.com>
* hash.c (initialize_copy): duping should rehash the hash.
* test/ruby/test_hash.rb: added a test to ensure rehash.
Wed Oct 17 21:16:47 2012 Hiroshi Shirosaki <h.shirosaki@gmail.com> Wed Oct 17 21:16:47 2012 Hiroshi Shirosaki <h.shirosaki@gmail.com>
* common.mk (WPROGRAM): need same dependencies as PROGRAM. * common.mk (WPROGRAM): need same dependencies as PROGRAM.

5
hash.c
View File

@ -1187,8 +1187,11 @@ rb_hash_initialize_copy(VALUE hash, VALUE hash2)
{ {
Check_Type(hash2, T_HASH); Check_Type(hash2, T_HASH);
if (!RHASH_EMPTY_P(hash2)) if (!RHASH_EMPTY_P(hash2)) {
RHASH(hash)->ntbl = st_copy(RHASH(hash2)->ntbl); RHASH(hash)->ntbl = st_copy(RHASH(hash2)->ntbl);
rb_hash_rehash(hash);
}
if (FL_TEST(hash2, HASH_PROC_DEFAULT)) { if (FL_TEST(hash2, HASH_PROC_DEFAULT)) {
FL_SET(hash, HASH_PROC_DEFAULT); FL_SET(hash, HASH_PROC_DEFAULT);
} }

9
test/ruby/test_hash.rb
View File

@ -100,6 +100,15 @@ class TestHash < Test::Unit::TestCase
assert_raises(TypeError) { h.dup } assert_raises(TypeError) { h.dup }
end end
def test_dup_will_rehash
set1 = { }
set2 = { set1 => true}
set1[set1] = true
assert_equal set2, set2.dup
end
def test_s_AREF def test_s_AREF
h = @cls["a" => 100, "b" => 200] h = @cls["a" => 100, "b" => 200]
assert_equal(100, h['a']) assert_equal(100, h['a'])