0.7.6.29:

[sbcl.git] / src / pcl / slots.lisp

diff --git a/src/pcl/slots.lisp b/src/pcl/slots.lisp
index 5d2e4de..e726ba4 100644 (file)
--- 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)
-  (without-interrupts
+  (sb-sys:without-interrupts
    (cond ((std-instance-p i1)
          (let ((w1 (std-instance-wrapper i1))
                (s1 (std-instance-slots i1)))
@@ -144,8 +144,6 @@
       `(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)
-
 (defun slot-boundp (object slot-name)
   (let* ((class (class-of object))
         (slot-definition (find-slot-definition class slot-name)))
@@ -181,10 +179,10 @@
       default))
 \f
 (defun standard-instance-access (instance location)
-  (%instance-ref (std-instance-slots instance) location))
+  (clos-slots-ref (std-instance-slots instance) location))
 
 (defun funcallable-standard-instance-access (instance location)
-  (%instance-ref (fsc-instance-slots instance) location))
+  (clos-slots-ref (fsc-instance-slots instance) location))
 
 (defmethod slot-value-using-class ((class std-class)
                                   (object std-object)
@@ -193,17 +191,17 @@
         (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)))
+                         (when (invalid-wrapper-p (std-instance-wrapper
+                                                    object))
                            (check-wrapper-validity object))
-                         (%instance-ref (std-instance-slots object) location))
+                         (clos-slots-ref (std-instance-slots object)
+                                         location))
                         ((fsc-instance-p object)
-                         (unless (eq t (wrapper-state (fsc-instance-wrapper
-                                                       object)))
+                         (when (invalid-wrapper-p (fsc-instance-wrapper
+                                                    object))
                            (check-wrapper-validity object))
-                         (%instance-ref (fsc-instance-slots object) location))
+                         (clos-slots-ref (fsc-instance-slots object)
+                                         location))
                         (t (error "unrecognized instance type"))))
                  (cons
                   (cdr location))
@@ -224,15 +222,15 @@
     (typecase location
       (fixnum
        (cond ((std-instance-p object)
-             (unless (eq t (wrapper-state (std-instance-wrapper object)))
+             (when (invalid-wrapper-p (std-instance-wrapper object))
                (check-wrapper-validity object))
-             (setf (%instance-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)))
+             (when (invalid-wrapper-p (fsc-instance-wrapper object))
                (check-wrapper-validity object))
-             (setf (%instance-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))
@@ -249,15 +247,17 @@
         (value (typecase location
                  (fixnum
                   (cond ((std-instance-p object)
-                         (unless (eq t (wrapper-state (std-instance-wrapper
-                                                       object)))
+                         (when (invalid-wrapper-p (std-instance-wrapper
+                                                    object))
                            (check-wrapper-validity object))
-                         (%instance-ref (std-instance-slots object) location))
+                         (clos-slots-ref (std-instance-slots object)
+                                         location))
                         ((fsc-instance-p object)
-                         (unless (eq t (wrapper-state (fsc-instance-wrapper
-                                                       object)))
+                         (when (invalid-wrapper-p (fsc-instance-wrapper
+                                                    object))
                            (check-wrapper-validity object))
-                         (%instance-ref (fsc-instance-slots object) location))
+                         (clos-slots-ref (fsc-instance-slots object)
+                                         location))
                         (t (error "unrecognized instance type"))))
                  (cons
                   (cdr location))
@@ -276,15 +276,15 @@
     (typecase location
       (fixnum
        (cond ((std-instance-p object)
-             (unless (eq t (wrapper-state (std-instance-wrapper object)))
+             (when (invalid-wrapper-p (std-instance-wrapper object))
                (check-wrapper-validity object))
-             (setf (%instance-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)))
+             (when (invalid-wrapper-p (fsc-instance-wrapper object))
                (check-wrapper-validity object))
-             (setf (%instance-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+))