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

rename <dynamic-wind> to <dynwind>

Browse source 
* module/language/tree-il.scm (<dynwind>): Rename from <dynamic-wind>.
* module/language/tree-il/analyze.scm:
* module/language/tree-il/primitives.scm:
* module/language/tree-il/compile-glil.scm: All accessors and callers
  changed.
This commit is contained in:
Andy Wingo 2010-02-18 17:23:49 +01:00
parent c08899ff24
commit 8da6ab34bd
4 changed files with 23 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

34
module/language/tree-il.scm
View file

@ -45,7 +45,7 @@
<letrec> letrec? make-letrec letrec-src letrec-names letrec-vars letrec-vals letrec-body
<fix> fix? make-fix fix-src fix-names fix-vars fix-vals fix-body
<let-values> let-values? make-let-values let-values-src let-values-exp let-values-body
<dynamic-wind> dynamic-wind? make-dynamic-wind dynamic-wind-src dynamic-wind-winder dynamic-wind-body dynamic-wind-unwinder
<dynwind> dynwind? make-dynwind dynwind-src dynwind-winder dynwind-body dynwind-unwinder
<prompt> prompt? make-prompt prompt-src prompt-tag prompt-body prompt-handler prompt-pre-unwind-handler
<control> control? make-control control-src control-tag control-type control-args
@ -78,7 +78,7 @@
(<letrec> names vars vals body)
(<fix> names vars vals body)
(<let-values> exp body)
(<dynamic-wind> winder body unwinder)
(<dynwind> winder body unwinder)
(<prompt> tag body handler pre-unwind-handler)
(<control> tag type args))
@ -171,8 +171,8 @@
((let-values ,exp ,body)
(make-let-values loc (retrans exp) (retrans body)))
((dynamic-wind ,winder ,body ,unwinder)
(make-dynamic-wind loc (retrans winder) (retrans body) (retrans unwinder)))
((dynwind ,winder ,body ,unwinder)
(make-dynwind loc (retrans winder) (retrans body) (retrans unwinder)))
((prompt ,tag ,body ,handler ,pre-unwind-handler)
(make-prompt loc (retrans tag) (retrans body) (retrans handler)
@ -245,8 +245,8 @@
((<let-values> exp body)
`(let-values ,(unparse-tree-il exp) ,(unparse-tree-il body)))
((<dynamic-wind> body winder unwinder)
`(dynamic-wind ,(unparse-tree-il body)
((<dynwind> body winder unwinder)
`(dynwind ,(unparse-tree-il body)
,(unparse-tree-il winder) ,(unparse-tree-il unwinder)))
((<prompt> tag body handler pre-unwind-handler)
@ -328,7 +328,7 @@
`(call-with-values (lambda () ,(tree-il->scheme exp))
,(tree-il->scheme (make-lambda #f '() body))))
((<dynamic-wind> body winder unwinder)
((<dynwind> body winder unwinder)
`(dynamic-wind ,(tree-il->scheme winder)
(lambda () ,(tree-il->scheme body))
,(tree-il->scheme unwinder)))
@ -395,7 +395,7 @@ This is an implementation of `foldts' as described by Andy Wingo in
(down tree result)))))
((<let-values> exp body)
(up tree (loop body (loop exp (down tree result)))))
((<dynamic-wind> body winder unwinder)
((<dynwind> body winder unwinder)
(up tree (loop unwinder
(loop winder
(loop body (down tree result))))))
@ -464,7 +464,7 @@ This is an implementation of `foldts' as described by Andy Wingo in
((<let-values> exp body)
(let*-values (((seed ...) (foldts exp seed ...)))
(foldts body seed ...)))
((<dynamic-wind> body winder unwinder)
((<dynwind> body winder unwinder)
(let*-values (((seed ...) (foldts body seed ...))
((seed ...) (foldts winder seed ...)))
(foldts unwinder seed ...)))
@ -534,10 +534,10 @@ This is an implementation of `foldts' as described by Andy Wingo in
(set! (let-values-exp x) (lp exp))
(set! (let-values-body x) (lp body)))
((<dynamic-wind> body winder unwinder)
(set! (dynamic-wind-body x) (lp body))
(set! (dynamic-wind-winder x) (lp winder))
(set! (dynamic-wind-unwinder x) (lp unwinder)))
((<dynwind> body winder unwinder)
(set! (dynwind-body x) (lp body))
(set! (dynwind-winder x) (lp winder))
(set! (dynwind-unwinder x) (lp unwinder)))
((<prompt> tag body handler pre-unwind-handler)
(set! (prompt-tag x) (lp tag))
@ -606,10 +606,10 @@ This is an implementation of `foldts' as described by Andy Wingo in
(set! (let-values-exp x) (lp exp))
(set! (let-values-body x) (lp body)))
((<dynamic-wind> body winder unwinder)
(set! (dynamic-wind-body x) (lp body))
(set! (dynamic-wind-winder x) (lp winder))
(set! (dynamic-wind-unwinder x) (lp unwinder)))
((<dynwind> body winder unwinder)
(set! (dynwind-body x) (lp body))
(set! (dynwind-winder x) (lp winder))
(set! (dynwind-unwinder x) (lp unwinder)))
((<prompt> tag body handler pre-unwind-handler)
(set! (prompt-tag x) (lp tag))

4
module/language/tree-il/analyze.scm
View file

@ -336,7 +336,7 @@
((<let-values> exp body)
(lset-union eq? (step exp) (step body)))
((<dynamic-wind> body winder unwinder)
((<dynwind> body winder unwinder)
(lset-union eq? (step body) (step winder) (step unwinder)))
((<prompt> tag body handler pre-unwind-handler)
@ -497,7 +497,7 @@
((<let-values> exp body)
(max (recur exp) (recur body)))
((<dynamic-wind> body winder unwinder)
((<dynwind> body winder unwinder)
(max (recur body) (recur winder) (recur unwinder)))
((<prompt> tag body handler pre-unwind-handler)

2
module/language/tree-il/compile-glil.scm
View file

@ -915,7 +915,7 @@
;; to have body's return value(s) on the stack while the unwinder runs,
;; then proceed with returning or dropping or what-have-you, interacting
;; with RA and MVRA. What have you, I say.
((<dynamic-wind> src body winder unwinder)
((<dynwind> src body winder unwinder)
(comp-push winder)
(comp-push unwinder)
(comp-drop (make-application src winder '()))

6
module/language/tree-il/primitives.scm
View file

@ -382,7 +382,7 @@
'(pre post)
(list PRE POST)
(list pre post)
(make-dynamic-wind
(make-dynwind
src
(make-lexical-ref #f 'pre PRE)
(make-application #f thunk '())
@ -396,7 +396,7 @@
'(pre thunk post)
(list PRE THUNK POST)
(list pre thunk post)
(make-dynamic-wind
(make-dynwind
src
(make-lexical-ref #f 'pre PRE)
(make-application #f (make-lexical-ref #f 'thunk THUNK) '())
@ -414,7 +414,7 @@
'(pre post)
(list PRE POST)
(list pre post)
(make-dynamic-wind
(make-dynwind
src
(make-lexical-ref #f 'pre PRE)
expr