Changeset 14089

Timestamp:

08/14/12 21:06:34 (8 years ago)

Author:

ehuelsmann

Message:

Close #208: Merge pathname defaults.

Location:

trunk/abcl/src/org/armedbear/lisp

Files:

• Interpreter.java (modified) (1 diff)
• Lisp.java (modified) (1 diff)

trunk/abcl/src/org/armedbear/lisp/Interpreter.java

@@ -331 +331 @@
                     if (i + 1 < args.length) {
                         if (arg.equals("--load"))
-                            Load.load(new Pathname(args[i + 1]),
+                            Load.load(Pathname.mergePathnames(new Pathname(args[i + 1]),
+                                    checkPathname(Symbol.DEFAULT_PATHNAME_DEFAULTS.getSymbolValue())),
                                       false, false, true);
 

trunk/abcl/src/org/armedbear/lisp/Lisp.java

@@ -1648 +1648 @@
           return (Package) // Not reached.       
         type_error(obj, Symbol.PACKAGE);
+  }
+
+  public static Pathname checkPathname(LispObject obj)
+  {
+          if (obj instanceof Pathname)     
+                  return (Pathname) obj;         
+          return (Pathname) // Not reached.       
+        type_error(obj, Symbol.PATHNAME);
   }