0.pre7.127:

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

diff --git a/src/pcl/slots.lisp b/src/pcl/slots.lisp
index 27bc917..11ffc16 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)))))
@@ -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)
@@ -198,12 +196,14 @@
                          (unless (eq t (wrapper-state (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)))
                            (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))
@@ -226,13 +226,13 @@
        (cond ((std-instance-p object)
              (unless (eq t (wrapper-state (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)))
                (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))
@@ -252,12 +252,14 @@
                          (unless (eq t (wrapper-state (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)))
                            (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))
@@ -278,13 +280,13 @@
        (cond ((std-instance-p object)
              (unless (eq t (wrapper-state (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)))
                (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+))