Changeset 4069

Timestamp:

09/26/03 14:21:22 (20 years ago)

Author:

piso

Message:

_let(): added try/finally to make sure dynamic environment is restored
correctly in all cases.

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.440 2003-09-26 01:10:00 piso Exp $
+ * $Id: Primitives.java,v 1.441 2003-09-26 14:21:22 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -2814 +2814 @@
 
     private static final LispObject _let(LispObject args, Environment env,
-        boolean sequential) throws ConditionThrowable
+                                         boolean sequential)
+        throws ConditionThrowable
     {
         LispObject varList = checkList(args.car());
@@ -2821 +2822 @@
         if (varList != NIL) {
             Environment oldDynEnv = thread.getDynamicEnvironment();
-            Environment ext = new Environment(env);
-            Environment evalEnv = sequential ? ext : env;
-            for (int i = varList.length(); i-- > 0;) {
-                LispObject obj = varList.car();
-                varList = varList.cdr();
-                if (obj instanceof Cons) {
-                    bind(checkSymbol(obj.car()),
-                         eval(obj.cadr(), evalEnv, thread),
-                         ext);
-                } else
-                    bind(checkSymbol(obj), NIL, ext);
-            }
-            LispObject body = args.cdr();
-            while (body != NIL) {
-                result = eval(body.car(), ext, thread);
-                body = body.cdr();
-            }
-            thread.setDynamicEnvironment(oldDynEnv);
+            try {
+                Environment ext = new Environment(env);
+                Environment evalEnv = sequential ? ext : env;
+                for (int i = varList.length(); i-- > 0;) {
+                    LispObject obj = varList.car();
+                    varList = varList.cdr();
+                    if (obj instanceof Cons) {
+                        bind(checkSymbol(obj.car()),
+                             eval(obj.cadr(), evalEnv, thread),
+                             ext);
+                    } else
+                        bind(checkSymbol(obj), NIL, ext);
+                }
+                LispObject body = args.cdr();
+                while (body != NIL) {
+                    result = eval(body.car(), ext, thread);
+                    body = body.cdr();
+                }
+            }
+            finally {
+                thread.setDynamicEnvironment(oldDynEnv);
+            }
         } else {
             LispObject body = args.cdr();