Changeset 3889

Timestamp:

09/19/03 13:02:44 (19 years ago)

Author:

piso

Message:

Conditions: work in progress.

Location:

trunk/j/src/org/armedbear/lisp

Files:

• ControlError.java (modified) (3 diffs)
• Primitives.java (modified) (2 diffs)
• Throw.java (modified) (2 diffs)

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

@@ -3 +3 @@
  *
  * Copyright (C) 2003 Peter Graves
- * $Id: ControlError.java,v 1.1 2003-06-21 19:17:35 piso Exp $
+ * $Id: ControlError.java,v 1.2 2003-09-19 13:02:43 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -22 +22 @@
 package org.armedbear.lisp;
 
-public class ControlError extends LispError
+public class ControlError extends Condition
 {
     public ControlError()
     {
-        super();
     }
 
@@ -33 +32 @@
         super(message);
     }
+
+    public LispObject typep(LispObject type) throws ConditionThrowable
+    {
+        if (type == Symbol.CONTROL_ERROR)
+            return T;
+        if (type == Symbol.ERROR)
+            return T;
+        return super.typep(type);
+    }
 }

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

@@ -3 +3 @@
  *
  * Copyright (C) 2002-2003 Peter Graves
- * $Id: Primitives.java,v 1.410 2003-09-19 12:43:59 piso Exp $
+ * $Id: Primitives.java,v 1.411 2003-09-19 13:02:44 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -1804 +1804 @@
             return c.getCondition() instanceof ProgramError;
         if (type == Symbol.CONTROL_ERROR)
-            return c instanceof ControlError;
+            return c.getCondition() instanceof ControlError;
         if (type == Symbol.SIMPLE_ERROR)
             return c.getCondition() instanceof SimpleError;

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

@@ -3 +3 @@
  *
  * Copyright (C) 2002-2003 Peter Graves
- * $Id: Throw.java,v 1.4 2003-06-21 19:18:17 piso Exp $
+ * $Id: Throw.java,v 1.5 2003-09-19 13:02:44 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -22 +22 @@
 package org.armedbear.lisp;
 
-public final class Throw extends ControlError
+public final class Throw extends LispError
 {
     private final LispObject tag;