Changeset 4016

Timestamp:

09/23/03 14:29:17 (20 years ago)

Author:

piso

Message:

DOTIMES: make sure implicit nil block has the right scope.

File:

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

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

@@ -3 +3 @@
  *
  * Copyright (C) 2002-2003 Peter Graves
- * $Id: Primitives.java,v 1.427 2003-09-23 13:38:54 piso Exp $
+ * $Id: Primitives.java,v 1.428 2003-09-23 14:29:17 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -1581 +1581 @@
             LispObject resultForm = args.cdr().cdr().car();
             Environment oldDynEnv = thread.getDynamicEnvironment();
-            LispObject limit = eval(countForm, env, thread);
-            LispObject result;
-            if (limit instanceof Fixnum) {
-                int count = ((Fixnum)limit).getValue();
-                int i;
-                for (i = 0; i < count; i++) {
-                    Environment ext = new Environment(env);
-                    bind(var, new Fixnum(i), ext);
-                    LispObject body = bodyForm;
-                    int depth = thread.getStackDepth();
-                    try {
+            int depth = thread.getStackDepth();
+            try {
+                LispObject limit = eval(countForm, env, thread);
+                LispObject result;
+                if (limit instanceof Fixnum) {
+                    int count = ((Fixnum)limit).getValue();
+                    int i;
+                    for (i = 0; i < count; i++) {
+                        Environment ext = new Environment(env);
+                        bind(var, new Fixnum(i), ext);
+                        LispObject body = bodyForm;
                         while (body != NIL) {
                             eval(body.car(), ext, thread);
@@ -1597 +1597 @@
                         }
                     }
-                    catch (Return ret) {
-                        if (ret.getTag() == NIL) {
-                            thread.setStackDepth(depth);
-                            return ret.getResult();
-                        }
-                        throw ret;
-                    }
-                }
-                Environment ext = new Environment(env);
-                bind(var, new Fixnum(i), ext);
-                result = eval(resultForm, ext, thread);
-            } else if (limit instanceof Bignum) {
-                LispObject i = Fixnum.ZERO;
-                while (i.isLessThan(limit)) {
                     Environment ext = new Environment(env);
-                    bind(var, i, ext);
-                    LispObject body = bodyForm;
-                    int depth = thread.getStackDepth();
-                    try {
+                    bind(var, new Fixnum(i), ext);
+                    result = eval(resultForm, ext, thread);
+                } else if (limit instanceof Bignum) {
+                    LispObject i = Fixnum.ZERO;
+                    while (i.isLessThan(limit)) {
+                        Environment ext = new Environment(env);
+                        bind(var, i, ext);
+                        LispObject body = bodyForm;
                         while (body != NIL) {
                             eval(body.car(), ext, thread);
                             body = body.cdr();
                         }
+                        i = i.incr();
                     }
-                    catch (Return ret) {
-                        if (ret.getTag() == NIL) {
-                            thread.setStackDepth(depth);
-                            return ret.getResult();
-                        }
-                        throw ret;
-                    }
-                    i = i.incr();
-                }
-                Environment ext = new Environment(env);
-                bind(var, i, ext);
-                result = eval(resultForm, ext, thread);
-            } else
-                throw new ConditionThrowable(new TypeError(limit, "integer"));
-            thread.setDynamicEnvironment(oldDynEnv);
-            return result;
+                    Environment ext = new Environment(env);
+                    bind(var, i, ext);
+                    result = eval(resultForm, ext, thread);
+                } else
+                    throw new ConditionThrowable(new TypeError(limit, "integer"));
+                return result;
+            }
+            catch (Return ret) {
+                if (ret.getTag() == NIL) {
+                    thread.setStackDepth(depth);
+                    return ret.getResult();
+                }
+                throw ret;
+            }
+            finally {
+                thread.setDynamicEnvironment(oldDynEnv);
+            }
         }
     };