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

Fixing -m module loading.

Browse source
This commit is contained in:
Alex Shinn 2014-02-05 20:43:49 +09:00
parent 715d2ce984
commit be778009e2
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
main.c
View file

@ -319,20 +319,24 @@ static sexp check_exception (sexp ctx, sexp res) {
} }
static sexp sexp_load_standard_repl_env (sexp ctx, sexp env, sexp k, int bootp) { static sexp sexp_load_standard_repl_env (sexp ctx, sexp env, sexp k, int bootp) {
sexp_gc_var1(e); sexp_gc_var3(e, sym, tmp);
sexp_gc_preserve1(ctx, e); sexp_gc_preserve3(ctx, e, sym, tmp);
e = sexp_load_standard_env(ctx, env, k); e = sexp_load_standard_env(ctx, env, k);
if (!sexp_exceptionp(e)) { if (!sexp_exceptionp(e)) {
#if SEXP_USE_MODULES #if SEXP_USE_MODULES
if (!bootp) { if (!bootp) {
e = sexp_eval_string(ctx, sexp_default_environment, -1, sexp_global(ctx, SEXP_G_META_ENV)); e = sexp_eval_string(ctx, sexp_default_environment, -1, sexp_global(ctx, SEXP_G_META_ENV));
sym = sexp_intern(ctx, "repl-import", -1);
tmp = sexp_env_ref(ctx, sexp_meta_env(ctx), sym, SEXP_VOID);
sym = sexp_intern(ctx, "import", -1);
sexp_env_define(ctx, e, sym, tmp);
} }
#endif #endif
if (!sexp_exceptionp(e)) { if (!sexp_exceptionp(e)) {
e = sexp_load_standard_params(ctx, e); e = sexp_load_standard_params(ctx, e);
} }
} }
sexp_gc_release1(ctx); sexp_gc_release3(ctx);
return e; return e;
} }
@ -545,10 +549,6 @@ void run_main (int argc, char **argv) {
sexp_set_parameter(ctx, sexp_meta_env(ctx), sym=sexp_intern(ctx, sexp_argv_symbol, -1), args); sexp_set_parameter(ctx, sexp_meta_env(ctx), 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 */
sym = sexp_intern(ctx, "repl-import", -1);
tmp = sexp_env_ref(ctx, sexp_meta_env(ctx), sym, SEXP_VOID);
sym = sexp_intern(ctx, "import", -1);
sexp_env_define(ctx, env, sym, tmp);
repl(ctx, env); repl(ctx, env);
} else { } else {
#if SEXP_USE_MODULES #if SEXP_USE_MODULES