Changeset 3884

Timestamp:

09/19/03 11:50:19 (20 years ago)

Author:

piso

Message:

Conditions: work in progress.

Location:

trunk/j/src/org/armedbear/lisp

Files:

• AbstractVector.java (modified) (2 diffs)
• Array.java (modified) (4 diffs)
• Autoload.java (modified) (3 diffs)
• AutoloadMacro.java (modified) (3 diffs)
• Bignum.java (modified) (14 diffs)
• BitVector.java (modified) (3 diffs)
• CompiledFunction.java (modified) (2 diffs)
• Complex.java (modified) (5 diffs)
• Cons.java (modified) (4 diffs)
• DisplacedArray.java (modified) (6 diffs)
• Extensions.java (modified) (2 diffs)
• FillPointerOutputStream.java (modified) (2 diffs)
• Fixnum.java (modified) (16 diffs)
• HashTable.java (modified) (5 diffs)
• Java.java (modified) (2 diffs)
• JavaObject.java (modified) (3 diffs)
• Lisp.java (modified) (18 diffs)
• LispCharacter.java (modified) (3 diffs)
• LispClass.java (modified) (2 diffs)
• LispFloat.java (modified) (15 diffs)
• LispObject.java (modified) (15 diffs)
• LispString.java (modified) (2 diffs)
• LispThread.java (modified) (3 diffs)
• Nil.java (modified) (2 diffs)
• Pathname.java (modified) (4 diffs)
• Primitives.java (modified) (62 diffs)
• Ratio.java (modified) (11 diffs)
• StringFunctions.java (modified) (13 diffs)
• StringOutputStream.java (modified) (2 diffs)
• StructureObject.java (modified) (10 diffs)
• Time.java (modified) (2 diffs)
• TwoWayStream.java (modified) (4 diffs)
• TypeError.java (modified) (5 diffs)
• coerce.java (modified) (4 diffs)
• last.java (modified) (2 diffs)
• logand.java (modified) (4 diffs)
• logandc1.java (modified) (3 diffs)
• logandc2.java (modified) (3 diffs)
• logbitp.java (modified) (3 diffs)
• logeqv.java (modified) (4 diffs)
• logior.java (modified) (4 diffs)
• lognand.java (modified) (3 diffs)
• lognor.java (modified) (3 diffs)
• lognot.java (modified) (2 diffs)
• logorc1.java (modified) (3 diffs)
• logorc2.java (modified) (3 diffs)
• logxor.java (modified) (4 diffs)
• make_array.java (modified) (2 diffs)
• open.java (modified) (3 diffs)
• probe_file.java (modified) (2 diffs)

trunk/j/src/org/armedbear/lisp/AbstractVector.java

@@ -74 +74 @@
     {
         if (n != 0)
-            throw new TypeError("bad dimension for vector");
+            throw new ConditionThrowable(new TypeError("bad dimension for vector"));
         return capacity();
     }
@@ -123 +123 @@
             sb.append(')');
         }
-        throw new TypeError(sb.toString());
+        throw new ConditionThrowable(new TypeError(sb.toString()));
     }
 

trunk/j/src/org/armedbear/lisp/Array.java

@@ -3 +3 @@
  *
  * Copyright (C) 2003 Peter Graves
- * $Id: Array.java,v 1.12 2003-09-19 01:46:39 piso Exp $
+ * $Id: Array.java,v 1.13 2003-09-19 11:50:18 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -155 +155 @@
         }
         catch (ArrayIndexOutOfBoundsException e) {
-            throw new TypeError("bad array dimension");
+            throw new ConditionThrowable(new TypeError("bad array dimension"));
         }
     }
@@ -175 +175 @@
         }
         catch (ArrayIndexOutOfBoundsException e) {
-            throw new TypeError("bad row major index " + index);
+            throw new ConditionThrowable(new TypeError("bad row major index " + index));
         }
     }
@@ -185 +185 @@
         }
         catch (ArrayIndexOutOfBoundsException e) {
-            throw new TypeError("bad row major index " + index);
+            throw new ConditionThrowable(new TypeError("bad row major index " + index));
         }
     }

trunk/j/src/org/armedbear/lisp/Autoload.java

@@ -3 +3 @@
  *
  * Copyright (C) 2003 Peter Graves
- * $Id: Autoload.java,v 1.68 2003-09-19 01:46:39 piso Exp $
+ * $Id: Autoload.java,v 1.69 2003-09-19 11:50:18 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -132 +132 @@
                 return T;
             }
-            throw new TypeError(first);
+            throw new ConditionThrowable(new TypeError(first));
         }
         public LispObject execute(LispObject first, LispObject second)
@@ -150 +150 @@
                 return T;
             }
-            throw new TypeError(first);
+            throw new ConditionThrowable(new TypeError(first));
         }
     };

trunk/j/src/org/armedbear/lisp/AutoloadMacro.java

@@ -3 +3 @@
  *
  * Copyright (C) 2003 Peter Graves
- * $Id: AutoloadMacro.java,v 1.3 2003-09-19 01:46:39 piso Exp $
+ * $Id: AutoloadMacro.java,v 1.4 2003-09-19 11:50:18 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -66 +66 @@
                 return T;
             }
-            throw new TypeError(first);
+            throw new ConditionThrowable(new TypeError(first));
         }
         public LispObject execute(LispObject first, LispObject second)
@@ -84 +84 @@
                 return T;
             }
-            throw new TypeError(first);
+            throw new ConditionThrowable(new TypeError(first));
         }
     };

trunk/j/src/org/armedbear/lisp/Bignum.java

@@ -3 +3 @@
  *
  * Copyright (C) 2003 Peter Graves
- * $Id: Bignum.java,v 1.43 2003-09-19 01:46:39 piso Exp $
+ * $Id: Bignum.java,v 1.44 2003-09-19 11:50:18 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -148 +148 @@
     }
 
-    public boolean evenp() throws TypeError
+    public boolean evenp() throws ConditionThrowable
     {
         return !value.testBit(0);
     }
 
-    public boolean oddp() throws TypeError
+    public boolean oddp() throws ConditionThrowable
     {
         return value.testBit(0);
@@ -173 +173 @@
     }
 
-    public double floatValue() throws TypeError
+    public double floatValue() throws ConditionThrowable
     {
         double d = value.doubleValue();
         if (Double.isInfinite(d))
-            throw new TypeError(toString() +
+            throw new ConditionThrowable(new TypeError(toString()) +
                                 " is too large to be converted to a float");
         return d;
@@ -188 +188 @@
         }
         catch (ClassCastException e) {
-            throw new TypeError(obj, "bignum");
+            throw new ConditionThrowable(new TypeError(obj, "bignum"));
         }
     }
@@ -225 +225 @@
             return Complex.getInstance(add(c.getRealPart()), c.getImaginaryPart());
         }
-        throw new TypeError(obj, "number");
+        throw new ConditionThrowable(new TypeError(obj, "number"));
     }
 
@@ -247 +247 @@
                                        Fixnum.ZERO.subtract(c.getImaginaryPart()));
         }
-        throw new TypeError(obj, "number");
+        throw new ConditionThrowable(new TypeError(obj, "number"));
     }
 
@@ -268 +268 @@
         if (obj instanceof LispFloat)
             return new LispFloat(floatValue() * ((LispFloat)obj).getValue());
-        throw new TypeError(obj, "number");
+        throw new ConditionThrowable(new TypeError(obj, "number"));
     }
 
@@ -283 +283 @@
         if (obj instanceof LispFloat)
             return new LispFloat(floatValue() / ((LispFloat)obj).getValue());
-        throw new TypeError(obj, "number");
+        throw new ConditionThrowable(new TypeError(obj, "number"));
     }
 
@@ -294 +294 @@
         if (obj.numberp())
             return false;
-        throw new TypeError(obj, "number");
+        throw new ConditionThrowable(new TypeError(obj, "number"));
     }
 
@@ -305 +305 @@
         if (obj.numberp())
             return true;
-        throw new TypeError(obj, "number");
+        throw new ConditionThrowable(new TypeError(obj, "number"));
     }
 
@@ -320 +320 @@
         if (obj instanceof LispFloat)
             return floatValue() < ((LispFloat)obj).getValue();
-        throw new TypeError(obj, "real");
+        throw new ConditionThrowable(new TypeError(obj, "real"));
     }
 
@@ -335 +335 @@
         if (obj instanceof LispFloat)
             return floatValue() > ((LispFloat)obj).getValue();
-        throw new TypeError(obj, "real");
+        throw new ConditionThrowable(new TypeError(obj, "real"));
     }
 
@@ -350 +350 @@
         if (obj instanceof LispFloat)
             return floatValue() <= ((LispFloat)obj).getValue();
-        throw new TypeError(obj, "real");
+        throw new ConditionThrowable(new TypeError(obj, "real"));
     }
 
@@ -365 +365 @@
         if (obj instanceof LispFloat)
             return floatValue() >= ((LispFloat)obj).getValue();
-        throw new TypeError(obj, "real");
+        throw new ConditionThrowable(new TypeError(obj, "real"));
     }
 

trunk/j/src/org/armedbear/lisp/BitVector.java

@@ -3 +3 @@
  *
  * Copyright (C) 2003 Peter Graves
- * $Id: BitVector.java,v 1.23 2003-09-19 01:46:40 piso Exp $
+ * $Id: BitVector.java,v 1.24 2003-09-19 11:50:18 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -187 +187 @@
             // None of the above...
         }
-        catch (TypeError e) {}
-        throw new TypeError(newValue, "bit");
+        catch (ConditionThrowable t) {}
+        throw new ConditionThrowable(new TypeError(newValue, "bit"));
     }
 
@@ -232 +232 @@
             // None of the above...
         }
-        catch (TypeError e) {}
-        throw new TypeError(obj, "bit");
+        catch (ConditionThrowable t) {}
+        throw new ConditionThrowable(new TypeError(obj, "bit"));
     }
 

trunk/j/src/org/armedbear/lisp/CompiledFunction.java

@@ -3 +3 @@
  *
  * Copyright (C) 2003 Peter Graves
- * $Id: CompiledFunction.java,v 1.11 2003-09-19 01:46:40 piso Exp $
+ * $Id: CompiledFunction.java,v 1.12 2003-09-19 11:50:18 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -135 +135 @@
             if (arg instanceof CompiledFunction)
                 return ((CompiledFunction)arg).getVariableList();
-            throw new TypeError(arg, "compiled function");
+            throw new ConditionThrowable(new TypeError(arg, "compiled function"));
         }
     };

trunk/j/src/org/armedbear/lisp/Complex.java

@@ -3 +3 @@
  *
  * Copyright (C) 2003 Peter Graves
- * $Id: Complex.java,v 1.22 2003-09-19 01:46:40 piso Exp $
+ * $Id: Complex.java,v 1.23 2003-09-19 11:50:18 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -35 +35 @@
     public static LispObject getInstance(LispObject realpart,
                                          LispObject imagpart)
-        throws TypeError
+        throws ConditionThrowable
     {
         if (!realpart.realp())
-            throw new TypeError(realpart, "real number");
+            throw new ConditionThrowable(new TypeError(realpart, "real number"));
         if (!imagpart.realp())
-            throw new TypeError(imagpart, "real number");
+            throw new ConditionThrowable(new TypeError(imagpart, "real number"));
         if (realpart instanceof LispFloat)
             imagpart = LispFloat.coerceToFloat(imagpart);
@@ -201 +201 @@
             return false;
         }
-        throw new TypeError(obj, "number");
+        throw new ConditionThrowable(new TypeError(obj, "number"));
     }
 
@@ -209 +209 @@
     }
 
-    public LispObject ABS() throws TypeError
+    public LispObject ABS() throws ConditionThrowable
     {
         double real = LispFloat.coerceToFloat(realpart).getValue();
@@ -216 +216 @@
     }
 
-    public boolean zerop() throws TypeError
+    public boolean zerop() throws ConditionThrowable
     {
         return realpart.zerop() && imagpart.zerop();

trunk/j/src/org/armedbear/lisp/Cons.java

@@ -3 +3 @@
  *
  * Copyright (C) 2002-2003 Peter Graves
- * $Id: Cons.java,v 1.27 2003-09-19 01:46:40 piso Exp $
+ * $Id: Cons.java,v 1.28 2003-09-19 11:50:18 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -153 +153 @@
         }
         catch (ClassCastException e) {
-            throw new TypeError(obj, "list");
+            throw new ConditionThrowable(new TypeError(obj, "list"));
         }
         return length;
@@ -161 +161 @@
     {
         if (index < 0) {
-            throw new TypeError("ELT: invalid index " + index + " for " +
-                this);
+            throw new ConditionThrowable(new TypeError("ELT: invalid index " + index + " for " +
+                                                       this));
         }
         int i = 0;
@@ -176 +176 @@
         catch (ClassCastException e) {
             if (cons.cdr == NIL)
-                throw new TypeError("ELT: invalid index " + index + " for " +
-                    this);
+                throw new ConditionThrowable(new TypeError("ELT: invalid index " + index + " for " +
+                                                           this));
             else
-                throw new TypeError(this, "proper sequence");
+                throw new ConditionThrowable(new TypeError(this, "proper sequence"));
         }
     }

trunk/j/src/org/armedbear/lisp/DisplacedArray.java

@@ -3 +3 @@
  *
  * Copyright (C) 2003 Peter Graves
- * $Id: DisplacedArray.java,v 1.11 2003-09-19 01:46:40 piso Exp $
+ * $Id: DisplacedArray.java,v 1.12 2003-09-19 11:50:18 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -91 +91 @@
         if (dimv.length == 1)
             return size;
-        throw new TypeError(this, "sequence");
+        throw new ConditionThrowable(new TypeError(this, "sequence"));
     }
 
@@ -98 +98 @@
         if (dimv.length == 1)
             return getRowMajor(index);
-        throw new TypeError(this, "sequence");
+        throw new ConditionThrowable(new TypeError(this, "sequence"));
     }
 
@@ -130 +130 @@
         }
         catch (ArrayIndexOutOfBoundsException e) {
-            throw new TypeError("bad array dimension");
+            throw new ConditionThrowable(new TypeError("bad array dimension"));
         }
     }
@@ -148 +148 @@
         if (index >= 0 && index < size)
             return array.getRowMajor(index + offset);
-        throw new TypeError("bad row major index " + index);
+        throw new ConditionThrowable(new TypeError("bad row major index " + index));
     }
 
@@ -155 +155 @@
         if (index >= 0 && index < size)
             array.setRowMajor(index + offset, newValue);
-        throw new TypeError("bad row major index " + index);
+        throw new ConditionThrowable(new TypeError("bad row major index " + index));
     }
 

trunk/j/src/org/armedbear/lisp/Extensions.java

@@ -3 +3 @@
  *
  * Copyright (C) 2002-2003 Peter Graves
- * $Id: Extensions.java,v 1.9 2003-09-19 01:46:40 piso Exp $
+ * $Id: Extensions.java,v 1.10 2003-09-19 11:50:18 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -42 +42 @@
             if (arg instanceof CharacterOutputStream)
                 return new Fixnum(((CharacterOutputStream)arg).getCharPos());
-            throw new TypeError(arg, "character output stream");
+            throw new ConditionThrowable(new TypeError(arg, "character output stream"));
         }
     };

trunk/j/src/org/armedbear/lisp/FillPointerOutputStream.java

@@ -3 +3 @@
  *
  * Copyright (C) 2003 Peter Graves
- * $Id: FillPointerOutputStream.java,v 1.2 2003-09-19 01:46:40 piso Exp $
+ * $Id: FillPointerOutputStream.java,v 1.3 2003-09-19 11:50:18 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -40 +40 @@
             LispString string = checkString(arg);
             if (string.getFillPointer() < 0)
-                throw new TypeError(arg, "string with a fill pointer");
+                throw new ConditionThrowable(new TypeError(arg, "string with a fill pointer"));
             return new FillPointerOutputStream(string);
         }

trunk/j/src/org/armedbear/lisp/Fixnum.java

@@ -3 +3 @@
  *
  * Copyright (C) 2002-2003 Peter Graves
- * $Id: Fixnum.java,v 1.70 2003-09-19 01:46:40 piso Exp $
+ * $Id: Fixnum.java,v 1.71 2003-09-19 11:50:18 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -154 +154 @@
     }
 
-    public boolean evenp() throws TypeError
+    public boolean evenp() throws ConditionThrowable
     {
         return (value & 0x01) == 0;
     }
 
-    public boolean oddp() throws TypeError
+    public boolean oddp() throws ConditionThrowable
     {
         return (value & 0x01) != 0;
@@ -185 +185 @@
         }
         catch (ClassCastException e) {
-            throw new TypeError(obj, "fixnum");
+            throw new ConditionThrowable(new TypeError(obj, "fixnum"));
         }
     }
@@ -195 +195 @@
         }
         catch (ClassCastException e) {
-            throw new TypeError(obj, "fixnum");
+            throw new ConditionThrowable(new TypeError(obj, "fixnum"));
         }
     }
@@ -205 +205 @@
         }
         catch (ClassCastException e) {
-            throw new TypeError(obj, "fixnum");
+            throw new ConditionThrowable(new TypeError(obj, "fixnum"));
         }
     }
@@ -215 +215 @@
         }
         catch (ClassCastException e) {
-            throw new TypeError(obj, "fixnum");
+            throw new ConditionThrowable(new TypeError(obj, "fixnum"));
         }
     }
@@ -262 +262 @@
             return Complex.getInstance(add(c.getRealPart()), c.getImaginaryPart());
         }
-        throw new TypeError(obj, "number");
+        throw new ConditionThrowable(new TypeError(obj, "number"));
     }
 
@@ -285 +285 @@
                                        ZERO.subtract(c.getImaginaryPart()));
         }
-        throw new TypeError(obj, "number");
+        throw new ConditionThrowable(new TypeError(obj, "number"));
     }
 
@@ -308 +308 @@
                                        multiplyBy(c.getImaginaryPart()));
         }
-        throw new TypeError(obj, "number");
+        throw new ConditionThrowable(new TypeError(obj, "number"));
     }
 
@@ -340 +340 @@
                                            Fixnum.ZERO.subtract(multiplyBy(imagPart).divideBy(denominator)));
             }
-            throw new TypeError(obj, "number");
+            throw new ConditionThrowable(new TypeError(obj, "number"));
         }
         catch (ArithmeticException e) {
@@ -359 +359 @@
         if (obj.numberp())
             return false;
-        throw new TypeError(obj, "number");
+        throw new ConditionThrowable(new TypeError(obj, "number"));
     }
 
@@ -373 +373 @@
         if (obj.numberp())
             return true;
-        throw new TypeError(obj, "number");
+        throw new ConditionThrowable(new TypeError(obj, "number"));
     }
 
@@ -389 +389 @@
         if (obj instanceof LispFloat)
             return (float) value < LispFloat.getValue(obj);
-        throw new TypeError(obj, "number");
+        throw new ConditionThrowable(new TypeError(obj, "number"));
     }
 
@@ -405 +405 @@
         if (obj instanceof LispFloat)
             return (float) value > LispFloat.getValue(obj);
-        throw new TypeError(obj, "number");
+        throw new ConditionThrowable(new TypeError(obj, "number"));
     }
 
@@ -421 +421 @@
         if (obj instanceof LispFloat)
             return (float) value <= LispFloat.getValue(obj);
-        throw new TypeError(obj, "number");
+        throw new ConditionThrowable(new TypeError(obj, "number"));
     }
 
@@ -437 +437 @@
         if (obj instanceof LispFloat)
             return (float) value >= LispFloat.getValue(obj);
-        throw new TypeError(obj, "number");
+        throw new ConditionThrowable(new TypeError(obj, "number"));
     }
 

trunk/j/src/org/armedbear/lisp/HashTable.java

@@ -3 +3 @@
  *
  * Copyright (C) 2002-2003 Peter Graves
- * $Id: HashTable.java,v 1.18 2003-09-19 01:46:40 piso Exp $
+ * $Id: HashTable.java,v 1.19 2003-09-19 11:50:18 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -304 +304 @@
                 return ht.gethash(key, defaultValue);
             }
-            throw new TypeError(args[1], "hash-table");
+            throw new ConditionThrowable(new TypeError(args[1], "hash-table"));
         }
     };
@@ -329 +329 @@
                 return ht.puthash(key, value);
             }
-            throw new TypeError(args[1], "hash-table");
+            throw new ConditionThrowable(new TypeError(args[1], "hash-table"));
         }
     };
@@ -343 +343 @@
                 return ht.remhash(key);
             }
-            throw new TypeError(second, "hash-table");
+            throw new ConditionThrowable(new TypeError(second, "hash-table"));
         }
     };
@@ -372 +372 @@
             if (arg instanceof HashTable)
                 return ((HashTable)arg).ENTRIES();
-            throw new TypeError(arg, "hash-table");
+            throw new ConditionThrowable(new TypeError(arg, "hash-table"));
         }
     };

trunk/j/src/org/armedbear/lisp/Java.java

@@ -3 +3 @@
  *
  * Copyright (C) 2002-2003 Peter Graves
- * $Id: Java.java,v 1.8 2003-09-19 01:46:40 piso Exp $
+ * $Id: Java.java,v 1.9 2003-09-19 11:50:18 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -168 +168 @@
                     }
                 } else
-                    throw new TypeError(methodRef);
+                    throw new ConditionThrowable(new TypeError(methodRef));
                 Object[] methodArgs = new Object[args.length-2];
                 for (int i = 2; i < args.length; i++) {

trunk/j/src/org/armedbear/lisp/JavaObject.java

@@ -3 +3 @@
  *
  * Copyright (C) 2002-2003 Peter Graves
- * $Id: JavaObject.java,v 1.7 2003-09-19 00:05:10 piso Exp $
+ * $Id: JavaObject.java,v 1.8 2003-09-19 11:50:18 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -37 +37 @@
     }
 
-    public static final Object getObject(LispObject o) throws TypeError
+    public static final Object getObject(LispObject o) throws ConditionThrowable
     {
         try {
@@ -43 +43 @@
         }
         catch (ClassCastException e) {
-            throw new TypeError(o, "Java object");
+            throw new ConditionThrowable(new TypeError(o, "Java object"));
         }
     }

trunk/j/src/org/armedbear/lisp/Lisp.java

@@ -3 +3 @@
  *
  * Copyright (C) 2002-2003 Peter Graves
- * $Id: Lisp.java,v 1.134 2003-09-19 01:46:40 piso Exp $
+ * $Id: Lisp.java,v 1.135 2003-09-19 11:50:18 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -340 +340 @@
                 LispObject args = obj.cdr();
                 if (!args.listp())
-                    throw new TypeError(args, "list");
+                    throw new ConditionThrowable(new TypeError(args, "list"));
                 LispObject funcar = first.car();
                 LispObject rest = first.cdr();
@@ -460 +460 @@
         }
         catch (ClassCastException e) {
-            throw new TypeError(obj, "symbol");
+            throw new ConditionThrowable(new TypeError(obj, "symbol"));
         }
     }
@@ -472 +472 @@
         }
         catch (ClassCastException e) {
-            throw new TypeError(obj, "cons");
+            throw new ConditionThrowable(new TypeError(obj, "cons"));
         }
     }
@@ -483 +483 @@
         if (obj.listp())
             return obj;
-        throw new TypeError(obj, "list");
+        throw new ConditionThrowable(new TypeError(obj, "list"));
     }
 
@@ -495 +495 @@
         }
         catch (ClassCastException e) {
-            throw new TypeError(obj, "array");
+            throw new ConditionThrowable(new TypeError(obj, "array"));
         }
     }
@@ -508 +508 @@
         }
         catch (ClassCastException e) {
-            throw new TypeError(obj, "vector");
+            throw new ConditionThrowable(new TypeError(obj, "vector"));
         }
     }
@@ -521 +521 @@
         }
         catch (ClassCastException e) {
-            throw new TypeError(obj, "string");
+            throw new ConditionThrowable(new TypeError(obj, "string"));
         }
     }
@@ -533 +533 @@
         if (arg instanceof LispCharacter)
             return new LispString(((LispCharacter)arg).getValue());
-        throw new TypeError(String.valueOf(arg) +
-            " cannot be coerced to a string");
+        throw new ConditionThrowable(new TypeError(String.valueOf(arg) +
+                                                   " cannot be coerced to a string"));
     }
 
@@ -545 +545 @@
         if (arg instanceof LispCharacter)
             return String.valueOf(new char[] {((LispCharacter)arg).getValue()});
-        throw new TypeError(String.valueOf(arg) +
-            " cannot be coerced to a string");
+        throw new ConditionThrowable(new TypeError(String.valueOf(arg) +
+                                                   " cannot be coerced to a string"));
     }
 
@@ -655 +655 @@
         }
         catch (ClassCastException e) {
-            throw new TypeError(obj, "character");
+            throw new ConditionThrowable(new TypeError(obj, "character"));
         }
     }
@@ -668 +668 @@
         }
         catch (ClassCastException e) {
-            throw new TypeError(obj, "package");
+            throw new ConditionThrowable(new TypeError(obj, "package"));
         }
     }
@@ -681 +681 @@
         }
         catch (ClassCastException e) {
-            throw new TypeError(obj, "function");
+            throw new ConditionThrowable(new TypeError(obj, "function"));
         }
     }
@@ -694 +694 @@
         }
         catch (ClassCastException e) {
-            throw new TypeError(obj, "stream");
+            throw new ConditionThrowable(new TypeError(obj, "stream"));
         }
     }
@@ -707 +707 @@
         if (obj instanceof TwoWayStream)
             return ((TwoWayStream)obj).getInputStream();
-        throw new TypeError(obj, "input stream");
+        throw new ConditionThrowable(new TypeError(obj, "input stream"));
     }
 
@@ -719 +719 @@
         if (obj instanceof TwoWayStream)
             return ((TwoWayStream)obj).getOutputStream();
-        throw new TypeError(obj, "output stream");
+        throw new ConditionThrowable(new TypeError(obj, "output stream"));
     }
 
@@ -731 +731 @@
         }
         catch (ClassCastException e) {
-            throw new TypeError(obj, "readtable");
+            throw new ConditionThrowable(new TypeError(obj, "readtable"));
         }
     }
@@ -744 +744 @@
         }
         catch (ClassCastException e) {
-            throw new TypeError(obj, "environment");
+            throw new ConditionThrowable(new TypeError(obj, "environment"));
         }
     }

trunk/j/src/org/armedbear/lisp/LispCharacter.java

@@ -3 +3 @@
  *
  * Copyright (C) 2002-2003 Peter Graves
- * $Id: LispCharacter.java,v 1.25 2003-09-19 01:46:41 piso Exp $
+ * $Id: LispCharacter.java,v 1.26 2003-09-19 11:50:18 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -120 +120 @@
         }
         catch (ClassCastException e) {
-            throw new TypeError(obj, "character");
+            throw new ConditionThrowable(new TypeError(obj, "character"));
         }
     }
@@ -181 +181 @@
                     return new LispCharacter(name.charAt(0));
             }
-            throw new TypeError();
+            throw new ConditionThrowable(new TypeError());
         }
     };

trunk/j/src/org/armedbear/lisp/LispClass.java

@@ -3 +3 @@
  *
  * Copyright (C) 2003 Peter Graves
- * $Id: LispClass.java,v 1.14 2003-09-19 01:46:41 piso Exp $
+ * $Id: LispClass.java,v 1.15 2003-09-19 11:50:18 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -127 +127 @@
             }
             catch (ClassCastException e) {
-                throw new TypeError(arg, "class");
+                throw new ConditionThrowable(new TypeError(arg, "class"));
             }
         }

trunk/j/src/org/armedbear/lisp/LispFloat.java

@@ -3 +3 @@
  *
  * Copyright (C) 2003 Peter Graves
- * $Id: LispFloat.java,v 1.45 2003-09-19 01:46:41 piso Exp $
+ * $Id: LispFloat.java,v 1.46 2003-09-19 11:50:18 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -153 +153 @@
         }
         catch (ClassCastException e) {
-            throw new TypeError(obj, "float");
+            throw new ConditionThrowable(new TypeError(obj, "float"));
         }
     }
@@ -186 +186 @@
             return Complex.getInstance(add(c.getRealPart()), c.getImaginaryPart());
         }
-        throw new TypeError(obj, "number");
+        throw new ConditionThrowable(new TypeError(obj, "number"));
     }
 
@@ -204 +204 @@
                                        ZERO.subtract(c.getImaginaryPart()));
         }
-        throw new TypeError(obj, "number");
+        throw new ConditionThrowable(new TypeError(obj, "number"));
     }
 
@@ -217 +217 @@
         if (obj instanceof Ratio)
             return new LispFloat(value * ((Ratio)obj).floatValue());
-        throw new TypeError(obj, "number");
+        throw new ConditionThrowable(new TypeError(obj, "number"));
     }
 
@@ -232 +232 @@
         if (obj instanceof Ratio)
             return new LispFloat(value / ((Ratio)obj).floatValue());
-        throw new TypeError(obj, "number");
+        throw new ConditionThrowable(new TypeError(obj, "number"));
     }
 
@@ -247 +247 @@
         if (obj instanceof Complex)
             return obj.isEqualTo(this);
-        throw new TypeError(obj, "number");
+        throw new ConditionThrowable(new TypeError(obj, "number"));
     }
 
@@ -265 +265 @@
         if (obj instanceof Ratio)
             return value < ((Ratio)obj).floatValue();
-        throw new TypeError(obj, "real");
+        throw new ConditionThrowable(new TypeError(obj, "real"));
     }
 
@@ -278 +278 @@
         if (obj instanceof Ratio)
             return value > ((Ratio)obj).floatValue();
-        throw new TypeError(obj, "real");
+        throw new ConditionThrowable(new TypeError(obj, "real"));
     }
 
@@ -291 +291 @@
         if (obj instanceof Ratio)
             return value <= ((Ratio)obj).floatValue();
-        throw new TypeError(obj, "real");
+        throw new ConditionThrowable(new TypeError(obj, "real"));
     }
 
@@ -304 +304 @@
         if (obj instanceof Ratio)
             return value >= ((Ratio)obj).floatValue();
-        throw new TypeError(obj, "real");
+        throw new ConditionThrowable(new TypeError(obj, "real"));
     }
 
@@ -396 +396 @@
                 return values[0];
             }
-            throw new TypeError(arg, "float");
+            throw new ConditionThrowable(new TypeError(arg, "float"));
         }
     };
@@ -408 +408 @@
             if (arg instanceof LispFloat)
                 return Fixnum.TWO;
-            throw new TypeError(arg, "float");
+            throw new ConditionThrowable(new TypeError(arg, "float"));
         }
     };
@@ -420 +420 @@
             if (arg instanceof LispFloat)
                 return new Fixnum(52);
-            throw new TypeError(arg, "float");
+            throw new ConditionThrowable(new TypeError(arg, "float"));
         }
     };
 
-    public static LispFloat coerceToFloat(LispObject obj) throws TypeError
+    public static LispFloat coerceToFloat(LispObject obj) throws ConditionThrowable
     {
         if (obj instanceof LispFloat)
@@ -434 +434 @@
         if (obj instanceof Ratio)
             return new LispFloat(((Ratio)obj).floatValue());
-        throw new TypeError(obj, "real number");
+        throw new ConditionThrowable(new TypeError(obj, "real number"));
     }
 

trunk/j/src/org/armedbear/lisp/LispObject.java

@@ -3 +3 @@
  *
  * Copyright (C) 2002-2003 Peter Graves
- * $Id: LispObject.java,v 1.57 2003-09-19 01:46:41 piso Exp $
+ * $Id: LispObject.java,v 1.58 2003-09-19 11:50:18 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -72 +72 @@
     public LispObject car() throws ConditionThrowable
     {
-        throw new TypeError(this, "list");
+        throw new ConditionThrowable(new TypeError(this, "list"));
     }
 
     public void setCar(LispObject obj) throws ConditionThrowable
     {
-        throw new TypeError(this, "cons");
+        throw new ConditionThrowable(new TypeError(this, "cons"));
     }
 
     public LispObject cdr() throws ConditionThrowable
     {
-        throw new TypeError(this, "list");
+        throw new ConditionThrowable(new TypeError(this, "list"));
     }
 
     public void setCdr(LispObject obj) throws ConditionThrowable
     {
-        throw new TypeError(this, "cons");
+        throw new ConditionThrowable(new TypeError(this, "cons"));
     }
 
     public LispObject cadr() throws ConditionThrowable
     {
-        throw new TypeError(this, "list");
+        throw new ConditionThrowable(new TypeError(this, "list"));
     }
 
     public LispObject cddr() throws ConditionThrowable
     {
-        throw new TypeError(this, "list");
+        throw new ConditionThrowable(new TypeError(this, "list"));
     }
 
@@ -125 +125 @@
     }
 
-    public LispObject ABS() throws TypeError
-    {
-        throw new TypeError(this, "number");
-    }
-
-    public LispObject NUMERATOR() throws TypeError
-    {
-        throw new TypeError(this, "rational number");
-    }
-
-    public LispObject DENOMINATOR() throws TypeError
-    {
-        throw new TypeError(this, "rational number");
-    }
-
-    public LispObject EVENP() throws TypeError
+    public LispObject ABS() throws ConditionThrowable
+    {
+        throw new ConditionThrowable(new TypeError(this, "number"));
+    }
+
+    public LispObject NUMERATOR() throws ConditionThrowable
+    {
+        throw new ConditionThrowable(new TypeError(this, "rational number"));
+    }
+
+    public LispObject DENOMINATOR() throws ConditionThrowable
+    {
+        throw new ConditionThrowable(new TypeError(this, "rational number"));
+    }
+
+    public LispObject EVENP() throws ConditionThrowable
     {
         return evenp() ? T : NIL;
     }
 
-    public boolean evenp() throws TypeError
-    {
-        throw new TypeError(this, "integer");
-    }
-
-    public LispObject ODDP() throws TypeError
+    public boolean evenp() throws ConditionThrowable
+    {
+        throw new ConditionThrowable(new TypeError(this, "integer"));
+    }
+
+    public LispObject ODDP() throws ConditionThrowable
     {
         return oddp() ? T : NIL;
     }
 
-    public boolean oddp() throws TypeError
-    {
-        throw new TypeError(this, "integer");
-    }
-
-    public LispObject PLUSP() throws TypeError
+    public boolean oddp() throws ConditionThrowable
+    {
+        throw new ConditionThrowable(new TypeError(this, "integer"));
+    }
+
+    public LispObject PLUSP() throws ConditionThrowable
     {
         return plusp() ? T : NIL;
     }
 
-    public boolean plusp() throws TypeError
-    {
-        throw new TypeError(this, "real number");
-    }
-
-    public LispObject MINUSP() throws TypeError
+    public boolean plusp() throws ConditionThrowable
+    {
+        throw new ConditionThrowable(new TypeError(this, "real number"));
+    }
+
+    public LispObject MINUSP() throws ConditionThrowable
     {
         return minusp() ? T : NIL;
     }
 
-    public boolean minusp() throws TypeError
-    {
-        throw new TypeError(this, "real number");
+    public boolean minusp() throws ConditionThrowable
+    {
+        throw new ConditionThrowable(new TypeError(this, "real number"));
     }
 
@@ -190 +190 @@
     }
 
-    public LispObject ZEROP() throws TypeError
+    public LispObject ZEROP() throws ConditionThrowable
     {
         return zerop() ? T : NIL;
     }
 
-    public boolean zerop() throws TypeError
-    {
-        throw new TypeError(this, "number");
+    public boolean zerop() throws ConditionThrowable
+    {
+        throw new ConditionThrowable(new TypeError(this, "number"));
     }
 
@@ -272 +272 @@
     public int length() throws ConditionThrowable
     {
-        throw new TypeError(this, "sequence");
+        throw new ConditionThrowable(new TypeError(this, "sequence"));
     }
 
@@ -282 +282 @@
     public LispObject elt(int index) throws ConditionThrowable
     {
-        throw new TypeError(this, "sequence");
+        throw new ConditionThrowable(new TypeError(this, "sequence"));
     }
 
     public LispObject AREF(LispObject index) throws ConditionThrowable
     {
-        throw new TypeError(this, "array");
+        throw new ConditionThrowable(new TypeError(this, "array"));
     }
 
     public LispObject[] copyToArray() throws ConditionThrowable
     {
-        throw new TypeError(this, "list");
+        throw new ConditionThrowable(new TypeError(this, "list"));
     }
 
@@ -310 +310 @@
     }
 
-    public LispObject ENDP() throws TypeError
-    {
-        throw new TypeError(this, "list");
+    public LispObject ENDP() throws ConditionThrowable
+    {
+        throw new ConditionThrowable(new TypeError(this, "list"));
     }
 
@@ -327 +327 @@
     public LispObject getSymbolValue() throws ConditionThrowable
     {
-        throw new TypeError(this, "symbol");
+        throw new ConditionThrowable(new TypeError(this, "symbol"));
     }
 
     public LispObject getSymbolFunction() throws ConditionThrowable
     {
-        throw new TypeError(this, "symbol");
+        throw new ConditionThrowable(new TypeError(this, "symbol"));
     }
 
     public LispObject getSymbolFunctionOrDie() throws ConditionThrowable
     {
-        throw new TypeError(this, "symbol");
+        throw new ConditionThrowable(new TypeError(this, "symbol"));
     }
 
@@ -386 +386 @@
     public LispObject incr() throws ConditionThrowable
     {
-        throw new TypeError(this, "number");
+        throw new ConditionThrowable(new TypeError(this, "number"));
     }
 
     public LispObject decr() throws ConditionThrowable
     {
-        throw new TypeError(this, "number");
+        throw new ConditionThrowable(new TypeError(this, "number"));
     }
 
     public LispObject add(LispObject obj) throws ConditionThrowable
     {
-        throw new TypeError(this, "number");
+        throw new ConditionThrowable(new TypeError(this, "number"));
     }
 
     public LispObject subtract(LispObject obj) throws ConditionThrowable
     {
-        throw new TypeError(this, "number");
+        throw new ConditionThrowable(new TypeError(this, "number"));
     }
 
     public LispObject multiplyBy(LispObject obj) throws ConditionThrowable
     {
-        throw new TypeError(this, "number");
+        throw new ConditionThrowable(new TypeError(this, "number"));
     }
 
     public LispObject divideBy(LispObject obj) throws ConditionThrowable
     {
-        throw new TypeError(this, "number");
+        throw new ConditionThrowable(new TypeError(this, "number"));
     }
 
     public boolean isEqualTo(LispObject obj) throws ConditionThrowable
     {
-        throw new TypeError(this, "number");
+        throw new ConditionThrowable(new TypeError(this, "number"));
     }
 
@@ -426 +426 @@
     public boolean isNotEqualTo(LispObject obj) throws ConditionThrowable
     {
-        throw new TypeError(this, "number");
+        throw new ConditionThrowable(new TypeError(this, "number"));
     }
 
@@ -436 +436 @@
     public boolean isLessThan(LispObject obj) throws ConditionThrowable
     {
-        throw new TypeError(this, "number");
+        throw new ConditionThrowable(new TypeError(this, "number"));
     }
 
@@ -446 +446 @@
     public boolean isGreaterThan(LispObject obj) throws ConditionThrowable
     {
-        throw new TypeError(this, "number");
+        throw new ConditionThrowable(new TypeError(this, "number"));
     }
 
@@ -456 +456 @@
     public boolean isLessThanOrEqualTo(LispObject obj) throws ConditionThrowable
     {
-        throw new TypeError(this, "number");
+        throw new ConditionThrowable(new TypeError(this, "number"));
     }
 
@@ -466 +466 @@
     public boolean isGreaterThanOrEqualTo(LispObject obj) throws ConditionThrowable
     {
-        throw new TypeError(this, "number");
+        throw new ConditionThrowable(new TypeError(this, "number"));
     }
 
@@ -476 +476 @@
     public LispObject truncate(LispObject obj) throws ConditionThrowable
     {
-        throw new TypeError(this, "real number");
+        throw new ConditionThrowable(new TypeError(this, "real number"));
     }
 

trunk/j/src/org/armedbear/lisp/LispString.java

@@ -3 +3 @@
  *
  * Copyright (C) 2002-2003 Peter Graves
- * $Id: LispString.java,v 1.58 2003-09-19 01:46:41 piso Exp $
+ * $Id: LispString.java,v 1.59 2003-09-19 11:50:18 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -244 +244 @@
         }
         catch (ClassCastException e) {
-            throw new TypeError(obj, "string");
+            throw new ConditionThrowable(new TypeError(obj, "string"));
         }
     }

trunk/j/src/org/armedbear/lisp/LispThread.java

@@ -3 +3 @@
  *
  * Copyright (C) 2003 Peter Graves
- * $Id: LispThread.java,v 1.11 2003-09-19 01:46:41 piso Exp $
+ * $Id: LispThread.java,v 1.12 2003-09-19 11:50:18 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -340 +340 @@
                 ((LispFloat)arg.multiplyBy(new LispFloat(1000))).getValue();
             if (d < 0)
-                throw new TypeError(arg, "non-negative real");
+                throw new ConditionThrowable(new TypeError(arg, "non-negative real"));
             long millis = d < Long.MAX_VALUE ? (long) d : Long.MAX_VALUE;
             try {
@@ -380 +380 @@
                 return T;
             } else
-                throw new TypeError(arg, "Lisp thread");
+                throw new ConditionThrowable(new TypeError(arg, "Lisp thread"));
         }
     };

trunk/j/src/org/armedbear/lisp/Nil.java

@@ -3 +3 @@
  *
  * Copyright (C) 2002-2003 Peter Graves
- * $Id: Nil.java,v 1.23 2003-09-19 01:46:41 piso Exp $
+ * $Id: Nil.java,v 1.24 2003-09-19 11:50:18 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -87 +87 @@
     public LispObject elt(int index) throws ConditionThrowable
     {
-        throw new TypeError("ELT: invalid index " + index + " for " + this);
+        throw new ConditionThrowable(new TypeError("ELT: invalid index " + index + " for " + this));
     }
 

trunk/j/src/org/armedbear/lisp/Pathname.java

@@ -3 +3 @@
  *
  * Copyright (C) 2003 Peter Graves
- * $Id: Pathname.java,v 1.12 2003-09-19 01:46:42 piso Exp $
+ * $Id: Pathname.java,v 1.13 2003-09-19 11:50:19 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -96 +96 @@
             if (arg instanceof Pathname)
                 return new LispString(((Pathname)arg).getNamestring());
-            throw new TypeError(arg, "pathname designator");
+            throw new ConditionThrowable(new TypeError(arg, "pathname designator"));
         }
     };
@@ -114 +114 @@
                 namestring = ((Pathname)arg).getNamestring();
             else
-                throw new TypeError(arg, "pathname designator");
+                throw new ConditionThrowable(new TypeError(arg, "pathname designator"));
             if (namestring != null) {
                 for (int i = namestring.length(); i-- > 0;) {
@@ -136 +136 @@
             if (arg instanceof LispString)
                 return new Pathname(((LispString)arg).getValue());
-            throw new TypeError(arg, "pathname designator");
+            throw new ConditionThrowable(new TypeError(arg, "pathname designator"));
         }
     };

trunk/j/src/org/armedbear/lisp/Primitives.java

@@ -3 +3 @@
  *
  * Copyright (C) 2002-2003 Peter Graves
- * $Id: Primitives.java,v 1.405 2003-09-19 01:46:42 piso Exp $
+ * $Id: Primitives.java,v 1.406 2003-09-19 11:50:19 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -213 +213 @@
                 LispObject result = args[0];
                 if (!result.realp())
-                    throw new TypeError(result, "real");
+                    throw new ConditionThrowable(new TypeError(result, "real"));
                 for (int i = 1; i < args.length; i++) {
                     if (args[i].isLessThan(result))
@@ -225 +225 @@
                 LispObject result = args[0];
                 if (!result.realp())
-                    throw new TypeError(result, "real");
+                    throw new ConditionThrowable(new TypeError(result, "real"));
                 for (int i = 1; i < args.length; i++) {
                     if (args[i].isGreaterThan(result))
@@ -293 +293 @@
                 if (arg.typep(Symbol.SYMBOL) != NIL)
                     return new LispString(arg.getName());
-                throw new TypeError(arg, "symbol");
+                throw new ConditionThrowable(new TypeError(arg, "symbol"));
             case SYMBOL_PACKAGE:                // ### symbol-package
                 return checkSymbol(arg).getPackage();
@@ -313 +313 @@
                 }
                 catch (ClassCastException e) {
-                    throw new TypeError(arg, "symbol");
+                    throw new ConditionThrowable(new TypeError(arg, "symbol"));
                 }
             case ABS:                           // ### abs
@@ -324 +324 @@
                 if (arg instanceof AbstractArray)
                     return NIL;
-                throw new TypeError(arg, "array");
+                throw new ConditionThrowable(new TypeError(arg, "array"));
             case VECTORP:                       // ### vectorp
                 return arg.VECTORP();
@@ -527 +527 @@
     // ### plusp
     private static final Primitive1 PLUSP = new Primitive1("plusp") {
-        public LispObject execute(LispObject arg) throws TypeError
+        public LispObject execute(LispObject arg) throws ConditionThrowable
         {
             return arg.PLUSP();
@@ -535 +535 @@
     // ### minusp
     private static final Primitive1 MINUSP = new Primitive1("minusp") {
-        public LispObject execute(LispObject arg) throws TypeError
+        public LispObject execute(LispObject arg) throws ConditionThrowable
         {
             return arg.MINUSP();
@@ -543 +543 @@
     // ### zerop
     private static final Primitive1 ZEROP = new Primitive1("zerop") {
-        public LispObject execute(LispObject arg) throws TypeError
+        public LispObject execute(LispObject arg) throws ConditionThrowable
         {
             return arg.ZEROP();
@@ -677 +677 @@
                     out = (CharacterOutputStream) args[1];
                 else
-                    throw new TypeError(args[0], "output stream");
+                    throw new ConditionThrowable(new TypeError(args[0], "output stream"));
             }
             if (out == null)
@@ -722 +722 @@
                 out = getStandardOutput();
             else
-                throw new TypeError(second, "output stream");
+                throw new ConditionThrowable(new TypeError(second, "output stream"));
             out.prin1(first);
             return first;
@@ -764 +764 @@
                     out = (CharacterOutputStream) args[0];
                 else
-                    throw new TypeError(args[0], "output stream");
+                    throw new ConditionThrowable(new TypeError(args[0], "output stream"));
             }
             if (out == null)
@@ -898 +898 @@
                             }
                         } else
-                            throw new TypeError(list, "list");
+                            throw new ConditionThrowable(new TypeError(list, "list"));
                     }
                     if (result == null)
@@ -1071 +1071 @@
                         return cons;
                 } else if (cons != NIL)
-                    throw new TypeError(cons, "list");
+                    throw new ConditionThrowable(new TypeError(cons, "list"));
                 alist = alist.cdr();
             }
@@ -1131 +1131 @@
             final int index = Fixnum.getValue(first);
             if (index < 0)
-                throw new TypeError("bad index to NTHCDR: " + index);
+                throw new ConditionThrowable(new TypeError("bad index to NTHCDR: " + index));
             for (int i = 0; i < index; i++) {
                 second = second.cdr();
@@ -1156 +1156 @@
                     throw new ConditionThrowable(new ProgramError(_format(args, 1)));
                 if (datum == Symbol.TYPE_ERROR)
-                    throw new TypeError(_format(args, 1));
+                    throw new ConditionThrowable(new TypeError(_format(args, 1)));
                 // Default.
                 throw new SimpleError(((Symbol)datum).getName());
@@ -1398 +1398 @@
                 symbol.setVariableDocumentation(third);
             else if (third != NIL)
-                throw new TypeError(third, "string");
+                throw new ConditionThrowable(new TypeError(third, "string"));
             symbol.setSymbolValue(second);
             symbol.setSpecial(true);
@@ -1427 +1427 @@
                 symbol.setVariableDocumentation(third);
             else if (third != NIL)
-                throw new TypeError(third, "string");
+                throw new ConditionThrowable(new TypeError(third, "string"));
             symbol.setSymbolValue(second);
             symbol.setConstant(true);
@@ -1527 +1527 @@
                 args = args.cdr();
             }
-            throw new TypeError("ECASE: no match for " + key);
+            throw new ConditionThrowable(new TypeError("ECASE: no match for " + key));
         }
     };
@@ -1795 +1795 @@
             return c instanceof UndefinedFunctionError;
         if (type == Symbol.TYPE_ERROR)
-            return c instanceof TypeError;
+            return c.getCondition() instanceof TypeError;
         if (type == Symbol.PACKAGE_ERROR)
             return c instanceof PackageError;
@@ -1814 +1814 @@
             if (condition instanceof ProgramError)
                 return true;
+            if (condition instanceof TypeError)
+                return true;
             return false;
         }
@@ -1923 +1925 @@
                     return NIL;
                 } else
-                    throw new TypeError(arg, "integer");
+                    throw new ConditionThrowable(new TypeError(arg, "integer"));
             }
             return T;
@@ -2002 +2004 @@
                 throw new ConditionThrowable(new ProgramError());
             } else
-                throw new TypeError(subscript, "integer");
+                throw new ConditionThrowable(new TypeError(subscript, "integer"));
         }
         return sum;
@@ -2046 +2048 @@
             AbstractVector v = checkVector(first);
             if (!v.isSimpleVector())
-                throw new TypeError(first, "simple vector");
+                throw new ConditionThrowable(new TypeError(first, "simple vector"));
             int index = v.checkIndex(second);
             return v.get(index);
@@ -2062 +2064 @@
             AbstractVector v = checkVector(first);
             if (!v.isSimpleVector())
-                throw new TypeError(first, "simple vector");
+                throw new ConditionThrowable(new TypeError(first, "simple vector"));
             int i = v.checkIndex(second);
             v.set(i, third);
@@ -2077 +2079 @@
             int fillPointer = checkVector(arg).getFillPointer();
             if (fillPointer < 0)
-                throw new TypeError("array does not have a fill pointer");
+                throw new ConditionThrowable(new TypeError("array does not have a fill pointer"));
             return new Fixnum(fillPointer);
         }
@@ -2091 +2093 @@
             int fillPointer = v.getFillPointer();
             if (fillPointer < 0)
-                throw new TypeError("array does not have a fill pointer");
+                throw new ConditionThrowable(new TypeError("array does not have a fill pointer"));
             v.setFillPointer(second);
             return second;
@@ -2107 +2109 @@
             int fillPointer = v.getFillPointer();
             if (fillPointer < 0)
-                throw new TypeError("array does not have a fill pointer");
+                throw new ConditionThrowable(new TypeError("array does not have a fill pointer"));
             if (fillPointer >= v.capacity())
                 return NIL;
@@ -2132 +2134 @@
             int fillPointer = v.getFillPointer();
             if (fillPointer < 0)
-                throw new TypeError("array does not have a fill pointer");
+                throw new ConditionThrowable(new TypeError("array does not have a fill pointer"));
             if (fillPointer >= v.capacity()) {
                 // Need to extend vector.
@@ -2152 +2154 @@
             int fillPointer = v.getFillPointer();
             if (fillPointer < 0)
-                throw new TypeError("array does not have a fill pointer");
+                throw new ConditionThrowable(new TypeError("array does not have a fill pointer"));
             if (fillPointer == 0)
                 throw new LispError("nothing left to pop");
@@ -2311 +2313 @@
                 }
             }
-            throw new TypeError(fun, "function");
+            throw new ConditionThrowable(new TypeError(fun, "function"));
         }
         public LispObject execute(final LispObject[] args) throws ConditionThrowable
@@ -2334 +2336 @@
                 return funcall(fun, funArgs, LispThread.currentThread());
             }
-            throw new TypeError(fun, "function");
+            throw new ConditionThrowable(new TypeError(fun, "function"));
         }
     };
@@ -2414 +2416 @@
             for (int i = 1; i < numArgs; i++) {
                 if (!args[i].listp())
-                    throw new TypeError(args[i], "list");
+                    throw new ConditionThrowable(new TypeError(args[i], "list"));
                 int len = args[i].length();
                 if (commonLength < 0)
@@ -2488 +2490 @@
                     int n = ((Fixnum)arg).getValue();
                     if (n < 0)
-                        throw new TypeError(arg,
-                            "non-negative integer");
+                        throw new ConditionThrowable(new TypeError(arg,
+                                                                   "non-negative integer"));
                     StringBuffer sb = new StringBuffer(prefix);
                     sb.append(n);
@@ -2497 +2499 @@
                     BigInteger n = ((Bignum)arg).getValue();
                     if (n.signum() < 0)
-                        throw new TypeError(arg,
-                            "non-negative integer");
+                        throw new ConditionThrowable(new TypeError(arg,
+                                                                   "non-negative integer"));
                     StringBuffer sb = new StringBuffer(prefix);
                     sb.append(n.toString());
@@ -2506 +2508 @@
                     prefix = ((LispString)arg).getValue();
                 else
-                    throw new TypeError(arg, "string or non-negative integer");
+                    throw new ConditionThrowable(new TypeError(arg, "string or non-negative integer"));
             }
             return gensym(prefix);
@@ -3628 +3630 @@
                     out = getStandardOutput();
                 else
-                    throw new TypeError(args[1],
-                                        "character output stream");
+                    throw new ConditionThrowable(new TypeError(args[1],
+                                                               "character output stream"));
             }
             out.writeChar(c);
@@ -3655 +3657 @@
                     out = getStandardOutput();
                 else
-                    throw new TypeError(args[1],
-                        "character output stream");
+                    throw new ConditionThrowable(new TypeError(args[1],
+                                                               "character output stream"));
             }
             out.writeString(string);
@@ -3683 +3685 @@
                     out = getStandardOutput();
                 else
-                    throw new TypeError(args[1], "character output stream");
+                    throw new ConditionThrowable(new TypeError(args[1], "character output stream"));
             }
             out.finishOutput();
@@ -3777 +3779 @@
             int n = Fixnum.getValue(first);
             if (n < 0 || n > 255)
-                throw new TypeError(first, "unsigned byte");
+                throw new ConditionThrowable(new TypeError(first, "unsigned byte"));
             if (second instanceof BinaryOutputStream) {
                 ((BinaryOutputStream)second).writeByte(n);
                 return first;
             }
-            throw new TypeError(second, "binary output stream");
+            throw new ConditionThrowable(new TypeError(second, "binary output stream"));
         }
     };
@@ -3799 +3801 @@
                 stream = (BinaryInputStream) args[0];
             else
-                throw new TypeError(args[0], "binary input stream");
+                throw new ConditionThrowable(new TypeError(args[0], "binary input stream"));
             boolean eofError = length > 1 ? (args[1] != NIL) : true;
             LispObject eofValue = length > 2 ? args[2] : NIL;
@@ -3824 +3826 @@
                 stream = ((TwoWayStream)args[0]).getInputStream();
             else
-                throw new TypeError(args[0], "input stream");
+                throw new ConditionThrowable(new TypeError(args[0], "input stream"));
             boolean eofError = length > 1 ? (args[1] != NIL) : true;
             LispObject eofValue = length > 2 ? args[2] : NIL;
@@ -4042 +4044 @@
                 return second;
             } else
-                throw new TypeError(first, "function");
+                throw new ConditionThrowable(new TypeError(first, "function"));
         }
     };
@@ -4104 +4106 @@
                 }
             }
-            throw new TypeError(args[0], "positive integer or positive float");
+            throw new ConditionThrowable(new TypeError(args[0], "positive integer or positive float"));
         }
     };
@@ -4135 +4137 @@
             if (n instanceof LispFloat)
                 return ((LispFloat)n).truncate(d);
-            throw new TypeError(n, "number");
+            throw new ConditionThrowable(new TypeError(n, "number"));
         }
     };
@@ -4151 +4153 @@
                 n = ((Bignum)first).getValue();
             else
-                throw new TypeError(first, "integer");
+                throw new ConditionThrowable(new TypeError(first, "integer"));
             if (second instanceof Fixnum) {
                 int count = Fixnum.getInt(second);
@@ -4170 +4172 @@
                 Debug.bug(); // Shouldn't happen.
             }
-            throw new TypeError(second, "integer");
+            throw new ConditionThrowable(new TypeError(second, "integer"));
         }
     };
@@ -4360 +4362 @@
             if (arg == NIL)
                 return NIL;
-            throw new TypeError(arg, "proper sequence");
+            throw new ConditionThrowable(new TypeError(arg, "proper sequence"));
         }
     };
@@ -4373 +4375 @@
                 int index = Fixnum.getValue(second);
                 if (index < 0)
-                    throw new TypeError();
+                    throw new ConditionThrowable(new TypeError());
                 LispObject list = first;
                 int i = 0;
@@ -4383 +4385 @@
                     list = list.cdr();
                     if (list == NIL)
-                        throw new TypeError();
+                        throw new ConditionThrowable(new TypeError());
                     ++i;
                 }
@@ -4390 +4392 @@
                 return third;
             } else
-                throw new TypeError(first, "sequence");
+                throw new ConditionThrowable(new TypeError(first, "sequence"));
         }
     };
@@ -4429 +4431 @@
             int size = Fixnum.getValue(first);
             if (size < 0)
-                throw new TypeError("MAKE-LIST: " + size +
-                                    " is not a valid list length");
+                throw new ConditionThrowable(new TypeError("MAKE-LIST: " + size +
+                                                           " is not a valid list length"));
             LispObject result = NIL;
             for (int i = size; i-- > 0;)
@@ -4603 +4605 @@
             if (arg.realp())
                 return arg;
-            throw new TypeError(arg, "real number");
+            throw new ConditionThrowable(new TypeError(arg, "real number"));
         }
         public LispObject execute(LispObject first, LispObject second)
@@ -4644 +4646 @@
             if (arg.numberp())
                 return arg;
-            throw new TypeError(arg, "number");
+            throw new ConditionThrowable(new TypeError(arg, "number"));
         }
     };
@@ -4661 +4663 @@
     private static final Primitive1 INTEGER_LENGTH =
         new Primitive1("integer-length") {
-        public LispObject execute(LispObject arg) throws TypeError
+        public LispObject execute(LispObject arg) throws ConditionThrowable
         {
             BigInteger value;
@@ -4669 +4671 @@
                 value = ((Bignum)arg).getValue();
             else
-                throw new TypeError(arg, "integer");
+                throw new ConditionThrowable(new TypeError(arg, "integer"));
             return new Fixnum(value.bitLength());
         }
@@ -4688 +4690 @@
     };
 
-    private static final LispFloat sqrt(LispObject obj) throws TypeError
+    private static final LispFloat sqrt(LispObject obj) throws ConditionThrowable
     {
         if (obj instanceof Fixnum)
@@ -4698 +4700 @@
         if (obj instanceof LispFloat)
             return new LispFloat(Math.sqrt(((LispFloat)obj).getValue()));
-        throw new TypeError(obj, "number");
+        throw new ConditionThrowable(new TypeError(obj, "number"));
     }
 
@@ -4713 +4715 @@
     };
 
-    private static final LispFloat log(LispObject obj) throws TypeError
+    private static final LispFloat log(LispObject obj) throws ConditionThrowable
     {
         if (obj instanceof Fixnum)
@@ -4723 +4725 @@
         if (obj instanceof LispFloat)
             return new LispFloat(Math.log(((LispFloat)obj).getValue()));
-        throw new TypeError(obj, "number");
+        throw new ConditionThrowable(new TypeError(obj, "number"));
     }
 
@@ -4739 +4741 @@
                 n1 = ((Bignum)first).getValue();
             else
-                throw new TypeError(first, "integer");
+                throw new ConditionThrowable(new TypeError(first, "integer"));
             if (second instanceof Fixnum)
                 n2 = BigInteger.valueOf(((Fixnum)second).getValue());
@@ -4745 +4747 @@
                 n2 = ((Bignum)second).getValue();
             else
-                throw new TypeError(second, "integer");
+                throw new ConditionThrowable(new TypeError(second, "integer"));
             return number(n1.gcd(n2));
         }

trunk/j/src/org/armedbear/lisp/Ratio.java

@@ -3 +3 @@
  *
  * Copyright (C) 2003 Peter Graves
- * $Id: Ratio.java,v 1.33 2003-09-19 01:46:42 piso Exp $
+ * $Id: Ratio.java,v 1.34 2003-09-19 11:50:19 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -188 +188 @@
             return Complex.getInstance(add(c.getRealPart()), c.getImaginaryPart());
         }
-        throw new TypeError(obj, "number");
+        throw new ConditionThrowable(new TypeError(obj, "number"));
     }
 
@@ -220 +220 @@
                                        Fixnum.ZERO.subtract(c.getImaginaryPart()));
         }
-        throw new TypeError(obj, "number");
+        throw new ConditionThrowable(new TypeError(obj, "number"));
     }
 
@@ -241 +241 @@
             return new LispFloat(floatValue() * ((LispFloat)obj).getValue());
         }
-        throw new TypeError(obj, "number");
+        throw new ConditionThrowable(new TypeError(obj, "number"));
     }
 
@@ -264 +264 @@
             return new LispFloat(floatValue() / ((LispFloat)obj).getValue());
         }
-        throw new TypeError(obj, "number");
+        throw new ConditionThrowable(new TypeError(obj, "number"));
     }
 
@@ -276 +276 @@
         if (obj.numberp())
             return false;
-        throw new TypeError(obj, "number");
+        throw new ConditionThrowable(new TypeError(obj, "number"));
     }
 
@@ -302 +302 @@
             return floatValue() < ((LispFloat)obj).getValue();
         }
-        throw new TypeError(obj, "real");
+        throw new ConditionThrowable(new TypeError(obj, "real"));
     }
 
@@ -323 +323 @@
             return floatValue() > ((LispFloat)obj).getValue();
         }
-        throw new TypeError(obj, "real");
+        throw new ConditionThrowable(new TypeError(obj, "real"));
     }
 
@@ -344 +344 @@
             return floatValue() <= ((LispFloat)obj).getValue();
         }
-        throw new TypeError(obj, "real");
+        throw new ConditionThrowable(new TypeError(obj, "real"));
     }
 
@@ -365 +365 @@
             return floatValue() >= ((LispFloat)obj).getValue();
         }
-        throw new TypeError(obj, "real");
+        throw new ConditionThrowable(new TypeError(obj, "real"));
     }
 
@@ -382 +382 @@
         } else {
             Thread.dumpStack();
-            throw new TypeError(obj, "number");
+            throw new ConditionThrowable(new TypeError(obj, "number"));
         }
 

trunk/j/src/org/armedbear/lisp/StringFunctions.java

@@ -3 +3 @@
  *
  * Copyright (C) 2003 Peter Graves
- * $Id: StringFunctions.java,v 1.4 2003-09-19 01:46:42 piso Exp $
+ * $Id: StringFunctions.java,v 1.5 2003-09-19 11:50:19 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -388 +388 @@
             int start = (int) Fixnum.getValue(second);
             if (start < 0 || start > length)
-                throw new TypeError("invalid start position " + start);
+                throw new ConditionThrowable(new TypeError("invalid start position " + start));
             int end;
             if (third == NIL)
@@ -395 +395 @@
                 end = (int) Fixnum.getValue(third);
             if (end < 0 || end > length)
-                throw new TypeError("invalid end position " + start);
+                throw new ConditionThrowable(new TypeError("invalid end position " + start));
             if (start > end)
-                throw new TypeError("start (" + start + ") is greater than end (" + end + ")");
+                throw new ConditionThrowable(new TypeError("start (" + start + ") is greater than end (" + end + ")"));
             StringBuffer sb = new StringBuffer(length);
             char[] array = s.chars();
@@ -421 +421 @@
             int start = (int) Fixnum.getValue(second);
             if (start < 0 || start > length)
-                throw new TypeError("invalid start position " + start);
+                throw new ConditionThrowable(new TypeError("invalid start position " + start));
             int end;
             if (third == NIL)
@@ -428 +428 @@
                 end = (int) Fixnum.getValue(third);
             if (end < 0 || end > length)
-                throw new TypeError("invalid end position " + start);
+                throw new ConditionThrowable(new TypeError("invalid end position " + start));
             if (start > end)
-                throw new TypeError("start (" + start + ") is greater than end (" + end + ")");
+                throw new ConditionThrowable(new TypeError("start (" + start + ") is greater than end (" + end + ")"));
             StringBuffer sb = new StringBuffer(length);
             char[] array = s.chars();
@@ -454 +454 @@
             int start = (int) Fixnum.getValue(second);
             if (start < 0 || start > length)
-                throw new TypeError("invalid start position " + start);
+                throw new ConditionThrowable(new TypeError("invalid start position " + start));
             int end;
             if (third == NIL)
@@ -461 +461 @@
                 end = (int) Fixnum.getValue(third);
             if (end < 0 || end > length)
-                throw new TypeError("invalid end position " + start);
+                throw new ConditionThrowable(new TypeError("invalid end position " + start));
             if (start > end)
-                throw new TypeError("start (" + start + ") is greater than end (" + end + ")");
+                throw new ConditionThrowable(new TypeError("start (" + start + ") is greater than end (" + end + ")"));
             StringBuffer sb = new StringBuffer(length);
             char[] array = s.chars();
@@ -499 +499 @@
             int start = (int) Fixnum.getValue(second);
             if (start < 0 || start > length)
-                throw new TypeError("invalid start position " + start);
+                throw new ConditionThrowable(new TypeError("invalid start position " + start));
             int end;
             if (third == NIL)
@@ -506 +506 @@
                 end = (int) Fixnum.getValue(third);
             if (end < 0 || end > length)
-                throw new TypeError("invalid end position " + start);
+                throw new ConditionThrowable(new TypeError("invalid end position " + start));
             if (start > end)
-                throw new TypeError("start (" + start + ") is greater than end (" + end + ")");
+                throw new ConditionThrowable(new TypeError("start (" + start + ") is greater than end (" + end + ")"));
             char[] array = s.chars();
             for (int i = start; i < end; i++)
@@ -526 +526 @@
             int start = (int) Fixnum.getValue(second);
             if (start < 0 || start > length)
-                throw new TypeError("invalid start position " + start);
+                throw new ConditionThrowable(new TypeError("invalid start position " + start));
             int end;
             if (third == NIL)
@@ -533 +533 @@
                 end = (int) Fixnum.getValue(third);
             if (end < 0 || end > length)
-                throw new TypeError("invalid end position " + start);
+                throw new ConditionThrowable(new TypeError("invalid end position " + start));
             if (start > end)
-                throw new TypeError("start (" + start + ") is greater than end (" + end + ")");
+                throw new ConditionThrowable(new TypeError("start (" + start + ") is greater than end (" + end + ")"));
             char[] array = s.chars();
             for (int i = start; i < end; i++)
@@ -553 +553 @@
             int start = (int) Fixnum.getValue(second);
             if (start < 0 || start > length)
-                throw new TypeError("invalid start position " + start);
+                throw new ConditionThrowable(new TypeError("invalid start position " + start));
             int end;
             if (third == NIL)
@@ -560 +560 @@
                 end = (int) Fixnum.getValue(third);
             if (end < 0 || end > length)
-                throw new TypeError("invalid end position " + start);
+                throw new ConditionThrowable(new TypeError("invalid end position " + start));
             if (start > end)
-                throw new TypeError("start (" + start + ") is greater than end (" + end + ")");
+                throw new ConditionThrowable(new TypeError("start (" + start + ") is greater than end (" + end + ")"));
             char[] array = s.chars();
             boolean lastCharWasAlphanumeric = false;

trunk/j/src/org/armedbear/lisp/StringOutputStream.java

@@ -3 +3 @@
  *
  * Copyright (C) 2002-2003 Peter Graves
- * $Id: StringOutputStream.java,v 1.3 2003-09-19 01:46:42 piso Exp $
+ * $Id: StringOutputStream.java,v 1.4 2003-09-19 11:50:19 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -70 +70 @@
             if (arg instanceof StringOutputStream)
                 return ((StringOutputStream)arg).getString();
-            throw new TypeError(this, "string output stream");
+            throw new ConditionThrowable(new TypeError(this, "string output stream"));
         }
     };

trunk/j/src/org/armedbear/lisp/StructureObject.java

@@ -3 +3 @@
  *
  * Copyright (C) 2003 Peter Graves
- * $Id: StructureObject.java,v 1.10 2003-09-19 01:46:42 piso Exp $
+ * $Id: StructureObject.java,v 1.11 2003-09-19 11:50:19 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -84 +84 @@
             }
             catch (ClassCastException e) {
-                throw new TypeError();
+                throw new ConditionThrowable(new TypeError());
             }
             catch (ArrayIndexOutOfBoundsException e) {
@@ -101 +101 @@
             }
             catch (ClassCastException e) {
-                throw new TypeError();
+                throw new ConditionThrowable(new TypeError());
             }
             catch (ArrayIndexOutOfBoundsException e) {
@@ -118 +118 @@
             }
             catch (ClassCastException e) {
-                throw new TypeError();
+                throw new ConditionThrowable(new TypeError());
             }
             catch (ArrayIndexOutOfBoundsException e) {
@@ -135 +135 @@
             }
             catch (ClassCastException e) {
-                throw new TypeError();
+                throw new ConditionThrowable(new TypeError());
             }
             catch (ArrayIndexOutOfBoundsException e) {
@@ -157 +157 @@
             }
             catch (ClassCastException e) {
-                throw new TypeError();
+                throw new ConditionThrowable(new TypeError());
             }
             catch (ArrayIndexOutOfBoundsException e) {
@@ -176 +176 @@
             }
             catch (ClassCastException e) {
-                throw new TypeError();
+                throw new ConditionThrowable(new TypeError());
             }
             catch (ArrayIndexOutOfBoundsException e) {
@@ -195 +195 @@
             }
             catch (ClassCastException e) {
-                throw new TypeError();
+                throw new ConditionThrowable(new TypeError());
             }
             catch (ArrayIndexOutOfBoundsException e) {
@@ -214 +214 @@
             }
             catch (ClassCastException e) {
-                throw new TypeError();
+                throw new ConditionThrowable(new TypeError());
             }
             catch (ArrayIndexOutOfBoundsException e) {
@@ -244 +244 @@
             }
             catch (ClassCastException e) {
-                throw new TypeError(arg, "STRUCTURE-OBJECT");
+                throw new ConditionThrowable(new TypeError(arg, "STRUCTURE-OBJECT"));
             }
         }

trunk/j/src/org/armedbear/lisp/Time.java

@@ -3 +3 @@
  *
  * Copyright (C) 2003 Peter Graves
- * $Id: Time.java,v 1.5 2003-09-19 01:46:42 piso Exp $
+ * $Id: Time.java,v 1.6 2003-09-19 11:50:19 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -82 +82 @@
                 namestring = ((Pathname)arg).getNamestring();
             else
-                throw new TypeError(arg, "pathname designator");
+                throw new ConditionThrowable(new TypeError(arg, "pathname designator"));
             File file = new File(namestring);
             long lastModified = file.lastModified();

trunk/j/src/org/armedbear/lisp/TwoWayStream.java

@@ -3 +3 @@
  *
  * Copyright (C) 2003 Peter Graves
- * $Id: TwoWayStream.java,v 1.3 2003-09-19 01:46:42 piso Exp $
+ * $Id: TwoWayStream.java,v 1.4 2003-09-19 11:50:19 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -70 +70 @@
         {
             if (!(first instanceof CharacterInputStream))
-                throw new TypeError(first, "input stream");
+                throw new ConditionThrowable(new TypeError(first, "input stream"));
             if (!(second instanceof CharacterOutputStream))
-                throw new TypeError(second, "output stream");
+                throw new ConditionThrowable(new TypeError(second, "output stream"));
             return new TwoWayStream((CharacterInputStream) first,
                 (CharacterOutputStream) second);
@@ -86 +86 @@
             if (arg instanceof TwoWayStream)
                 return ((TwoWayStream)arg).getInputStream();
-            throw new TypeError(arg, "two-way-stream");
+            throw new ConditionThrowable(new TypeError(arg, "two-way-stream"));
         }
     };
@@ -98 +98 @@
             if (arg instanceof TwoWayStream)
                 return ((TwoWayStream)arg).getOutputStream();
-            throw new TypeError(arg, "two-way-stream");
+            throw new ConditionThrowable(new TypeError(arg, "two-way-stream"));
         }
     };

trunk/j/src/org/armedbear/lisp/TypeError.java

@@ -3 +3 @@
  *
  * Copyright (C) 2002-2003 Peter Graves
- * $Id: TypeError.java,v 1.2 2003-02-15 19:44:01 piso Exp $
+ * $Id: TypeError.java,v 1.3 2003-09-19 11:50:19 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -22 +22 @@
 package org.armedbear.lisp;
 
-public final class TypeError extends LispError
+public final class TypeError extends Condition
 {
+    private final String message;
     private final LispObject object;
     private final String expectedType;
@@ -34 +35 @@
     public TypeError(String message)
     {
-        super(message);
-        this.object = null;
-        this.expectedType = null;
+        this.message = message;
+        object = null;
+        expectedType = null;
     }
 
@@ -46 +47 @@
     public TypeError(LispObject object, String expectedType)
     {
+        message = null;
         this.object = object;
         this.expectedType = expectedType;
@@ -52 +54 @@
     public String getMessage()
     {
-        String s = super.getMessage();
-        if (s != null)
-            return s;
-
+        if (message != null)
+            return message;
         StringBuffer sb = new StringBuffer("wrong type");
         String name = object != null ? String.valueOf(object) : null;

trunk/j/src/org/armedbear/lisp/coerce.java

@@ -3 +3 @@
  *
  * Copyright (C) 2003 Peter Graves
- * $Id: coerce.java,v 1.7 2003-09-19 00:05:11 piso Exp $
+ * $Id: coerce.java,v 1.8 2003-09-19 11:50:19 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -43 +43 @@
                         return LispCharacter.getInstance(name.charAt(0));
                 }
-                throw new TypeError();
+                throw new ConditionThrowable(new TypeError());
             }
             if (second == Symbol.FLOAT || second == Symbol.SINGLE_FLOAT ||
@@ -56 +56 @@
                     return first;
                 }
-                throw new TypeError(first, "number");
+                throw new ConditionThrowable(new TypeError(first, "number"));
             }
             if (first instanceof AbstractVector) {
@@ -126 +126 @@
                     if (obj instanceof Function) {
                         if (obj instanceof SpecialOperator)
-                            throw new TypeError();
+                            throw new ConditionThrowable(new TypeError());
                         return obj;
                     }
                 }
             }
-            throw new TypeError();
+            throw new ConditionThrowable(new TypeError());
         }
     };

trunk/j/src/org/armedbear/lisp/last.java

@@ -3 +3 @@
  *
  * Copyright (C) 2003 Peter Graves
- * $Id: last.java,v 1.2 2003-09-19 01:46:42 piso Exp $
+ * $Id: last.java,v 1.3 2003-09-19 11:50:19 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -75 +75 @@
             return result;
         }
-        throw new TypeError(second, "non-negative integer");
+        throw new ConditionThrowable(new TypeError(second, "non-negative integer"));
     }
 

trunk/j/src/org/armedbear/lisp/logand.java

@@ -3 +3 @@
  *
  * Copyright (C) 2003 Peter Graves
- * $Id: logand.java,v 1.3 2003-09-19 01:46:42 piso Exp $
+ * $Id: logand.java,v 1.4 2003-09-19 11:50:19 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -51 +51 @@
                 n1 = ((Bignum)first).getValue();
             else
-                throw new TypeError(first, "integer");
+                throw new ConditionThrowable(new TypeError(first, "integer"));
             if (second instanceof Fixnum)
                 n2 = ((Fixnum)second).getBigInteger();
@@ -57 +57 @@
                 n2 = ((Bignum)second).getValue();
             else
-                throw new TypeError(second, "integer");
+                throw new ConditionThrowable(new TypeError(second, "integer"));
             return number(n1.and(n2));
         }
@@ -71 +71 @@
                 n = ((Bignum)args[i]).getValue();
             else
-                throw new TypeError(args[i], "integer");
+                throw new ConditionThrowable(new TypeError(args[i], "integer"));
             result = result.and(n);
         }

trunk/j/src/org/armedbear/lisp/logandc1.java

@@ -3 +3 @@
  *
  * Copyright (C) 2003 Peter Graves
- * $Id: logandc1.java,v 1.2 2003-09-19 01:46:42 piso Exp $
+ * $Id: logandc1.java,v 1.3 2003-09-19 11:50:19 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -43 +43 @@
                 return number(n1.not().and(n2));
             }
-            throw new TypeError(second, "integer");
+            throw new ConditionThrowable(new TypeError(second, "integer"));
         }
         if (first instanceof Bignum) {
@@ -55 +55 @@
                 return number(n1.not().and(n2));
             }
-            throw new TypeError(second, "integer");
+            throw new ConditionThrowable(new TypeError(second, "integer"));
         }
-        throw new TypeError(first, "integer");
+        throw new ConditionThrowable(new TypeError(first, "integer"));
     }
 

trunk/j/src/org/armedbear/lisp/logandc2.java

@@ -3 +3 @@
  *
  * Copyright (C) 2003 Peter Graves
- * $Id: logandc2.java,v 1.3 2003-09-19 01:46:42 piso Exp $
+ * $Id: logandc2.java,v 1.4 2003-09-19 11:50:19 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -46 +46 @@
                 return number(n1.and(n2.not()));
             }
-            throw new TypeError(second, "integer");
+            throw new ConditionThrowable(new TypeError(second, "integer"));
         }
         if (first instanceof Bignum) {
@@ -58 +58 @@
                 return number(n1.and(n2.not()));
             }
-            throw new TypeError(second, "integer");
+            throw new ConditionThrowable(new TypeError(second, "integer"));
         }
-        throw new TypeError(first, "integer");
+        throw new ConditionThrowable(new TypeError(first, "integer"));
     }
 

trunk/j/src/org/armedbear/lisp/logbitp.java

@@ -3 +3 @@
  *
  * Copyright (C) 2003 Peter Graves
- * $Id: logbitp.java,v 1.2 2003-09-19 01:46:42 piso Exp $
+ * $Id: logbitp.java,v 1.3 2003-09-19 11:50:19 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -46 +46 @@
         }
         if (index < 0)
-            throw new TypeError(first, "non-negative integer");
+            throw new ConditionThrowable(new TypeError(first, "non-negative integer"));
         BigInteger n;
         if (second instanceof Fixnum)
@@ -53 +53 @@
             n = ((Bignum)second).getValue();
         else
-            throw new TypeError(second, "integer");
+            throw new ConditionThrowable(new TypeError(second, "integer"));
         // FIXME See above.
         if (index == Integer.MAX_VALUE)

trunk/j/src/org/armedbear/lisp/logeqv.java

@@ -3 +3 @@
  *
  * Copyright (C) 2003 Peter Graves
- * $Id: logeqv.java,v 1.1 2003-09-10 16:10:32 piso Exp $
+ * $Id: logeqv.java,v 1.2 2003-09-19 11:50:19 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -39 +39 @@
     }
 
-    public LispObject execute(LispObject arg) throws TypeError
+    public LispObject execute(LispObject arg) throws ConditionThrowable
     {
         if (arg instanceof Fixnum)
@@ -45 +45 @@
         if (arg instanceof Bignum)
             return arg;
-        throw new TypeError(arg, "integer");
+        throw new ConditionThrowable(new TypeError(arg, "integer"));
     }
 
-    public LispObject execute(LispObject[] args) throws TypeError
+    public LispObject execute(LispObject[] args) throws ConditionThrowable
     {
         BigInteger result = null;
@@ -59 +59 @@
                 n = ((Bignum)arg).getValue();
             else
-                throw new TypeError(arg, "integer");
+                throw new ConditionThrowable(new TypeError(arg, "integer"));
             if (result == null)
                 result = n;

trunk/j/src/org/armedbear/lisp/logior.java

@@ -3 +3 @@
  *
  * Copyright (C) 2003 Peter Graves
- * $Id: logior.java,v 1.2 2003-09-19 01:46:42 piso Exp $
+ * $Id: logior.java,v 1.3 2003-09-19 11:50:19 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -51 +51 @@
                 n1 = ((Bignum)first).getValue();
             else
-                throw new TypeError(first, "integer");
+                throw new ConditionThrowable(new TypeError(first, "integer"));
             if (second instanceof Fixnum)
                 n2 = ((Fixnum)second).getBigInteger();
@@ -57 +57 @@
                 n2 = ((Bignum)second).getValue();
             else
-                throw new TypeError(second, "integer");
+                throw new ConditionThrowable(new TypeError(second, "integer"));
             return number(n1.or(n2));
         }
@@ -71 +71 @@
                 n = ((Bignum)args[i]).getValue();
             else
-                throw new TypeError(args[i], "integer");
+                throw new ConditionThrowable(new TypeError(args[i], "integer"));
             result = result.or(n);
         }

trunk/j/src/org/armedbear/lisp/lognand.java

@@ -3 +3 @@
  *
  * Copyright (C) 2003 Peter Graves
- * $Id: lognand.java,v 1.2 2003-09-19 01:46:42 piso Exp $
+ * $Id: lognand.java,v 1.3 2003-09-19 11:50:19 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -43 +43 @@
                 return number(n1.and(n2).not());
             }
-            throw new TypeError(second, "integer");
+            throw new ConditionThrowable(new TypeError(second, "integer"));
         }
         if (first instanceof Bignum) {
@@ -55 +55 @@
                 return number(n1.and(n2).not());
             }
-            throw new TypeError(second, "integer");
+            throw new ConditionThrowable(new TypeError(second, "integer"));
         }
-        throw new TypeError(first, "integer");
+        throw new ConditionThrowable(new TypeError(first, "integer"));
     }
 

trunk/j/src/org/armedbear/lisp/lognor.java

@@ -3 +3 @@
  *
  * Copyright (C) 2003 Peter Graves
- * $Id: lognor.java,v 1.2 2003-09-19 01:46:42 piso Exp $
+ * $Id: lognor.java,v 1.3 2003-09-19 11:50:19 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -43 +43 @@
                 return number(n1.or(n2).not());
             }
-            throw new TypeError(second, "integer");
+            throw new ConditionThrowable(new TypeError(second, "integer"));
         }
         if (first instanceof Bignum) {
@@ -55 +55 @@
                 return number(n1.or(n2).not());
             }
-            throw new TypeError(second, "integer");
+            throw new ConditionThrowable(new TypeError(second, "integer"));
         }
-        throw new TypeError(first, "integer");
+        throw new ConditionThrowable(new TypeError(first, "integer"));
     }
 

trunk/j/src/org/armedbear/lisp/lognot.java

@@ -3 +3 @@
  *
  * Copyright (C) 2003 Peter Graves
- * $Id: lognot.java,v 1.2 2003-09-19 01:46:42 piso Exp $
+ * $Id: lognot.java,v 1.3 2003-09-19 11:50:19 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -38 +38 @@
         if (arg instanceof Bignum)
             return number(((Bignum)arg).getValue().not());
-        throw new TypeError(arg, "integer");
+        throw new ConditionThrowable(new TypeError(arg, "integer"));
     }
 

trunk/j/src/org/armedbear/lisp/logorc1.java

@@ -3 +3 @@
  *
  * Copyright (C) 2003 Peter Graves
- * $Id: logorc1.java,v 1.2 2003-09-19 01:46:42 piso Exp $
+ * $Id: logorc1.java,v 1.3 2003-09-19 11:50:19 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -46 +46 @@
                 return number(n1.not().or(n2));
             }
-            throw new TypeError(second, "integer");
+            throw new ConditionThrowable(new TypeError(second, "integer"));
         }
         if (first instanceof Bignum) {
@@ -58 +58 @@
                 return number(n1.not().or(n2));
             }
-            throw new TypeError(second, "integer");
+            throw new ConditionThrowable(new TypeError(second, "integer"));
         }
-        throw new TypeError(first, "integer");
+        throw new ConditionThrowable(new TypeError(first, "integer"));
     }
 

trunk/j/src/org/armedbear/lisp/logorc2.java

@@ -3 +3 @@
  *
  * Copyright (C) 2003 Peter Graves
- * $Id: logorc2.java,v 1.2 2003-09-19 01:46:42 piso Exp $
+ * $Id: logorc2.java,v 1.3 2003-09-19 11:50:19 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -46 +46 @@
                 return number(n1.or(n2.not()));
             }
-            throw new TypeError(second, "integer");
+            throw new ConditionThrowable(new TypeError(second, "integer"));
         }
         if (first instanceof Bignum) {
@@ -58 +58 @@
                 return number(n1.or(n2.not()));
             }
-            throw new TypeError(second, "integer");
+            throw new ConditionThrowable(new TypeError(second, "integer"));
         }
-        throw new TypeError(first, "integer");
+        throw new ConditionThrowable(new TypeError(first, "integer"));
     }
 

trunk/j/src/org/armedbear/lisp/logxor.java

@@ -3 +3 @@
  *
  * Copyright (C) 2003 Peter Graves
- * $Id: logxor.java,v 1.1 2003-09-10 16:49:01 piso Exp $
+ * $Id: logxor.java,v 1.2 2003-09-19 11:50:19 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -39 +39 @@
     }
 
-    public LispObject execute(LispObject arg) throws TypeError
+    public LispObject execute(LispObject arg) throws ConditionThrowable
     {
         if (arg instanceof Fixnum)
@@ -45 +45 @@
         if (arg instanceof Bignum)
             return arg;
-        throw new TypeError(arg, "integer");
+        throw new ConditionThrowable(new TypeError(arg, "integer"));
     }
 
-    public LispObject execute(LispObject[] args) throws TypeError
+    public LispObject execute(LispObject[] args) throws ConditionThrowable
     {
         BigInteger result = null;
@@ -59 +59 @@
                 n = ((Bignum)arg).getValue();
             else
-                throw new TypeError(arg, "integer");
+                throw new ConditionThrowable(new TypeError(arg, "integer"));
             if (result == null)
                 result = n;

trunk/j/src/org/armedbear/lisp/make_array.java

@@ -3 +3 @@
  *
  * Copyright (C) 2003 Peter Graves
- * $Id: make_array.java,v 1.4 2003-09-19 01:46:42 piso Exp $
+ * $Id: make_array.java,v 1.5 2003-09-19 11:50:19 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -110 +110 @@
                         v.set(i, initialContents.elt(i));
                 } else
-                    throw new TypeError(initialContents, "sequence");
+                    throw new ConditionThrowable(new TypeError(initialContents, "sequence"));
             }
             if (fillPointer != NIL)

trunk/j/src/org/armedbear/lisp/open.java

@@ -3 +3 @@
  *
  * Copyright (C) 2003 Peter Graves
- * $Id: open.java,v 1.3 2003-09-19 01:46:43 piso Exp $
+ * $Id: open.java,v 1.4 2003-09-19 11:50:19 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -42 +42 @@
                 namestring = ((Pathname)first).getNamestring();
             else
-                throw new TypeError(first, "pathname designator");
+                throw new ConditionThrowable(new TypeError(first, "pathname designator"));
             boolean binary;
             LispObject elementType = second;
@@ -91 +91 @@
                 namestring = ((Pathname)first).getNamestring();
             else
-                throw new TypeError(first, "pathname designator");
+                throw new ConditionThrowable(new TypeError(first, "pathname designator"));
             boolean binary;
             LispObject elementType = second;

trunk/j/src/org/armedbear/lisp/probe_file.java

@@ -3 +3 @@
  *
  * Copyright (C) 2003 Peter Graves
- * $Id: probe_file.java,v 1.3 2003-09-19 01:46:43 piso Exp $
+ * $Id: probe_file.java,v 1.4 2003-09-19 11:50:19 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -37 +37 @@
                 namestring = ((Pathname)arg).getNamestring();
             else
-                throw new TypeError(arg, "pathname designator");
+                throw new ConditionThrowable(new TypeError(arg, "pathname designator"));
             boolean absolute = false;
             if (System.getProperty("os.name").startsWith("Windows")) {