admin/mruby-mruby
1
0
Fork 0
mirror of https://github.com/mruby/mruby synced 2026-06-08 16:11:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Comment in a refactor to match MRI, but that fails 320 tests.

Browse Source
This commit is contained in:
Blaž Hrastnik
2015-07-10 22:01:07 +02:00
parent 2e617e37e1
commit 97529c2a9a
1 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/class.c
+15 -1
View File
@@ -776,11 +776,25 @@ include_module_at(mrb_state *mrb, struct RClass *c, struct RClass *ins_pos, stru
while (m) {
struct RClass *p = c, *ic;
int superclass_seen = 0;
//if (m->origin != m)
// goto skip;
if (c->mt && c->mt == m->mt) {
mrb_raise(mrb, E_ARGUMENT_ERROR, "cyclic include detected");
}
while (p) {
/*if (p->tt == MRB_TT_ICLASS) {
if (!superclass_seen) {
ins_pos = p; // move insert point
}
goto skip;
} else if (p->tt == MRB_TT_CLASS) {
if (p->mt == m->mt) {
if (!search_super) break;
superclass_seen = 1;
}
}*/
//
if (c != p && p->tt == MRB_TT_CLASS) {
if (!search_super) break;
superclass_seen = 1;