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

[Mark Evenson]

Author: mevenson
Date: Thu Apr 14 01:56:24 2011
New Revision: 13267

Log:
Fix #146 so MAKE-PATHNAME uses :DIRECTORY argument even if NIL.

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	(original)
+++ trunk/abcl/src/org/armedbear/lisp/Pathname.java	Thu Apr 14 01:56:24 2011
@@ -1253,6 +1253,7 @@
         boolean deviceSupplied = false;
         boolean nameSupplied = false;
         boolean typeSupplied = false;
+        boolean directorySupplied = false;
         for (int i = 0; i < args.length; i += 2) {
             LispObject key = args[i];
             LispObject value = args[i + 1];
@@ -1262,6 +1263,7 @@
                 device = value;
                 deviceSupplied = true;
             } else if (key == Keyword.DIRECTORY) {
+                directorySupplied = true;
                 if (value instanceof AbstractString) {
                     directory = list(Keyword.ABSOLUTE, value);
                 } else if (value == Keyword.WILD) {
@@ -1298,7 +1300,7 @@
             if (host == NIL) {
                 host = defaults.host;
             }
-            if (directory == NIL) {
+            if (!directorySupplied) {
                 directory = defaults.directory;
             }
             if (!deviceSupplied) {