X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fpcl%2Fslots-boot.lisp;h=4129a8118e2632c394166418e7af44937774b33f;hb=475c832b081651e66ad9446d4852c62086f5e740;hp=7fdd212e5f322982f1fcee66146ecedc2afca9f5;hpb=4aa82530da00c41e2751671ac75eda2d19a173a0;p=sbcl.git

diff --git a/src/pcl/slots-boot.lisp b/src/pcl/slots-boot.lisp
index 7fdd212..4129a81 100644
--- a/src/pcl/slots-boot.lisp
+++ b/src/pcl/slots-boot.lisp
@@ -141,12 +141,12 @@
    (etypecase index
      (fixnum (if fsc-p
 		 #'(lambda (instance)
-		     (let ((value (%instance-ref (fsc-instance-slots instance) index)))
+		     (let ((value (instance-ref (fsc-instance-slots instance) index)))
 		       (if (eq value +slot-unbound+)
 			   (slot-unbound (class-of instance) instance slot-name)
 			   value)))
 		 #'(lambda (instance)
-		     (let ((value (%instance-ref (std-instance-slots instance) index)))
+		     (let ((value (instance-ref (std-instance-slots instance) index)))
 		       (if (eq value +slot-unbound+)
 			   (slot-unbound (class-of instance) instance slot-name)
 			   value)))))
@@ -163,9 +163,9 @@
    (etypecase index
      (fixnum (if fsc-p
 		 #'(lambda (nv instance)
-		     (setf (%instance-ref (fsc-instance-slots instance) index) nv))
+		     (setf (instance-ref (fsc-instance-slots instance) index) nv))
 		 #'(lambda (nv instance)
-		     (setf (%instance-ref (std-instance-slots instance) index) nv))))
+		     (setf (instance-ref (std-instance-slots instance) index) nv))))
      (cons   #'(lambda (nv instance)
 		 (declare (ignore instance))
 		 (setf (cdr index) nv))))
@@ -177,11 +177,11 @@
    (etypecase index
      (fixnum (if fsc-p
 		 #'(lambda (instance)
-		     (not (eq (%instance-ref (fsc-instance-slots instance)
+		     (not (eq (instance-ref (fsc-instance-slots instance)
 					     index)
 			      +slot-unbound+)))
 		 #'(lambda (instance)
-		     (not (eq (%instance-ref (std-instance-slots instance)
+		     (not (eq (instance-ref (std-instance-slots instance)
 					     index)
 			      +slot-unbound+)))))
      (cons   #'(lambda (instance)
@@ -242,14 +242,14 @@
 		#'(lambda (class instance slotd)
 		    (declare (ignore slotd))
 		    (unless (fsc-instance-p instance) (error "not fsc"))
-		    (let ((value (%instance-ref (fsc-instance-slots instance) index)))
+		    (let ((value (instance-ref (fsc-instance-slots instance) index)))
 		      (if (eq value +slot-unbound+)
 			  (slot-unbound class instance slot-name)
 			  value)))
 		#'(lambda (class instance slotd)
 		    (declare (ignore slotd))
 		    (unless (std-instance-p instance) (error "not std"))
-		    (let ((value (%instance-ref (std-instance-slots instance) index)))
+		    (let ((value (instance-ref (std-instance-slots instance) index)))
 		      (if (eq value +slot-unbound+)
 			  (slot-unbound class instance slot-name)
 			  value)))))
@@ -268,10 +268,10 @@
     (fixnum (if fsc-p
 		#'(lambda (nv class instance slotd)
 		    (declare (ignore class slotd))
-		    (setf (%instance-ref (fsc-instance-slots instance) index) nv))
+		    (setf (instance-ref (fsc-instance-slots instance) index) nv))
 		#'(lambda (nv class instance slotd)
 		    (declare (ignore class slotd))
-		    (setf (%instance-ref (std-instance-slots instance) index) nv))))
+		    (setf (instance-ref (std-instance-slots instance) index) nv))))
     (cons   #'(lambda (nv class instance slotd)
 		(declare (ignore class instance slotd))
 		(setf (cdr index) nv)))))
@@ -284,12 +284,12 @@
     (fixnum (if fsc-p
 		#'(lambda (class instance slotd)
 		    (declare (ignore class slotd))
-		    (not (eq (%instance-ref (fsc-instance-slots instance)
+		    (not (eq (instance-ref (fsc-instance-slots instance)
 					    index)
 			     +slot-unbound+ )))
 		#'(lambda (class instance slotd)
 		    (declare (ignore class slotd))
-		    (not (eq (%instance-ref (std-instance-slots instance)
+		    (not (eq (instance-ref (std-instance-slots instance)
 					    index)
 			     +slot-unbound+ )))))
     (cons   #'(lambda (class instance slotd)
@@ -317,7 +317,7 @@
 				    (assq slot-name (wrapper-class-slots wrapper)))))
 		    (typecase index
 		      (fixnum 	
-		       (let ((value (%instance-ref (get-slots instance) index)))
+		       (let ((value (instance-ref (get-slots instance) index)))
 			 (if (eq value +slot-unbound+)
 			     (slot-unbound (class-of instance) instance slot-name)
 			     value)))