Avoid constant-set duplication; ref #3747

This commit is contained in:
Yukihiro "Matz" Matsumoto
2017-07-19 09:03:07 +09:00
parent a8bffdae50
commit 14a72b0800
+6 -2
View File
@@ -2178,10 +2178,14 @@ 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) {
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);
}
mrb_const_set(mrb, mod, id, value);
else {
mrb_const_set(mrb, mod, id, value);
}
return value;
}