Changeset 14089


Ignore:
Timestamp:
08/14/12 21:06:34 (9 years ago)
Author:
ehuelsmann
Message:

Close #208: Merge pathname defaults.

Location:
trunk/abcl/src/org/armedbear/lisp
Files:
2 edited

Legend:

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

    r13454 r14089  
    331331                    if (i + 1 < args.length) {
    332332                        if (arg.equals("--load"))
    333                             Load.load(new Pathname(args[i + 1]),
     333                            Load.load(Pathname.mergePathnames(new Pathname(args[i + 1]),
     334                                    checkPathname(Symbol.DEFAULT_PATHNAME_DEFAULTS.getSymbolValue())),
    334335                                      false, false, true);
    335336
  • trunk/abcl/src/org/armedbear/lisp/Lisp.java

    r14078 r14089  
    16481648          return (Package) // Not reached.       
    16491649        type_error(obj, Symbol.PACKAGE);
     1650  }
     1651
     1652  public static Pathname checkPathname(LispObject obj)
     1653  {
     1654          if (obj instanceof Pathname)     
     1655                  return (Pathname) obj;         
     1656          return (Pathname) // Not reached.       
     1657        type_error(obj, Symbol.PATHNAME);
    16501658  }
    16511659
Note: See TracChangeset for help on using the changeset viewer.