(defmethod shared-initialize
((instance slot-object) slot-names &rest initargs)
- (when (eq slot-names 't)
+ (when (eq slot-names t)
(return-from shared-initialize
(call-initialize-function
- (initialize-info-shared-initialize-t-function
+ (initialize-info-shared-initialize-t-fun
(initialize-info (class-of instance) initargs))
instance initargs)))
- (when (eq slot-names 'nil)
+ (when (eq slot-names nil)
(return-from shared-initialize
(call-initialize-function
- (initialize-info-shared-initialize-nil-function
+ (initialize-info-shared-initialize-nil-fun
(initialize-info (class-of instance) initargs))
instance initargs)))
;; Initialize the instance's slots in a two step process:
instance
slotd)
val)
- (return 't))))
+ (return t))))
;; Try to initialize the slot from its initform.
(if (and slot-names
- (or (eq slot-names 't)
+ (or (eq slot-names t)
(memq slot-name slot-names))
- (or (and (not std-p) (eq slot-names 't))
+ (or (and (not std-p) (eq slot-names t))
(not (slot-boundp-using-class class instance slotd))))
(let ((initfunction (slot-definition-initfunction slotd)))
(when initfunction
(check-initargs-2-list initargs class legal error-p)))))
(defun check-initargs-values (class call-list)
- (let ((methods (mapcan #'(lambda (call)
- (if (consp call)
- (copy-list (compute-applicable-methods
- (gdefinition (car call))
- (cdr call)))
- (list call)))
+ (let ((methods (mapcan (lambda (call)
+ (if (consp call)
+ (copy-list (compute-applicable-methods
+ (gdefinition (car call))
+ (cdr call)))
+ (list call)))
call-list))
(legal (apply #'append (mapcar #'slot-definition-initargs
(class-slots class)))))
;; Now check the supplied-initarg-names and the default initargs
;; against the total set that we know are legal.
(doplist (key val) initargs
- (unless (memq key legal)
- (if error-p
- (error "Invalid initialization argument ~S for class ~S"
- key
- (class-name class))
- (return-from check-initargs-2-plist nil)))))
+ (unless (memq key legal)
+ (if error-p
+ (error "Invalid initialization argument ~S for class ~S"
+ key
+ (class-name class))
+ (return-from check-initargs-2-plist nil)))))
t)
(defun check-initargs-2-list (initkeys class legal &optional (error-p t))