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/throw.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/throw.c')
-rw-r--r-- | libguile/throw.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libguile/throw.c b/libguile/throw.c index ae131d0ad..de157faa2 100644 --- a/libguile/throw.c +++ b/libguile/throw.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1995,1996,1997,1998,2000,2001, 2003, 2004, 2006, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. +/* Copyright (C) 1995,1996,1997,1998,2000,2001, 2003, 2004, 2006, 2008, 2009, 2010, 2011, 2012, 2013 Free Software Foundation, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License @@ -510,7 +510,7 @@ static SCM pre_init_throw (SCM k, SCM args) { if (find_pre_init_catch ()) - return scm_at_abort (sym_pre_init_catch_tag, scm_cons (k, args)); + return scm_abort_to_prompt_star (sym_pre_init_catch_tag, scm_cons (k, args)); else { static int error_printing_error = 0; |