From 67b446a925caed4176a0addcbf2e40483d7b8977 Mon Sep 17 00:00:00 2001 From: dearblue Date: Tue, 28 Jun 2022 22:54:48 +0900 Subject: [PATCH] Remove `USE_MRUBY_OLD_BYTE_CODE` Since mruby-2.0.0 has been released, it can be replaced by comparing with `MRUBY_RELEASE_NO`. --- src/require.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/src/require.c b/src/require.c index 2914e1c..c29c4e1 100644 --- a/src/require.c +++ b/src/require.c @@ -19,11 +19,6 @@ #define E_LOAD_ERROR (mrb_class_get(mrb, "LoadError")) -/* We can't use MRUBY_RELEASE_NO to determine if byte code implementation is old */ -#ifdef MKOP_A -#define USE_MRUBY_OLD_BYTE_CODE -#endif - #if MRUBY_RELEASE_NO < 10000 mrb_value mrb_yield_internal(mrb_state *mrb, mrb_value b, int argc, mrb_value *argv, mrb_value self, struct RClass *c); #define mrb_yield_with_class mrb_yield_internal @@ -53,7 +48,9 @@ mrb_value mrb_yield_internal(mrb_state *mrb, mrb_value b, int argc, mrb_value *a } #endif -#ifdef USE_MRUBY_OLD_BYTE_CODE +#if MRUBY_RELEASE_NO >= 20000 +#define replace_stop_with_return(mrb, irep) ((void)0) +#else static void replace_stop_with_return(mrb_state *mrb, mrb_irep *irep) { @@ -104,9 +101,7 @@ eval_load_irep(mrb_state *mrb, mrb_irep *irep) int ai; struct RProc *proc; -#ifdef USE_MRUBY_OLD_BYTE_CODE replace_stop_with_return(mrb, irep); -#endif proc = mrb_proc_new(mrb, irep); mrb_irep_decref(mrb, irep); MRB_PROC_SET_TARGET_CLASS(proc, mrb->object_class);