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

Making new -x handling work with -e/-p.

Browse source 
Optimizing the -xchibi.primitive case to use -q (i.e. no file I/O).
This commit is contained in:
Alex Shinn 2013-09-29 11:15:29 +09:00
parent 5e4c6a8848
commit 008d13b294
1 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
main.c
View file

@ -213,15 +213,6 @@ static void repl (sexp ctx, sexp env) {
if (in == NULL || out == NULL || err == NULL) { if (in == NULL || out == NULL || err == NULL) {
fprintf(stderr, "Standard I/O ports not found, aborting. Maybe a bad -x language?\n"); fprintf(stderr, "Standard I/O ports not found, aborting. Maybe a bad -x language?\n");
exit_failure(); exit_failure();
} else if (!(sexp_iportp(in) && sexp_oportp(out) && sexp_oportp(err))) {
res = sexp_load_standard_params(ctx, env);
if (sexp_exceptionp(res)) {
fprintf(stderr, "Couldn't load standard parameters, aborting. Maybe a bad -x language?\n");
exit_failure();
}
in = sexp_param_ref(ctx, env, sexp_global(ctx, SEXP_G_CUR_IN_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));
} }
sexp_port_sourcep(in) = 1; sexp_port_sourcep(in) = 1;
while (1) { while (1) {
@ -362,10 +353,12 @@ void run_main (int argc, char **argv) {
prefix = sexp_environment_prefix; prefix = sexp_environment_prefix;
suffix = sexp_environment_suffix; suffix = sexp_environment_suffix;
case 'm': case 'm':
arg = ((argv[i][2] == '\0') ? argv[++i] : argv[i]+2);
if (c == 'x' && strcmp(arg, "chibi.primitive") == 0)
goto load_primitive;
if (c != 'x') {prefix = sexp_import_prefix; suffix = sexp_import_suffix;} if (c != 'x') {prefix = sexp_import_prefix; suffix = sexp_import_suffix;}
mods_loaded = 1; mods_loaded = 1;
load_init(); load_init();
arg = ((argv[i][2] == '\0') ? argv[++i] : argv[i]+2);
#if SEXP_USE_MODULES #if SEXP_USE_MODULES
check_nonull_arg(c, arg); check_nonull_arg(c, arg);
len = strlen(arg)+strlen(prefix)+strlen(suffix); len = strlen(arg)+strlen(prefix)+strlen(suffix);
@ -381,9 +374,13 @@ void run_main (int argc, char **argv) {
if (c == 'x') { if (c == 'x') {
sexp_set_parameter(ctx, env, sexp_global(ctx, SEXP_G_INTERACTION_ENV_SYMBOL), tmp); 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;
tmp = sexp_param_ref(ctx, env, sexp_global(ctx, SEXP_G_CUR_OUT_SYMBOL));
if (tmp != NULL && !sexp_oportp(tmp))
sexp_load_standard_ports(ctx, env, stdin, stdout, stderr, 0);
} }
#endif #endif
break; break;
load_primitive:
case 'q': case 'q':
init_context(); init_context();
mods_loaded = 1; mods_loaded = 1;