From 06675418948d45f5448c7b722f1e7c990f5c89bc Mon Sep 17 00:00:00 2001 From: nobu Date: Thu, 13 Dec 2012 04:06:40 +0000 Subject: [PATCH] method transplanting * proc.c (umethod_bind): allow another form of method transplanting from a module via UnboundMethod. [ruby-core:34267][Feature #4254] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38354 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ proc.c | 3 ++- test/ruby/test_method.rb | 4 ++++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index ccd13b2f10..c14fed5908 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Thu Dec 13 13:06:27 2012 Nobuyoshi Nakada + + * proc.c (umethod_bind): allow another form of method transplanting + from a module via UnboundMethod. [ruby-core:34267][Feature #4254] + Thu Dec 13 12:07:25 2012 Shugo Maeda * include/ruby/ruby.h (RB_UNUSED_VAR): new macro to suppress diff --git a/proc.c b/proc.c index a112677e69..dc13c7e418 100644 --- a/proc.c +++ b/proc.c @@ -1620,7 +1620,8 @@ umethod_bind(VALUE method, VALUE recv) TypedData_Get_Struct(method, struct METHOD, &method_data_type, data); - if (data->rclass != CLASS_OF(recv) && !rb_obj_is_kind_of(recv, data->rclass)) { + if (!RB_TYPE_P(data->rclass, T_MODULE) && + 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"); diff --git a/test/ruby/test_method.rb b/test/ruby/test_method.rb index 06c1c2c08f..c8f55e20e5 100644 --- a/test/ruby/test_method.rb +++ b/test/ruby/test_method.rb @@ -206,6 +206,10 @@ class TestMethod < Test::Unit::TestCase def o.bar; end m = o.method(:bar).unbind assert_raise(TypeError) { m.bind(Object.new) } + + feature4254 = '[ruby-core:34267]' + m = M.instance_method(:meth) + assert_equal(:meth, m.bind(Object.new).call, feature4254) end def test_define_method