Skip to content
Snippets Groups Projects
Commit 9722b37e authored by pw's avatar pw
Browse files

Fix extract-name-tape-and-version to honor rule that a leading "."

is part of the name component.
parent 3f6cc5b0
No related branches found
No related tags found
No related merge requests found
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
;;; Scott Fahlman or slisp-group@cs.cmu.edu. ;;; Scott Fahlman or slisp-group@cs.cmu.edu.
;;; ;;;
(ext:file-comment (ext:file-comment
"$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/filesys.lisp,v 1.62 2001/03/11 22:00:38 pw Exp $") "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/filesys.lisp,v 1.63 2001/03/12 12:44:31 pw Exp $")
;;; ;;;
;;; ********************************************************************** ;;; **********************************************************************
;;; ;;;
...@@ -204,12 +204,17 @@ ...@@ -204,12 +204,17 @@
(values version where)) (values version where))
((and (char= (schar namestr (- end 1)) #\*) ((and (char= (schar namestr (- end 1)) #\*)
(char= (schar namestr (- end 2)) #\.) (char= (schar namestr (- end 2)) #\.)
(find #\. namestr :start start :end (- end 2))) (find #\. namestr
:start (min (1+ start) (- end 2))
:end (- end 2)))
(values :wild (- end 2))) (values :wild (- end 2)))
(t (values version where))))) (t (values version where)))))
(any-type (namestr start end) (any-type (namestr start end)
;; process end of string looking for a type. ;; Process end of string looking for a type. A leading "."
(let ((where (position #\. namestr :start start :end end :from-end t))) ;; is part of the name.
(let ((where (position #\. namestr
:start (min (1+ start) end)
:end end :from-end t)))
(when where (when where
(values where end)))) (values where end))))
(any-name (namestr start end) (any-name (namestr start end)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment