Changeset 11940

Timestamp:

05/23/09 22:44:26 (14 years ago)

Author:

astalla

Message:

Fixed a bug in interpreted let* and do*: the environment used for bindings
was a single one, shared with all the initforms and the body. This caused
closures in initforms to capture newly-introduced bindings.
The fix amounts to creating a new extended environment for every binding.
In passing a typo was fixed in java.lisp.

Location:

trunk/abcl/src/org/armedbear/lisp

Files:

• Do.java (modified) (1 diff)
• SpecialOperators.java (modified) (1 diff)
• java.lisp (modified) (1 diff)

trunk/abcl/src/org/armedbear/lisp/Do.java

@@ -102 +102 @@
     body = bodyAndDecls.car();
 
-    final Environment ext = new Environment(env);
+    Environment ext = new Environment(env);
     for (int i = 0; i < numvars; i++)
       {
         Symbol var = vars[i];
         LispObject value = eval(initforms[i], (sequential ? ext : env), thread);
+  ext = new Environment(ext);
         if (specials != NIL && memq(var, specials))
             thread.bindSpecial(var, value);

trunk/abcl/src/org/armedbear/lisp/SpecialOperators.java

@@ -144 +144 @@
                 value = NIL;
               }
-            if (sequential)
+            if (sequential) {
+        ext = new Environment(ext);
               bindArg(specials, symbol, value, ext, thread);
+      }
             else
                 nonSequentialVars.add(new Cons(symbol, value));

trunk/abcl/src/org/armedbear/lisp/java.lisp

@@ -289 +289 @@
       `(java:jclass ,(jcall (jmethod "java.lang.Class" "getName") object)))
      (t
-      (error "Unknown load-from for ~A" class-name)))))
+      (error "Unknown load-form for ~A" class-name)))))
 
 (defun jproperty-value (obj prop)