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

[Alessio Stalla]

Author: astalla
Date: Tue Jul 20 14:36:44 2010
New Revision: 12814

Log:
Fix for r12809: bind *print-readably* to NIL when printing conditions in the debugger to avoid Maximum error depth exceeded.
Fix for r12813: Better error reporting.


Modified:
   trunk/abcl/src/org/armedbear/lisp/Java.java
   trunk/abcl/src/org/armedbear/lisp/debug.lisp

Modified: trunk/abcl/src/org/armedbear/lisp/Java.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/Java.java	(original)
+++ trunk/abcl/src/org/armedbear/lisp/Java.java	Tue Jul 20 14:36:44 2010
@@ -529,12 +529,7 @@
 		    } else if(object instanceof Class<?>) {
 			constructor = findConstructor((Class<?>) object, args);
 		    } else {
-			return type_error(classRef,
-					  list(Symbol.OR,
-					       list(Symbol.JCLASS,
-						    new SimpleString("java.lang.reflect.Constructor")),
-					       list(Symbol.JCLASS,
-						    new SimpleString("java.lang.Class"))));
+			return error(new LispError(classRef.writeToString() + " is neither a Constructor nor a Class"));
 		    }
 		}
                 Class[] argTypes = constructor.getParameterTypes();

Modified: trunk/abcl/src/org/armedbear/lisp/debug.lisp
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/debug.lisp	(original)
+++ trunk/abcl/src/org/armedbear/lisp/debug.lisp	Tue Jul 20 14:36:44 2010
@@ -85,7 +85,8 @@
   (when condition
     (fresh-line *debug-io*)
     (with-standard-io-syntax
-      (let ((*print-structure* nil))
+      (let ((*print-structure* nil)
+	    (*print-readably* nil))
         (when (and *load-truename* (streamp *load-stream*))
           (simple-format *debug-io*
                          "Error loading ~A at line ~D (offset ~D)~%"