diff options
| author | Yukihiro "Matz" Matsumoto <[email protected]> | 2017-08-01 16:25:09 +0900 |
|---|---|---|
| committer | Yukihiro "Matz" Matsumoto <[email protected]> | 2017-08-01 16:25:09 +0900 |
| commit | 648e9ea51ba6c058ccec725af0ada5c8dd7e9197 (patch) | |
| tree | ebb22d75c71165efb3215013aa3d4316b8bb6478 /src/variable.c | |
| parent | 3f6a098626d95ef59f566dad4afbef83249e9334 (diff) | |
| download | mruby-648e9ea51ba6c058ccec725af0ada5c8dd7e9197.tar.gz mruby-648e9ea51ba6c058ccec725af0ada5c8dd7e9197.zip | |
Move naming unnamed classes/modules
From `mrb_mod_const_set` to `mrb_const_set`.
Diffstat (limited to 'src/variable.c')
| -rw-r--r-- | src/variable.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/src/variable.c b/src/variable.c index 9f4b2e728..b700081a5 100644 --- a/src/variable.c +++ b/src/variable.c @@ -869,7 +869,19 @@ mrb_vm_const_get(mrb_state *mrb, mrb_sym sym) MRB_API void mrb_const_set(mrb_state *mrb, mrb_value mod, mrb_sym sym, mrb_value v) { + mrb_sym id = mrb_intern_lit(mrb, "__classid__"); + mod_const_check(mrb, mod); + if ((mrb_type(v) == MRB_TT_CLASS || mrb_type(v) == MRB_TT_MODULE) + && !mrb_obj_iv_defined(mrb, mrb_obj_ptr(v), id)) { + struct RObject *c = mrb_obj_ptr(v); + + /* name unnamed classes/modules */ + mrb_obj_iv_set(mrb, c, id, mrb_symbol_value(sym)); + if (mrb_class_ptr(mod) != mrb->object_class) { + mrb_obj_iv_set(mrb, c, mrb_intern_lit(mrb, "__outer__"), mod); + } + } mrb_iv_set(mrb, mod, sym, v); } |