From 9e969476e1b366a62b9c866eb100360c95b7144f Mon Sep 17 00:00:00 2001 From: "Henry M. Wu" Date: Thu, 28 May 1992 18:58:44 +0000 Subject: [PATCH] Delayed expansion of rewritten directory name till use time. --- v7/src/runtime/infutl.scm | 20 ++++++++++---------- v8/src/runtime/infutl.scm | 20 ++++++++++---------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/v7/src/runtime/infutl.scm b/v7/src/runtime/infutl.scm index 3d4342b1d..5c6b82a47 100644 --- a/v7/src/runtime/infutl.scm +++ b/v7/src/runtime/infutl.scm @@ -1,6 +1,6 @@ #| -*-Scheme-*- -$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/runtime/infutl.scm,v 1.38 1992/05/28 18:40:00 mhwu Exp $ +$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/runtime/infutl.scm,v 1.39 1992/05/28 18:58:44 mhwu Exp $ Copyright (c) 1988-91 Massachusetts Institute of Technology @@ -245,8 +245,7 @@ MIT in each case. |# '()) (define (add-directory-rewriting-rule! match replace) - (let ((match (merge-pathnames match)) - (replace (merge-pathnames replace))) + (let ((match (merge-pathnames match))) (let ((rule (list-search-positive directory-rewriting-rules (lambda (rule) @@ -266,13 +265,14 @@ MIT in each case. |# (directory-prefix? (pathname-directory pathname) (pathname-directory (car rule))))))) (if rule - (pathname-new-device - (pathname-new-directory - pathname - (append (pathname-directory (cdr rule)) - (list-tail (pathname-directory pathname) - (length (pathname-directory (car rule)))))) - (pathname-device (cdr rule))) + (let ((replacement-directory (merge-pathnames (cdr rule)))) + (pathname-new-device + (pathname-new-directory + pathname + (append (pathname-directory replacement-directory) + (list-tail (pathname-directory pathname) + (length (pathname-directory (car rule)))))) + (pathname-device replacement-directory))) pathname))) (define (directory-prefix? x y) diff --git a/v8/src/runtime/infutl.scm b/v8/src/runtime/infutl.scm index 6e509ad60..bde72617f 100644 --- a/v8/src/runtime/infutl.scm +++ b/v8/src/runtime/infutl.scm @@ -1,6 +1,6 @@ #| -*-Scheme-*- -$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v8/src/runtime/infutl.scm,v 1.38 1992/05/28 18:40:00 mhwu Exp $ +$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v8/src/runtime/infutl.scm,v 1.39 1992/05/28 18:58:44 mhwu Exp $ Copyright (c) 1988-91 Massachusetts Institute of Technology @@ -245,8 +245,7 @@ MIT in each case. |# '()) (define (add-directory-rewriting-rule! match replace) - (let ((match (merge-pathnames match)) - (replace (merge-pathnames replace))) + (let ((match (merge-pathnames match))) (let ((rule (list-search-positive directory-rewriting-rules (lambda (rule) @@ -266,13 +265,14 @@ MIT in each case. |# (directory-prefix? (pathname-directory pathname) (pathname-directory (car rule))))))) (if rule - (pathname-new-device - (pathname-new-directory - pathname - (append (pathname-directory (cdr rule)) - (list-tail (pathname-directory pathname) - (length (pathname-directory (car rule)))))) - (pathname-device (cdr rule))) + (let ((replacement-directory (merge-pathnames (cdr rule)))) + (pathname-new-device + (pathname-new-directory + pathname + (append (pathname-directory replacement-directory) + (list-tail (pathname-directory pathname) + (length (pathname-directory (car rule)))))) + (pathname-device replacement-directory))) pathname))) (define (directory-prefix? x y) -- 2.25.1