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

[vvoutilainen at common-lisp.net]

Author: vvoutilainen
Date: Mon May 23 08:46:06 2011
New Revision: 13287

Log:
Copy version from defaults if not explicitly provided.

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

Modified: trunk/abcl/src/org/armedbear/lisp/Pathname.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/Pathname.java	Sat May 21 19:18:43 2011	(r13286)
+++ trunk/abcl/src/org/armedbear/lisp/Pathname.java	Mon May 23 08:46:06 2011	(r13287)
@@ -1254,6 +1254,7 @@
         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,6 +1291,7 @@
                 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,6 +1314,9 @@
             if (!typeSupplied) {
                 type = defaults.type;
             }
+            if (!versionSupplied) {
+                version = defaults.version;
+            }
         }
         final Pathname p;
         final boolean logical;