Changeset 13296

Timestamp:

05/25/11 14:31:59 (12 years ago)

Author:

Mark Evenson

Message:

Another stab at implementing MERGE-PATHNAME with version.

From a reading of CLtLv2 it seems that I was misinterpretering the
antecedent of "If no version is supplied" as the PATHNAME not the
DEFAULT-PATHNAME.

File:

• trunk/abcl/src/org/armedbear/lisp/Pathname.java (modified) (3 diffs)

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

@@ -1819 +1819 @@
         return mergePathnames(pathname, defaultPathname, Keyword.NEWEST);
     }
-
+    
     public static final Pathname mergePathnames(final Pathname pathname,
                                                 final Pathname defaultPathname,
-                                                final LispObject defaultVersion) 
+                                                final LispObject defaultVersion)
     {
         Pathname result;
@@ -1887 +1887 @@
         //  default-version is nil, the version component will remain
         //  unchanged."
-        if (p.version == NIL && defaultVersion != NIL) {
-            result.version = defaultVersion;
-        } else if (p.version == NIL && defaultVersion == NIL) {
-            result.version = p.version;
         // "If pathname does not specify a name, then the version, if
         //  not provided, will come from default-pathname, just like
@@ -1897 +1893 @@
         //  this process leaves the version missing, the
         //  default-version is used."
-        } else if (p.name == NIL && p.version == NIL) {
-            result.version = defaultPathname.version;
-        } else if (p.name != NIL) {
-            if (defaultVersion != NIL) {
+        if (p.version != NIL) {
+            result.version = p.version;
+        } else if (p.name == NIL) {
+            if (defaultPathname.version == NIL) {
                 result.version = defaultVersion;
             } else {
-                result.version = p.version;
-            }
-        } else {
-            result.version = defaultPathname.version;
+                result.version = defaultPathname.version;
+            }
+        } else if (defaultVersion == NIL) {
+            result.version = p.version;
+        } 
+        if (result.version == NIL) {
+            result.version = defaultVersion;
         }