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

CRuby style inclusion order; close #377

Browse Source
This commit is contained in:
Yukihiro Matsumoto
2012-07-17 03:31:56 +09:00
parent e8ade38104
commit 8ce2af99f3
1 changed files with 27 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/class.c
+27 -25
View File
@@ -653,40 +653,42 @@ boot_defclass(mrb_state *mrb, struct RClass *super)
return c;
}
static int
find_in_ancestors(struct RClass *c, struct RClass *m)
{
while(c) {
if (c == m || c->mt == m->mt){
return 1;
}
c = c->super;
}
return 0;
}
void
mrb_include_module(mrb_state *mrb, struct RClass *c, struct RClass *m)
{
struct RClass *ic, *ins_pos;
struct RClass *ins_pos;
ins_pos = c;
while (m) {
if (!find_in_ancestors(c, m)) {
ic = (struct RClass*)mrb_obj_alloc(mrb, MRB_TT_ICLASS, mrb->class_class);
if (m->tt == MRB_TT_ICLASS) {
ic->c = m->c;
struct RClass *p = c, *ic;
int superclass_seen = 0;
while(p) {
if (c != p && p->tt == MRB_TT_CLASS) {
superclass_seen = 1;
}
else {
ic->c = m;
else if (p->mt == m->mt){
if (p->tt == MRB_TT_ICLASS && !superclass_seen) {
ins_pos = p;
}
goto skip;
}
ic->mt = m->mt;
ic->iv = m->iv;
ic->super = ins_pos->super;
ins_pos->super = ic;
mrb_field_write_barrier(mrb, (struct RBasic*)ins_pos, (struct RBasic*)ic);
ins_pos = ic;
p = p->super;
}
ic = (struct RClass*)mrb_obj_alloc(mrb, MRB_TT_ICLASS, mrb->class_class);
if (m->tt == MRB_TT_ICLASS) {
ic->c = m->c;
}
else {
ic->c = m;
}
ic->mt = m->mt;
ic->iv = m->iv;
ic->super = ins_pos->super;
ins_pos->super = ic;
mrb_field_write_barrier(mrb, (struct RBasic*)ins_pos, (struct RBasic*)ic);
ins_pos = ic;
skip:
m = m->super;
}
}