summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-02-13 09:38:49 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-02-13 09:38:49 +0000
commit4b7514527870f3e7268846ee9fb275301f57b30a (patch)
tree652d86baec39246b717b690df4725b8f67ed42f3
parentaae1d28b6f33d1237e576317497d22158114f103 (diff)
proc.c: skip prepends
* proc.c (mnew): skip prepending modules and return the method bound on the given class. [ruby-core:52160] [Bug #7836] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39224 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--proc.c1
-rw-r--r--test/ruby/test_method.rb27
3 files changed, 33 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 4c11a73..f13ed2d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Feb 13 18:37:50 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * proc.c (mnew): skip prepending modules and return the method bound
+ on the given class. [ruby-core:52160] [Bug #7836]
+
Wed Feb 13 18:11:59 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
* proc.c (method_original_name): new methods Method#original_name and
diff --git a/proc.c b/proc.c
index 6424eeb..bc47359 100644
--- a/proc.c
+++ b/proc.c
@@ -941,6 +941,7 @@ mnew(VALUE klass, VALUE obj, ID id, VALUE mclass, int scope)
rb_method_flag_t flag = NOEX_UNDEF;
again:
+ if (klass) klass = RCLASS_ORIGIN(klass);
me = rb_method_entry_without_refinements(klass, id, &defined_class);
if (UNDEFINED_METHOD_ENTRY_P(me)) {
ID rmiss = rb_intern("respond_to_missing?");
diff --git a/test/ruby/test_method.rb b/test/ruby/test_method.rb
index ad68357..59034eb 100644
--- a/test/ruby/test_method.rb
+++ b/test/ruby/test_method.rb
@@ -534,4 +534,31 @@ class TestMethod < Test::Unit::TestCase
assert_equal(x.singleton_class, x.method(:bar).owner)
assert(x.method(:foo) != x.method(:bar), bug7613)
end
+
+ def test_included
+ m = Module.new {
+ def foo
+ end
+ }
+ c = Class.new {
+ def foo
+ end
+ include m
+ }
+ assert_equal(c, c.instance_method(:foo).owner)
+ end
+
+ def test_prepended
+ bug7836 = '[ruby-core:52160] [Bug #7836]'
+ m = Module.new {
+ def foo
+ end
+ }
+ c = Class.new {
+ def foo
+ end
+ prepend m
+ }
+ assert_equal(c, c.instance_method(:foo).owner, bug7836)
+ end
end