Skip to content

Remove USE_MRUBY_OLD_BYTE_CODE #35

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dearblue wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Remove USE_MRUBY_OLD_BYTE_CODE #35

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 3 additions & 8 deletions src/require.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)
{
Expand Down Expand Up @@ -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);
Expand Down