diff options
author | marcandre <marcandre@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-09-22 20:04:59 +0000 |
---|---|---|
committer | marcandre <marcandre@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-09-22 20:04:59 +0000 |
commit | 92304aa3cd52a390383661c69622195247098deb (patch) | |
tree | b0eff66d7d54bbbc7b95fcbb0f68bc2596d99c0f /proc.c | |
parent | 78ddb4f60306152a3f72971eb49177f3e9665734 (diff) | |
download | ruby-92304aa3cd52a390383661c69622195247098deb.tar.gz |
* proc.c (umethod_bind, rb_mod_define_method): Fix bug that disallowed methods from singleton classes to be used for UnboundMethod#bind, Kernel#define_singleton_method and Module#define_method, even when that singleton class was of the right kind_of. A patch by Shane O'Brien [ruby-core:25632]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@25046 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'proc.c')
-rw-r--r-- | proc.c | 9 |
1 files changed, 5 insertions, 4 deletions
@@ -1249,12 +1249,12 @@ rb_mod_define_method(int argc, VALUE *argv, VALUE mod) if (rb_obj_is_method(body)) { struct METHOD *method = (struct METHOD *)DATA_PTR(body); VALUE rclass = method->rclass; - if (rclass != mod) { + if (rclass != mod && !RTEST(rb_class_inherited_p(mod, rclass))) { if (FL_TEST(rclass, FL_SINGLETON)) { rb_raise(rb_eTypeError, "can't bind singleton method to a different class"); } - if (!RTEST(rb_class_inherited_p(mod, rclass))) { + else { rb_raise(rb_eTypeError, "bind argument must be a subclass of %s", rb_class2name(rclass)); @@ -1481,12 +1481,13 @@ umethod_bind(VALUE method, VALUE recv) struct METHOD *data, *bound; TypedData_Get_Struct(method, struct METHOD, &method_data_type, data); - if (data->rclass != CLASS_OF(recv)) { + + if (data->rclass != CLASS_OF(recv) && !rb_obj_is_kind_of(recv, data->rclass)) { if (FL_TEST(data->rclass, FL_SINGLETON)) { rb_raise(rb_eTypeError, "singleton method called for a different object"); } - if (!rb_obj_is_kind_of(recv, data->rclass)) { + else { rb_raise(rb_eTypeError, "bind argument must be an instance of %s", rb_class2name(data->rclass)); } |