diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/class.c | 2 | ||||
| -rw-r--r-- | src/variable.c | 26 |
2 files changed, 15 insertions, 13 deletions
diff --git a/src/class.c b/src/class.c index 22fe36fb3..96d32b4c5 100644 --- a/src/class.c +++ b/src/class.c @@ -65,7 +65,7 @@ mrb_class_name_class(mrb_state *mrb, struct RClass *outer, struct RClass *c, mrb else { name = mrb_class_path(mrb, outer); if (mrb_nil_p(name)) { /* unnamed outer class */ - if (outer != mrb->object_class) { + if (outer != mrb->object_class && outer != c) { mrb_obj_iv_set(mrb, (struct RObject*)c, mrb_intern_lit(mrb, "__outer__"), mrb_obj_value(outer)); } diff --git a/src/variable.c b/src/variable.c index 047c96e8a..20edd56e4 100644 --- a/src/variable.c +++ b/src/variable.c @@ -377,21 +377,23 @@ is_namespace(enum mrb_vtype tt) static inline void assign_class_name(mrb_state *mrb, struct RObject *obj, mrb_sym sym, mrb_value v) { - if (is_namespace(obj->tt) && is_namespace(mrb_type(v)) && ISUPPER(mrb_sym2name(mrb, sym)[0])) { + if (is_namespace(obj->tt) && is_namespace(mrb_type(v))) { struct RObject *c = mrb_obj_ptr(v); - mrb_sym id_classname = mrb_intern_lit(mrb, "__classname__"); - mrb_value o = mrb_obj_iv_get(mrb, c, id_classname); - - if (mrb_nil_p(o)) { - mrb_sym id_outer = mrb_intern_lit(mrb, "__outer__"); - o = mrb_obj_iv_get(mrb, c, id_outer); + if (obj != c && ISUPPER(mrb_sym2name(mrb, sym)[0])) { + mrb_sym id_classname = mrb_intern_lit(mrb, "__classname__"); + mrb_value o = mrb_obj_iv_get(mrb, c, id_classname); if (mrb_nil_p(o)) { - if ((struct RClass *)obj == mrb->object_class) { - mrb_obj_iv_set(mrb, c, id_classname, mrb_symbol_value(sym)); - } - else { - mrb_obj_iv_set(mrb, c, id_outer, mrb_obj_value(obj)); + mrb_sym id_outer = mrb_intern_lit(mrb, "__outer__"); + o = mrb_obj_iv_get(mrb, c, id_outer); + + if (mrb_nil_p(o)) { + if ((struct RClass *)obj == mrb->object_class) { + mrb_obj_iv_set(mrb, c, id_classname, mrb_symbol_value(sym)); + } + else { + mrb_obj_iv_set(mrb, c, id_outer, mrb_obj_value(obj)); + } } } } |