From 877300f949f916e4b35fbfad0a4d2f97e1b0f032 Mon Sep 17 00:00:00 2001 From: Chris Hanson Date: Sat, 27 Feb 2016 15:20:10 -0800 Subject: [PATCH] Rename default-pathname-defaults to param:default-pathname-defaults. Makes consistent with param:flonum-unparser-cutoff. --- src/runtime/pathnm.scm | 6 +++--- src/runtime/rep.scm | 3 ++- src/runtime/runtime.pkg | 2 +- src/runtime/wrkdir.scm | 6 +++--- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/runtime/pathnm.scm b/src/runtime/pathnm.scm index 366c247d5..cbf281c37 100644 --- a/src/runtime/pathnm.scm +++ b/src/runtime/pathnm.scm @@ -437,12 +437,12 @@ these rules: ;;;; Pathname Merging (define *default-pathname-defaults*) -(define default-pathname-defaults) +(define param:default-pathname-defaults) ;;; Kludge to support FLUID-LET: (define (get-default-pathname-defaults) (if (default-object? *default-pathname-defaults*) - (default-pathname-defaults) + (param:default-pathname-defaults) *default-pathname-defaults*)) (define (merge-pathnames pathname #!optional defaults default-version) @@ -724,7 +724,7 @@ these rules: (set! host-types types) (set! local-host (make-host host-type #f)))) (set! *default-pathname-defaults* #!default) - (set! default-pathname-defaults + (set! param:default-pathname-defaults (make-parameter (make-pathname local-host #f #f #f #f #f))) (set! library-directory-path (make-parameter diff --git a/src/runtime/rep.scm b/src/runtime/rep.scm index fc9a2a5ec..315dc5106 100644 --- a/src/runtime/rep.scm +++ b/src/runtime/rep.scm @@ -128,7 +128,8 @@ USA. (cons standard-error-hook #f) (cons standard-warning-hook #f) (cons standard-breakpoint-hook #f) - (cons default-pathname-defaults (default-pathname-defaults)) + (cons param:default-pathname-defaults + (param:default-pathname-defaults)) (cons dynamic-handler-frames '()) (cons *bound-restarts* (if (cmdl/parent cmdl) (*bound-restarts*) '()))) diff --git a/src/runtime/runtime.pkg b/src/runtime/runtime.pkg index 551c679c4..d482db8b4 100644 --- a/src/runtime/runtime.pkg +++ b/src/runtime/runtime.pkg @@ -3139,7 +3139,6 @@ USA. ->namestring ->pathname ->truename - default-pathname-defaults directory-namestring directory-pathname directory-pathname-as-file @@ -3158,6 +3157,7 @@ USA. local-host make-pathname merge-pathnames + param:default-pathname-defaults parse-namestring pathname->uri pathname-absolute? diff --git a/src/runtime/wrkdir.scm b/src/runtime/wrkdir.scm index ba5dae21b..383ef6084 100644 --- a/src/runtime/wrkdir.scm +++ b/src/runtime/wrkdir.scm @@ -40,7 +40,7 @@ USA. (pathname-as-directory ((ucode-primitive working-directory-pathname)))))) (working-directory-pathname pathname) - (default-pathname-defaults pathname)) + (param:default-pathname-defaults pathname)) unspecific) (define working-directory-pathname) @@ -62,13 +62,13 @@ USA. 'SET-WORKING-DIRECTORY-PATHNAME! (list name))) (working-directory-pathname pathname) - (default-pathname-defaults pathname) + (param:default-pathname-defaults pathname) (cmdl/set-default-directory (nearest-cmdl) pathname) pathname)) (define (with-working-directory-pathname name thunk) (let ((pathname (new-pathname name))) - (parameterize* (list (cons default-pathname-defaults pathname) + (parameterize* (list (cons param:default-pathname-defaults pathname) (cons working-directory-pathname pathname)) thunk))) -- 2.25.1