Move naming unnamed classes/modules

From `mrb_mod_const_set` to `mrb_const_set`.

2 files changed, 13 insertions, 8 deletions

diff --git a/src/class.c b/src/class.c
index 54754092e..df7258ac0 100644
--- a/src/class.c
+++ b/src/class.c
@@ -2208,14 +2208,7 @@ mrb_mod_const_set(mrb_state *mrb, mrb_value mod)
 
   mrb_get_args(mrb, "no", &id, &value);
   check_const_name_sym(mrb, id);
-  if ((mrb_type(value) == MRB_TT_CLASS || mrb_type(value) == MRB_TT_MODULE)
-      && !mrb_obj_iv_defined(mrb, mrb_obj_ptr(value), mrb_intern_lit(mrb, "__classid__"))) {
-    /* name unnamed classes/modules */
-    setup_class(mrb, mrb_class_ptr(mod), mrb_class_ptr(value), id);
-  }
-  else {
-    mrb_const_set(mrb, mod, id, value);
-  }
+  mrb_const_set(mrb, mod, id, value);
   return value;
 }
 
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);
 }