mirror of
https://git.savannah.gnu.org/git/guile.git
synced 2025-06-24 12:20:20 +02:00
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.
This commit is contained in:
parent
0fcc39a0a9
commit
bb97e4abd4
17 changed files with 108 additions and 280 deletions
|
@ -104,8 +104,6 @@
|
|||
(($ <conditional> _ test consequent alternate)
|
||||
(and (singly-valued-expression? consequent)
|
||||
(singly-valued-expression? alternate)))
|
||||
(($ <dynwind> _ winder body unwinder)
|
||||
(singly-valued-expression? body))
|
||||
(else #f)))
|
||||
|
||||
(define (truncate-values x)
|
||||
|
@ -543,10 +541,6 @@ top-level bindings from ENV and return the resulting expression."
|
|||
(($ <prompt>) #f)
|
||||
(($ <abort>) #f)
|
||||
|
||||
;; Bail on dynwinds, as that would cause the consumer to run in
|
||||
;; the wrong dynamic context.
|
||||
(($ <dynwind>) #f)
|
||||
|
||||
;; Propagate to tail positions.
|
||||
(($ <let> src names gensyms vals body)
|
||||
(let ((body (loop body)))
|
||||
|
@ -1002,11 +996,6 @@ top-level bindings from ENV and return the resulting expression."
|
|||
(else #f))))
|
||||
(_ #f))
|
||||
(make-let-values lv-src producer (for-tail consumer)))))
|
||||
(($ <dynwind> src winder body unwinder)
|
||||
(make-dynwind src
|
||||
(for-value winder)
|
||||
(for-tail body)
|
||||
(for-value unwinder)))
|
||||
(($ <dynlet> src fluids vals body)
|
||||
(make-dynlet src (map for-value fluids) (map for-value vals)
|
||||
(for-tail body)))
|
||||
|
@ -1169,13 +1158,29 @@ top-level bindings from ENV and return the resulting expression."
|
|||
(list w u) 2
|
||||
(match-lambda
|
||||
((w u)
|
||||
(make-seq src
|
||||
(make-call src w '())
|
||||
(make-begin0 src
|
||||
(make-dynwind src w
|
||||
(make-call src thunk '())
|
||||
u)
|
||||
(make-call src u '()))))))))
|
||||
(make-seq
|
||||
src
|
||||
(make-seq
|
||||
src
|
||||
(make-conditional
|
||||
src
|
||||
;; fixme: introduce logic to fold thunk?
|
||||
(make-primcall src 'thunk? (list u))
|
||||
(make-call src w '())
|
||||
(make-primcall
|
||||
src 'scm-error
|
||||
(list
|
||||
(make-const #f 'wrong-type-arg)
|
||||
(make-const #f "dynamic-wind")
|
||||
(make-const #f "Wrong type (expecting thunk): ~S")
|
||||
(make-primcall #f 'list (list u))
|
||||
(make-primcall #f 'list (list u)))))
|
||||
(make-primcall src 'wind (list w u)))
|
||||
(make-begin0 src
|
||||
(make-call src thunk '())
|
||||
(make-seq src
|
||||
(make-primcall src 'unwind '())
|
||||
(make-call src u '())))))))))
|
||||
|
||||
(($ <primcall> src 'values exps)
|
||||
(cond
|
||||
|
@ -1244,6 +1249,15 @@ top-level bindings from ENV and return the resulting expression."
|
|||
((name . args)
|
||||
(make-primcall src name args))))))
|
||||
|
||||
(($ <primcall> src 'thunk? (proc))
|
||||
(match (for-value proc)
|
||||
(($ <lambda> _ _ ($ <lambda-case> _ req))
|
||||
(for-tail (make-const src (null? req))))
|
||||
(proc
|
||||
(case ctx
|
||||
((effect) (make-void src))
|
||||
(else (make-primcall src 'thunk? (list proc)))))))
|
||||
|
||||
(($ <primcall> src (? accessor-primitive? name) args)
|
||||
(match (cons name (map for-value args))
|
||||
;; FIXME: these for-tail recursions could take place outside
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue