From a02894afa39368944e95b6c7b986a5847190a825 Mon Sep 17 00:00:00 2001 From: "Yukihiro \"Matz\" Matsumoto" Date: Sat, 27 May 2023 16:41:43 +0900 Subject: [PATCH] small cosmetic changes --- src/gc.c | 2 +- src/variable.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/gc.c b/src/gc.c index 067257bf2..a01b70ce9 100644 --- a/src/gc.c +++ b/src/gc.c @@ -1601,7 +1601,7 @@ mrb_objspace_each_objects(mrb_state *mrb, mrb_each_object_callback *callback, vo gc_each_objects(mrb, &mrb->gc, callback, data); mrb->jmp = prev_jmp; mrb->gc.iterating = iterating; - } MRB_CATCH(&c_jmp) { + } MRB_CATCH(&c_jmp) { mrb->gc.iterating = iterating; mrb->jmp = prev_jmp; MRB_THROW(prev_jmp); diff --git a/src/variable.c b/src/variable.c index 4d1dbd1ad..79b0652d5 100644 --- a/src/variable.c +++ b/src/variable.c @@ -774,9 +774,8 @@ const_get(mrb_state *mrb, struct RClass *base, mrb_sym sym, mrb_bool skip) if (skip) c = c->super; L_RETRY: while (c) { - if (!MRB_FLAG_TEST(c, MRB_FL_CLASS_IS_PREPENDED) && c->iv) { - if (iv_get(mrb, c->iv, sym, &v)) - return v; + if (!MRB_FLAG_TEST(c, MRB_FL_CLASS_IS_PREPENDED) && c->iv && iv_get(mrb, c->iv, sym, &v)) { + return v; } c = c->super; if (!skip && c == mrb->object_class) break;