X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fpcl%2Fslots.lisp;h=a5bf11ba6e49da01c2d8829197cef5d6cf4b9d86;hb=bd0ba0f214518e8d72ff2d44de5a1e3e4b02af2c;hp=6d82bcd22b2f567d0c22979a4d30a82a8fd2f42e;hpb=26b8ddda97fcfa2e2c0eae3bd2fdb19717c5fa40;p=sbcl.git diff --git a/src/pcl/slots.lisp b/src/pcl/slots.lisp index 6d82bcd..a5bf11b 100644 --- a/src/pcl/slots.lisp +++ b/src/pcl/slots.lisp @@ -28,7 +28,7 @@ (define-condition unbound-slot (cell-error) ((instance :reader unbound-slot-instance :initarg :instance) (slot :reader unbound-slot-slot :initarg :slot)) - (:report (lambda(condition stream) + (:report (lambda (condition stream) (format stream "The slot ~S is unbound in the object ~S." (unbound-slot-slot condition) (unbound-slot-instance condition))))) @@ -58,7 +58,7 @@ (error "unrecognized instance type")))) (defun swap-wrappers-and-slots (i1 i2) - (sb-sys:without-interrupts + (with-pcl-lock ;FIXME is this sufficient? (cond ((std-instance-p i1) (let ((w1 (std-instance-wrapper i1)) (s1 (std-instance-slots i1))) @@ -116,14 +116,11 @@ (slot-missing class object slot-name 'slot-value) (slot-value-using-class class object slot-definition)))) -(setf (gdefinition 'slot-value-normal) #'slot-value) - -(define-compiler-macro slot-value (object-form slot-name-form) - (if (and (constantp slot-name-form) - (let ((slot-name (eval slot-name-form))) - (and (symbolp slot-name) (symbol-package slot-name)))) - `(accessor-slot-value ,object-form ,slot-name-form) - `(slot-value-normal ,object-form ,slot-name-form))) +(define-compiler-macro slot-value (&whole form object slot-name) + (if (and (constantp slot-name) + (interned-symbol-p (eval slot-name))) + `(accessor-slot-value ,object ,slot-name) + form)) (defun set-slot-value (object slot-name new-value) (let* ((class (class-of object)) @@ -133,18 +130,11 @@ (setf (slot-value-using-class class object slot-definition) new-value)))) -(setf (gdefinition 'set-slot-value-normal) #'set-slot-value) - -(define-compiler-macro set-slot-value (object-form - slot-name-form - new-value-form) - (if (and (constantp slot-name-form) - (let ((slot-name (eval slot-name-form))) - (and (symbolp slot-name) (symbol-package slot-name)))) - `(accessor-set-slot-value ,object-form ,slot-name-form ,new-value-form) - `(set-slot-value-normal ,object-form ,slot-name-form ,new-value-form))) - -(defconstant +optimize-slot-boundp+ nil) +(define-compiler-macro set-slot-value (&whole form object slot-name new-value) + (if (and (constantp slot-name) + (interned-symbol-p (eval slot-name))) + `(accessor-set-slot-value ,object ,slot-name ,new-value) + form)) (defun slot-boundp (object slot-name) (let* ((class (class-of object)) @@ -155,12 +145,11 @@ (setf (gdefinition 'slot-boundp-normal) #'slot-boundp) -(define-compiler-macro slot-boundp (object-form slot-name-form) - (if (and (constantp slot-name-form) - (let ((slot-name (eval slot-name-form))) - (and (symbolp slot-name) (symbol-package slot-name)))) - `(accessor-slot-boundp ,object-form ,slot-name-form) - `(slot-boundp-normal ,object-form ,slot-name-form))) +(define-compiler-macro slot-boundp (&whole form object slot-name) + (if (and (constantp slot-name) + (interned-symbol-p (eval slot-name))) + `(accessor-slot-boundp ,object ,slot-name) + form)) (defun slot-makunbound (object slot-name) (let* ((class (class-of object)) @@ -189,21 +178,14 @@ (defmethod slot-value-using-class ((class std-class) (object std-object) (slotd standard-effective-slot-definition)) + (check-obsolete-instance object) (let* ((location (slot-definition-location slotd)) (value (typecase location (fixnum (cond ((std-instance-p object) - ;; FIXME: EQ T (WRAPPER-STATE ..) is better done - ;; through INVALID-WRAPPER-P (here and below). - (unless (eq t (wrapper-state (std-instance-wrapper - object))) - (check-wrapper-validity object)) (clos-slots-ref (std-instance-slots object) location)) ((fsc-instance-p object) - (unless (eq t (wrapper-state (fsc-instance-wrapper - object))) - (check-wrapper-validity object)) (clos-slots-ref (fsc-instance-slots object) location)) (t (error "unrecognized instance type")))) @@ -222,19 +204,16 @@ (new-value (class std-class) (object std-object) (slotd standard-effective-slot-definition)) + (check-obsolete-instance object) (let ((location (slot-definition-location slotd))) (typecase location (fixnum (cond ((std-instance-p object) - (unless (eq t (wrapper-state (std-instance-wrapper object))) - (check-wrapper-validity object)) - (setf (clos-slots-ref (std-instance-slots object) location) - new-value)) + (setf (clos-slots-ref (std-instance-slots object) location) + new-value)) ((fsc-instance-p object) - (unless (eq t (wrapper-state (fsc-instance-wrapper object))) - (check-wrapper-validity object)) - (setf (clos-slots-ref (fsc-instance-slots object) location) - new-value)) + (setf (clos-slots-ref (fsc-instance-slots object) location) + new-value)) (t (error "unrecognized instance type")))) (cons (setf (cdr location) new-value)) @@ -247,19 +226,14 @@ ((class std-class) (object std-object) (slotd standard-effective-slot-definition)) + (check-obsolete-instance object) (let* ((location (slot-definition-location slotd)) (value (typecase location (fixnum (cond ((std-instance-p object) - (unless (eq t (wrapper-state (std-instance-wrapper - object))) - (check-wrapper-validity object)) (clos-slots-ref (std-instance-slots object) location)) ((fsc-instance-p object) - (unless (eq t (wrapper-state (fsc-instance-wrapper - object))) - (check-wrapper-validity object)) (clos-slots-ref (fsc-instance-slots object) location)) (t (error "unrecognized instance type")))) @@ -276,19 +250,16 @@ ((class std-class) (object std-object) (slotd standard-effective-slot-definition)) + (check-obsolete-instance object) (let ((location (slot-definition-location slotd))) (typecase location (fixnum (cond ((std-instance-p object) - (unless (eq t (wrapper-state (std-instance-wrapper object))) - (check-wrapper-validity object)) - (setf (clos-slots-ref (std-instance-slots object) location) - +slot-unbound+)) + (setf (clos-slots-ref (std-instance-slots object) location) + +slot-unbound+)) ((fsc-instance-p object) - (unless (eq t (wrapper-state (fsc-instance-wrapper object))) - (check-wrapper-validity object)) - (setf (clos-slots-ref (fsc-instance-slots object) location) - +slot-unbound+)) + (setf (clos-slots-ref (fsc-instance-slots object) location) + +slot-unbound+)) (t (error "unrecognized instance type")))) (cons (setf (cdr location) +slot-unbound+)) @@ -296,7 +267,36 @@ (error "~@" slotd 'slot-makunbound-using-class)))) - nil) + object) + +(defmethod slot-value-using-class + ((class condition-class) + (object condition) + (slotd condition-effective-slot-definition)) + (let ((fun (slot-definition-reader-function slotd))) + (declare (type function fun)) + (funcall fun object))) + +(defmethod (setf slot-value-using-class) + (new-value + (class condition-class) + (object condition) + (slotd condition-effective-slot-definition)) + (let ((fun (slot-definition-writer-function slotd))) + (declare (type function fun)) + (funcall fun new-value object))) + +(defmethod slot-boundp-using-class + ((class condition-class) + (object condition) + (slotd condition-effective-slot-definition)) + (let ((fun (slot-definition-boundp-function slotd))) + (declare (type function fun)) + (funcall fun object))) + +(defmethod slot-makunbound-using-class ((class condition-class) object slot) + (error "attempt to unbind slot ~S in condition object ~S." + slot object)) (defmethod slot-value-using-class ((class structure-class) @@ -366,3 +366,7 @@ (if constructor (funcall constructor) (error "can't allocate an instance of class ~S" (class-name class))))) + +(defmethod allocate-instance ((class condition-class) &rest initargs) + (declare (ignore initargs)) + (make-condition (class-name class)))