projects
/
sbcl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
0.7.9.68:
[sbcl.git]
/
src
/
code
/
target-pathname.lisp
diff --git
a/src/code/target-pathname.lisp
b/src/code/target-pathname.lisp
index
760399a
..
9121c1c
100644
(file)
--- a/
src/code/target-pathname.lisp
+++ b/
src/code/target-pathname.lisp
@@
-282,7
+282,7
@@
(,pathname (etypecase ,pd0
(pathname ,pd0)
(string (parse-namestring ,pd0))
(,pathname (etypecase ,pd0
(pathname ,pd0)
(string (parse-namestring ,pd0))
- (stream (file-name ,pd0)))))
+ (file-stream (file-name ,pd0)))))
,@body)))
;;; Convert the var, a host or string name for a host, into a
,@body)))
;;; Convert the var, a host or string name for a host, into a
@@
-479,11
+479,11
@@
a host-structure or string."
(default-host (if defaults
(%pathname-host defaults)
(pathname-host *default-pathname-defaults*)))
(default-host (if defaults
(%pathname-host defaults)
(pathname-host *default-pathname-defaults*)))
- ;; toy@rtp.ericsson.se: CLHS says make-pathname can take a
+ ;; Raymond Toy writes: CLHS says make-pathname can take a
;; string (as a logical-host) for the host part. We map that
;; string into the corresponding logical host structure.
;;
;; string (as a logical-host) for the host part. We map that
;; string into the corresponding logical host structure.
;;
- ;; pw@snoopy.mv.com:
+ ;; Paul Werkowski writes:
;; HyperSpec says for the arg to MAKE-PATHNAME;
;; "host---a valid physical pathname host. ..."
;; where it probably means -- a valid pathname host.
;; HyperSpec says for the arg to MAKE-PATHNAME;
;; "host---a valid physical pathname host. ..."
;; where it probably means -- a valid pathname host.
@@
-625,7
+625,7
@@
a host-structure or string."
(let ((potential-host
(logical-word-or-lose (subseq namestr start colon))))
;; depending on the outcome of CSR comp.lang.lisp post
(let ((potential-host
(logical-word-or-lose (subseq namestr start colon))))
;; depending on the outcome of CSR comp.lang.lisp post
- ;; "can PARSE-NAMESTRING create logical hosts, we may need
+ ;; "can PARSE-NAMESTRING create logical hosts", we may need
;; to do things with potential-host (create it
;; temporarily, parse the namestring and unintern the
;; logical host potential-host on failure.
;; to do things with potential-host (create it
;; temporarily, parse the namestring and unintern the
;; logical host potential-host on failure.
@@
-683,7
+683,10
@@
a host-structure or string."
;; *DEFAULT-PATHNAME-DEFAULTS has a SB-IMPL::UNIX-HOST
;; for a host.
((pathname-host defaults)
;; *DEFAULT-PATHNAME-DEFAULTS has a SB-IMPL::UNIX-HOST
;; for a host.
((pathname-host defaults)
- (funcall (host-parse (pathname-host defaults)) namestr start end))
+ (funcall (host-parse (pathname-host defaults))
+ namestr
+ start
+ end))
;; I don't think we should ever get here, as the default
;; host will always have a non-null HOST, given that we
;; can't create a new pathname without going through
;; I don't think we should ever get here, as the default
;; host will always have a non-null HOST, given that we
;; can't create a new pathname without going through
@@
-909,7
+912,7
@@
a host-structure or string."
(declare (type pathname-designator in-pathname))
(with-pathname (pathname in-pathname)
(with-pathname (wildname in-wildname)
(declare (type pathname-designator in-pathname))
(with-pathname (pathname in-pathname)
(with-pathname (wildname in-wildname)
- (macrolet ((frob (field &optional (op 'components-match ))
+ (macrolet ((frob (field &optional (op 'components-match))
`(or (null (,field wildname))
(,op (,field pathname) (,field wildname)))))
(and (or (null (%pathname-host wildname))
`(or (null (,field wildname))
(,op (,field pathname) (,field wildname)))))
(and (or (null (%pathname-host wildname))
@@
-1494,8
+1497,7
@@
a host-structure or string."
(return (translate-logical-pathname
(translate-pathname pathname from to)))))))
(pathname pathname)
(return (translate-logical-pathname
(translate-pathname pathname from to)))))))
(pathname pathname)
- (stream (translate-logical-pathname (pathname pathname)))
- (t (translate-logical-pathname (logical-pathname pathname)))))
+ (t (translate-logical-pathname (pathname pathname)))))
(defun translate-logical-pathname (pathname &key)
#!+sb-doc
(defun translate-logical-pathname (pathname &key)
#!+sb-doc