Changeset 13206

Timestamp:

02/06/11 20:03:28 (13 years ago)

Author:

ehuelsmann

Message:

Simplify argument passing in CHECK-INITARGS.

File:

• trunk/abcl/src/org/armedbear/lisp/clos.lisp (modified) (1 diff)

trunk/abcl/src/org/armedbear/lisp/clos.lisp

@@ -2561 +2561 @@
            :format-control "Odd number of keyword arguments."))
   (unless (getf initargs :allow-other-keys)
-    (let ((methods 
-     (nconc 
-      (compute-applicable-methods 
-       #'shared-initialize
-       (if initargs
-     `(,instance ,shared-initialize-param ,@initargs)
-         (list instance shared-initialize-param)))
-      (compute-applicable-methods 
-       #'initialize-instance
-       (if initargs
-     `(,instance ,@initargs)
-         (list instance)))))
-    (slots (class-slots (class-of instance))))
+    (let ((methods
+           (nconc
+            (compute-applicable-methods #'shared-initialize
+                                        (list* instance shared-initialize-param
+                                               initargs))
+            (compute-applicable-methods #'initialize-instance
+                                        (list* instance initargs))))
+          (slots (class-slots (class-of instance))))
       (do* ((tail initargs (cddr tail))
             (initarg (car tail) (car tail)))
            ((null tail))
         (unless (or (valid-initarg-p initarg slots)
-        (valid-methodarg-p initarg methods)
+                    (valid-methodarg-p initarg methods)
                     (eq initarg :allow-other-keys))
           (error 'program-error