Changeset 11334

Timestamp:

10/02/08 21:26:10 (14 years ago)

Author:

ehuelsmann

Message:

Cleanup patch.

Patch by: Ville Voutilainen.

File:

• trunk/j/src/org/armedbear/lisp/Closure.java (modified) (2 diffs)

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

@@ -292 +292 @@
   }
 
-  // Also sets bindInitForms.
-  private final Symbol[] processVariables()
-  {
-    ArrayList<Symbol> vars = new ArrayList<Symbol>();
-    if (requiredParameters != null)
-      {
-        for (Parameter parameter : requiredParameters)
-          vars.add(parameter.var);
-      }
-    if (optionalParameters != null)
-      {
-        for (Parameter parameter : optionalParameters)
+  private final void processParameters(ArrayList<Symbol> vars,
+          final Parameter[] parameters)
+  {
+    if (parameters != null)
+      {
+        for (Parameter parameter : parameters)
           {
             vars.add(parameter.var);
@@ -313 +307 @@
           }
       }
+  }
+
+  // Also sets bindInitForms.
+  private final Symbol[] processVariables()
+  {
+    ArrayList<Symbol> vars = new ArrayList<Symbol>();
+    if (requiredParameters != null)
+      {
+        for (Parameter parameter : requiredParameters)
+          vars.add(parameter.var);
+      }
+    processParameters(vars, optionalParameters);
     if (restVar != null)
       {
         vars.add(restVar);
       }
-    if (keywordParameters != null)
-      {
-        for (Parameter parameter : keywordParameters)
-          {
-            vars.add(parameter.var);
-            if (parameter.svar != NIL)
-              vars.add((Symbol)parameter.svar);
-            if (!bindInitForms)
-              if (!parameter.initForm.constantp())
-                bindInitForms = true;
-          }
-      }
+    processParameters(vars, keywordParameters);
     Symbol[] array = new Symbol[vars.size()];
     vars.toArray(array);