From 80534b6d14f1392ab1c199f0906880d61f55ae84 Mon Sep 17 00:00:00 2001 From: take_cheeze Date: Tue, 1 Apr 2014 01:13:39 +0900 Subject: Use MRB_ENV_STACK_LEN instead of accessing `flags` directly to get REnv's stack length. --- mrbgems/mruby-proc-ext/src/proc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'mrbgems/mruby-proc-ext/src/proc.c') diff --git a/mrbgems/mruby-proc-ext/src/proc.c b/mrbgems/mruby-proc-ext/src/proc.c index 507f91d7d..b4744fa1b 100644 --- a/mrbgems/mruby-proc-ext/src/proc.c +++ b/mrbgems/mruby-proc-ext/src/proc.c @@ -18,7 +18,7 @@ mrb_proc_new_cfunc_with_env(mrb_state *mrb, mrb_func_t f, mrb_int argc, const mr mrb_gc_arena_restore(mrb, ai); e->cioff = -1; - e->flags = argc; + MRB_ENV_STACK_LEN(e) = argc; e->stack = (mrb_value*)mrb_malloc(mrb, sizeof(mrb_value) * argc); for (i = 0; i < argc; ++i) { e->stack[i] = argv[i]; @@ -39,9 +39,9 @@ mrb_cfunc_env_get(mrb_state *mrb, mrb_int idx) if (!e) { mrb_raise(mrb, E_TYPE_ERROR, "Can't get cfunc env from cfunc Proc without REnv."); } - if (idx < 0 || e->flags <= idx) { + if (idx < 0 || MRB_ENV_STACK_LEN(e) <= idx) { mrb_raisef(mrb, E_INDEX_ERROR, "Env index out of range: %S (expected: 0 <= index < %S)", - mrb_fixnum_value(idx), mrb_fixnum_value(e->flags)); + mrb_fixnum_value(idx), mrb_fixnum_value(MRB_ENV_STACK_LEN(e))); } return e->stack[idx]; -- cgit v1.2.3 From b38eb72d829edc94c6a9f5d34bb6e5c102039cb5 Mon Sep 17 00:00:00 2001 From: take_cheeze Date: Tue, 1 Apr 2014 01:35:40 +0900 Subject: Add macro MRB_ENV_UNSHARE_STACK instead of assigning -1 directly. --- include/mruby/proc.h | 1 + mrbgems/mruby-proc-ext/src/proc.c | 2 +- src/vm.c | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) (limited to 'mrbgems/mruby-proc-ext/src/proc.c') diff --git a/include/mruby/proc.h b/include/mruby/proc.h index 6d2cf516a..e72e8f7e4 100644 --- a/include/mruby/proc.h +++ b/include/mruby/proc.h @@ -21,6 +21,7 @@ struct REnv { }; #define MRB_ENV_STACK_LEN(e) ((e)->flags) +#define MRB_ENV_UNSHARE_STACK(e) ((e)->cioff = -1) struct RProc { MRB_OBJECT_HEADER; diff --git a/mrbgems/mruby-proc-ext/src/proc.c b/mrbgems/mruby-proc-ext/src/proc.c index b4744fa1b..8b6ee4740 100644 --- a/mrbgems/mruby-proc-ext/src/proc.c +++ b/mrbgems/mruby-proc-ext/src/proc.c @@ -17,7 +17,7 @@ mrb_proc_new_cfunc_with_env(mrb_state *mrb, mrb_func_t f, mrb_int argc, const mr p->env = e; mrb_gc_arena_restore(mrb, ai); - e->cioff = -1; + MRB_ENV_UNSHARE_STACK(e); MRB_ENV_STACK_LEN(e) = argc; e->stack = (mrb_value*)mrb_malloc(mrb, sizeof(mrb_value) * argc); for (i = 0; i < argc; ++i) { diff --git a/src/vm.c b/src/vm.c index e2b02a4ce..4aa9b9460 100644 --- a/src/vm.c +++ b/src/vm.c @@ -248,7 +248,7 @@ cipop(mrb_state *mrb) size_t len = (size_t)MRB_ENV_STACK_LEN(e); mrb_value *p = (mrb_value *)mrb_malloc(mrb, sizeof(mrb_value)*len); - e->cioff = -1; + MRB_ENV_UNSHARE_STACK(e); stack_copy(p, e->stack, len); e->stack = p; } -- cgit v1.2.3