From 67af0bb675f51960ca02c55f8e0b701b800f7141 Mon Sep 17 00:00:00 2001 From: Alex Shinn Date: Sun, 26 Sep 2010 01:08:12 +0900 Subject: [PATCH] these were supposed to be included in the previous patch --- main.c | 14 ++++---------- opt/opcode_names.h | 2 +- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/main.c b/main.c index eaae6876..f20eda87 100644 --- a/main.c +++ b/main.c @@ -24,7 +24,7 @@ static sexp sexp_param_ref (sexp ctx, sexp env, sexp name) { sexp res=sexp_env_ref(env, name, SEXP_FALSE); - return sexp_opcodep(res) ? sexp_cdr(sexp_opcode_data(res)) : SEXP_VOID; + return sexp_opcodep(res) ? sexp_parameter_ref(ctx, res) : SEXP_VOID; } static void repl (sexp ctx) { @@ -90,17 +90,11 @@ static sexp check_exception (sexp ctx, sexp res) { static sexp sexp_load_standard_repl_env (sexp ctx, sexp env, sexp k) { sexp p, res = sexp_load_standard_env(ctx, env, k); #if SEXP_USE_GREEN_THREADS - p = sexp_env_ref(env, sexp_global(ctx, SEXP_G_CUR_IN_SYMBOL), SEXP_FALSE); - if (sexp_opcodep(p)) p = sexp_opcode_data(p); - if (sexp_pairp(p)) p = sexp_cdr(p); + p = sexp_param_ref(ctx, env, sexp_global(ctx, SEXP_G_CUR_IN_SYMBOL)); if (sexp_portp(p)) fcntl(sexp_port_fileno(p), F_SETFL, O_NONBLOCK); - p = sexp_env_ref(env, sexp_global(ctx, SEXP_G_CUR_OUT_SYMBOL), SEXP_FALSE); - if (sexp_opcodep(p)) p = sexp_opcode_data(p); - if (sexp_pairp(p)) p = sexp_cdr(p); + p = sexp_param_ref(ctx, env, sexp_global(ctx, SEXP_G_CUR_OUT_SYMBOL)); if (sexp_portp(p)) fcntl(sexp_port_fileno(p), F_SETFL, O_NONBLOCK); - p = sexp_env_ref(env, sexp_global(ctx, SEXP_G_CUR_ERR_SYMBOL), SEXP_FALSE); - if (sexp_opcodep(p)) p = sexp_opcode_data(p); - if (sexp_pairp(p)) p = sexp_cdr(p); + p = sexp_param_ref(ctx, env, sexp_global(ctx, SEXP_G_CUR_ERR_SYMBOL)); if (sexp_portp(p)) fcntl(sexp_port_fileno(p), F_SETFL, O_NONBLOCK); #endif return res; diff --git a/opt/opcode_names.h b/opt/opcode_names.h index a87aeb1c..d8c89ceb 100644 --- a/opt/opcode_names.h +++ b/opt/opcode_names.h @@ -3,7 +3,7 @@ static const char* reverse_opcode_names[] = {"NOOP", "RAISE", "RESUMECC", "CALLCC", "APPLY1", "TAIL-CALL", "CALL", "FCALL0", "FCALL1", "FCALL2", "FCALL3", "FCALL4", "FCALLN", "JUMP-UNLESS", "JUMP", "PUSH", "DROP", - "GLOBAL-REF", "GLOBAL-KNOWN-REF", "STACK-REF", + "GLOBAL-REF", "GLOBAL-KNOWN-REF", "PARAMETER-REF", "STACK-REF", "LOCAL-REF", "LOCAL-SET", "CLOSURE-REF", "VECTOR-REF", "VECTOR-SET", "VECTOR-LENGTH", "BYTES-REF", "BYTES-SET", "BYTES-LENGTH",