Bug #7844 ยป include-after-origin-7844.patch
| class.c | ||
|---|---|---|
|
struct rb_id_table *const klass_m_tbl = RCLASS_M_TBL(RCLASS_ORIGIN(klass));
|
||
|
while (module) {
|
||
|
int origin_seen = FALSE;
|
||
|
int superclass_seen = FALSE;
|
||
|
struct rb_id_table *tbl;
|
||
|
if (klass == c)
|
||
|
origin_seen = TRUE;
|
||
|
if (RCLASS_ORIGIN(module) != module)
|
||
|
goto skip;
|
||
|
if (klass_m_tbl && klass_m_tbl == RCLASS_M_TBL(module))
|
||
| ... | ... | |
|
/* ignore if the module included already in superclasses */
|
||
|
for (p = RCLASS_SUPER(klass); p; p = RCLASS_SUPER(p)) {
|
||
|
int type = BUILTIN_TYPE(p);
|
||
|
if (c == p)
|
||
|
origin_seen = TRUE;
|
||
|
if (type == T_ICLASS) {
|
||
|
if (RCLASS_M_TBL(p) == RCLASS_M_TBL(module)) {
|
||
|
if (!superclass_seen) {
|
||
|
if (!superclass_seen && origin_seen) {
|
||
|
c = p; /* move insertion point */
|
||
|
}
|
||
|
goto skip;
|
||
| test/ruby/test_module.rb | ||
|---|---|---|
|
assert_equal([Comparable, Kernel], String.included_modules - mixins)
|
||
|
end
|
||
|
def test_include_with_prepend
|
||
|
c = Class.new{def m; [:c] end}
|
||
|
p = Module.new{def m; [:p] + super end}
|
||
|
q = Module.new{def m; [:q] + super end; include p}
|
||
|
r = Module.new{def m; [:r] + super end; prepend q}
|
||
|
s = Module.new{def m; [:s] + super end; include r}
|
||
|
a = Class.new(c){def m; [:a] + super end; prepend p; include s}
|
||
|
assert_equal([:p, :a, :s, :q, :r, :c], a.new.m)
|
||
|
end
|
||
|
def test_instance_methods
|
||
|
assert_equal([:user, :user2], User.instance_methods(false).sort)
|
||
|
assert_equal([:user, :user2, :mixin].sort, User.instance_methods(true).sort)
|
||