Changeset 13294

Timestamp:

05/24/11 12:25:55 (12 years ago)

Author:

Mark Evenson

Message:

Fix #150: MAKE-PATHNAME ignores version in :DEFAULTS.

Location:

trunk/abcl

Files:

• src/org/armedbear/lisp/Pathname.java (modified) (4 diffs)
• test/lisp/abcl/pathname-tests.lisp (modified) (1 diff)

trunk/abcl/src/org/armedbear/lisp/Pathname.java

@@ -1255 +1255 @@
         boolean typeSupplied = false;
         boolean directorySupplied = false;
+        boolean versionSupplied = false;
         for (int i = 0; i < args.length; i += 2) {
             LispObject key = args[i];
@@ -1291 +1292 @@
             } else if (key == Keyword.VERSION) {
                 version = value;
+                versionSupplied = true;
             } else if (key == Keyword.DEFAULTS) {
                 defaults = coerceToPathname(value);
@@ -1312 +1314 @@
             if (!typeSupplied) {
                 type = defaults.type;
+            }
+            if (!versionSupplied) {
+                version = defaults.version;
             }
         }
@@ -1386 +1391 @@
             }
         }
+        
         p.version = version;
         return p;

trunk/abcl/test/lisp/abcl/pathname-tests.lisp

@@ -1718 +1718 @@
     (make-pathname :directory nil :defaults "/home/fare/")
   #p"")
+
+(deftest pathname.make-pathname.2
+    (let ((p (make-pathname 
+              :defaults (make-pathname :name :wild :type :wild :version :wild :directory :wild))))
+      (values 
+       (pathname-name p) (pathname-type p) (pathname-version p) (pathname-directory p)))
+  :wild :wild :wild (:absolute :wild))
+