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

mruby-method/method.c (method_super_method): fixed module related bug.

Browse Source 
When the method is defined in module, super_method started method
searching from wrong point. We needed to find ICLASS corresponding to the
module, then start searching super_method from the next ancestor.
This commit is contained in:
Yukihiro "Matz" Matsumoto
2022-09-27 22:31:46 +09:00
parent 0a0ab73e8d
commit 5e1c16653f
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mrbgems/mruby-method/src/method.c
+14 -14
View File
@@ -325,25 +325,25 @@ method_super_method(mrb_state *mrb, mrb_value self)
struct RProc *proc;
struct RObject *me;
switch (mrb_type(klass)) {
case MRB_TT_SCLASS:
super = mrb_class_ptr(klass)->super->super;
break;
case MRB_TT_ICLASS:
super = mrb_class_ptr(klass)->super;
break;
default:
super = mrb_class_ptr(owner)->super;
break;
if (mrb_type(owner) == MRB_TT_MODULE) {
struct RClass *m = mrb_class_ptr(owner);
rklass = mrb_class_ptr(klass)->super;
while (rklass && rklass->c != m) {
rklass = rklass->super;
}
if (!rklass) return mrb_nil_value();
super = rklass->super;
}
else {
super = mrb_class_ptr(owner)->super;
}
proc = method_search_vm(mrb, &super, mrb_symbol(name));
if (!proc)
return mrb_nil_value();
if (!proc) return mrb_nil_value();
rklass = super;
while (super->tt == MRB_TT_ICLASS)
super = super->c;
super = mrb_class_real(super);
if (!super) return mrb_nil_value();
me = method_object_alloc(mrb, mrb_obj_class(mrb, self));
mrb_obj_iv_set(mrb, me, MRB_SYM(_owner), mrb_obj_value(super));