From 9c622fef676a8e616e64d3ecfa45a1d051ec3486 Mon Sep 17 00:00:00 2001 From: Alex Shinn Date: Wed, 29 May 2013 23:32:54 +0900 Subject: [PATCH] Renaming dynamic-wind point routines to avoid likely user names. --- lib/init-7.scm | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/lib/init-7.scm b/lib/init-7.scm index 26a81dff..95516766 100644 --- a/lib/init-7.scm +++ b/lib/init-7.scm @@ -579,14 +579,14 @@ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; dynamic-wind -(define make-point vector) -(define (point-depth point) (vector-ref point 0)) -(define (point-in point) (vector-ref point 1)) -(define (point-out point) (vector-ref point 2)) -(define (point-parent point) (vector-ref point 3)) +(define %make-point vector) +(define (%point-depth point) (vector-ref point 0)) +(define (%point-in point) (vector-ref point 1)) +(define (%point-out point) (vector-ref point 2)) +(define (%point-parent point) (vector-ref point 3)) (define root-point ; Shared among all state spaces - (make-point 0 + (%make-point 0 (lambda () (error "winding in to root!")) (lambda () (error "winding out of root!")) #f)) @@ -603,7 +603,7 @@ (define (dynamic-wind in body out) (in) (let ((here (%dk))) - (%dk (make-point (+ (point-depth here) 1) + (%dk (%make-point (+ (%point-depth here) 1) in out here)) @@ -616,12 +616,12 @@ (cond ((eq? here target) 'done) - ((< (point-depth here) (point-depth target)) - (travel-to-point! here (point-parent target)) - ((point-in target))) + ((< (%point-depth here) (%point-depth target)) + (travel-to-point! here (%point-parent target)) + ((%point-in target))) (else - ((point-out here)) - (travel-to-point! (point-parent here) target)))) + ((%point-out here)) + (travel-to-point! (%point-parent here) target)))) (define (continuation->procedure cont point) (lambda res