Changeset 12552 for trunk/abcl/src/org/armedbear/lisp/pathnames.lisp

Timestamp:

03/16/10 21:02:54 (13 years ago)

Author:

Mark Evenson

Message:

Refine TRANSLATE-PATHNAME to match SBCL's behavior on corner case.

This patch allows

(TRANSLATE-PATHNAME

#P"/Users/evenson/work/bordeaux-threads/src/bordeaux-threads.abcl"
#P"///*.*"
#P"/Users/evenson/.cache/common-lisp/armedbear-0.20.0-dev-darwin-unknown//*.*")

to return

#P"/Users/evenson/.cache/common-lisp/armedbear-0.20.0-dev-darwin-unknown/bordeaux-threads.abcl"

which matches SBCL' behavior, and seems reasonable that if there is no
more of SRC or TO left to match and FROM has a :WILD-INFERIORS, one
might as well return what has matched so far.

File:

• trunk/abcl/src/org/armedbear/lisp/pathnames.lisp (modified) (1 diff)

trunk/abcl/src/org/armedbear/lisp/pathnames.lisp

@@ -233 +233 @@
                    (translate-directory-components-aux
                     src (cdr from) (cdr to) case))))
+       (when (and (null src) 
+                  (eq (car from) :wild-inferiors)
+                  (eq (car to) :wild-inferiors))
+         (return-from translate-directory-components-aux nil))
        (when (null src) ;; SRC is NIL and we're still here: error exit
          (throw 'failed-match))))))