Changeset 3881

Timestamp:

09/19/03 01:08:41 (20 years ago)

Author:

piso

Message:

A ParseError? is now a Condition.

File:

• trunk/j/src/org/armedbear/lisp/Primitives.java (modified) (4 diffs)

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

@@ -3 +3 @@
  *
  * Copyright (C) 2002-2003 Peter Graves
- * $Id: Primitives.java,v 1.403 2003-09-19 00:30:16 piso Exp $
+ * $Id: Primitives.java,v 1.404 2003-09-19 01:08:41 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -1143 +1143 @@
     // ### error
     private static final Primitive ERROR = new Primitive("error") {
-        public LispObject execute(LispObject[] args) throws LispError
+        public LispObject execute(LispObject[] args) throws ConditionThrowable
         {
             if (args.length < 1)
@@ -1152 +1152 @@
                     throw new PackageError(_format(args, 1));
                 if (datum == Symbol.PARSE_ERROR)
-                    throw new ParseError(_format(args, 1));
+                    throw new ConditionThrowable(new ParseError(_format(args, 1)));
                 if (datum == Symbol.PROGRAM_ERROR)
                     throw new ProgramError(_format(args, 1));
@@ -1799 +1799 @@
             return c instanceof PackageError;
         if (type == Symbol.PARSE_ERROR)
-            return c instanceof ParseError;
+            return c.getCondition() instanceof ParseError;
         if (type == Symbol.PROGRAM_ERROR)
             return c instanceof ProgramError;