Changeset 11778

Timestamp:

04/23/09 20:46:27 (14 years ago)

Author:

vvoutilainen

Message:

Fix declaration of free specials for non-array execute.

File:

• trunk/abcl/src/org/armedbear/lisp/Closure.java (modified) (3 diffs)

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

@@ -399 +399 @@
       }
     bindAuxVars(ext, thread);
+    declareFreeSpecials(ext);
     try
       {
@@ -557 +558 @@
                                   sixth, seventh, eighth);
       }
+  }
+
+  private final void declareFreeSpecials(Environment ext)
+    throws ConditionThrowable
+  {
+    LispObject s = specials;
+    special:
+    while (s != NIL) {
+      Symbol special = (Symbol)s.car();
+      s = s.cdr();
+      for (Symbol var : variables)
+  if (special == var)
+          continue special;
+      for (Parameter parameter : auxVars)
+        if (special == parameter.var)
+          continue special;
+      ext.declareSpecial(special);
+    }
   }
 
@@ -580 +599 @@
       }
     bindAuxVars(ext, thread);
-    LispObject s = specials;
-    special:
-    while (s != NIL) {
-      Symbol special = (Symbol)s.car();
-      s = s.cdr();
-      for (Symbol var : variables)
-        if (special == var)
-          continue special;
-      for (Parameter parameter : auxVars)
-        if (special == parameter.var)
-          continue special;
-      ext.declareSpecial(special);
-    }
+    declareFreeSpecials(ext);
     try
       {