Changeset 13828

Timestamp:

01/29/12 23:13:37 (9 years ago)

Author:

ehuelsmann

Message:

Remove variables 'variables' and 'bindInitForms'.
Simplify free specials binding.

Location:

trunk/abcl/src/org/armedbear/lisp

Files:

• ArgumentListProcessor.java (modified) (2 diffs)
• Closure.java (modified) (6 diffs)

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

@@ -472 +472 @@
   }
   
+  public Symbol[] freeSpecials(LispObject specials) {
+      ArrayList<Symbol> list = new ArrayList<Symbol>();
+      
+      next_special:
+          while (specials != NIL) {
+              Symbol special = (Symbol)specials.car();
+              specials = specials.cdr();
+
+              for (Symbol v : variables)
+                  if (v == special)
+                      continue next_special;
+
+              list.add(special);
+          }
+
+      Symbol[] rv = new Symbol[list.size()];
+      return list.toArray(rv);
+  }
+  
   public int getArity() {
       return arity;
@@ -482 +501 @@
   public int getMaxArgs() {
       return maxArgs;
+  }
+  
+  public Symbol[] getVariables() {
+      return variables;
   }
   

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

@@ -71 +71 @@
   private int maxArgs;
 
-  private Symbol[] variables = new Symbol[0];
   private LispObject specials = NIL;
-
-  private boolean bindInitForms;
-
+  private Symbol[] freeSpecials = new Symbol[0];
 
   private ArgumentListProcessor arglist;
@@ -111 +108 @@
       andKey = keys != NIL;
       allowOtherKeys = moreKeys != NIL;
-      variables = processVariables();
-      bindInitForms = false;
 
       // stuff we don't need: we're a compiled function
@@ -373 +368 @@
     if (arity >= 0)
       Debug.assertTrue(arity == minArgs);
-    variables = processVariables();
 
     arglist = new ArgumentListProcessor(this, lambdaList, specials);
+    freeSpecials = arglist.freeSpecials(specials);
   }
 
@@ -386 +381 @@
         if (parameter.svar != NIL)
           vars.add((Symbol)parameter.svar);
-        if (!bindInitForms)
-          if (!parameter.initForm.constantp())
-            bindInitForms = true;
-      }
-  }
-
-  // Also sets bindInitForms.
-  private final Symbol[] processVariables()
-  {
-    ArrayList<Symbol> vars = new ArrayList<Symbol>();
-    for (Parameter parameter : requiredParameters)
-      vars.add(parameter.var);
-    processParameters(vars, optionalParameters);
-    if (restVar != null)
-      {
-        vars.add(restVar);
-      }
-    processParameters(vars, keywordParameters);
-    Symbol[] array = new Symbol[vars.size()];
-    vars.toArray(array);
-    return array;
+      }
   }
 
@@ -426 +401 @@
   public final LispObject getVariableList()
   {
+    Symbol[] variables = arglist.getVariables();
     LispObject result = NIL;
     for (int i = variables.length; i-- > 0;)
@@ -611 +587 @@
   }
 
-  private final void declareFreeSpecials(Environment ext)
-
-  {
-    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);
-    }
+  private void declareFreeSpecials(Environment ext)
+  {
+      for (Symbol special : freeSpecials)
+        ext.declareSpecial(special);
   }