0.7.13.pcl-class.1

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

diff --git a/src/pcl/low.lisp b/src/pcl/low.lisp
index d4a4af5..396446a 100644 (file)
--- a/src/pcl/low.lisp
+++ b/src/pcl/low.lisp
@@ -83,8 +83,8 @@
   :slot-names (clos-slots name hash-code)
   :boa-constructor %make-pcl-funcallable-instance
   :superclass-name sb-kernel:funcallable-instance
-  :metaclass-name sb-kernel:random-pcl-class
-  :metaclass-constructor sb-kernel:make-random-pcl-class
+  :metaclass-name sb-kernel:random-pcl-classoid
+  :metaclass-constructor sb-kernel:make-random-pcl-classoid
   :dd-type sb-kernel:funcallable-structure
   ;; Only internal implementation code will access these, and these
   ;; accesses (slot readers in particular) could easily be a
@@ -230,13 +230,10 @@
 (defmacro precompile-random-code-segments (&optional system)
   `(progn
      (eval-when (:compile-toplevel)
-       (update-dispatch-dfuns)
-       (compile-iis-functions nil))
+       (update-dispatch-dfuns))
      (precompile-function-generators ,system)
      (precompile-dfun-constructors ,system)
-     (precompile-iis-functions ,system)
-     (eval-when (:load-toplevel)
-       (compile-iis-functions t))))
+     (precompile-ctors)))
 \f
 ;;; This definition is for interpreted code.
 (defun pcl-instance-p (x)
@@ -260,8 +257,8 @@
   :slot-names (slots hash-code)
   :boa-constructor %make-standard-instance
   :superclass-name sb-kernel:instance
-  :metaclass-name cl:standard-class
-  :metaclass-constructor sb-kernel:make-standard-class
+  :metaclass-name sb-kernel:standard-classoid
+  :metaclass-constructor sb-kernel:make-standard-classoid
   :dd-type structure
   :runtime-type-checks-p nil)
 
@@ -285,7 +282,7 @@
       (std-instance-slots instance)
       (fsc-instance-slots instance)))
 (defun get-slots-or-nil (instance)
-  ;; Supress a code-deletion note.  FIXME: doing the FIXME above,
+  ;; Suppress a code-deletion note.  FIXME: doing the FIXME above,
   ;; integrating PCL more with the compiler, would remove the need for
   ;; this icky stuff.
   (declare (optimize (inhibit-warnings 3)))
@@ -331,7 +328,8 @@
 ;;; The definition of STRUCTURE-TYPE-P was moved to early-low.lisp.
 
 (defun get-structure-dd (type)
-  (sb-kernel:layout-info (sb-kernel:class-layout (cl:find-class type))))
+  (sb-kernel:layout-info (sb-kernel:classoid-layout
+                         (sb-kernel:find-classoid type))))
 
 (defun structure-type-included-type-name (type)
   (let ((include (sb-kernel::dd-include (get-structure-dd type))))