Fcalva/chibi-scheme
1
0
Fork 0
mirror of https://github.com/ashinn/chibi-scheme.git synced 2025-05-21 06:39:17 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixing bug when using -x with a language which doesn't have

Browse source 
interaction-environment.  We need to set this in the underlying
core environment first.  Fixes issue #193.
This commit is contained in:
Alex Shinn 2013-09-14 22:31:27 +09:00
parent ca6f2e07cf
commit d85cff247e
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
eval.c
View file

@ -2130,6 +2130,8 @@ void sexp_set_parameter (sexp ctx, sexp env, sexp name, sexp value) {
sexp_opcode_data(param) = sexp_cons(ctx, name, value); sexp_opcode_data(param) = sexp_cons(ctx, name, value);
else else
sexp_cdr(sexp_opcode_data(param)) = value; sexp_cdr(sexp_opcode_data(param)) = value;
} else {
sexp_warn(ctx, "can't set non-parameter: ", name);
} }
} }

6
main.c
View file

@ -183,7 +183,7 @@ static void repl (sexp ctx, sexp env) {
out = sexp_param_ref(ctx, env, sexp_global(ctx, SEXP_G_CUR_OUT_SYMBOL)); out = sexp_param_ref(ctx, env, sexp_global(ctx, SEXP_G_CUR_OUT_SYMBOL));
err = sexp_param_ref(ctx, env, sexp_global(ctx, SEXP_G_CUR_ERR_SYMBOL)); err = sexp_param_ref(ctx, env, sexp_global(ctx, SEXP_G_CUR_ERR_SYMBOL));
if (!(sexp_iportp(in) && sexp_oportp(out) && sexp_oportp(err))) { if (!(sexp_iportp(in) && sexp_oportp(out) && sexp_oportp(err))) {
fprintf(stderr, "No standing I/O ports found, aborting. Maybe a bad -x language?\n"); fprintf(stderr, "No standard I/O ports found, aborting. Maybe a bad -x language?\n");
exit_failure(); exit_failure();
} }
sexp_port_sourcep(in) = 1; sexp_port_sourcep(in) = 1;
@ -370,8 +370,8 @@ void run_main (int argc, char **argv) {
tmp = check_exception(ctx, sexp_eval_string(ctx, impmod, -1, (c=='x' ? sexp_global(ctx, SEXP_G_META_ENV) : env))); tmp = check_exception(ctx, sexp_eval_string(ctx, impmod, -1, (c=='x' ? sexp_global(ctx, SEXP_G_META_ENV) : env)));
free(impmod); free(impmod);
if (c == 'x') { if (c == 'x') {
sexp_set_parameter(ctx, env, sexp_global(ctx, SEXP_G_INTERACTION_ENV_SYMBOL), tmp);
sexp_context_env(ctx) = env = tmp; sexp_context_env(ctx) = env = tmp;
sexp_set_parameter(ctx, env, sexp_global(ctx, SEXP_G_INTERACTION_ENV_SYMBOL), env);
} }
#endif #endif
break; break;
@ -475,7 +475,7 @@ void run_main (int argc, char **argv) {
args = sexp_cons(ctx, tmp=sexp_c_string(ctx,argv[j],-1), args); args = sexp_cons(ctx, tmp=sexp_c_string(ctx,argv[j],-1), args);
if (i >= argc || no_script) if (i >= argc || no_script)
args = sexp_cons(ctx, tmp=sexp_c_string(ctx,argv[0],-1), args); args = sexp_cons(ctx, tmp=sexp_c_string(ctx,argv[0],-1), args);
sexp_set_parameter(ctx, env, sym=sexp_intern(ctx, sexp_argv_symbol, -1), args); sexp_set_parameter(ctx, sexp_global(ctx, SEXP_G_META_ENV), sym=sexp_intern(ctx, sexp_argv_symbol, -1), args);
if (i >= argc && main_symbol == NULL) { if (i >= argc && main_symbol == NULL) {
/* no script or main, run interactively */ /* no script or main, run interactively */
repl(ctx, env); repl(ctx, env);