summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--proc.c3
-rw-r--r--test/ruby/test_method.rb15
3 files changed, 25 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 2946570bf7..14c3c5bff5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Fri Dec 28 11:17:47 2012 Shugo Maeda <shugo@ruby-lang.org>
+
+ * proc.c (method_eq): fix the documentation to refer to owner.
+ [ruby-core:51105] [Bug #7613]
+
+ * test/ruby/test_method.rb (test_alias_onwer): new test to confirm
+ that `a == b' returns false if owners of a and b are different.
+
Fri Dec 28 07:07:43 2012 NARUSE, Yui <naruse@ruby-lang.org>
* def/id.def: use split(/^/) instead of String#lines to support
diff --git a/proc.c b/proc.c
index 5b1313a468..c5122daed6 100644
--- a/proc.c
+++ b/proc.c
@@ -1023,7 +1023,8 @@ mnew(VALUE klass, VALUE obj, ID id, VALUE mclass, int scope)
* meth == other_meth -> true or false
*
* Two method objects are equal if they are bound to the same
- * object and refer to the same method definition.
+ * object and refer to the same method definition and their owners are the
+ * same class or module.
*/
static VALUE
diff --git a/test/ruby/test_method.rb b/test/ruby/test_method.rb
index c8f55e20e5..03d7cab2d7 100644
--- a/test/ruby/test_method.rb
+++ b/test/ruby/test_method.rb
@@ -507,4 +507,19 @@ class TestMethod < Test::Unit::TestCase
assert_instance_of String, __dir__
assert_equal(File.dirname(__FILE__), __dir__)
end
+
+ def test_alias_owner
+ bug7613 = '[ruby-core:51105]'
+ c = Class.new {
+ def foo
+ end
+ }
+ x = c.new
+ class << x
+ alias bar foo
+ end
+ assert_equal(c, x.method(:foo).owner)
+ assert_equal(x.singleton_class, x.method(:bar).owner)
+ assert(x.method(:foo) != x.method(:bar), bug7613)
+ end
end