From 368f8a5da6d0e0282e07e6cceef777fab5c4844c Mon Sep 17 00:00:00 2001 From: dearblue Date: Sat, 14 Nov 2020 11:30:34 +0900 Subject: Don't use private structs with `mrb_mt_foreach()` The `MRB_API` function `mrb_mt_foreach()` previously used the private structure `struct mt_elem`. Therefore, use `mrb_method_t` instead. --- src/class.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/class.c b/src/class.c index f00d3c782..26366aeb9 100644 --- a/src/class.c +++ b/src/class.c @@ -230,7 +230,16 @@ mrb_mt_foreach(mrb_state *mrb, struct RClass *c, mrb_mt_foreach_func *fn, void * struct mt_elem *slot = &t->table[i]; if (slot->key) { - if (fn(mrb, slot->key, slot, p) != 0) + mrb_method_t m; + + if (slot->func_p) { + MRB_METHOD_FROM_FUNC(m, slot->ptr.func); + } + else { + MRB_METHOD_FROM_PROC(m, slot->ptr.proc); + } + + if (fn(mrb, slot->key, m, p) != 0) return; } } -- cgit v1.2.3