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

nicer error for bad images

Browse source
This commit is contained in:
Alex Shinn 2018-01-07 23:54:31 +09:00
parent fd3e1f10d3
commit f5b2ba6fe3
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
main.c
View file

@ -440,13 +440,15 @@ sexp run_main (int argc, char **argv) {
case 'i': case 'i':
arg = ((argv[i][2] == '\0') ? argv[++i] : argv[i]+2); arg = ((argv[i][2] == '\0') ? argv[++i] : argv[i]+2);
if (ctx) { if (ctx) {
fprintf(stderr, "-:i <file>: image files must be loaded first\n"); fprintf(stderr, "-i <file>: image files must be loaded before other command-line options are specified: %s\n", arg);
if (sexp_truep(sexp_global(ctx, SEXP_G_STRICT_P)))
exit_failure(); exit_failure();
} }
ctx = sexp_load_image(arg, 0, heap_size, heap_max_size); ctx = sexp_load_image(arg, 0, heap_size, heap_max_size);
if (!ctx || !sexp_contextp(ctx)) { if (!ctx || !sexp_contextp(ctx)) {
fprintf(stderr, "-:i <file>: couldn't open image file for reading: %s\n", arg); fprintf(stderr,
fprintf(stderr, " %s\n", sexp_load_image_err()); "-i <file>: image failed to load, ignoring: %s\n"
" %s", arg, sexp_load_image_err());
ctx = NULL; ctx = NULL;
} else { } else {
env = sexp_load_standard_params(ctx, sexp_context_env(ctx), nonblocking); env = sexp_load_standard_params(ctx, sexp_context_env(ctx), nonblocking);