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/throw.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/throw.c')
-rw-r--r-- | libguile/throw.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/libguile/throw.c b/libguile/throw.c index 04bcba83e..595e3beac 100644 --- a/libguile/throw.c +++ b/libguile/throw.c @@ -498,6 +498,9 @@ scm_ithrow (SCM key, SCM args, int noreturn SCM_UNUSED) /* Unfortunately we have to support catch and throw before boot-9 has, um, booted. So here are lame versions, which will get replaced with their scheme equivalents. */ + +SCM_SYMBOL (sym_pre_init_catch_tag, "%pre-init-catch-tag"); + static SCM pre_init_catch (SCM tag, SCM thunk, SCM handler, SCM pre_unwind_handler) { @@ -510,7 +513,7 @@ pre_init_catch (SCM tag, SCM thunk, SCM handler, SCM pre_unwind_handler) abort (); vm = scm_the_vm (); - prompt = scm_c_make_prompt (scm_fluid_ref (scm_sys_default_prompt_tag), + prompt = scm_c_make_prompt (sym_pre_init_catch_tag, SCM_VM_DATA (vm)->fp, SCM_VM_DATA (vm)->sp, SCM_VM_DATA (vm)->ip, 1, -1, scm_i_dynwinds ()); scm_i_set_dynwinds (scm_cons (prompt, SCM_PROMPT_DYNWINDS (prompt))); @@ -532,7 +535,7 @@ pre_init_catch (SCM tag, SCM thunk, SCM handler, SCM pre_unwind_handler) static SCM pre_init_throw (SCM args) { - return scm_at_abort (scm_fluid_ref (scm_sys_default_prompt_tag), args); + return scm_at_abort (sym_pre_init_catch_tag, args); } void |