mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
fix null m_tbl
* class.c (rb_obj_singleton_methods): m_tbl in prepended class/module is NULL. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36238 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
cf3a8f09b8
commit
d4269d7b7c
2 changed files with 10 additions and 2 deletions
6
class.c
6
class.c
|
@ -1172,12 +1172,14 @@ rb_obj_singleton_methods(int argc, VALUE *argv, VALUE obj)
|
|||
klass = CLASS_OF(obj);
|
||||
list = st_init_numtable();
|
||||
if (klass && FL_TEST(klass, FL_SINGLETON)) {
|
||||
st_foreach(RCLASS_M_TBL(klass), method_entry_i, (st_data_t)list);
|
||||
if (RCLASS_M_TBL(klass))
|
||||
st_foreach(RCLASS_M_TBL(klass), method_entry_i, (st_data_t)list);
|
||||
klass = RCLASS_SUPER(klass);
|
||||
}
|
||||
if (RTEST(recur)) {
|
||||
while (klass && (FL_TEST(klass, FL_SINGLETON) || RB_TYPE_P(klass, T_ICLASS))) {
|
||||
st_foreach(RCLASS_M_TBL(klass), method_entry_i, (st_data_t)list);
|
||||
if (RCLASS_M_TBL(klass))
|
||||
st_foreach(RCLASS_M_TBL(klass), method_entry_i, (st_data_t)list);
|
||||
klass = RCLASS_SUPER(klass);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1284,4 +1284,10 @@ class TestModule < Test::Unit::TestCase
|
|||
bug6655 = '[ruby-core:45915]'
|
||||
assert_equal(Object.instance_methods, Class.new {prepend Module.new}.instance_methods, bug6655)
|
||||
end
|
||||
|
||||
def test_prepend_singleton_methods
|
||||
o = Object.new
|
||||
o.singleton_class.class_eval {prepend Module.new}
|
||||
assert_equal([], o.singleton_methods)
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Reference in a new issue