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

class.c: take visibility from outer scope

Browse Source 
It is possible to update the visibility from within a block, so that
`find_visibility_ci()` should look up outer scopes.
This commit is contained in:
Yukihiro "Matz" Matsumoto
2025-03-07 17:49:08 +09:00
parent 67e85ed296
commit ec7477fe0d
1 changed files with 30 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/class.c
+30 -3
View File
@@ -742,10 +742,37 @@ mrb_define_class_under(mrb_state *mrb, struct RClass *outer, const char *name, s
return mrb_define_class_under_id(mrb, outer, mrb_intern_cstr(mrb, name), super);
}
#define CI_TARGET_CLASS(ci) (((ci)->u.env && (ci)->u.env->tt == MRB_TT_ENV)? (ci)->u.env->c : (ci)->u.target_class)
static mrb_callinfo*
find_visibility_ci(mrb_state *mrb, int n)
find_ci_from_proc(const struct RProc *p, mrb_callinfo *ci, const mrb_callinfo *cibase)
{
if (ci == cibase) return NULL;
ci--;
while (cibase < ci) {
if (ci->proc == p) break;
ci--;
}
return ci;
}
static mrb_callinfo*
find_visibility_ci(mrb_state *mrb, const struct RClass *c, int n)
{
mrb_callinfo *ci = mrb->c->ci - n;
const mrb_callinfo *cibase = mrb->c->cibase;
const struct RProc *p = ci->proc;
mrb_assert(p != NULL);
if (c == NULL) c = CI_TARGET_CLASS(ci);
while (p->upper && cibase < ci) {
p = p->upper;
mrb_callinfo *nci = find_ci_from_proc(p, ci, cibase);
if (nci == NULL || CI_TARGET_CLASS(nci) != c) {
return ci;
}
ci = nci;
}
return ci;
}
@@ -793,7 +820,7 @@ mrb_define_method_raw(mrb_state *mrb, struct RClass *c, mrb_sym mid, mrb_method_
MRB_SET_VISIBILITY(flags, MT_PRIVATE);
}
else if ((flags & MT_VMASK) == MT_VDEFAULT) {
mrb_callinfo *ci = find_visibility_ci(mrb, 0);
mrb_callinfo *ci = find_visibility_ci(mrb, c, 0);
MRB_SET_VISIBILITY(flags, ci->vis);
}
mt_put(mrb, h, mid, flags, ptr);
@@ -1678,7 +1705,7 @@ mrb_mod_visibility(mrb_state *mrb, mrb_value mod, int vis)
mrb_get_args(mrb, "*!", &argv, &argc);
if (argc == 0) {
mrb_callinfo *ci = find_visibility_ci(mrb, 1);
mrb_callinfo *ci = find_visibility_ci(mrb, NULL, 1);
ci->vis = vis;
}
else {