diff options
author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-12-22 14:33:11 +0000 |
---|---|---|
committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-12-22 14:33:11 +0000 |
commit | f0f3821be7507a96e613e6d8e7e675eada78a892 (patch) | |
tree | e4a52931045ae0d6a5f6252837eb6fa0054fc1cb /test | |
parent | 86d9d122bef745aad9bf3dabd80ad03fbec1beec (diff) |
merge revision(s) 44175,44179: [Backport #9236]
* proc.c (method_owner): return the class where alias is defined, not
the class original method is defined.
* vm_method.c (rb_method_entry_make, rb_alias): store the originally
defined class in me. [Bug #7993] [Bug #7842] [Bug #9236]
* vm_method.c (rb_method_entry_get_without_cache): cache included
module but not iclass.
* proc.c (mnew_from_me): achieve the original defined_class from
prepended iclass, to fix inherited owner.
* proc.c (method_owner): return the defined class, but not the
class which the method object is created from.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@44345 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test')
-rw-r--r-- | test/ruby/test_method.rb | 15 | ||||
-rw-r--r-- | test/ruby/test_module.rb | 51 |
2 files changed, 66 insertions, 0 deletions
diff --git a/test/ruby/test_method.rb b/test/ruby/test_method.rb index 6d0f6acf35..1514c26f5c 100644 --- a/test/ruby/test_method.rb +++ b/test/ruby/test_method.rb @@ -180,6 +180,15 @@ class TestMethod < Test::Unit::TestCase assert_equal(Array.instance_method(:map).hash, Array.instance_method(:collect).hash) end + def test_owner + c = Class.new do + def foo; end + end + assert_equal(c, c.instance_method(:foo).owner) + c2 = Class.new(c) + assert_equal(c, c2.instance_method(:foo).owner) + end + def test_receiver_name_owner o = Object.new def o.foo; end @@ -534,17 +543,23 @@ class TestMethod < Test::Unit::TestCase def test_alias_owner bug7613 = '[ruby-core:51105]' + bug7993 = '[Bug #7993]' c = Class.new { def foo end + prepend Module.new + attr_reader :zot } x = c.new class << x alias bar foo end + assert_equal(c, c.instance_method(:foo).owner) assert_equal(c, x.method(:foo).owner) assert_equal(x.singleton_class, x.method(:bar).owner) assert(x.method(:foo) != x.method(:bar), bug7613) + assert_equal(c, x.method(:zot).owner, bug7993) + assert_equal(c, c.instance_method(:zot).owner, bug7993) end def test_gced_bmethod diff --git a/test/ruby/test_module.rb b/test/ruby/test_module.rb index 915a1b9feb..aa2d82841f 100644 --- a/test/ruby/test_module.rb +++ b/test/ruby/test_module.rb @@ -1555,6 +1555,57 @@ class TestModule < Test::Unit::TestCase assert_include(im, mixin, bug8025) end + def test_prepend_super_in_alias + bug7842 = '[Bug #7842]' + + p = labeled_module("P") do + def m; "P"+super; end + end + a = labeled_class("A") do + def m; "A"; end + end + b = labeled_class("B", a) do + def m; "B"+super; end + alias m2 m + prepend p + alias m3 m + end + assert_equal("BA", b.new.m2, bug7842) + assert_equal("PBA", b.new.m3, bug7842) + end + + def test_include_super_in_alias + bug9236 = '[Bug #9236]' + + fun = labeled_module("Fun") do + def hello + orig_hello + end + end + + m1 = labeled_module("M1") do + def hello + 'hello!' + end + end + + m2 = labeled_module("M2") do + def hello + super + end + end + + foo = labeled_class("Foo") do + include m1 + include m2 + + alias orig_hello hello + include fun + end + + assert_equal('hello!', foo.new.hello, bug9236) + end + def test_class_variables m = Module.new m.class_variable_set(:@@foo, 1) |