diff options
author | Andy Wingo <wingo@pobox.com> | 2010-02-18 17:23:49 +0100 |
---|---|---|
committer | Andy Wingo <wingo@pobox.com> | 2010-02-18 22:15:43 +0100 |
commit | 8da6ab34bd23f27eb257936925cf81e89c26ff4e (patch) | |
tree | 63805f18c292e5061ab34eda2ad64bd09814041c | |
parent | c08899ff24932b96573093d490160591e446b8a0 (diff) | |
download | guile-8da6ab34bd23f27eb257936925cf81e89c26ff4e.tar.gz |
rename <dynamic-wind> to <dynwind>
* 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.
-rw-r--r-- | module/language/tree-il.scm | 34 | ||||
-rw-r--r-- | module/language/tree-il/analyze.scm | 4 | ||||
-rw-r--r-- | module/language/tree-il/compile-glil.scm | 2 | ||||
-rw-r--r-- | module/language/tree-il/primitives.scm | 6 |
4 files changed, 23 insertions, 23 deletions
diff --git a/module/language/tree-il.scm b/module/language/tree-il.scm index 9bb7c3722..863d240a3 100644 --- a/module/language/tree-il.scm +++ b/module/language/tree-il.scm @@ -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)) diff --git a/module/language/tree-il/analyze.scm b/module/language/tree-il/analyze.scm index 1143dabea..dc29c34fe 100644 --- a/module/language/tree-il/analyze.scm +++ b/module/language/tree-il/analyze.scm @@ -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) diff --git a/module/language/tree-il/compile-glil.scm b/module/language/tree-il/compile-glil.scm index 7148e1e25..6e3407427 100644 --- a/module/language/tree-il/compile-glil.scm +++ b/module/language/tree-il/compile-glil.scm @@ -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 '())) diff --git a/module/language/tree-il/primitives.scm b/module/language/tree-il/primitives.scm index 58119b68b..2593426e0 100644 --- a/module/language/tree-il/primitives.scm +++ b/module/language/tree-il/primitives.scm @@ -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 |