[armedbear-cvs] r13300 - trunk/abcl/src/org/armedbear/lisp

[mevenson at common-lisp.net]

Author: mevenson
Date: Fri May 27 06:06:08 2011
New Revision: 13300

Log:
TRANSLATE-PATHNAME uses source version if to version if :wild or nil.

This aligns the behavior to what SBCL does.  The original behavior of
ABCL of using the from version would result in a lot of the usages of
TRANSLATE-PATHNAME with wildcards to produce a wild version in the
result which is probably never the intention.

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

Modified: trunk/abcl/src/org/armedbear/lisp/pathnames.lisp
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/pathnames.lisp	Thu May 26 22:46:28 2011	(r13299)
+++ trunk/abcl/src/org/armedbear/lisp/pathnames.lisp	Fri May 27 06:06:08 2011	(r13300)
@@ -323,8 +323,9 @@
                                                    (pathname-type to)
                                                    case)
                    :version   (if (null (pathname-host from))
-                                  (if (eq (pathname-version to) :wild)
-                                      (pathname-version from)
+                                  (if (or (eq (pathname-version to) :wild)
+                                          (eq (pathname-version to) nil))
+                                      (pathname-version source)
                                       (pathname-version to))
                                   (translate-component (pathname-version source)
                                                        (pathname-version from)