0.6.11.23:

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

diff --git a/src/pcl/construct.lisp b/src/pcl/construct.lisp
index bb1a24c..0224049 100644 (file)
--- a/src/pcl/construct.lisp
+++ b/src/pcl/construct.lisp
@@ -443,7 +443,7 @@
                 (funcall fn constructor))
               (dolist (subclass (class-direct-subclasses class))
                 (recurse subclass))))
-      (recurse (find-class 't))
+      (recurse (find-class t))
       (values nclasses nconstructors))))
 
 (defun reset-constructors ()
@@ -527,7 +527,7 @@
               (when (eq flag ':unsupplied) (setq flag ':constants)))
              (t
               (push (cons name +slot-unbound+) constants)
-              (setq flag 't)))))
+              (setq flag t)))))
     (let* ((constants-alist (sort constants #'(lambda (x y)
                                                (memq (car y)
                                                      (memq (car x) layout)))))
@@ -637,7 +637,7 @@
                          (push val .initargs.)
                          (push initarg .initargs.))
                        (dolist (pos (cddr entry))
-                         (setf (instance-ref .slots. pos) val))))
+                         (setf (clos-slots-ref .slots. pos) val))))
 
                   ,@(gathering1 (collecting)
                        (doplist (initarg value) supplied-initargs
@@ -646,7 +646,7 @@
                                       (push .value. .initargs.)
                                       (push ',initarg .initargs.)
                                       (dolist (.p. (pop .positions.))
-                                        (setf (instance-ref .slots. .p.)
+                                        (setf (clos-slots-ref .slots. .p.)
                                               .value.)))))))
 
                   (dolist (fn .shared-initfns.)
@@ -784,7 +784,7 @@
                   (dolist (entry .initfns-and-positions.)
                     (let ((val (funcall (car entry))))
                       (dolist (pos (cdr entry))
-                        (setf (instance-ref .slots. pos) val))))
+                        (setf (clos-slots-ref .slots. pos) val))))
 
                   ,@(gathering1 (collecting)
                       (doplist (initarg value) supplied-initargs
@@ -792,7 +792,8 @@
                           (gather1
                             `(let ((.value. ,value))
                                (dolist (.p. (pop .positions.))
-                                 (setf (instance-ref .slots. .p.) .value.)))))))
+                                 (setf (clos-slots-ref .slots. .p.)
+                                       .value.)))))))
 
                   .instance.))))))))
 
@@ -914,8 +915,8 @@
                             (gather1
                               `(let ((.value. ,value))
                                  (dolist (.p. (pop .positions.))
-                                   (setf (instance-ref .slots. .p.)
-                                            .value.)))))))
+                                   (setf (clos-slots-ref .slots. .p.)
+                                         .value.)))))))
 
                     .instance.))))))))))