Ticket #150: abcl-make-pathname-version.diff

src/org/armedbear/lisp/Pathname.java

@@ -1254 +1254 @@
         boolean nameSupplied = false;
         boolean typeSupplied = false;
         boolean directorySupplied = false;
+        boolean versionSupplied = false;
         for (int i = 0; i < args.length; i += 2) {
             LispObject key = args[i];
             LispObject value = args[i + 1];
@@ -1290 +1291 @@
                 typeSupplied = true;
             } else if (key == Keyword.VERSION) {
                 version = value;
+                versionSupplied = true;
             } else if (key == Keyword.DEFAULTS) {
                 defaults = coerceToPathname(value);
             } else if (key == Keyword.CASE) {
@@ -1312 +1314 @@
             if (!typeSupplied) {
                 type = defaults.type;
             }
+            if (!versionSupplied) {
+                version = defaults.version;
+            }
         }
         final Pathname p;
         final boolean logical;
@@ -1385 +1390 @@
                 p.type = type;
             }
         }
+        
         p.version = version;
         return p;
     }

src/org/armedbear/lisp/top-level.lisp

@@ -419 +419 @@
               (results (multiple-value-list (sys:interactive-eval form))))
          (dolist (result results)
            (fresh-line out)
-           (prin1 result out)))))
+           (pprint result out)))))
 
 (defun top-level-loop ()
   (fresh-line)

test/lisp/abcl/pathname-tests.lisp

@@ -1717 +1717 @@
 (deftest pathname.make-pathname.1
     (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))
+      
+ No newline at end of file