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

fixed const_get && const_missing issue

Browse Source
This commit is contained in:
Yuichiro MASUI
2012-06-02 17:00:11 +09:00
parent 7752d2ab43
commit e473ce1ac4
1 changed files with 6 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/variable.c
+6 -29
View File
@@ -186,7 +186,7 @@ mrb_vm_cv_set(mrb_state *mrb, mrb_sym sym, mrb_value v)
if (k != kh_end(h)) {
k = kh_put(iv, h, sym);
kh_value(h, k) = v;
return;
return;
}
}
c = c->super;
@@ -233,26 +233,8 @@ const_get(mrb_state *mrb, struct RClass *base, mrb_sym sym)
struct RClass *c = base;
khash_t(iv) *h;
khiter_t k;
mrb_sym cm = mrb_intern(mrb, "const_missing");
if (c->iv) {
h = c->iv;
k = kh_get(iv, h, sym);
if (k != kh_end(h)) {
return kh_value(h, k);
}
}
for (;;) {
c = mrb_class_outer_module(mrb, c);
if (!c) break;
if (c->iv) {
h = c->iv;
k = kh_get(iv, h, sym);
if (k != kh_end(h)) {
return kh_value(h, k);
}
}
}
c = base->super;
while (c) {
if (c->iv) {
h = c->iv;
@@ -260,19 +242,14 @@ const_get(mrb_state *mrb, struct RClass *base, mrb_sym sym)
if (k != kh_end(h)) {
return kh_value(h, k);
}
if (mrb_respond_to(mrb, mrb_obj_value(c), cm)) {
mrb_value argv = mrb_symbol_value(sym);
return mrb_funcall_argv(mrb, mrb_obj_value(c), "const_missing", 1, &argv);
}
}
c = c->super;
}
if (!c) {
c = mrb->object_class;
}
if (mrb_respond_to(mrb, mrb_obj_value(c), mrb_intern(mrb, "const_missing"))) {
mrb_value argv = mrb_symbol_value(sym);
return mrb_funcall_argv(mrb, mrb_obj_value(c), "const_missing", 1, &argv);
}
mrb_raise(mrb, E_NAME_ERROR, "uninitialized constant %s",
mrb_sym2name(mrb, sym));
/* not reached */