mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-04-30 11:50:28 +02:00
Code Activity

$prompt is now its own kind of CPS term.

Browse source 
* module/language/cps.scm ($prompt): Rework to be its own term kind.
  Now $continue always continues to a single continuation.  Adapt
  callers.
This commit is contained in:
Andy Wingo 2018-01-03 17:17:23 +01:00
parent 29fee39c2a
commit ee15ca1455
22 changed files with 198 additions and 195 deletions
Download patch file Download diff file Expand all files Collapse all files

24
module/language/cps/utils.scm
View file

@ -200,12 +200,12 @@ disjoint, an error will be signalled."
(visit-cont kbody labels)))
(($ $kargs names syms term)
(match term
(($ $continue k src ($ $prompt escape? tag handler))
(visit-cont k (visit-cont handler labels)))
(($ $continue k)
(visit-cont k labels))
(($ $branch kf kt)
(visit-cont kf (visit-cont kt labels))))))))))))
(visit-cont kf (visit-cont kt labels)))
(($ $prompt k kh)
(visit-cont k (visit-cont kh labels))))))))))))
(define* (compute-reachable-functions conts #:optional (kfun 0))
"Compute a mapping LABEL->LABEL..., where each key is a reachable
@ -260,11 +260,9 @@ intset."
(match (intmap-ref conts label)
(($ $kargs names vars term)
(match term
(($ $continue k src exp)
(match exp
(($ $prompt escape? tag handler) (propagate2 k handler))
(_ (propagate1 k))))
(($ $branch kf kt) (propagate2 kf kt))))
(($ $continue k) (propagate1 k))
(($ $branch kf kt) (propagate2 kf kt))
(($ $prompt k kh) (propagate2 k kh))))
(($ $kreceive arity k)
(propagate1 k))
(($ $kfun src meta self tail clause)
@ -296,13 +294,9 @@ intset."
(add-pred kbody (if kalt (add-pred kalt preds) preds)))
(($ $kargs names syms term)
(match term
(($ $continue k src exp)
(add-pred k
(match exp
(($ $prompt _ _ k) (add-pred k preds))
(_ preds))))
(($ $branch kf kt)
(add-pred kf (add-pred kt preds)))))))
(($ $continue k) (add-pred k preds))
(($ $branch kf kt) (add-pred kf (add-pred kt preds)))
(($ $prompt k kh) (add-pred k (add-pred kh preds)))))))
(persistent-intmap
(intset-fold add-preds labels
(intset->intmap (lambda (label) '()) labels))))