summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--proc.c1
-rw-r--r--test/ruby/test_method.rb11
3 files changed, 17 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 670e294076..6a85e907cd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Dec 14 13:01:45 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * proc.c (mnew_from_me): method by respond_to_missing? should be
+ owned by the original class.
+
Sat Dec 14 11:55:31 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/scanf.rb (IO#scanf): fix mistaken use of rescue modifier.
diff --git a/proc.c b/proc.c
index 3e22ebd156..dd481870ae 100644
--- a/proc.c
+++ b/proc.c
@@ -1139,6 +1139,7 @@ mnew_from_me(rb_method_entry_t *me, VALUE defined_class, VALUE klass,
if (obj != Qundef && !rb_method_basic_definition_p(klass, rmiss)) {
if (RTEST(rb_funcall(obj, rmiss, 2, sym, scope ? Qfalse : Qtrue))) {
me = 0;
+ defined_class = klass;
goto gen_method;
}
diff --git a/test/ruby/test_method.rb b/test/ruby/test_method.rb
index 45268ed779..2fde505183 100644
--- a/test/ruby/test_method.rb
+++ b/test/ruby/test_method.rb
@@ -189,6 +189,17 @@ class TestMethod < Test::Unit::TestCase
assert_equal(c, c2.instance_method(:foo).owner)
end
+ def test_owner_missing
+ c = Class.new do
+ def respond_to_missing?(name, bool)
+ name == :foo
+ end
+ end
+ c2 = Class.new(c)
+ assert_equal(c, c.new.method(:foo).owner)
+ assert_equal(c2, c2.new.method(:foo).owner)
+ end
+
def test_receiver_name_owner
o = Object.new
def o.foo; end