: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
- ;; does not yet exist. Maybe should return NIL in that case as RES
- ;; is not useful to the user?
- (and (class-wrapper res) (sb-kernel:layout-class (class-wrapper res)))))
+ res))
(setf (gdefinition 'load-defclass) #'real-load-defclass)
(defmethod ensure-class-using-class (name (class null) &rest args &key)
(multiple-value-bind (meta initargs)
(ensure-class-values class args)
+ (set-class-type-translation (class-prototype meta) name)
(setf class (apply #'make-instance meta :name name initargs)
(find-class name) class)
- (inform-type-system-about-class class name)
+ (set-class-type-translation class name)
class))
(defmethod ensure-class-using-class (name (class pcl-class) &rest args &key)
(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)
+ (set-class-type-translation class name)
class))
(defmethod class-predicate-name ((class t))
*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 "~@<There is more than one direct slot ~
+ with name ~S.~:>"
+ :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 "~@<Duplicate slot option ~S for ~
+ slot named ~S.~:>"
+ :format-arguments (list option slot-name)))
+ ((and (eq option :readers)
+ (notevery #'symbolp value))
+ (error 'simple-program-error
+ :format-control "~@<Slot reader names for slot ~
+ named ~S must be symbols.~:>"
+ :format-arguments (list slot-name)))
+ ((and (eq option :initargs)
+ (notevery #'symbolp value))
+ (error 'simple-program-error
+ :format-control "~@<Slot initarg names for slot ~
+ named ~S must be symbols.~:>"
+ :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 "~@<Duplicate initialization argument ~
+ name ~S in :DEFAULT-INITARGS.~:>"
+ :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 "~@<More than one :METACLASS ~
+ option specified.~:>")))
+ (:direct-default-initargs
+ (when (> (incf default-initargs) 1)
+ (error 'simple-program-error
+ :format-control "~@<More than one :DEFAULT-INITARGS ~
+ option specified.~:>"))))))
+ (remf initargs :metaclass)
(loop (unless (remf initargs :direct-superclasses) (return)))
(loop (unless (remf initargs :direct-slots) (return)))
(values meta
(setf (plist-value class 'class-slot-cells)
(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)))
(push (cons (slot-definition-name dslotd)
(if initfunction
(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))
+(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 ())
+slot-unbound+))
direct-slots)))
(reader-names (mapcar (lambda (slotd)
- (intern (format nil
- "~A~A reader"
- conc-name
- (slot-definition-name
- slotd))))
+ (list 'slot-accessor name
+ (slot-definition-name slotd)
+ 'reader))
direct-slots))
(writer-names (mapcar (lambda (slotd)
- (intern (format nil
- "~A~A writer"
- conc-name
- (slot-definition-name
- slotd))))
+ (list 'slot-accessor name
+ (slot-definition-name slotd)
+ 'writer))
direct-slots))
(readers-init
(mapcar (lambda (slotd reader-name)
(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)))
+ (let ((lclass (sb-kernel:find-classoid (class-name class))))
+ (setf (sb-kernel:classoid-pcl-class lclass) class)
+ (setf (slot-value class 'wrapper) (sb-kernel:classoid-layout lclass)))
(update-pv-table-cache-info class)
(setq predicate-name (if predicate-name-p
(setf (slot-value class 'predicate-name)
(dolist (r (slot-definition-readers dslotd)) (fix r slot-name 'r))
(dolist (w (slot-definition-writers dslotd)) (fix w slot-name 'w))))))
\f
-(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))))
\f
(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
+ "~@<FINALIZE-INHERITANCE was called on a forward referenced class:~
+ ~2I~_~S~:>"
+ class))
+
\f
(defun class-has-a-forward-referenced-superclass-p (class)
(or (forward-referenced-class-p class)
;;; 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))
- (update-make-instance-function-table class))
+ (update-ctors 'finalize-inheritance :class class))
(unless finalizep
(dolist (sub (class-direct-subclasses class)) (update-class sub nil))))
(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.
(let (collect)
(dolist (eslotd eslotds)
(push (assoc (slot-definition-name eslotd)
- (class-slot-cells (slot-definition-allocation eslotd)))
+ (class-slot-cells (slot-definition-class eslotd)))
collect))
(nreverse collect)))
-(defun compute-layout (cpl instance-eslotds)
- (let* ((names
- (let (collect)
- (dolist (eslotd instance-eslotds)
- (when (eq (slot-definition-allocation eslotd) :instance)
- (push (slot-definition-name eslotd) collect)))
- (nreverse collect)))
- (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)))))
-
(defun update-gfs-of-class (class)
(when (and (class-finalized-p class)
(let ((cpl (class-precedence-list class)))
;; 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))))))
+ (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)
(initform nil)
(initargs nil)
(allocation nil)
+ (allocation-class nil)
(type t)
(namep nil)
(initp nil)
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)))
:initfunction initfunction
:initargs initargs
:allocation allocation
+ :allocation-class allocation-class
:type type
:class class)))
(let ((method (get-method generic-function () (list class) nil)))
(when method (remove-method generic-function method))))
\f
-;;; 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)
(defmethod make-boundp-method-function ((class slot-class) slot-name)
(make-std-boundp-method-function (class-name class) slot-name))
\f
-;;;; 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)
-\f
(defmethod compatible-meta-class-change-p (class proto-new-class)
(eq (class-of class) (class-of proto-new-class)))
(or (eq new-super-meta-class *the-class-std-class*)
(eq (class-of class) new-super-meta-class))))
\f
+;;; 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 <wrapper>) or (:OBSOLETE <wrapper>), 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 <wrapper>); UPDATE-SLOTS later gets to choose whether or
+;;; not to "upgrade" this to (:OBSOLETE <wrapper>).
+;;;
+;;; 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)
(declare (ignore owrapper))
(set-wrapper instance nwrapper))
\f
-;;; 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)
(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
;;;
;;; 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*
plist)
nwrapper)))
\f
-(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))
(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))))))
+ (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."
;; 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))
\f
;;;; The metaclass BUILT-IN-CLASS
;;;;
(or (eq s *the-class-t*)
(eq s *the-class-stream*)))
\f
+;;; 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)