summaryrefslogtreecommitdiff
path: root/libguile/throw.c
diff options
context:
space:
mode:
authorAndy Wingo <wingo@pobox.com>2010-02-26 13:05:25 +0100
committerAndy Wingo <wingo@pobox.com>2010-02-26 13:05:25 +0100
commitadbdfd6d2418b1404af48d480c2273f501517d6e (patch)
tree9624620bcedfbdd1cc29a9454b2cbcfdebdf808b /libguile/throw.c
parent416f26c7534a018c59f1c8d888dc9153f42d86d1 (diff)
downloadguile-adbdfd6d2418b1404af48d480c2273f501517d6e.tar.gz
rewinding prompts works
* libguile/control.h (SCM_PROMPT_HANDLER): Remove, it was unused. (SCM_PROMPT_DYNWINDS): Rename from SCM_PROMPT_DYNENV. * libguile/control.c: (scm_c_make_prompt): Take another arg, the winds that are to be in place for the prompt. Fix allocation to be 4 words instead of 5 (the handler was never used). * libguile/eval.c (eval): * libguile/throw.c (pre_init_catch): Adapt to scm_c_make_prompt change. * libguile/vm-i-system.c (partial-cont-call): Grovel the new elements of the wind list in order to call setjmp() on the new prompts. Pass cookie to vm_reinstate_partial_continuation. (prompt): Adapt to scm_c_make_prompt change. * libguile/vm.c (vm_reinstate_partial_continuation): Take a cookie arg, used when winding captured prompts onto the stack. Winding a prompt implies making a new prompt, actually -- with new registers, a new jump buffer, new winds, etc. * test-suite/tests/control.test ("rewinding prompts"): Add a test for rewinding prompts.
Diffstat (limited to 'libguile/throw.c')
-rw-r--r--libguile/throw.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libguile/throw.c b/libguile/throw.c
index 7f6564570..04bcba83e 100644
--- a/libguile/throw.c
+++ b/libguile/throw.c
@@ -512,8 +512,8 @@ pre_init_catch (SCM tag, SCM thunk, SCM handler, SCM pre_unwind_handler)
vm = scm_the_vm ();
prompt = scm_c_make_prompt (scm_fluid_ref (scm_sys_default_prompt_tag),
SCM_VM_DATA (vm)->fp, SCM_VM_DATA (vm)->sp,
- SCM_VM_DATA (vm)->ip, 1, -1);
- scm_i_set_dynwinds (scm_cons (prompt, scm_i_dynwinds ()));
+ SCM_VM_DATA (vm)->ip, 1, -1, scm_i_dynwinds ());
+ scm_i_set_dynwinds (scm_cons (prompt, SCM_PROMPT_DYNWINDS (prompt)));
if (SCM_PROMPT_SETJMP (prompt))
{