Changeset 13287 for trunk/abcl/src/org


Ignore:
Timestamp:
05/23/11 15:46:06 (10 years ago)
Author:
vvoutilainen
Message:

Copy version from defaults if not explicitly provided.

File:
1 edited

Legend:

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

    r13267 r13287  
    12551255        boolean typeSupplied = false;
    12561256        boolean directorySupplied = false;
     1257        boolean versionSupplied = false;
    12571258        for (int i = 0; i < args.length; i += 2) {
    12581259            LispObject key = args[i];
     
    12911292            } else if (key == Keyword.VERSION) {
    12921293                version = value;
     1294                versionSupplied = true;
    12931295            } else if (key == Keyword.DEFAULTS) {
    12941296                defaults = coerceToPathname(value);
     
    13121314            if (!typeSupplied) {
    13131315                type = defaults.type;
     1316            }
     1317            if (!versionSupplied) {
     1318                version = defaults.version;
    13141319            }
    13151320        }
Note: See TracChangeset for help on using the changeset viewer.