Changeset 13267


Ignore:
Timestamp:
04/14/11 05:56:24 (11 years ago)
Author:
Mark Evenson
Message:

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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/abcl/src/org/armedbear/lisp/Pathname.java

    r13230 r13267  
    12541254        boolean nameSupplied = false;
    12551255        boolean typeSupplied = false;
     1256        boolean directorySupplied = false;
    12561257        for (int i = 0; i < args.length; i += 2) {
    12571258            LispObject key = args[i];
     
    12631264                deviceSupplied = true;
    12641265            } else if (key == Keyword.DIRECTORY) {
     1266                directorySupplied = true;
    12651267                if (value instanceof AbstractString) {
    12661268                    directory = list(Keyword.ABSOLUTE, value);
     
    12991301                host = defaults.host;
    13001302            }
    1301             if (directory == NIL) {
     1303            if (!directorySupplied) {
    13021304                directory = defaults.directory;
    13031305            }
Note: See TracChangeset for help on using the changeset viewer.