Changeset 13823

Timestamp:

01/29/12 21:15:48 (12 years ago)

Author:

ehuelsmann

Message:

Add an ArgumentListProcessor? to Closure. It'll take over
argument list processing soon.

File:

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

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

@@ -77 +77 @@
 
 
+  private ArgumentListProcessor arglist;
+
     /** Construct a closure object with a lambda-list described
      * by these parameters.
@@ -116 +118 @@
       executionBody = null;
       environment = null;
+
+      ArrayList<ArgumentListProcessor.RequiredParam> reqParams =
+              new ArrayList<ArgumentListProcessor.RequiredParam>();
+      for (Parameter req : requiredParameters)
+          reqParams.add(new ArgumentListProcessor.RequiredParam(req.var, false));
+
+      ArrayList<ArgumentListProcessor.OptionalParam> optParams =
+              new ArrayList<ArgumentListProcessor.OptionalParam>();
+      for (Parameter opt : optionalParameters)
+          optParams.add(new ArgumentListProcessor.OptionalParam(opt.var, false,
+                  (opt.svar == NIL) ? null : (Symbol)opt.svar, false,
+                  opt.initForm));
+
+      ArrayList<ArgumentListProcessor.KeywordParam> keyParams =
+              new ArrayList<ArgumentListProcessor.KeywordParam>();
+      for (Parameter key : keywordParameters)
+          keyParams.add(new ArgumentListProcessor.KeywordParam(key.var, false,
+                  (key.svar == NIL) ? null : (Symbol)key.svar, false, key.initForm,
+                  key.keyword));
+      arglist = new ArgumentListProcessor(this, reqParams, optParams, keyParams, andKey, allowOtherKeys, restVar);
   }
 
@@ -352 +374 @@
       Debug.assertTrue(arity == minArgs);
     variables = processVariables();
+
+    arglist = new ArgumentListProcessor(this, lambdaList, specials);
   }