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

Supporting (chibi repl) advise from main.c.

Browse source
This commit is contained in:
Alex Shinn 2013-10-03 23:34:17 +09:00
parent 3b7a042d61
commit 8b15884658
2 changed files with 23 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/chibi/features.h
View file

@ -641,6 +641,10 @@
#define SEXP_USE_MAIN_HELP ! SEXP_USE_NO_FEATURES #define SEXP_USE_MAIN_HELP ! SEXP_USE_NO_FEATURES
#endif #endif
#ifndef SEXP_USE_MAIN_ERROR_ADVISE
#define SEXP_USE_MAIN_ERROR_ADVISE ! SEXP_USE_NO_FEATURES
#endif
#ifndef SEXP_USE_SEND_FILE #ifndef SEXP_USE_SEND_FILE
#define SEXP_USE_SEND_FILE (__linux || SEXP_BSD) #define SEXP_USE_SEND_FILE (__linux || SEXP_BSD)
#endif #endif

20
main.c
View file

@ -11,6 +11,7 @@
#define sexp_environment_prefix "(environment '(" #define sexp_environment_prefix "(environment '("
#define sexp_environment_suffix "))" #define sexp_environment_suffix "))"
#define sexp_default_environment "(environment '(scheme base))" #define sexp_default_environment "(environment '(scheme base))"
#define sexp_advice_environment "(load-module '(chibi repl))"
#define sexp_version_string "chibi-scheme "sexp_version" \""sexp_release_name"\" " #define sexp_version_string "chibi-scheme "sexp_version" \""sexp_release_name"\" "
@ -268,13 +269,30 @@ static void check_nonull_arg (int c, char *arg) {
} }
static sexp check_exception (sexp ctx, sexp res) { static sexp check_exception (sexp ctx, sexp res) {
sexp err; sexp_gc_var4(err, advise, sym, tmp);
if (res && sexp_exceptionp(res)) { if (res && sexp_exceptionp(res)) {
sexp_gc_preserve4(ctx, err, advise, sym, tmp);
tmp = res;
err = sexp_current_error_port(ctx); err = sexp_current_error_port(ctx);
if (! sexp_oportp(err)) if (! sexp_oportp(err))
err = sexp_make_output_port(ctx, stderr, SEXP_FALSE); err = sexp_make_output_port(ctx, stderr, SEXP_FALSE);
sexp_print_exception(ctx, res, err); sexp_print_exception(ctx, res, err);
sexp_stack_trace(ctx, err); sexp_stack_trace(ctx, err);
#if SEXP_USE_MAIN_ERROR_ADVISE
if (sexp_envp(sexp_global(ctx, SEXP_G_META_ENV))) {
advise = sexp_eval_string(ctx, sexp_advice_environment, -1, sexp_global(ctx, SEXP_G_META_ENV));
if (sexp_vectorp(advise)) {
advise = sexp_vector_ref(advise, SEXP_ONE);
if (sexp_envp(advise)) {
sym = sexp_intern(ctx, "repl-advise-exception", -1);
advise = sexp_env_ref(advise, sym, SEXP_FALSE);
if (sexp_procedurep(advise))
sexp_apply(ctx, advise, tmp=sexp_list2(ctx, res, err));
}
}
}
#endif
sexp_gc_release4(ctx);
exit_failure(); exit_failure();
} }
return res; return res;