diff options
author | Andy Wingo <wingo@pobox.com> | 2010-03-11 22:31:29 +0100 |
---|---|---|
committer | Andy Wingo <wingo@pobox.com> | 2010-03-11 22:31:29 +0100 |
commit | c6a32a2cd59190dcf17c7fb3022588f56079a03e (patch) | |
tree | 7bd8d2b30f2acf1276b43b9985c251b90a0bfe68 /libguile/control.c | |
parent | 8fc43b12c71789030d9058fea8b6eff5490dec27 (diff) | |
download | guile-c6a32a2cd59190dcf17c7fb3022588f56079a03e.tar.gz |
remove internal treatment of default prompt tag, it seems there was no need
* libguile/control.h (scm_sys_default_prompt_tag):
* libguile/control.c (scm_init_control): Remove the logic that defined
%default-prompt-tag.
(scm_c_abort): Remove check for default prompt tag, it wasn't useful.
* libguile/throw.c (sym_pre_init_catch_tag): Define as the pre-init
prompt tag.
(pre_init_catch, pre_init_throw): Use sym_pre_init_catch_tag.
* module/ice-9/boot-9.scm (default-prompt-tag): Define as a simple
value, not a fluid. Perhaps we can expose it as a fluid later.
Diffstat (limited to 'libguile/control.c')
-rw-r--r-- | libguile/control.c | 19 |
1 files changed, 2 insertions, 17 deletions
diff --git a/libguile/control.c b/libguile/control.c index 7e51e1e38..78a325674 100644 --- a/libguile/control.c +++ b/libguile/control.c @@ -28,8 +28,6 @@ -SCM scm_sys_default_prompt_tag; - SCM scm_c_make_prompt (SCM k, SCM *fp, SCM *sp, scm_t_uint8 *abort_ip, @@ -207,19 +205,9 @@ scm_c_abort (SCM vm, SCM tag, size_t n, SCM *argv, scm_t_int64 cookie) } } - /* If we didn't find anything, print a message and abort the process - right here. If you don't want this, establish a catch-all around - any code that might throw up. */ + /* If we didn't find anything, raise an error. */ if (scm_is_false (prompt)) - { - if (scm_is_eq (tag, scm_fluid_ref (scm_sys_default_prompt_tag))) - { - fprintf (stderr, "No prompt found for abort to default prompt tag!\n"); - abort (); - } - else - scm_misc_error ("abort", "abort to unknown tag", scm_list_1 (tag)); - } + scm_misc_error ("abort", "abort to unknown tag", scm_list_1 (tag)); cont = reify_partial_continuation (vm, prompt, winds, cookie); @@ -285,9 +273,6 @@ void scm_init_control (void) { #include "libguile/control.x" - scm_sys_default_prompt_tag = scm_make_fluid (); - scm_fluid_set_x (scm_sys_default_prompt_tag, scm_gensym (SCM_UNDEFINED)); - scm_c_define ("%default-prompt-tag", scm_sys_default_prompt_tag); } /* |