X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fpcl%2Fstd-class.lisp;h=6b9f967dd870e48c1eb5c1d1cf819c042a331067;hb=f6a2be77637d025bfded9430f02863c28f74f77a;hp=23271785994cd586ca6f19fdf18c5c1aefb072f1;hpb=26b8ddda97fcfa2e2c0eae3bd2fdb19717c5fa40;p=sbcl.git diff --git a/src/pcl/std-class.lisp b/src/pcl/std-class.lisp index 2327178..6b9f967 100644 --- a/src/pcl/std-class.lisp +++ b/src/pcl/std-class.lisp @@ -173,9 +173,6 @@ (defmethod class-default-initargs ((class slot-class)) (plist-value class 'default-initargs)) -(defmethod class-constructors ((class slot-class)) - (plist-value class 'constructors)) - (defmethod class-slot-cells ((class std-class)) (plist-value class 'class-slot-cells)) @@ -228,9 +225,12 @@ (with-slots (direct-methods) specializer (or (cdr direct-methods) (setf (cdr direct-methods) - (gathering1 (collecting-once) + (let (collect) (dolist (m (car direct-methods)) - (gather1 (method-generic-function m)))))))) + ;; the old PCL code used COLLECTING-ONCE which used + ;; #'EQ to check for newness + (pushnew (method-generic-function m) collect :test #'eq)) + (nreverse collect)))))) ;;; This hash table is used to store the direct methods and direct generic ;;; functions of EQL specializers. Each value in the table is the cons. @@ -243,7 +243,8 @@ (defmethod specializer-method-table ((specializer class-eq-specializer)) *class-eq-specializer-methods*) -(defmethod add-direct-method ((specializer specializer-with-object) (method method)) +(defmethod add-direct-method ((specializer specializer-with-object) + (method method)) (let* ((object (specializer-object specializer)) (table (specializer-method-table specializer)) (entry (gethash object table))) @@ -255,7 +256,8 @@ (cdr entry) ()) method)) -(defmethod remove-direct-method ((specializer specializer-with-object) (method method)) +(defmethod remove-direct-method ((specializer specializer-with-object) + (method method)) (let* ((object (specializer-object specializer)) (entry (gethash object (specializer-method-table specializer)))) (when entry @@ -267,40 +269,45 @@ (car (gethash (specializer-object specializer) (specializer-method-table specializer)))) -(defmethod specializer-direct-generic-functions ((specializer specializer-with-object)) +(defmethod specializer-direct-generic-functions ((specializer + specializer-with-object)) (let* ((object (specializer-object specializer)) (entry (gethash object (specializer-method-table specializer)))) (when entry (or (cdr entry) (setf (cdr entry) - (gathering1 (collecting-once) + (let (collect) (dolist (m (car entry)) - (gather1 (method-generic-function m))))))))) + (pushnew (method-generic-function m) collect :test #'eq)) + (nreverse collect))))))) (defun map-specializers (function) - (map-all-classes #'(lambda (class) - (funcall function (class-eq-specializer class)) - (funcall function class))) - (maphash #'(lambda (object methods) - (declare (ignore methods)) - (intern-eql-specializer object)) + (map-all-classes (lambda (class) + (funcall function (class-eq-specializer class)) + (funcall function class))) + (maphash (lambda (object methods) + (declare (ignore methods)) + (intern-eql-specializer object)) *eql-specializer-methods*) - (maphash #'(lambda (object specl) - (declare (ignore object)) - (funcall function specl)) + (maphash (lambda (object specl) + (declare (ignore object)) + (funcall function specl)) *eql-specializer-table*) nil) (defun map-all-generic-functions (function) (let ((all-generic-functions (make-hash-table :test 'eq))) - (map-specializers #'(lambda (specl) - (dolist (gf (specializer-direct-generic-functions specl)) - (unless (gethash gf all-generic-functions) - (setf (gethash gf all-generic-functions) t) - (funcall function gf)))))) + (map-specializers (lambda (specl) + (dolist (gf (specializer-direct-generic-functions + specl)) + (unless (gethash gf all-generic-functions) + (setf (gethash gf all-generic-functions) t) + (funcall function gf)))))) nil) -(defmethod shared-initialize :after ((specl class-eq-specializer) slot-names &key) +(defmethod shared-initialize :after ((specl class-eq-specializer) + slot-names + &key) (declare (ignore slot-names)) (setf (slot-value specl 'type) `(class-eq ,(specializer-class specl)))) @@ -329,10 +336,9 @@ (defmethod ensure-class-using-class (name (class null) &rest args &key) (multiple-value-bind (meta initargs) (ensure-class-values class args) - (inform-type-system-about-class (class-prototype meta) name);*** (setf class (apply #'make-instance meta :name name initargs) (find-class name) class) - (inform-type-system-about-class class name) ;*** + (inform-type-system-about-class class name) class)) (defmethod ensure-class-using-class (name (class pcl-class) &rest args &key) @@ -341,12 +347,22 @@ (unless (eq (class-of class) meta) (change-class class meta)) (apply #'reinitialize-instance class initargs) (setf (find-class name) class) - (inform-type-system-about-class class name) ;*** + (inform-type-system-about-class class name) class)) (defmethod class-predicate-name ((class t)) 'constantly-nil) +(defun fix-super (s) + (cond ((classp s) s) + ((not (legal-class-name-p s)) + (error "~S is not a class or a legal class name." s)) + (t + (or (find-class s nil) + (setf (find-class s) + (make-instance 'forward-referenced-class + :name s)))))) + (defun ensure-class-values (class args) (let* ((initargs (copy-list args)) (unsupplied (list 1)) @@ -361,34 +377,17 @@ *the-class-standard-class*) (t (class-of class))))) - (flet ((fix-super (s) - (cond ((classp s) s) - ((not (legal-class-name-p s)) - (error "~S is not a class or a legal class name." s)) - (t - (or (find-class s nil) - (setf (find-class s) - (make-instance 'forward-referenced-class - :name s))))))) - (loop (unless (remf initargs :metaclass) (return))) - (loop (unless (remf initargs :direct-superclasses) (return))) - (loop (unless (remf initargs :direct-slots) (return))) - (values meta - (list* :direct-superclasses - (and (neq supplied-supers unsupplied) - (mapcar #'fix-super supplied-supers)) - :direct-slots - (and (neq supplied-slots unsupplied) supplied-slots) - initargs))))) + (loop (unless (remf initargs :metaclass) (return))) + (loop (unless (remf initargs :direct-superclasses) (return))) + (loop (unless (remf initargs :direct-slots) (return))) + (values meta + (list* :direct-superclasses + (and (neq supplied-supers unsupplied) + (mapcar #'fix-super supplied-supers)) + :direct-slots + (and (neq supplied-slots unsupplied) supplied-slots) + initargs)))) -#|| ; since it doesn't do anything -(defmethod shared-initialize :before ((class std-class) - slot-names - &key direct-superclasses) - (declare (ignore slot-names)) - ;; *** error checking - ) -||# (defmethod shared-initialize :after ((class std-class) @@ -418,26 +417,32 @@ (setq direct-slots (if direct-slots-p (setf (slot-value class 'direct-slots) - (mapcar #'(lambda (pl) (make-direct-slotd class pl)) direct-slots)) + (mapcar (lambda (pl) (make-direct-slotd class pl)) + direct-slots)) (slot-value class 'direct-slots))) (if direct-default-initargs-p - (setf (plist-value class 'direct-default-initargs) direct-default-initargs) - (setq direct-default-initargs (plist-value class 'direct-default-initargs))) + (setf (plist-value class 'direct-default-initargs) + direct-default-initargs) + (setq direct-default-initargs + (plist-value class 'direct-default-initargs))) (setf (plist-value class 'class-slot-cells) - (gathering1 (collecting) + (let (collect) (dolist (dslotd direct-slots) (when (eq (slot-definition-allocation dslotd) class) (let ((initfunction (slot-definition-initfunction dslotd))) - (gather1 (cons (slot-definition-name dslotd) + (push (cons (slot-definition-name dslotd) (if initfunction (funcall initfunction) - +slot-unbound+)))))))) + +slot-unbound+)) + collect)))) + (nreverse collect))) (setq predicate-name (if predicate-name-p (setf (slot-value class 'predicate-name) (car predicate-name)) (or (slot-value class 'predicate-name) (setf (slot-value class 'predicate-name) - (make-class-predicate-name (class-name class)))))) + (make-class-predicate-name (class-name + class)))))) (add-direct-subclasses class direct-superclasses) (update-class class nil) (make-class-predicate class predicate-name) @@ -459,8 +464,76 @@ &rest initargs &key) (map-dependents class - #'(lambda (dependent) - (apply #'update-dependent class dependent initargs)))) + (lambda (dependent) + (apply #'update-dependent class dependent initargs)))) + +(defmethod shared-initialize :after ((slotd standard-slot-definition) + slot-names &key) + (declare (ignore slot-names)) + (with-slots (allocation class) + slotd + (setq allocation (if (eq allocation :class) class allocation)))) + +(defmethod shared-initialize :after ((slotd structure-slot-definition) + slot-names + &key (allocation :instance)) + (declare (ignore slot-names)) + (unless (eq allocation :instance) + (error "Structure slots must have :INSTANCE allocation."))) + +(defun make-structure-class-defstruct-form (name direct-slots include) + (let* ((conc-name (intern (format nil "~S structure class " name))) + (constructor (intern (format nil "~A constructor" conc-name))) + (defstruct `(defstruct (,name + ,@(when include + `((:include ,(class-name include)))) + (:print-function print-std-instance) + (:predicate nil) + (:conc-name ,conc-name) + (:constructor ,constructor ()) + (:copier nil)) + ,@(mapcar (lambda (slot) + `(,(slot-definition-name slot) + +slot-unbound+)) + direct-slots))) + (reader-names (mapcar (lambda (slotd) + (intern (format nil + "~A~A reader" + conc-name + (slot-definition-name + slotd)))) + direct-slots)) + (writer-names (mapcar (lambda (slotd) + (intern (format nil + "~A~A writer" + conc-name + (slot-definition-name + slotd)))) + direct-slots)) + (readers-init + (mapcar (lambda (slotd reader-name) + (let ((accessor + (slot-definition-defstruct-accessor-symbol + slotd))) + `(defun ,reader-name (obj) + (declare (type ,name obj)) + (,accessor obj)))) + direct-slots reader-names)) + (writers-init + (mapcar (lambda (slotd writer-name) + (let ((accessor + (slot-definition-defstruct-accessor-symbol + slotd))) + `(defun ,writer-name (nv obj) + (declare (type ,name obj)) + (setf (,accessor obj) nv)))) + direct-slots writer-names)) + (defstruct-form + `(progn + ,defstruct + ,@readers-init ,@writers-init + (cons nil nil)))) + (values defstruct-form constructor reader-names writer-names))) (defmethod shared-initialize :after ((class structure-class) @@ -483,71 +556,25 @@ (if direct-slots-p (setf (slot-value class 'direct-slots) (setq direct-slots - (mapcar #'(lambda (pl) - (when defstruct-p - (let* ((slot-name (getf pl :name)) - (acc-name (format nil "~S structure class ~A" - name slot-name)) - (accessor (intern acc-name))) - (setq pl (list* :defstruct-accessor-symbol accessor - pl)))) - (make-direct-slotd class pl)) + (mapcar (lambda (pl) + (when defstruct-p + (let* ((slot-name (getf pl :name)) + (acc-name + (format nil + "~S structure class ~A" + name slot-name)) + (accessor (intern acc-name))) + (setq pl (list* :defstruct-accessor-symbol + accessor pl)))) + (make-direct-slotd class pl)) direct-slots))) (setq direct-slots (slot-value class 'direct-slots))) (when defstruct-p - (let* ((include (car (slot-value class 'direct-superclasses))) - (conc-name (intern (format nil "~S structure class " name))) - (constructor (intern (format nil "~A constructor" conc-name))) - (defstruct `(defstruct (,name - ,@(when include - `((:include ,(class-name include)))) - (:print-function print-std-instance) - (:predicate nil) - (:conc-name ,conc-name) - (:constructor ,constructor ())) - ,@(mapcar #'(lambda (slot) - `(,(slot-definition-name slot) - +slot-unbound+)) - direct-slots))) - (reader-names (mapcar (lambda (slotd) - (intern (format nil - "~A~A reader" - conc-name - (slot-definition-name - slotd)))) - direct-slots)) - (writer-names (mapcar (lambda (slotd) - (intern (format nil - "~A~A writer" - conc-name - (slot-definition-name - slotd)))) - direct-slots)) - (readers-init - (mapcar (lambda (slotd reader-name) - (let ((accessor - (slot-definition-defstruct-accessor-symbol - slotd))) - `(defun ,reader-name (obj) - (declare (type ,name obj)) - (,accessor obj)))) - direct-slots reader-names)) - (writers-init - (mapcar (lambda (slotd writer-name) - (let ((accessor - (slot-definition-defstruct-accessor-symbol - slotd))) - `(defun ,writer-name (nv obj) - (declare (type ,name obj)) - (setf (,accessor obj) nv)))) - direct-slots writer-names)) - (defstruct-form - `(progn - ,defstruct - ,@readers-init ,@writers-init - (cons nil nil)))) - (unless (structure-type-p name) (eval defstruct-form)) - (mapc #'(lambda (dslotd reader-name writer-name) + (let ((include (car (slot-value class 'direct-superclasses)))) + (multiple-value-bind (defstruct-form constructor reader-names writer-names) + (make-structure-class-defstruct-form name direct-slots include) + (unless (structure-type-p name) (eval defstruct-form)) + (mapc (lambda (dslotd reader-name writer-name) (let* ((reader (gdefinition reader-name)) (writer (when (gboundp writer-name) (gdefinition writer-name)))) @@ -555,26 +582,27 @@ reader) (setf (slot-value dslotd 'internal-writer-function) writer))) - direct-slots reader-names writer-names) - (setf (slot-value class 'defstruct-form) defstruct-form) - (setf (slot-value class 'defstruct-constructor) constructor)))) - (add-direct-subclasses class direct-superclasses) - (setf (slot-value class 'class-precedence-list) - (compute-class-precedence-list class)) - (setf (slot-value class 'slots) (compute-slots class)) - (let ((lclass (cl:find-class (class-name class)))) - (setf (sb-kernel:class-pcl-class lclass) class) - (setf (slot-value class 'wrapper) (sb-kernel:class-layout lclass))) - (update-pv-table-cache-info class) - (setq predicate-name (if predicate-name-p + direct-slots reader-names writer-names) + (setf (slot-value class 'defstruct-form) defstruct-form) + (setf (slot-value class 'defstruct-constructor) constructor)))) + (add-direct-subclasses class direct-superclasses) + (setf (slot-value class 'class-precedence-list) + (compute-class-precedence-list class)) + (setf (slot-value class 'slots) (compute-slots class)) + (let ((lclass (cl:find-class (class-name class)))) + (setf (sb-kernel:class-pcl-class lclass) class) + (setf (slot-value class 'wrapper) (sb-kernel:class-layout lclass))) + (update-pv-table-cache-info class) + (setq predicate-name (if predicate-name-p (setf (slot-value class 'predicate-name) - (car predicate-name)) + (car predicate-name)) (or (slot-value class 'predicate-name) (setf (slot-value class 'predicate-name) - (make-class-predicate-name (class-name class)))))) - (make-class-predicate class predicate-name) - (add-slot-accessors class direct-slots)) - + (make-class-predicate-name + (class-name class)))))) + (make-class-predicate class predicate-name) + (add-slot-accessors class direct-slots))) + (defmethod direct-slot-definition-class ((class structure-class) initargs) (declare (ignore initargs)) (find-class 'structure-direct-slot-definition)) @@ -666,7 +694,8 @@ ;; If there is a change in the shape of the instances then the ;; old class is now obsolete. (let* ((nlayout (mapcar #'slot-definition-name - (sort instance-slots #'< :key #'slot-definition-location))) + (sort instance-slots #'< + :key #'slot-definition-location))) (nslots (length nlayout)) (nwrapper-class-slots (compute-class-slots class-slots)) (owrapper (class-wrapper class)) @@ -677,15 +706,16 @@ (make-wrapper nslots class)) ((and (equal nlayout olayout) (not - (iterate ((o (list-elements owrapper-class-slots)) - (n (list-elements nwrapper-class-slots))) - (unless (eq (car o) (car n)) (return t))))) + (loop for o in owrapper-class-slots + for n in nwrapper-class-slots + do (unless (eq (car o) (car n)) (return t))))) owrapper) (t - ;; This will initialize the new wrapper to have the same - ;; state as the old wrapper. We will then have to change - ;; that. This may seem like wasted work (it is), but the - ;; spec requires that we call make-instances-obsolete. + ;; This will initialize the new wrapper to have the + ;; same state as the old wrapper. We will then have + ;; to change that. This may seem like wasted work + ;; (and it is), but the spec requires that we call + ;; MAKE-INSTANCES-OBSOLETE. (make-instances-obsolete class) (class-wrapper class))))) @@ -701,18 +731,20 @@ (update-pv-table-cache-info class))))) (defun compute-class-slots (eslotds) - (gathering1 (collecting) + (let (collect) (dolist (eslotd eslotds) - (gather1 - (assoc (slot-definition-name eslotd) - (class-slot-cells (slot-definition-allocation eslotd))))))) + (push (assoc (slot-definition-name eslotd) + (class-slot-cells (slot-definition-allocation eslotd))) + collect)) + (nreverse collect))) (defun compute-layout (cpl instance-eslotds) (let* ((names - (gathering1 (collecting) + (let (collect) (dolist (eslotd instance-eslotds) (when (eq (slot-definition-allocation eslotd) :instance) - (gather1 (slot-definition-name eslotd)))))) + (push (slot-definition-name eslotd) collect))) + (nreverse collect))) (order ())) (labels ((rwalk (tail) (when tail @@ -731,16 +763,17 @@ (when (and (class-finalized-p class) (let ((cpl (class-precedence-list class))) (or (member *the-class-slot-class* cpl) - (member *the-class-standard-effective-slot-definition* cpl)))) + (member *the-class-standard-effective-slot-definition* + cpl)))) (let ((gf-table (make-hash-table :test 'eq))) (labels ((collect-gfs (class) (dolist (gf (specializer-direct-generic-functions class)) (setf (gethash gf gf-table) t)) (mapc #'collect-gfs (class-direct-superclasses class)))) (collect-gfs class) - (maphash #'(lambda (gf ignore) - (declare (ignore ignore)) - (update-gf-dfun class gf)) + (maphash (lambda (gf ignore) + (declare (ignore ignore)) + (update-gf-dfun class gf)) gf-table))))) (defun update-inits (class inits) @@ -786,9 +819,9 @@ (if entry (push d (cdr entry)) (push (list name d) name-dslotds-alist)))))) - (mapcar #'(lambda (direct) - (compute-effective-slot-definition class - (nreverse (cdr direct)))) + (mapcar (lambda (direct) + (compute-effective-slot-definition class + (nreverse (cdr direct)))) name-dslotds-alist))) (defmethod compute-slots :around ((class std-class)) @@ -812,11 +845,11 @@ eslotds)) (defmethod compute-slots ((class structure-class)) - (mapcan #'(lambda (superclass) - (mapcar #'(lambda (dslotd) - (compute-effective-slot-definition class - (list dslotd))) - (class-direct-slots superclass))) + (mapcan (lambda (superclass) + (mapcar (lambda (dslotd) + (compute-effective-slot-definition class + (list dslotd))) + (class-direct-slots superclass))) (reverse (slot-value class 'class-precedence-list)))) (defmethod compute-slots :around ((class structure-class)) @@ -864,7 +897,7 @@ allocp t)) (setq initargs (append (slot-definition-initargs slotd) initargs)) (let ((slotd-type (slot-definition-type slotd))) - (setq type (cond ((eq type 't) slotd-type) + (setq type (cond ((eq type t) slotd-type) ((*subtypep type slotd-type) type) (t `(and ,type ,slotd-type))))))) (list :name name @@ -878,12 +911,15 @@ (defmethod compute-effective-slot-definition-initargs :around ((class structure-class) direct-slotds) (let ((slotd (car direct-slotds))) - (list* :defstruct-accessor-symbol (slot-definition-defstruct-accessor-symbol slotd) - :internal-reader-function (slot-definition-internal-reader-function slotd) - :internal-writer-function (slot-definition-internal-writer-function slotd) + (list* :defstruct-accessor-symbol + (slot-definition-defstruct-accessor-symbol slotd) + :internal-reader-function + (slot-definition-internal-reader-function slotd) + :internal-writer-function + (slot-definition-internal-writer-function slotd) (call-next-method)))) -;;; NOTE: For bootstrapping considerations, these can't use make-instance +;;; NOTE: For bootstrapping considerations, these can't use MAKE-INSTANCE ;;; to make the method object. They have to use make-a-method which ;;; is a specially bootstrapped mechanism for making standard methods. (defmethod reader-method-class ((class slot-class) direct-slot &rest initargs) @@ -949,7 +985,7 @@ ;;; *** There is a subtle bug here which is going to have to be fixed. ;;; *** Namely, the simplistic use of the template has to be fixed. We ;;; *** have to give the optimize-slot-value method the user might have -;;; *** defined for this metclass a chance to run. +;;; *** defined for this metaclass a chance to run. (defmethod make-reader-method-function ((class slot-class) slot-name) (make-std-reader-method-function (class-name class) slot-name)) @@ -961,16 +997,18 @@ (make-std-boundp-method-function (class-name class) slot-name)) ;;;; inform-type-system-about-class -;;;; make-type-predicate ;;; -;;; These are NOT part of the standard protocol. They are internal mechanism -;;; which PCL uses to *try* and tell the type system about class definitions. -;;; In a more fully integrated implementation of CLOS, the type system would -;;; know about class objects and class names in a more fundamental way and -;;; the mechanism used to inform the type system about new classes would be -;;; different. +;;; These are NOT part of the standard protocol. They are internal +;;; mechanism which PCL uses to *try* and tell the type system about +;;; class definitions. In a more fully integrated implementation of +;;; CLOS, the type system would know about class objects and class +;;; names in a more fundamental way and the mechanism used to inform +;;; the type system about new classes would be different. (defmethod inform-type-system-about-class ((class std-class) name) (inform-type-system-about-std-class name)) + +(defmethod inform-type-system-about-class ((class structure-class) (name t)) + nil) (defmethod compatible-meta-class-change-p (class proto-new-class) (eq (class-of class) (class-of proto-new-class))) @@ -992,7 +1030,7 @@ ;; will already be doing what we want. In particular, we must be ;; sure we never change an OBSOLETE into a FLUSH since OBSOLETE ;; means do what FLUSH does and then some. - (when (eq state 't) ; FIXME: should be done through INVALID-WRAPPER-P + (when (eq state t) ; FIXME: should be done through INVALID-WRAPPER-P (let ((nwrapper (make-wrapper (wrapper-no-of-instance-slots owrapper) class))) (setf (wrapper-instance-slots-layout nwrapper) @@ -1002,7 +1040,7 @@ (sb-sys:without-interrupts (update-lisp-class-layout class nwrapper) (setf (slot-value class 'wrapper) nwrapper) - (invalidate-wrapper owrapper ':flush nwrapper)))))) + (invalidate-wrapper owrapper :flush nwrapper)))))) (defun flush-cache-trap (owrapper nwrapper instance) (declare (ignore owrapper)) @@ -1022,7 +1060,7 @@ (sb-sys:without-interrupts (update-lisp-class-layout class nwrapper) (setf (slot-value class 'wrapper) nwrapper) - (invalidate-wrapper owrapper ':obsolete nwrapper) + (invalidate-wrapper owrapper :obsolete nwrapper) class))) (defmethod make-instances-obsolete ((class symbol)) @@ -1033,19 +1071,19 @@ ;;; - when the instance is involved in method lookup ;;; - when attempting to access a slot of an instance ;;; -;;; It is not called by class-of, wrapper-of, or any of the low-level instance -;;; access macros. +;;; It is not called by class-of, wrapper-of, or any of the low-level +;;; instance access macros. ;;; -;;; Of course these times when it is called are an internal implementation -;;; detail of PCL and are not part of the documented description of when the -;;; obsolete instance update happens. The documented description is as it -;;; appears in 88-002R. +;;; Of course these times when it is called are an internal +;;; implementation detail of PCL and are not part of the documented +;;; description of when the obsolete instance update happens. The +;;; documented description is as it appears in 88-002R. ;;; -;;; This has to return the new wrapper, so it counts on all the methods on -;;; obsolete-instance-trap-internal to return the new wrapper. It also does -;;; a little internal error checking to make sure that the traps are only -;;; happening when they should, and that the trap methods are computing -;;; appropriate new wrappers. +;;; This has to return the new wrapper, so it counts on all the +;;; methods on obsolete-instance-trap-internal to return the new +;;; wrapper. It also does a little internal error checking to make +;;; sure that the traps are only happening when they should, and that +;;; the trap methods are computing appropriate new wrappers. ;;; obsolete-instance-trap might be called on structure instances ;;; after a structure is redefined. In most cases, obsolete-instance-trap @@ -1064,9 +1102,7 @@ (lambda (condition stream) ;; Don't try to print the structure, since it probably won't work. (format stream - "obsolete structure error in ~S:~@ - for a structure of type: ~S" - (sb-kernel::condition-function-name condition) + "~@" (type-of (obsolete-structure-datum condition)))))) (defun obsolete-instance-trap (owrapper nwrapper instance) @@ -1095,19 +1131,20 @@ ;; -- --> shared -- ;; Go through all the old local slots. - (iterate ((name (list-elements olayout)) - (opos (interval :from 0))) - (let ((npos (posq name nlayout))) - (if npos - (setf (clos-slots-ref nslots npos) - (clos-slots-ref oslots opos)) - (progn - (push name discarded) - (unless (eq (clos-slots-ref oslots opos) +slot-unbound+) - (setf (getf plist name) (clos-slots-ref oslots opos))))))) + (let ((opos 0)) + (dolist (name olayout) + (let ((npos (posq name nlayout))) + (if npos + (setf (clos-slots-ref nslots npos) + (clos-slots-ref oslots opos)) + (progn + (push name discarded) + (unless (eq (clos-slots-ref oslots opos) +slot-unbound+) + (setf (getf plist name) (clos-slots-ref oslots opos)))))) + (incf opos))) ;; Go through all the old shared slots. - (iterate ((oclass-slot-and-val (list-elements oclass-slots))) + (dolist (oclass-slot-and-val oclass-slots) (let ((name (car oclass-slot-and-val)) (val (cdr oclass-slot-and-val))) (let ((npos (posq name nlayout))) @@ -1154,18 +1191,18 @@ (old-class-slots (wrapper-class-slots old-wrapper))) ;; "The values of local slots specified by both the class CTO and - ;; CFROM are retained. If such a local slot was unbound, it remains - ;; unbound." - (iterate ((new-slot (list-elements new-layout)) - (new-position (interval :from 0))) - (let ((old-position (posq new-slot old-layout))) - (when old-position - (setf (clos-slots-ref new-slots new-position) - (clos-slots-ref old-slots old-position))))) + ;; CFROM are retained. If such a local slot was unbound, it + ;; remains unbound." + (let ((new-position 0)) + (dolist (new-slot new-layout) + (let ((old-position (posq new-slot old-layout))) + (when old-position + (setf (clos-slots-ref new-slots new-position) + (clos-slots-ref old-slots old-position)))))) ;; "The values of slots specified as shared in the class CFROM and ;; as local in the class CTO are retained." - (iterate ((slot-and-val (list-elements old-class-slots))) + (dolist (slot-and-val old-class-slots) (let ((position (posq (car slot-and-val) new-layout))) (when position (setf (clos-slots-ref new-slots position) (cdr slot-and-val))))) @@ -1225,7 +1262,7 @@ (defmethod validate-superclass ((c slot-class) (f forward-referenced-class)) - 't) + t) (defmethod add-dependent ((metaobject dependent-update-mixin) dependent) (pushnew dependent (plist-value metaobject 'dependents)))