diff options
author | Andy Wingo <wingo@pobox.com> | 2013-06-27 18:49:21 +0200 |
---|---|---|
committer | Andy Wingo <wingo@pobox.com> | 2013-06-27 22:02:43 +0200 |
commit | bb97e4abd49e8094e9eb8bf767c696bf7ee1ba7e (patch) | |
tree | 4a266c032b794c87f7ebd8f8101339b21f51607d /libguile/eval.c | |
parent | 0fcc39a0a962e44d509dbb659529165c7ce5b91d (diff) | |
download | guile-bb97e4abd49e8094e9eb8bf767c696bf7ee1ba7e.tar.gz |
dynamic-wind in terms of wind and unwind; remove <dynwind>, @dynamic-wind
* doc/ref/compiler.texi: Remove mention of <dynwind>.
* libguile/eval.c (eval): Remove SCM_M_DYNWIND case.
* libguile/expand.c: Remove scm_sym_at_dynamic_wind.
* libguile/memoize.c (do_wind, do_unwind): A couple of hacky subrs. If
we see a wind or unwind primcall, we expand to a call of a quoted subr
value. It works and removes a kind of memoized value from the
interpreter. For the compiler,primcalls to wind and unwind are
handled specially.
(MAKMEMO_DYNWIND): Remove.
(scm_tc16_memoizer): Remove. Yay!
(memoize): Remove speculative lookup for toplevels to see if they are
memoizers: there are no more memoizers. Memoize calls to the wind and
unwind primitives.
(m_dynamic_wind): Remove.
(unmemoize): Remove dynwind case.
(scm_init_memoize): Add wind and unwind local definitions.
* module/ice-9/boot-9.scm (dynamic-wind): Reimplement in terms of "wind"
and "unwind" primitives. These primitives are not exposed to other
modules.
* module/ice-9/eval.scm (primitive-eval): Remove dynwind case.
* module/language/scheme/decompile-tree-il.scm (do-decompile):
(choose-output-names): Remove dynwind cases.
* module/language/tree-il.scm: Remove <dynwind>. Yaaay!
* module/language/tree-il/analyze.scm (analyze-lexicals): Remove dynwind
cases.
* module/language/tree-il/compile-glil.scm (*primcall-ops*): Add wind
and unwind.
(flatten-lambda-case): Remove dynwind case. Yay!
* module/language/tree-il/cse.scm (cse):
* module/language/tree-il/debug.scm (verify-tree-il):
* module/language/tree-il/effects.scm (make-effects-analyzer):
* module/language/tree-il/peval.scm (singly-valued-expression?, peval):
Remove <dywind> cases. Inline primcalls to dynamic-wind. Add
constant folding for thunk?.
* module/language/tree-il/primitives.scm (*interesting-primitive-names*):
Remove @dynamic-wind, and add procedure? and thunk?.
(*effect+exception-free-primitives*): Add procedure? and thunk?.
(*multiply-valued-primitives*): Remove @dynamic-wind.
Remove @dynamic-wind expander.
* test-suite/tests/peval.test ("partial evaluation"): Update tests for
dynwind desugaring.
Diffstat (limited to 'libguile/eval.c')
-rw-r--r-- | libguile/eval.c | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/libguile/eval.c b/libguile/eval.c index 162fd54dc..ca0f731f9 100644 --- a/libguile/eval.c +++ b/libguile/eval.c @@ -265,20 +265,6 @@ eval (SCM x, SCM env) scm_define (CAR (mx), EVAL1 (CDR (mx), env)); return SCM_UNSPECIFIED; - case SCM_M_DYNWIND: - { - SCM in, out, res; - scm_i_thread *t = SCM_I_CURRENT_THREAD; - in = EVAL1 (CAR (mx), env); - out = EVAL1 (CDDR (mx), env); - scm_call_0 (in); - scm_dynstack_push_dynwind (&t->dynstack, in, out); - res = eval (CADR (mx), env); - scm_dynstack_pop (&t->dynstack); - scm_call_0 (out); - return res; - } - case SCM_M_WITH_FLUIDS: { long i, len; |