[armedbear-cvs] r12469 - trunk/abcl/src/org/armedbear/lisp

[Mark Evenson]

Author: mevenson
Date: Sun Feb 14 04:07:54 2010
New Revision: 12469

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

Fixes ANSI LOAD.ERROR.1.


Modified:
   trunk/abcl/src/org/armedbear/lisp/FileError.java
   trunk/abcl/src/org/armedbear/lisp/Load.java

Modified: trunk/abcl/src/org/armedbear/lisp/FileError.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/FileError.java	(original)
+++ trunk/abcl/src/org/armedbear/lisp/FileError.java	Sun Feb 14 04:07:54 2010
@@ -69,6 +69,7 @@
         super(StandardClass.FILE_ERROR);
         setFormatControl(message);
         setFormatArguments(NIL);
+        setPathname(NIL);
     }
 
     public FileError(String message, LispObject pathname)

Modified: trunk/abcl/src/org/armedbear/lisp/Load.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/Load.java	(original)
+++ trunk/abcl/src/org/armedbear/lisp/Load.java	Sun Feb 14 04:07:54 2010
@@ -144,9 +144,9 @@
 
         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;
             }
         }