Changeset 12469

Timestamp:

02/14/10 09:07:54 (11 years ago)

Author:

Mark Evenson

Message:

Ensure that FILE-ERROR always has a value for PATHNAME.

Fixes ANSI LOAD.ERROR.1.

Location:

trunk/abcl/src/org/armedbear/lisp

Files:

• FileError.java (modified) (1 diff)
• Load.java (modified) (1 diff)

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

@@ -70 +70 @@
         setFormatControl(message);
         setFormatArguments(NIL);
+        setPathname(NIL);
     }
 

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

@@ -145 +145 @@
         if (truename == null || truename.equals(NIL)) {
             if (ifDoesNotExist) {
-                return error(new FileError("File not found: " + pathname));
+                return error(new FileError("File not found.", pathname));
             } else {
-                Debug.trace("Failed to load " + pathname.getNamestring());
+                Debug.warn("Failed to load " + pathname.getNamestring());
                 return NIL;
             }