Changeset 13206


Ignore:
Timestamp:
02/06/11 20:03:28 (11 years ago)
Author:
ehuelsmann
Message:

Simplify argument passing in CHECK-INITARGS.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/abcl/src/org/armedbear/lisp/clos.lisp

    r13205 r13206  
    25612561           :format-control "Odd number of keyword arguments."))
    25622562  (unless (getf initargs :allow-other-keys)
    2563     (let ((methods
    2564      (nconc
    2565       (compute-applicable-methods
    2566        #'shared-initialize
    2567        (if initargs
    2568      `(,instance ,shared-initialize-param ,@initargs)
    2569          (list instance shared-initialize-param)))
    2570       (compute-applicable-methods
    2571        #'initialize-instance
    2572        (if initargs
    2573      `(,instance ,@initargs)
    2574          (list instance)))))
    2575     (slots (class-slots (class-of instance))))
     2563    (let ((methods
     2564           (nconc
     2565            (compute-applicable-methods #'shared-initialize
     2566                                        (list* instance shared-initialize-param
     2567                                               initargs))
     2568            (compute-applicable-methods #'initialize-instance
     2569                                        (list* instance initargs))))
     2570          (slots (class-slots (class-of instance))))
    25762571      (do* ((tail initargs (cddr tail))
    25772572            (initarg (car tail) (car tail)))
    25782573           ((null tail))
    25792574        (unless (or (valid-initarg-p initarg slots)
    2580         (valid-methodarg-p initarg methods)
     2575                    (valid-methodarg-p initarg methods)
    25812576                    (eq initarg :allow-other-keys))
    25822577          (error 'program-error
Note: See TracChangeset for help on using the changeset viewer.