From: Nikodemus S. <de...@us...> - 2004-06-01 15:27:36
|
Update of /cvsroot/sbcl/sbcl/src/code In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12809/src/code Modified Files: target-pathname.lisp Log Message: 0.8.10.76: Squish bug #330 ... PARSE-NAMESTRING now accepts any valid pathname designator as its defaults argument. ... Poke at it with a regression stick. Index: target-pathname.lisp =================================================================== RCS file: /cvsroot/sbcl/sbcl/src/code/target-pathname.lisp,v retrieving revision 1.43 retrieving revision 1.44 diff -u -d -r1.43 -r1.44 --- target-pathname.lisp 27 May 2004 12:19:55 -0000 1.43 +++ target-pathname.lisp 1 Jun 2004 15:27:26 -0000 1.44 @@ -716,9 +716,8 @@ host (defaults *default-pathname-defaults*) &key (start 0) end junk-allowed) - (declare (type pathname-designator thing) + (declare (type pathname-designator thing defaults) (type (or list host string (member :unspecific)) host) - (type pathname defaults) (type index start) (type (or index null) end) (type (or t null) junk-allowed) @@ -775,8 +774,18 @@ supported in this implementation:~% ~S" host)) (host - host)))) - (declare (type (or null host) found-host)) + host))) + ;; According to ANSI defaults may be any valid pathname designator + (defaults (etypecase defaults + (pathname + defaults) + (string + (aver (pathnamep *default-pathname-defaults*)) + (parse-namestring defaults)) + (stream + (truename defaults))))) + (declare (type (or null host) found-host) + (type pathname defaults)) (etypecase thing (simple-string (%parse-namestring thing found-host defaults start end junk-allowed)) |