diff options
author | Andy Wingo <wingo@pobox.com> | 2013-06-25 22:36:08 +0200 |
---|---|---|
committer | Andy Wingo <wingo@pobox.com> | 2013-06-27 11:31:21 +0200 |
commit | 1773bc7dd5f4c8a1d13c7cf2015f3a04c9299eeb (patch) | |
tree | 3a645fa1af56c5572d7d0933792930592e84ab6f /libguile/eval.c | |
parent | 385049949aa52b8578334d073b2c63291a5d5274 (diff) | |
download | guile-1773bc7dd5f4c8a1d13c7cf2015f3a04c9299eeb.tar.gz |
Remove @prompt memoizer
* libguile/memoize.h:
* libguile/memoize.c (MAKMEMO_CALL_WITH_PROMPT, memoize, unmemoize):
Remove the @prompt memoizer in favor of recognizing call-with-prompt
primcalls. Rename SCM_M_PROMPT to SCM_M_CALL_WITH_PROMPT, and pass a
thunk instead of an expression so that it has normal applicative
order.
* libguile/expand.c (PRIMITIVE_REF, PRIMCALL, expand): Produce primcalls
from forms whose car is a primitive.
(expand_atat): Recognize (@@ primitive FOO) as being a primitive-ref.
* module/ice-9/boot-9.scm (call-with-prompt): Instead of dispatching to
the wonky @prompt memoizer, residualize a primcall to
call-with-prompt. The memoizer will DTRT to allow call-with-prompt to
be interpreted correctly without needing an additional binding.
* module/ice-9/eval.scm (primitive-eval): Change the 'prompt clause to a
call to call-with-prompt.
* module/language/tree-il/primitives.scm: No more need to recognize
@prompt.
* libguile/eval.c (eval): Adapt to SCM_M_PROMPT renaming to
SCM_M_CALL_WITH_PROMPT, and apply the thunk.
* libguile/throw.c (pre_init_throw): Adapt to scm_abort_to_prompt_star
rename.
Diffstat (limited to 'libguile/eval.c')
-rw-r--r-- | libguile/eval.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libguile/eval.c b/libguile/eval.c index f743ed78e..8494e10a0 100644 --- a/libguile/eval.c +++ b/libguile/eval.c @@ -436,7 +436,7 @@ eval (SCM x, SCM env) return SCM_UNSPECIFIED; } - case SCM_M_PROMPT: + case SCM_M_CALL_WITH_PROMPT: { SCM vm, k, res; scm_i_jmp_buf registers; @@ -465,7 +465,7 @@ eval (SCM x, SCM env) goto apply_proc; } - res = eval (CADR (mx), env); + res = scm_call_0 (eval (CADR (mx), env)); scm_dynstack_pop (&SCM_I_CURRENT_THREAD->dynstack); return res; } |