From 912df4b615f30c5de468a3f214c86a1ec30cd22f Mon Sep 17 00:00:00 2001 From: nagachika Date: Thu, 28 Jun 2012 00:39:52 +0000 Subject: * class.c (class_instance_method_list): consider prepended Class/Module when recur != 0. [ruby-dev:45863] [Bug #6660] * test/ruby/test_module.rb (test_prepend_instance_methods_false): add a test for it. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36243 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- class.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'class.c') diff --git a/class.c b/class.c index 9ff56f8563..beeecc7865 100644 --- a/class.c +++ b/class.c @@ -938,7 +938,7 @@ static VALUE class_instance_method_list(int argc, VALUE *argv, VALUE mod, int obj, int (*func) (st_data_t, st_data_t, st_data_t)) { VALUE ary; - int recur; + int recur, prepended = 0; st_table *list; if (argc == 0) { @@ -950,10 +950,15 @@ class_instance_method_list(int argc, VALUE *argv, VALUE mod, int obj, int (*func recur = RTEST(r); } + if (!recur && RCLASS_ORIGIN(mod) != mod) { + mod = RCLASS_ORIGIN(mod); + prepended = 1; + } + list = st_init_numtable(); for (; mod; mod = RCLASS_SUPER(mod)) { if (RCLASS_M_TBL(mod)) st_foreach(RCLASS_M_TBL(mod), method_entry_i, (st_data_t)list); - if (BUILTIN_TYPE(mod) == T_ICLASS) continue; + if (BUILTIN_TYPE(mod) == T_ICLASS && !prepended) continue; if (obj && FL_TEST(mod, FL_SINGLETON)) continue; if (!recur) break; } -- cgit v1.2.3