diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-12-29 02:37:47 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-12-29 02:37:47 +0000 |
commit | ad6f06aed8bf9b753622809441c4db0d523cd41f (patch) | |
tree | c5efd6b6403efde336be0f4d01a3e900a63fdbee | |
parent | 11803022002e188eb94868335d79ea2b16bd7934 (diff) |
object.c: singleton class clone
* object.c (rb_obj_clone): attach clone to its singleton class during
cloning singleton class so that singleton_method_added will be called
on it. based on the patch by shiba (satoshi shiba)[Bug #5283] in
[ruby-dev:44477]. [Bug #5283]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38648 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 7 | ||||
-rw-r--r-- | class.c | 9 | ||||
-rw-r--r-- | internal.h | 1 | ||||
-rw-r--r-- | object.c | 2 | ||||
-rw-r--r-- | test/ruby/test_class.rb | 14 |
5 files changed, 32 insertions, 1 deletions
@@ -1,3 +1,10 @@ +Sat Dec 29 11:37:36 2012 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * object.c (rb_obj_clone): attach clone to its singleton class during + cloning singleton class so that singleton_method_added will be called + on it. based on the patch by shiba (satoshi shiba)[Bug #5283] in + [ruby-dev:44477]. [Bug #5283] + Sat Dec 29 10:10:39 2012 Nobuyoshi Nakada <nobu@ruby-lang.org> * configure.in (crt_externs.h): use standard macro AC_CHECK_HEADERS. @@ -240,6 +240,12 @@ rb_mod_init_copy(VALUE clone, VALUE orig) VALUE rb_singleton_class_clone(VALUE obj) { + return rb_singleton_class_clone_and_attach(obj, Qundef); +} + +VALUE +rb_singleton_class_clone_and_attach(VALUE obj, VALUE attach) +{ VALUE klass = RBASIC(obj)->klass; if (!FL_TEST(klass, FL_SINGLETON)) @@ -264,6 +270,9 @@ rb_singleton_class_clone(VALUE obj) RCLASS_CONST_TBL(clone) = st_init_numtable(); st_foreach(RCLASS_CONST_TBL(klass), clone_const_i, (st_data_t)RCLASS_CONST_TBL(clone)); } + if (attach != Qundef) { + rb_singleton_class_attached(clone, attach); + } RCLASS_M_TBL(clone) = st_init_numtable(); st_foreach(RCLASS_M_TBL(klass), clone_method_i, (st_data_t)clone); rb_singleton_class_attached(RBASIC(clone)->klass, clone); diff --git a/internal.h b/internal.h index 13c36f7a2c..c8317a51e8 100644 --- a/internal.h +++ b/internal.h @@ -63,6 +63,7 @@ VALUE rb_obj_private_methods(int argc, VALUE *argv, VALUE obj); VALUE rb_obj_public_methods(int argc, VALUE *argv, VALUE obj); int rb_obj_basic_to_s_p(VALUE); VALUE rb_special_singleton_class(VALUE); +VALUE rb_singleton_class_clone_and_attach(VALUE obj, VALUE attach); void Init_class_hierarchy(void); /* compile.c */ @@ -298,7 +298,7 @@ rb_obj_clone(VALUE obj) rb_raise(rb_eTypeError, "can't clone %s", rb_obj_classname(obj)); } clone = rb_obj_alloc(rb_obj_class(obj)); - singleton = rb_singleton_class_clone(obj); + singleton = rb_singleton_class_clone_and_attach(obj, clone); RBASIC(clone)->klass = singleton; if (FL_TEST(singleton, FL_SINGLETON)) { rb_singleton_class_attached(singleton, clone); diff --git a/test/ruby/test_class.rb b/test/ruby/test_class.rb index 47c9d9d99f..ef7d4fa922 100644 --- a/test/ruby/test_class.rb +++ b/test/ruby/test_class.rb @@ -336,4 +336,18 @@ class TestClass < Test::Unit::TestCase end; end end + + def test_cloned_singleton_method_added + bug5283 = '[ruby-dev:44477]' + added = [] + c = Class.new + c.singleton_class.class_eval do + define_method(:singleton_method_added) {|mid| added << [self, mid]} + def foo; :foo; end + end + added.clear + d = c.clone + assert_empty(added.grep(->(k) {c == k[0]}), bug5283) + assert_equal(:foo, d.foo) + end end |