Changeset 13267

Timestamp:

04/14/11 05:56:24 (14 years ago)

Author:

Mark Evenson

Message:

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

File:

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

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

@@ -1254 +1254 @@
         boolean nameSupplied = false;
         boolean typeSupplied = false;
+        boolean directorySupplied = false;
         for (int i = 0; i < args.length; i += 2) {
             LispObject key = args[i];
@@ -1263 +1264 @@
                 deviceSupplied = true;
             } else if (key == Keyword.DIRECTORY) {
+                directorySupplied = true;
                 if (value instanceof AbstractString) {
                     directory = list(Keyword.ABSOLUTE, value);
@@ -1299 +1301 @@
                 host = defaults.host;
             }
-            if (directory == NIL) {
+            if (!directorySupplied) {
                 directory = defaults.directory;
             }