summaryrefslogtreecommitdiff
path: root/libguile/eval.c
diff options
context:
space:
mode:
authorAndy Wingo <wingo@pobox.com>2013-11-21 18:09:29 +0100
committerAndy Wingo <wingo@pobox.com>2013-11-21 18:09:29 +0100
commit4fcbc1b0d8207df2dafce5fa80b942366d0ed7ed (patch)
tree77e824c778766e940def7446afaf2f3b44780d93 /libguile/eval.c
parent9b4c3ab5fa293310a7853d99768426b7dba4005b (diff)
downloadguile-4fcbc1b0d8207df2dafce5fa80b942366d0ed7ed.tar.gz
scm_i_prompt_pop_abort_args_x takes struct scm_vm* as arg
* libguile/control.h: * libguile/control.c (scm_i_prompt_pop_abort_args_x): Change to take VP as an arg, not VM. * libguile/eval.c (eval): * libguile/throw.c (pre_init_catch): Adapt.
Diffstat (limited to 'libguile/eval.c')
-rw-r--r--libguile/eval.c24
1 files changed, 13 insertions, 11 deletions
diff --git a/libguile/eval.c b/libguile/eval.c
index 7b09d84f7..d4d1085af 100644
--- a/libguile/eval.c
+++ b/libguile/eval.c
@@ -438,7 +438,8 @@ eval (SCM x, SCM env)
case SCM_M_CALL_WITH_PROMPT:
{
- SCM vm, k, res;
+ struct scm_vm *vp;
+ SCM k, res;
scm_i_jmp_buf registers;
/* We need the handler after nonlocal return to the setjmp, so
make sure it is volatile. */
@@ -446,23 +447,24 @@ eval (SCM x, SCM env)
k = EVAL1 (CAR (mx), env);
handler = EVAL1 (CDDR (mx), env);
- vm = scm_the_vm ();
+ vp = SCM_VM_DATA (scm_the_vm ());
/* Push the prompt onto the dynamic stack. */
- scm_dynstack_push_prompt
- (&SCM_I_CURRENT_THREAD->dynstack,
- SCM_F_DYNSTACK_PROMPT_ESCAPE_ONLY | SCM_F_DYNSTACK_PROMPT_PUSH_NARGS,
- k,
- SCM_VM_DATA (vm)->fp - SCM_VM_DATA (vm)->stack_base,
- SCM_VM_DATA (vm)->sp - SCM_VM_DATA (vm)->stack_base,
- SCM_VM_DATA (vm)->ip,
- &registers);
+ scm_dynstack_push_prompt (&SCM_I_CURRENT_THREAD->dynstack,
+ SCM_F_DYNSTACK_PROMPT_ESCAPE_ONLY
+ | SCM_F_DYNSTACK_PROMPT_PUSH_NARGS,
+ k,
+ vp->fp - vp->stack_base,
+ vp->sp - vp->stack_base,
+ vp->ip,
+ &registers);
if (SCM_I_SETJMP (registers))
{
/* The prompt exited nonlocally. */
proc = handler;
- args = scm_i_prompt_pop_abort_args_x (scm_the_vm ());
+ vp = SCM_VM_DATA (scm_the_vm ());
+ args = scm_i_prompt_pop_abort_args_x (vp);
goto apply_proc;
}