Changeset 3912

Timestamp:

09/20/03 00:12:37 (20 years ago)

Author:

piso

Message:

HANDLER-CASE: support :NO-ERROR clause.

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.415 2003-09-19 23:56:10 piso Exp $
+ * $Id: Primitives.java,v 1.416 2003-09-20 00:12:37 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -1746 +1746 @@
     // ### handler-case
     private static final SpecialOperator HANDLER_CASE =
-        new SpecialOperator("handler-case") {
+        new SpecialOperator("handler-case")
+    {
         public LispObject execute(LispObject args, Environment env)
             throws ConditionThrowable
@@ -1754 +1755 @@
             final LispThread thread = LispThread.currentThread();
             final int depth = thread.getStackDepth();
+            LispObject result;
             try {
-                return eval(form, env, thread);
+                result = eval(form, env, thread);
             }
             catch (ConditionThrowable c) {
@@ -1783 +1785 @@
                 throw c;
             }
+            // No error.
+            while (clauses != NIL) {
+                Cons clause = checkCons(clauses.car());
+                if (clause.car() == Keyword.NO_ERROR) {
+                    Closure closure = new Closure(clause.cadr(), clause.cddr(),
+                                                  env);
+                    if (thread.getValues() != null)
+                        result = closure.execute(thread.getValues());
+                    else
+                        result = closure.execute(result);
+                    break;
+                }
+                clauses = clauses.cdr();
+            }
+            return result;
         }
     };