0.6.10.20:

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

diff --git a/src/pcl/vector.lisp b/src/pcl/vector.lisp
index 212a182..524a854 100644 (file)
--- a/src/pcl/vector.lisp
+++ b/src/pcl/vector.lisp
@@ -663,7 +663,7 @@
          (let ((,index (pvref ,pv ,pv-offset)))
            (setq ,value (typecase ,index
                           ,@(when (or (null type) (eq type ':instance))
-                              `((fixnum (instance-ref ,slots ,index))))
+                              `((fixnum (clos-slots-ref ,slots ,index))))
                           ,@(when (or (null type) (eq type ':class))
                               `((cons (cdr ,index))))
                           (t +slot-unbound+)))
@@ -697,8 +697,8 @@
          (let ((,index (pvref ,pv ,pv-offset)))
            (typecase ,index
              ,@(when (or (null type) (eq type ':instance))
-                      `((fixnum (setf (instance-ref ,slots ,index)
-                                        ,new-value))))
+                      `((fixnum (setf (clos-slots-ref ,slots ,index)
+                                     ,new-value))))
              ,@(when (or (null type) (eq type ':class))
                  `((cons (setf (cdr ,index) ,new-value))))
              (t ,default)))))))
@@ -745,7 +745,7 @@
            (typecase ,index
              ,@(when (or (null type) (eq type ':instance))
                  `((fixnum (not (and ,slots
-                                      (eq (instance-ref ,slots ,index)
+                                      (eq (clos-slots-ref ,slots ,index)
                                           +slot-unbound+))))))
              ,@(when (or (null type) (eq type ':class))
                  `((cons (not (eq (cdr ,index) +slot-unbound+)))))