Changeset 12815 for trunk/abcl/src/org

Timestamp:

07/20/10 21:04:41 (13 years ago)

Author:

astalla

Message:

Fixed printing of certain conditions (e.g., type-errors) with unbound format-control.

File:

• trunk/abcl/src/org/armedbear/lisp/Condition.java (modified) (2 diffs)

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

@@ -105 +105 @@
   public final LispObject getFormatControl()
   {
-    return getInstanceSlotValue(Symbol.FORMAT_CONTROL);
+      return getInstanceSlotValue(Symbol.FORMAT_CONTROL);
   }
 
@@ -136 +136 @@
   public String getMessage()
   {
-    return getFormatControl().toString();
+      LispObject formatControl = getFormatControl();
+      return formatControl != UNBOUND_VALUE ? formatControl.writeToString() : null;
   }