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

"--" doesn't necessarily imply no script.

Browse source 
Fixes issue #237.
This commit is contained in:
Alex Shinn 2014-08-25 23:25:37 +09:00
parent d10de2f613
commit 176a633feb
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
main.c
View file

@ -390,7 +390,7 @@ void run_main (int argc, char **argv) {
char *arg; char *arg;
const char *prefix=NULL, *suffix=NULL, *main_symbol=NULL, *main_module=NULL; const char *prefix=NULL, *suffix=NULL, *main_symbol=NULL, *main_module=NULL;
sexp_sint_t i, j, c, quit=0, print=0, init_loaded=0, mods_loaded=0, sexp_sint_t i, j, c, quit=0, print=0, init_loaded=0, mods_loaded=0,
no_script=0, fold_case=SEXP_DEFAULT_FOLD_CASE_SYMS; fold_case=SEXP_DEFAULT_FOLD_CASE_SYMS;
sexp_uint_t heap_size=0, heap_max_size=SEXP_MAXIMUM_HEAP_SIZE; sexp_uint_t heap_size=0, heap_max_size=SEXP_MAXIMUM_HEAP_SIZE;
sexp out=SEXP_FALSE, ctx=NULL; sexp out=SEXP_FALSE, ctx=NULL;
sexp_gc_var4(tmp, sym, args, env); sexp_gc_var4(tmp, sym, args, env);
@ -482,7 +482,6 @@ void run_main (int argc, char **argv) {
case '-': case '-':
if (argv[i][2] == '\0') { if (argv[i][2] == '\0') {
i++; i++;
no_script = 1;
goto done_options; goto done_options;
} }
sexp_usage(1); sexp_usage(1);
@ -585,7 +584,7 @@ void run_main (int argc, char **argv) {
if (i < argc) if (i < argc)
for (j=argc-1; j>=i; j--) for (j=argc-1; j>=i; j--)
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)
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, 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) {
@ -606,7 +605,7 @@ void run_main (int argc, char **argv) {
} }
} else } else
#endif #endif
if (i < argc && !no_script) { /* script usage */ if (i < argc) { /* script usage */
#if SEXP_USE_MODULES #if SEXP_USE_MODULES
/* reset the environment to have only the `import' and */ /* reset the environment to have only the `import' and */
/* `cond-expand' bindings */ /* `cond-expand' bindings */