diff options
-rw-r--r-- | ChangeLog | 7 | ||||
-rw-r--r-- | hash.c | 17 | ||||
-rw-r--r-- | test/ruby/test_hash.rb | 9 |
3 files changed, 32 insertions, 1 deletions
@@ -1,3 +1,10 @@ +Wed Oct 17 06:25:56 2012 Aaron Patterson <aaron@tenderlovemaking.com> + + * hash.c (initialize_copy): copy the underlying st_table on dup, + rather than copying the hash key by key. [ruby-core:48009] + + * test/ruby/test_hash.rb: relevant tests for initialize_copy + Wed Oct 17 06:17:44 2012 Koichi Sasada <ko1@atdot.net> * vm_insnhelper.c (vm_call_iseq_setup_2): separate tailcall and normal @@ -1182,6 +1182,21 @@ replace_i(VALUE key, VALUE val, VALUE hash) return ST_CONTINUE; } +static VALUE +rb_hash_initialize_copy(VALUE hash, VALUE hash2) +{ + Check_Type(hash2, T_HASH); + + if (!RHASH_EMPTY_P(hash2)) + RHASH(hash)->ntbl = st_copy(RHASH(hash2)->ntbl); + if (FL_TEST(hash2, HASH_PROC_DEFAULT)) { + FL_SET(hash, HASH_PROC_DEFAULT); + } + RHASH_IFNONE(hash) = RHASH_IFNONE(hash2); + + return hash; +} + /* * call-seq: * hsh.replace(other_hash) -> hsh @@ -3359,7 +3374,7 @@ Init_Hash(void) rb_define_singleton_method(rb_cHash, "[]", rb_hash_s_create, -1); rb_define_singleton_method(rb_cHash, "try_convert", rb_hash_s_try_convert, 1); rb_define_method(rb_cHash,"initialize", rb_hash_initialize, -1); - rb_define_method(rb_cHash,"initialize_copy", rb_hash_replace, 1); + rb_define_method(rb_cHash,"initialize_copy", rb_hash_initialize_copy, 1); rb_define_method(rb_cHash,"rehash", rb_hash_rehash, 0); rb_define_method(rb_cHash,"to_hash", rb_hash_to_hash, 0); diff --git a/test/ruby/test_hash.rb b/test/ruby/test_hash.rb index 34d58a0354..1806746ef2 100644 --- a/test/ruby/test_hash.rb +++ b/test/ruby/test_hash.rb @@ -91,6 +91,15 @@ class TestHash < Test::Unit::TestCase $VERBOSE = @verbose end + def test_bad_initialize_copy + h = Class.new(Hash) { + def initialize_copy(h) + super(Object.new) + end + }.new + assert_raises(TypeError) { h.dup } + end + def test_s_AREF h = @cls["a" => 100, "b" => 200] assert_equal(100, h['a']) |