admin/mruby-mruby
1
0
Fork 0
mirror of https://github.com/mruby/mruby synced 2026-06-08 16:11:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use MRB_ENV_STACK_SHARED_P to check cioff field of REnv.

Browse Source
This commit is contained in:
take_cheeze
2014-04-01 01:53:28 +09:00
parent b38eb72d82
commit 755ded2ef0
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/mruby/proc.h
+1
View File
@@ -22,6 +22,7 @@ struct REnv {
#define MRB_ENV_STACK_LEN(e) ((e)->flags)
#define MRB_ENV_UNSHARE_STACK(e) ((e)->cioff = -1)
#define MRB_ENV_STACK_SHARED_P(e) ((e)->cioff >= 0)
struct RProc {
MRB_OBJECT_HEADER;
src/gc.c
+2 -2
View File
@@ -515,7 +515,7 @@ gc_mark_children(mrb_state *mrb, struct RBasic *obj)
{
struct REnv *e = (struct REnv*)obj;
if (e->cioff < 0) {
if (!MRB_ENV_STACK_SHARED_P(e)) {
int i, len;
len = (int)MRB_ENV_STACK_LEN(e);
@@ -612,7 +612,7 @@ obj_free(mrb_state *mrb, struct RBasic *obj)
{
struct REnv *e = (struct REnv*)obj;
if (e->cioff < 0) {
if (!MRB_ENV_STACK_SHARED_P(e)) {
mrb_free(mrb, e->stack);
e->stack = NULL;
}
src/vm.c
+4 -4
View File
@@ -121,7 +121,7 @@ envadjust(mrb_state *mrb, mrb_value *oldbase, mrb_value *newbase)
if (newbase == oldbase) return;
while (ci <= mrb->c->ci) {
struct REnv *e = ci->env;
if (e && e->cioff >= 0) {
if (e && MRB_ENV_STACK_SHARED_P(e)) {
ptrdiff_t off = e->stack - oldbase;
e->stack = newbase + off;
@@ -188,7 +188,7 @@ is_strict(mrb_state *mrb, struct REnv *e)
{
int cioff = e->cioff;
if (cioff >= 0 && mrb->c->cibase[cioff].proc &&
if (MRB_ENV_STACK_SHARED_P(e) && mrb->c->cibase[cioff].proc &&
MRB_PROC_STRICT_P(mrb->c->cibase[cioff].proc)) {
return TRUE;
}
@@ -1406,7 +1406,7 @@ RETRY_TRY_BLOCK:
if (proc->env && !MRB_PROC_STRICT_P(proc)) {
struct REnv *e = top_env(mrb, proc);
if (e->cioff < 0) {
if (!MRB_ENV_STACK_SHARED_P(e)) {
localjump_error(mrb, LOCALJUMP_ERROR_RETURN);
goto L_RAISE;
}
@@ -1437,7 +1437,7 @@ RETRY_TRY_BLOCK:
ci = mrb->c->ci;
break;
case OP_R_BREAK:
if (!proc->env || proc->env->cioff < 0) {
if (!proc->env || !MRB_ENV_STACK_SHARED_P(proc->env)) {
localjump_error(mrb, LOCALJUMP_ERROR_BREAK);
goto L_RAISE;
}