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

Merge pull request #4772 from shuujii/refactor-mrb_class_name_class

Browse Source 
Refactor `mrb_class_name_class`
This commit is contained in:
Yukihiro "Matz" Matsumoto
2019-10-13 17:20:46 +09:00
committed by GitHub
parent d128e2d09e 6377c9bce5
commit 265034134a
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/class.c
+10 -5
View File
@@ -65,17 +65,22 @@ mrb_class_name_class(mrb_state *mrb, struct RClass *outer, struct RClass *c, mrb
name = mrb_symbol_value(id);
}
else {
name = mrb_class_path(mrb, outer);
if (mrb_nil_p(name)) { /* unnamed outer class */
const char *n;
mrb_int len;
mrb_value outer_name = mrb_class_path(mrb, outer);
if (mrb_nil_p(outer_name)) { /* unnamed outer class */
if (outer != mrb->object_class && outer != c) {
mrb_obj_iv_set_force(mrb, (struct RObject*)c, mrb_intern_lit(mrb, "__outer__"),
mrb_obj_value(outer));
}
return;
}
name = mrb_str_dup(mrb, name);
mrb_str_cat_cstr(mrb, name, "::");
mrb_str_cat_cstr(mrb, name, mrb_sym_name(mrb, id));
n = mrb_sym_name_len(mrb, id, &len);
name = mrb_str_new_capa(mrb, RSTRING_LEN(outer_name) + 2 + len);
mrb_str_cat_str(mrb, name, outer_name);
mrb_str_cat_lit(mrb, name, "::");
mrb_str_cat(mrb, name, n, len);
MRB_SET_FROZEN_FLAG(mrb_obj_ptr(name));
}
mrb_obj_iv_set_force(mrb, (struct RObject*)c, nsym, name);