Changeset 11337

Timestamp:

10/06/08 18:54:08 (14 years ago)

Author:

ehuelsmann

Message:

Cleanup: merge bindKeywordParameterDefaults and bindOptionalParameterDefaults.

Patch by: Ville Voutilainen <ville.voutilainen at gmail dot com>

File:

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

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

@@ -412 +412 @@
     if (arity != arityValue)
       {
-        if (optionalParameters.length > 0)
-          bindOptionalParameterDefaults(ext, thread);
+        bindParameterDefaults(optionalParameters, ext, thread);
         if (restVar != null)
           bindArg(restVar, NIL, ext, thread);
-        if (keywordParameters.length > 0)
-          bindKeywordParameterDefaults(ext, thread);
+        bindParameterDefaults(keywordParameters, ext, thread);
       }
     bindAuxVars(ext, thread);
@@ -655 +653 @@
     if (sym.isSpecialVariable())
       return true;
-    if (specials != null)
-      {
-        for (Symbol special : specials)
-          {
-            if (sym == special)
-              return true;
-          }
+    for (Symbol special : specials)
+      {
+        if (sym == special)
+            return true;
       }
     return false;
@@ -682 +677 @@
     if (argsLength < minArgs)
       error(new WrongNumberOfArgumentsException(this));
-    if (thread == null)
-      thread = LispThread.currentThread();
     final LispObject[] array = new LispObject[variables.length];
     int index = 0;
@@ -1001 +994 @@
   }
 
-  private final void bindOptionalParameterDefaults(Environment env,
-                                                   LispThread thread)
-    throws ConditionThrowable
-  {
-    for (Parameter parameter : optionalParameters)
-      {
-        LispObject value;
-        if (parameter.initVal != null)
-          value = parameter.initVal;
-        else
-          value = eval(parameter.initForm, env, thread);
-        bindArg(parameter.var, value, env, thread);
-        if (parameter.svar != NIL)
-            bindArg((Symbol)parameter.svar, NIL, env, thread);
-      }
-  }
-
-  private final void bindKeywordParameterDefaults(Environment env,
-                                                  LispThread thread)
-    throws ConditionThrowable
-  {
-    for (Parameter parameter : keywordParameters)
+  private final void bindParameterDefaults(Parameter[] parameters,
+                                           Environment env,
+                                           LispThread thread)
+    throws ConditionThrowable
+  {
+    for (Parameter parameter : parameters)
       {
         LispObject value;