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

[Erik Huelsmann]

Author: ehuelsmann
Date: Sun Oct 25 15:56:41 2009
New Revision: 12221

Log:
In case a built-in error object (Condition class derivative) is
passed as an argument to the ERROR stub, print its message (for
easier debugging).

Modified:
   trunk/abcl/src/org/armedbear/lisp/Primitives.java

Modified: trunk/abcl/src/org/armedbear/lisp/Primitives.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/Primitives.java	(original)
+++ trunk/abcl/src/org/armedbear/lisp/Primitives.java	Sun Oct 25 15:56:41 2009
@@ -1462,8 +1462,14 @@
         e.printStackTrace();
 
         System.out.println("ERROR placeholder called with arguments:");
-        for (LispObject a : args)
-            System.out.println(a.writeToString());
+
+        if (args.length == 1 && args[0] instanceof Condition) {
+            System.out.println(args[0].writeToString());
+            System.out.println(((Condition)args[0]).getConditionReport());
+        }
+        else
+            for (LispObject a : args)
+                System.out.println(a.writeToString());
 
         //###FIXME: Bail out, but do it nicer...
         System.exit(1);