summaryrefslogtreecommitdiff
path: root/libguile/vm-i-system.c
diff options
context:
space:
mode:
authorAndy Wingo <wingo@pobox.com>2010-02-18 23:56:12 +0100
committerAndy Wingo <wingo@pobox.com>2010-02-19 12:10:11 +0100
commit07a0c7d5d9523936d5fe4cac595bd75859416c9e (patch)
treeb9534ac4f124341beddeec1b67255fadf85892c9 /libguile/vm-i-system.c
parentbcbbba866b56460d097dba17e0dbb0c53d9f9211 (diff)
downloadguile-07a0c7d5d9523936d5fe4cac595bd75859416c9e.tar.gz
<prompt> has no pre-unwind-handler, it's unnecessary
* libguile/control.h: * libguile/control.c (scm_c_make_prompt, SCM_PROMPT_PRE_UNWIND_HANDLER): * libguile/vm-i-system.c (prompt) * module/language/tree-il.scm (<prompt> prompt-pre-unwind-handler): * module/language/tree-il/analyze.scm: * module/language/tree-il/compile-glil.scm: * module/language/tree-il/inline.scm: * module/language/tree-il/primitives.scm: Remove the "pre-unwind" handler from prompt; it turns out not to be necessary. Adapt all references.
Diffstat (limited to 'libguile/vm-i-system.c')
-rw-r--r--libguile/vm-i-system.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/libguile/vm-i-system.c b/libguile/vm-i-system.c
index 003bdb443..15e339492 100644
--- a/libguile/vm-i-system.c
+++ b/libguile/vm-i-system.c
@@ -1450,16 +1450,15 @@ VM_DEFINE_INSTRUCTION (82, make_symbol, "make-symbol", 0, 1, 1)
NEXT;
}
-VM_DEFINE_INSTRUCTION (83, prompt, "prompt", 5, 3, 0)
+VM_DEFINE_INSTRUCTION (83, prompt, "prompt", 5, 2, 0)
{
scm_t_int32 offset;
scm_t_uint8 inline_handler_p, escape_only_p;
- SCM k, handler, pre_unwind, prompt;
+ SCM k, handler, prompt;
inline_handler_p = FETCH ();
escape_only_p = FETCH ();
FETCH_OFFSET (offset);
- POP (pre_unwind);
POP (handler);
POP (k);
@@ -1467,8 +1466,7 @@ VM_DEFINE_INSTRUCTION (83, prompt, "prompt", 5, 3, 0)
/* Push the prompt onto the dynamic stack. The setjmp itself has to be local
to this procedure. */
/* FIXME: do more error checking */
- prompt = scm_c_make_prompt (vm, k, handler, pre_unwind,
- inline_handler_p, escape_only_p);
+ prompt = scm_c_make_prompt (vm, k, handler, inline_handler_p, escape_only_p);
scm_i_set_dynwinds (scm_cons (prompt, scm_i_dynwinds ()));
if (SCM_PROMPT_SETJMP (prompt))
{