nobu	2011-09-19 07:54:25 +0900 (Mon, 19 Sep 2011)

  New Revision: 33292

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=33292

  Log:
    * 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]

  Modified files:
    trunk/ChangeLog
    trunk/object.c
    trunk/test/ruby/test_class.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 33291)
+++ ChangeLog	(revision 33292)
@@ -1,3 +1,9 @@
+Mon Sep 19 07:54:17 2011  Nobuyoshi Nakada  <nobu@r...>
+
+	* 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@r...>
 
 	* parse.y (parser_data_type): inherit the core type in ripper so
Index: object.c
===================================================================
--- object.c	(revision 33291)
+++ object.c	(revision 33292)
@@ -273,12 +273,17 @@
 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);
Index: test/ruby/test_class.rb
===================================================================
--- test/ruby/test_class.rb	(revision 33291)
+++ test/ruby/test_class.rb	(revision 33292)
@@ -258,4 +258,12 @@
     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

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/