From 58e94427377952b0953bcdf2d544c62b0fefd4a6 Mon Sep 17 00:00:00 2001 From: dearblue Date: Sun, 10 Jan 2021 10:20:01 +0900 Subject: Unified `target_class` and `env` of `mrb_callinfo` If there is `env`, `env->c` means `target_class`. --- mrbgems/mruby-bin-mirb/tools/mirb/mirb.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'mrbgems/mruby-bin-mirb/tools/mirb/mirb.c') diff --git a/mrbgems/mruby-bin-mirb/tools/mirb/mirb.c b/mrbgems/mruby-bin-mirb/tools/mirb/mirb.c index b626024d1..12adfc4a6 100644 --- a/mrbgems/mruby-bin-mirb/tools/mirb/mirb.c +++ b/mrbgems/mruby-bin-mirb/tools/mirb/mirb.c @@ -516,8 +516,8 @@ main(int argc, char **argv) } mrb_load_file_cxt(mrb, lfp, cxt); fclose(lfp); - e = mrb->c->cibase->env; - mrb->c->cibase->env = NULL; + e = mrb_vm_ci_env(mrb->c->cibase); + mrb_vm_ci_env_set(mrb->c->cibase, NULL); mrb_env_unshare(mrb, e); mrbc_cleanup_local_variables(mrb, cxt); } @@ -658,8 +658,8 @@ main(int argc, char **argv) mrb_codedump_all(mrb, proc); } /* adjust stack length of toplevel environment */ - if (mrb->c->cibase->env) { - struct REnv *e = mrb->c->cibase->env; + if (mrb->c->cibase->u.env) { + struct REnv *e = mrb_vm_ci_env(mrb->c->cibase); if (e && MRB_ENV_LEN(e) < proc->body.irep->nlocals) { MRB_ENV_SET_LEN(e, proc->body.irep->nlocals); } -- cgit v1.2.3