diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-09-18 22:54:25 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-09-18 22:54:25 +0000 |
commit | 125b62e76d97fd9483c9e15313f80c43a8c1a213 (patch) | |
tree | 83750302fec59fc52a83ab168178b04b5d2ed4e4 | |
parent | c4d77cb4adaae2bab9aa015c9a0528f0abf07bbd (diff) |
* object.c (rb_obj_clone): singleton class should be attached
singleton object to. a patch by Satoshi Shiba <shiba AT rvm.jp>
at [ruby-dev:44460]. [Bug #5274]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@33292 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | object.c | 7 | ||||
-rw-r--r-- | test/ruby/test_class.rb | 8 |
3 files changed, 20 insertions, 1 deletions
@@ -1,3 +1,9 @@ +Mon Sep 19 07:54:17 2011 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * object.c (rb_obj_clone): singleton class should be attached + singleton object to. a patch by Satoshi Shiba <shiba AT rvm.jp> + at [ruby-dev:44460]. [Bug #5274] + Sat Sep 17 23:34:10 2011 Nobuyoshi Nakada <nobu@ruby-lang.org> * parse.y (parser_data_type): inherit the core type in ripper so @@ -273,12 +273,17 @@ VALUE rb_obj_clone(VALUE obj) { VALUE clone; + VALUE singleton; if (rb_special_const_p(obj)) { rb_raise(rb_eTypeError, "can't clone %s", rb_obj_classname(obj)); } clone = rb_obj_alloc(rb_obj_class(obj)); - RBASIC(clone)->klass = rb_singleton_class_clone(obj); + singleton = rb_singleton_class_clone(obj); + RBASIC(clone)->klass = singleton; + if (FL_TEST(singleton, FL_SINGLETON)) { + rb_singleton_class_attached(singleton, clone); + } RBASIC(clone)->flags = (RBASIC(obj)->flags | FL_TEST(clone, FL_TAINT) | FL_TEST(clone, FL_UNTRUSTED)) & ~(FL_FREEZE|FL_FINALIZE|FL_MARK); init_copy(clone, obj); rb_funcall(clone, id_init_clone, 1, obj); diff --git a/test/ruby/test_class.rb b/test/ruby/test_class.rb index 55940a8891..12f78ddabc 100644 --- a/test/ruby/test_class.rb +++ b/test/ruby/test_class.rb @@ -258,4 +258,12 @@ class TestClass < Test::Unit::TestCase END assert_equal(42, PrivateClass.new.foo) end + + StrClone = String.clone + Class.new(StrClone) + + def test_cloned_class + bug5274 = StrClone.new("[ruby-dev:44460]") + assert_equal(bug5274, Marshal.load(Marshal.dump(bug5274))) + end end |