Use def!struct

[jscl.git] / src / lambda-list.lisp

diff --git a/src/lambda-list.lisp b/src/lambda-list.lisp
index 8e4ed61..ed0669f 100644 (file)
--- a/src/lambda-list.lisp
+++ b/src/lambda-list.lisp
@@ -18,16 +18,16 @@
 
 ;;;; Lambda list parsing
 
-(defstruct optvar
+(def!struct optvar
   variable initform supplied-p-parameter)
 
-(defstruct keyvar
+(def!struct keyvar
   variable keyword-name initform supplied-p-parameter)
 
-(defstruct auxvar
+(def!struct auxvar
   variable initform)
 
-(defstruct d-lambda-list
+(def!struct d-lambda-list
   wholevar
   reqvars
   optvars
@@ -283,7 +283,11 @@
                              (compute-pbindings supplied `(keyword-supplied-p ,keyword ,rest)))
                            (compute-pbindings variable `(if ,supplied
                                                             (keyword-lookup ,keyword ,rest)
-                                                            ,(keyvar-initform keyvar))))))))))
+                                                            ,(keyvar-initform keyvar)))))))
+
+                   ;; Aux variables
+                   (dolist (auxvar (d-lambda-list-auxvars d-ll))
+                     (compute-pbindings (auxvar-variable auxvar) (auxvar-initform auxvar))))))
 
         ;; Macroexpansion. Compute bindings and generate code for them
         ;; and some necessary checking.
@@ -297,10 +301,3 @@
 #+jscl
 (defmacro destructuring-bind (lambda-list expression &body body)
   `(!destructuring-bind ,lambda-list ,expression ,@body))
-
-
-
-
-
-
-