diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-09-10 03:39:31 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-09-10 03:39:31 +0000 |
commit | 67129c8383f382eddd805411ef619d5c8c258dc3 (patch) | |
tree | 4c4db72dfa8de0712003b3481e6b50fb499c3379 | |
parent | 9d9dfc217240613e6e64f314d888b94fd9c80a4e (diff) | |
download | ruby-67129c8383f382eddd805411ef619d5c8c258dc3.tar.gz |
class.c: exclude refined methods
* class.c (method_entry_i): should exclude refined methods from
instance method list. [ruby-core:57080] [Bug #8881]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@42903 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | class.c | 4 | ||||
-rw-r--r-- | test/ruby/test_refinement.rb | 11 |
3 files changed, 20 insertions, 0 deletions
@@ -1,3 +1,8 @@ +Tue Sep 10 12:39:17 2013 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * class.c (method_entry_i): should exclude refined methods from + instance method list. [ruby-core:57080] [Bug #8881] + Tue Sep 10 12:05:04 2013 Kazuhiro NISHIYAMA <zn@mbf.nifty.com> * io.c (rb_f_printf): [DOC] add missing parenthesis in rdoc. @@ -1121,6 +1121,10 @@ method_entry_i(st_data_t key, st_data_t value, st_data_t data) st_table *list = (st_table *)data; long type; + if (me && me->def->type == VM_METHOD_TYPE_REFINED) { + me = rb_resolve_refined_method(Qnil, me, NULL); + if (!me) return ST_CONTINUE; + } if (!st_lookup(list, key, 0)) { if (UNDEFINED_METHOD_ENTRY_P(me)) { type = -1; /* none */ diff --git a/test/ruby/test_refinement.rb b/test/ruby/test_refinement.rb index 02193ae615..60681b2f1a 100644 --- a/test/ruby/test_refinement.rb +++ b/test/ruby/test_refinement.rb @@ -1005,6 +1005,17 @@ class TestRefinement < Test::Unit::TestCase end; end + def test_instance_methods + bug8881 = '[ruby-core:57080] [Bug #8881]' + assert_not_include(Foo.instance_methods(false), :z, bug8881) + assert_not_include(FooSub.instance_methods(true), :z, bug8881) + end + + def test_method_defined + assert_not_send([Foo, :method_defined?, :z]) + assert_not_send([FooSub, :method_defined?, :z]) + end + private def eval_using(mod, s) |