diff options
| author | Corey Powell <[email protected]> | 2015-07-14 08:55:53 -0500 |
|---|---|---|
| committer | Corey Powell <[email protected]> | 2015-07-14 08:55:53 -0500 |
| commit | f0e920baf07e17fd1073566d7e9605f9192d766d (patch) | |
| tree | 252b26ec9531fdb44de71227a51826bd61d76637 /src/class.c | |
| parent | 78462c9181ccbc92d26a466c5a3f06aec2d2f714 (diff) | |
| download | mruby-f0e920baf07e17fd1073566d7e9605f9192d766d.tar.gz mruby-f0e920baf07e17fd1073566d7e9605f9192d766d.zip | |
Renamed parameters in include_module_at
Diffstat (limited to 'src/class.c')
| -rw-r--r-- | src/class.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/src/class.c b/src/class.c index cde5736e0..14d81495e 100644 --- a/src/class.c +++ b/src/class.c @@ -798,26 +798,26 @@ include_class_new(mrb_state *mrb, struct RClass *m, struct RClass *super) } MRB_API int -include_module_at(mrb_state *mrb, struct RClass *klass, struct RClass *c, struct RClass *module, int search_super) +include_module_at(mrb_state *mrb, struct RClass *c, struct RClass *ins_pos, struct RClass *m, int search_super) { - struct RClass *p, *iclass; - void *klass_mt = klass->origin->mt; + struct RClass *p, *ic; + void *klass_mt = c->origin->mt; - while (module) { + while (m) { int superclass_seen = 0; - if (module->origin != module) + if (m->origin != m) goto skip; - if (klass_mt && klass_mt == module->mt) + if (klass_mt && klass_mt == m->mt) return -1; - p = klass->super; + p = c->super; while(p) { if (p->tt == MRB_TT_ICLASS) { - if (p->mt == module->mt) { + if (p->mt == m->mt) { if (!superclass_seen) { - c = p; // move insert point + ins_pos = p; // move insert point } goto skip; } @@ -828,12 +828,12 @@ include_module_at(mrb_state *mrb, struct RClass *klass, struct RClass *c, struct p = p->super; } - iclass = include_class_new(mrb, module, c->super); - c->super = iclass; - mrb_field_write_barrier(mrb, (struct RBasic*)c, (struct RBasic*)c->super); - c = iclass; + ic = include_class_new(mrb, m, ins_pos->super); + ins_pos->super = ic; + mrb_field_write_barrier(mrb, (struct RBasic*)ins_pos, (struct RBasic*)ins_pos->super); + ins_pos = ic; skip: - module = module->super; + m = m->super; } return 0; } |
