mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-06-16 16:50:21 +02:00
Code Activity

Remove @prompt memoizer

Browse source 
* 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.
This commit is contained in:
Andy Wingo 2013-06-25 22:36:08 +02:00
parent 385049949a
commit 1773bc7dd5
8 changed files with 56 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

4
libguile/eval.c
View file

@ -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;
}