X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fpcl%2Fstd-class.lisp;h=adb128253f52e3d3cad3e9abd00c9da8974e7646;hb=cf607a404d7518e8a18c9e362913f370eb9a5e38;hp=206e2226c1577edf1b8565eed607072cdb821181;hpb=4eb1a6d3ad2b7dcc19ac0ec979a1eb1eb049659a;p=sbcl.git diff --git a/src/pcl/std-class.lisp b/src/pcl/std-class.lisp index 206e222..adb1282 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. @@ -276,32 +276,33 @@ (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) @@ -319,7 +320,7 @@ :direct-superclasses supers :direct-slots slots :definition-source `((defclass ,name) - ,*load-truename*) + ,*load-pathname*) other))) ;; Defclass of a class with a forward-referenced superclass does not ;; have a wrapper. RES is the incomplete PCL class. The Lisp class @@ -337,7 +338,6 @@ (ensure-class-values class args) (setf class (apply #'make-instance meta :name name initargs) (find-class name) class) - (inform-type-system-about-class class name) class)) (defmethod ensure-class-using-class (name (class pcl-class) &rest args &key) @@ -346,7 +346,6 @@ (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) class)) (defmethod class-predicate-name ((class t)) @@ -376,7 +375,73 @@ *the-class-standard-class*) (t (class-of class))))) - (loop (unless (remf initargs :metaclass) (return))) + ;; KLUDGE: It seemed to me initially that there ought to be a way + ;; of collecting all the erroneous problems in one go, rather than + ;; this way of solving the problem of signalling the errors that + ;; we are required to, which stops at the first bogus input. + ;; However, after playing around a little, I couldn't find that + ;; way, so I've left it as is, but if someone does come up with a + ;; better way... -- CSR, 2002-09-08 + (do ((direct-slots (getf initargs :direct-slots) (cdr direct-slots))) + ((endp direct-slots) nil) + (destructuring-bind (slot &rest more) direct-slots + (let ((slot-name (getf slot :name))) + (when (some (lambda (s) (eq slot-name (getf s :name))) more) + ;; FIXME: It's quite possible that we ought to define an + ;; SB-INT:PROGRAM-ERROR function to signal these and other + ;; errors throughout the codebase that are required to be + ;; of type PROGRAM-ERROR. + (error 'simple-program-error + :format-control "~@" + :format-arguments (list slot-name))) + (do ((stuff slot (cddr stuff))) + ((endp stuff) nil) + (destructuring-bind (option value &rest more) stuff + (cond + ((and (member option '(:allocation :type + :initform :documentation)) + (not (eq unsupplied + (getf more option unsupplied)))) + (error 'simple-program-error + :format-control "~@" + :format-arguments (list option slot-name))) + ((and (eq option :readers) + (notevery #'symbolp value)) + (error 'simple-program-error + :format-control "~@" + :format-arguments (list slot-name))) + ((and (eq option :initargs) + (notevery #'symbolp value)) + (error 'simple-program-error + :format-control "~@" + :format-arguments (list slot-name))))))))) + (loop for (initarg . more) on (getf initargs :direct-default-initargs) + for name = (car initarg) + when (some (lambda (a) (eq (car a) name)) more) + do (error 'simple-program-error + :format-control "~@" + :format-arguments (list name class))) + (let ((metaclass 0) + (default-initargs 0)) + (do ((args initargs (cddr args))) + ((endp args) nil) + (case (car args) + (:metaclass + (when (> (incf metaclass) 1) + (error 'simple-program-error + :format-control "~@"))) + (:direct-default-initargs + (when (> (incf default-initargs) 1) + (error 'simple-program-error + :format-control "~@")))))) + (remf initargs :metaclass) (loop (unless (remf initargs :direct-superclasses) (return))) (loop (unless (remf initargs :direct-slots) (return))) (values meta @@ -425,14 +490,16 @@ (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) + (when (eq :class (slot-definition-allocation dslotd)) (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)) @@ -461,30 +528,22 @@ &rest initargs &key) (map-dependents class - #'(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)))) + (lambda (dependent) + (apply #'update-dependent class dependent initargs)))) -(defmethod shared-initialize :after ((slotd structure-slot-definition) - slot-names - &key (allocation :instance)) - (declare (ignore slot-names)) +(defmethod shared-initialize :after + ((slotd structure-slot-definition) slot-names &key + (allocation :instance) allocation-class) + (declare (ignore slot-names allocation-class)) (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))) + (constructor (intern (format nil "~Aconstructor" conc-name))) (defstruct `(defstruct (,name ,@(when include `((:include ,(class-name include)))) - (:print-function print-std-instance) (:predicate nil) (:conc-name ,conc-name) (:constructor ,constructor ()) @@ -553,17 +612,17 @@ (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 @@ -571,14 +630,14 @@ (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)))) - (setf (slot-value dslotd 'internal-reader-function) - reader) - (setf (slot-value dslotd 'internal-writer-function) - writer))) + (mapc (lambda (dslotd reader-name writer-name) + (let* ((reader (gdefinition reader-name)) + (writer (when (gboundp writer-name) + (gdefinition writer-name)))) + (setf (slot-value dslotd 'internal-reader-function) + 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)))) @@ -628,18 +687,29 @@ (dolist (r (slot-definition-readers dslotd)) (fix r slot-name 'r)) (dolist (w (slot-definition-writers dslotd)) (fix w slot-name 'w)))))) -(defun add-direct-subclasses (class new) - (dolist (n new) +(defun add-direct-subclasses (class supers) + (dolist (super supers) (unless (memq class (class-direct-subclasses class)) - (add-direct-subclass n class)))) + (add-direct-subclass super class)))) -(defun remove-direct-subclasses (class new) +(defun remove-direct-subclasses (class supers) (let ((old (class-direct-superclasses class))) - (dolist (o (set-difference old new)) + (dolist (o (set-difference old supers)) (remove-direct-subclass o class)))) (defmethod finalize-inheritance ((class std-class)) (update-class class t)) + +(defmethod finalize-inheritance ((class forward-referenced-class)) + ;; FIXME: should we not be thinking a bit about what kinds of error + ;; we're throwing? Maybe we need a clos-error type to mix in? Or + ;; possibly a forward-referenced-class-error, though that's + ;; difficult given e.g. class precedence list calculations... + (error + "~@" + class)) + (defun class-has-a-forward-referenced-superclass-p (class) (or (forward-referenced-class-p class) @@ -649,9 +719,24 @@ ;;; This is called by :after shared-initialize whenever a class is initialized ;;; or reinitialized. The class may or may not be finalized. (defun update-class (class finalizep) + ;; Comment from Gerd Moellmann: + ;; + ;; Note that we can't simply delay the finalization when CLASS has + ;; no forward referenced superclasses because that causes bootstrap + ;; problems. + (when (and (not finalizep) + (not (class-finalized-p class)) + (not (class-has-a-forward-referenced-superclass-p class))) + (finalize-inheritance class) + (return-from update-class)) (when (or finalizep (class-finalized-p class) (not (class-has-a-forward-referenced-superclass-p class))) (update-cpl class (compute-class-precedence-list class)) + ;; This invocation of UPDATE-SLOTS, in practice, finalizes the + ;; class. The hoops above are to ensure that FINALIZE-INHERITANCE + ;; is called at finalization, so that MOP programmers can hook + ;; into the system as described in "Class Finalization Protocol" + ;; (section 5.5.2 of AMOP). (update-slots class (compute-slots class)) (update-gfs-of-class class) (update-inits class (compute-default-initargs class)) @@ -685,8 +770,9 @@ (class-slots ())) (dolist (eslotd eslotds) (let ((alloc (slot-definition-allocation eslotd))) - (cond ((eq alloc :instance) (push eslotd instance-slots)) - ((classp alloc) (push eslotd class-slots))))) + (case alloc + (:instance (push eslotd instance-slots)) + (:class (push eslotd class-slots))))) ;; If there is a change in the shape of the instances then the ;; old class is now obsolete. @@ -703,9 +789,9 @@ (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 @@ -728,31 +814,12 @@ (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))))))) - -(defun compute-layout (cpl instance-eslotds) - (let* ((names - (gathering1 (collecting) - (dolist (eslotd instance-eslotds) - (when (eq (slot-definition-allocation eslotd) :instance) - (gather1 (slot-definition-name eslotd)))))) - (order ())) - (labels ((rwalk (tail) - (when tail - (rwalk (cdr tail)) - (dolist (ss (class-slots (car tail))) - (let ((n (slot-definition-name ss))) - (when (member n names) - (setq order (cons n order) - names (remove n names)))))))) - (rwalk (if (slot-boundp (car cpl) 'slots) - cpl - (cdr cpl))) - (reverse (append names order))))) + (push (assoc (slot-definition-name eslotd) + (class-slot-cells (slot-definition-class eslotd))) + collect)) + (nreverse collect))) (defun update-gfs-of-class (class) (when (and (class-finalized-p class) @@ -766,9 +833,9 @@ (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) @@ -807,44 +874,90 @@ ;; The list is in most-specific-first order. (let ((name-dslotds-alist ())) (dolist (c (class-precedence-list class)) - (let ((dslotds (class-direct-slots c))) - (dolist (d dslotds) - (let* ((name (slot-definition-name d)) - (entry (assq name name-dslotds-alist))) - (if entry - (push d (cdr entry)) - (push (list name d) name-dslotds-alist)))))) - (mapcar #'(lambda (direct) - (compute-effective-slot-definition class - (nreverse (cdr direct)))) + (dolist (slot (class-direct-slots c)) + (let* ((name (slot-definition-name slot)) + (entry (assq name name-dslotds-alist))) + (if entry + (push slot (cdr entry)) + (push (list name slot) name-dslotds-alist))))) + (mapcar (lambda (direct) + (compute-effective-slot-definition class + (nreverse (cdr direct)))) name-dslotds-alist))) -(defmethod compute-slots :around ((class std-class)) +(defmethod compute-slots ((class standard-class)) + (call-next-method)) + +(defmethod compute-slots :around ((class standard-class)) (let ((eslotds (call-next-method)) - (cpl (class-precedence-list class)) - (instance-slots ()) - (class-slots ())) - (dolist (eslotd eslotds) - (let ((alloc (slot-definition-allocation eslotd))) - (cond ((eq alloc :instance) (push eslotd instance-slots)) - ((classp alloc) (push eslotd class-slots))))) - (let ((nlayout (compute-layout cpl instance-slots))) - (dolist (eslotd instance-slots) - (setf (slot-definition-location eslotd) - (position (slot-definition-name eslotd) nlayout)))) - (dolist (eslotd class-slots) + (location -1)) + (dolist (eslotd eslotds eslotds) (setf (slot-definition-location eslotd) - (assoc (slot-definition-name eslotd) - (class-slot-cells (slot-definition-allocation eslotd))))) - (mapc #'initialize-internal-slot-functions eslotds) - eslotds)) + (ecase (slot-definition-allocation eslotd) + (:instance + (incf location)) + (:class + (let* ((name (slot-definition-name eslotd)) + (from-class (slot-definition-allocation-class eslotd)) + (cell (assq name (class-slot-cells from-class)))) + (aver (consp cell)) + cell)))) + (initialize-internal-slot-functions eslotd)))) + +(defmethod compute-slots ((class funcallable-standard-class)) + (call-next-method)) + +(defmethod compute-slots :around ((class funcallable-standard-class)) + (labels ((instance-slot-names (slotds) + (let (collect) + (dolist (slotd slotds (nreverse collect)) + (when (eq (slot-definition-allocation slotd) :instance) + (push (slot-definition-name slotd) collect))))) + ;; This sorts slots so that slots of classes later in the CPL + ;; come before slots of other classes. This is crucial for + ;; funcallable instances because it ensures that the slots of + ;; FUNCALLABLE-STANDARD-OBJECT, which includes the slots of + ;; KERNEL:FUNCALLABLE-INSTANCE, come first, which in turn + ;; makes it possible to treat FUNCALLABLE-STANDARD-OBJECT as + ;; a funcallable instance. + (compute-layout (eslotds) + (let ((first ()) + (names (instance-slot-names eslotds))) + (dolist (class + (reverse (class-precedence-list class)) + (nreverse (nconc names first))) + (dolist (ss (class-slots class)) + (let ((name (slot-definition-name ss))) + (when (member name names) + (push name first) + (setq names (delete name names))))))))) + (let ((all-slotds (call-next-method)) + (instance-slots ()) + (class-slots ())) + (dolist (slotd all-slotds) + (ecase (slot-definition-allocation slotd) + (:instance (push slotd instance-slots)) + (:class (push slotd class-slots)))) + (let ((layout (compute-layout instance-slots))) + (dolist (slotd instance-slots) + (setf (slot-definition-location slotd) + (position (slot-definition-name slotd) layout)) + (initialize-internal-slot-functions slotd))) + (dolist (slotd class-slots) + (let ((name (slot-definition-name slotd)) + (from-class (slot-definition-allocation-class slotd))) + (setf (slot-definition-location slotd) + (assoc name (class-slot-cells from-class))) + (aver (consp (slot-definition-location slotd))) + (initialize-internal-slot-functions slotd))) + all-slotds))) (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)) @@ -872,6 +985,7 @@ (initform nil) (initargs nil) (allocation nil) + (allocation-class nil) (type t) (namep nil) (initp nil) @@ -889,6 +1003,7 @@ initp t))) (unless allocp (setq allocation (slot-definition-allocation slotd) + allocation-class (slot-definition-class slotd) allocp t)) (setq initargs (append (slot-definition-initargs slotd) initargs)) (let ((slotd-type (slot-definition-type slotd))) @@ -900,6 +1015,7 @@ :initfunction initfunction :initargs initargs :allocation allocation + :allocation-class allocation-class :type type :class class))) @@ -968,18 +1084,17 @@ (let ((method (get-method generic-function () (list class) nil))) (when method (remove-method generic-function method)))) -;;; make-reader-method-function and make-write-method function are NOT part of -;;; the standard protocol. They are however useful, PCL makes uses makes use -;;; of them internally and documents them for PCL users. +;;; MAKE-READER-METHOD-FUNCTION and MAKE-WRITE-METHOD function are NOT +;;; part of the standard protocol. They are however useful, PCL makes +;;; use of them internally and documents them for PCL users. ;;; ;;; *** This needs work to make type testing by the writer functions which ;;; *** do type testing faster. The idea would be to have one constructor -;;; *** for each possible type test. In order to do this it would be nice -;;; *** to have help from inform-type-system-about-class and friends. +;;; *** for each possible type test. ;;; ;;; *** 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 +;;; *** have to give the OPTIMIZE-SLOT-VALUE method the user might have ;;; *** defined for this metaclass a chance to run. (defmethod make-reader-method-function ((class slot-class) slot-name) @@ -991,20 +1106,6 @@ (defmethod make-boundp-method-function ((class slot-class) slot-name) (make-std-boundp-method-function (class-name class) slot-name)) -;;;; inform-type-system-about-class -;;; -;;; 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))) @@ -1017,15 +1118,38 @@ (or (eq new-super-meta-class *the-class-std-class*) (eq (class-of class) new-super-meta-class)))) +;;; What this does depends on which of the four possible values of +;;; LAYOUT-INVALID the PCL wrapper has; the simplest case is when it +;;; is (:FLUSH ) or (:OBSOLETE ), when there is +;;; nothing to do, as the new wrapper has already been created. If +;;; LAYOUT-INVALID returns NIL, then we invalidate it (setting it to +;;; (:FLUSH ); UPDATE-SLOTS later gets to choose whether or +;;; not to "upgrade" this to (:OBSOLETE ). +;;; +;;; This leaves the case where LAYOUT-INVALID returns T, which happens +;;; when REGISTER-LAYOUT has invalidated a superclass of CLASS (which +;;; invalidated all the subclasses in SB-KERNEL land). Again, here we +;;; must flush the caches and allow UPDATE-SLOTS to decide whether to +;;; obsolete the wrapper. +;;; +;;; FIXME: either here or in INVALID-WRAPPER-P looks like a good place +;;; for (AVER (NOT (EQ (SB-KERNEL:LAYOUT-INVALID OWRAPPER) +;;; :UNINITIALIZED))) +;;; +;;; Thanks to Gerd Moellmann for the explanation. -- CSR, 2002-10-29 (defun force-cache-flushes (class) - (let* ((owrapper (class-wrapper class)) - (state (wrapper-state owrapper))) - ;; We only need to do something if the state is still T. If the - ;; state isn't T, it will be FLUSH or OBSOLETE, and both of those - ;; 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 + (let* ((owrapper (class-wrapper class))) + ;; We only need to do something if the wrapper is still valid. If + ;; the wrapper isn't valid, state will be FLUSH or OBSOLETE, and + ;; both of those 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 (or (not (invalid-wrapper-p owrapper)) + ;; KLUDGE: despite the observations above, this remains + ;; a violation of locality or what might be considered + ;; good style. There has to be a better way! -- CSR, + ;; 2002-10-29 + (eq (sb-kernel:layout-invalid owrapper) t)) (let ((nwrapper (make-wrapper (wrapper-no-of-instance-slots owrapper) class))) (setf (wrapper-instance-slots-layout nwrapper) @@ -1035,15 +1159,15 @@ (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)) (set-wrapper instance nwrapper)) -;;; make-instances-obsolete can be called by user code. It will cause the -;;; next access to the instance (as defined in 88-002R) to trap through the -;;; update-instance-for-redefined-class mechanism. +;;; MAKE-INSTANCES-OBSOLETE can be called by user code. It will cause +;;; the next access to the instance (as defined in 88-002R) to trap +;;; through the UPDATE-INSTANCE-FOR-REDEFINED-CLASS mechanism. (defmethod make-instances-obsolete ((class std-class)) (let* ((owrapper (class-wrapper class)) (nwrapper (make-wrapper (wrapper-no-of-instance-slots owrapper) @@ -1055,14 +1179,14 @@ (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)) (make-instances-obsolete (find-class class))) -;;; obsolete-instance-trap is the internal trap that is called when we see -;;; an obsolete instance. The times when it is called are: +;;; OBSOLETE-INSTANCE-TRAP is the internal trap that is called when we +;;; see an obsolete instance. The times when it is called are: ;;; - when the instance is involved in method lookup ;;; - when attempting to access a slot of an instance ;;; @@ -1080,12 +1204,13 @@ ;;; 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 -;;; will not be able to fix the old instance, so it must signal an -;;; error. The hard part of this is that the error system and debugger -;;; might cause obsolete-instance-trap to be called again, so in that -;;; case, we have to return some reasonable wrapper, instead. +;;; OBSOLETE-INSTANCE-TRAP might be called on structure instances +;;; after a structure is redefined. In most cases, +;;; OBSOLETE-INSTANCE-TRAP will not be able to fix the old instance, +;;; so it must signal an error. The hard part of this is that the +;;; error system and debugger might cause OBSOLETE-INSTANCE-TRAP to be +;;; called again, so in that case, we have to return some reasonable +;;; wrapper, instead. (defvar *in-obsolete-instance-trap* nil) (defvar *the-wrapper-of-structure-object* @@ -1126,19 +1251,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))) @@ -1162,18 +1288,7 @@ plist) nwrapper))) -(defmacro copy-instance-internal (instance) - `(progn - (let* ((class (class-of instance)) - (copy (allocate-instance class))) - (if (std-instance-p ,instance) - (setf (std-instance-slots ,instance) - (std-instance-slots ,instance)) - (setf (fsc-instance-slots ,instance) - (fsc-instance-slots ,instance))) - copy))) - -(defun change-class-internal (instance new-class) +(defun change-class-internal (instance new-class initargs) (let* ((old-class (class-of instance)) (copy (allocate-instance new-class)) (new-wrapper (get-wrapper copy)) @@ -1187,16 +1302,17 @@ ;; "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))))) + (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)))) + (incf new-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))))) @@ -1205,31 +1321,37 @@ ;; old instance point to the new storage. (swap-wrappers-and-slots instance copy) - (update-instance-for-different-class copy instance) + (apply #'update-instance-for-different-class copy instance initargs) instance)) (defmethod change-class ((instance standard-object) - (new-class standard-class)) - (change-class-internal instance new-class)) + (new-class standard-class) + &rest initargs) + (change-class-internal instance new-class initargs)) (defmethod change-class ((instance funcallable-standard-object) - (new-class funcallable-standard-class)) - (change-class-internal instance new-class)) + (new-class funcallable-standard-class) + &rest initargs) + (change-class-internal instance new-class initargs)) (defmethod change-class ((instance standard-object) - (new-class funcallable-standard-class)) + (new-class funcallable-standard-class) + &rest initargs) + (declare (ignore initargs)) (error "You can't change the class of ~S to ~S~@ because it isn't already an instance with metaclass ~S." instance new-class 'standard-class)) (defmethod change-class ((instance funcallable-standard-object) - (new-class standard-class)) + (new-class standard-class) + &rest initargs) + (declare (ignore initargs)) (error "You can't change the class of ~S to ~S~@ because it isn't already an instance with metaclass ~S." instance new-class 'funcallable-standard-class)) -(defmethod change-class ((instance t) (new-class-name symbol)) - (change-class instance (find-class new-class-name))) +(defmethod change-class ((instance t) (new-class-name symbol) &rest initargs) + (apply #'change-class instance (find-class new-class-name) initargs)) ;;;; The metaclass BUILT-IN-CLASS ;;;; @@ -1254,6 +1376,17 @@ (or (eq s *the-class-t*) (eq s *the-class-stream*))) +;;; Some necessary methods for FORWARD-REFERENCED-CLASS +(defmethod class-direct-slots ((class forward-referenced-class)) ()) +(defmethod class-direct-default-initargs ((class forward-referenced-class)) ()) +(macrolet ((def (method) + `(defmethod ,method ((class forward-referenced-class)) + (error "~@<~I~S was called on a forward referenced class:~2I~_~S~:>" + ',method class)))) + (def class-default-initargs) + (def class-precedence-list) + (def class-slots)) + (defmethod validate-superclass ((c slot-class) (f forward-referenced-class)) t)