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 (find_visibility_ci): inline find_ci_from_proc()

Browse Source
This commit is contained in:
Yukihiro "Matz" Matsumoto
2025-03-08 07:54:51 +09:00
parent 07b986f710
commit 3c4f6501b0
1 changed files with 11 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/class.c
+11 -16
View File
@@ -744,18 +744,6 @@ mrb_define_class_under(mrb_state *mrb, struct RClass *outer, const char *name, s
#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_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)
{
@@ -767,11 +755,18 @@ find_visibility_ci(mrb_state *mrb, const struct RClass *c, int n)
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;
mrb_callinfo *upper_ci = ci - 1;
while (cibase < upper_ci) {
if (upper_ci->proc == p) {
if (CI_TARGET_CLASS(upper_ci) != c) {
return ci;
}
ci = upper_ci;
break;
}
upper_ci--;
}
ci = nci;
}
return ci;
}