From 29e4631976fb7b855ebb187f62658bc0392382b2 Mon Sep 17 00:00:00 2001 From: dtc <dtc> Date: Thu, 6 Jul 2000 04:37:20 +0000 Subject: [PATCH] o Correct some of the return types of parse-namestring to be consistent with the declared return type; some paths were returning only a single value. o Correct the declared result type of substitute-into to declare both return values. --- code/pathname.lisp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/code/pathname.lisp b/code/pathname.lisp index ddfe3b12a..632137aa0 100644 --- a/code/pathname.lisp +++ b/code/pathname.lisp @@ -4,7 +4,7 @@ ;;; Carnegie Mellon University, and has been placed in the public domain. ;;; (ext:file-comment - "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/pathname.lisp,v 1.39 1999/04/12 12:33:18 dtc Exp $") + "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/pathname.lisp,v 1.40 2000/07/06 04:37:20 dtc Exp $") ;;; ;;; ********************************************************************** ;;; @@ -848,7 +848,7 @@ a host-structure or string." (type (or index null) end) (type (or t null) junk-allowed) (values (or null pathname) (or null index))) - (typecase thing + (etypecase thing (simple-string (%parse-namestring thing host defaults start end junk-allowed)) (string @@ -865,7 +865,7 @@ a host-structure or string." (unless name (error "Can't figure out the file associated with stream:~% ~S" thing)) - name)))) + (values name nil))))) ;;; NAMESTRING -- Interface @@ -1001,7 +1001,7 @@ a host-structure or string." (defun substitute-into (pattern subs diddle-case) (declare (type pattern pattern) (type list subs) - (values (or simple-base-string pattern))) + (values (or simple-base-string pattern) list)) (let ((in-wildcard nil) (pieces nil) (strings nil)) -- GitLab