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

Move naming unnamed classes/modules

Browse Source 
From `mrb_mod_const_set` to `mrb_const_set`.
This commit is contained in:
Yukihiro "Matz" Matsumoto
2017-08-01 16:25:09 +09:00
parent 3f6a098626
commit 648e9ea51b
2 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/class.c
+1 -8
View File
@@ -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;
}
src/variable.c
+12
View File
@@ -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);
}