X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fpcl%2Finit.lisp;h=a1821ec0983dc334d268679cac5a9b010b79e082;hb=d40a76606c86722b0aef8179155f9f2840739b72;hp=5c381fdccfc5b9a077d19ed79f99fc1d52f8519d;hpb=a530bbe337109d898d5b4a001fc8f1afa3b5dc39;p=sbcl.git diff --git a/src/pcl/init.lisp b/src/pcl/init.lisp index 5c381fd..a1821ec 100644 --- a/src/pcl/init.lisp +++ b/src/pcl/init.lisp @@ -24,9 +24,6 @@ ;;;; specification. (in-package "SB-PCL") - -(sb-int:file-comment - "$Header$") (defmethod make-instance ((class symbol) &rest initargs) (apply #'make-instance (find-class class) initargs)) @@ -132,16 +129,16 @@ (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: @@ -175,12 +172,12 @@ 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 @@ -199,12 +196,12 @@ (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)))))