X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fpcl%2Fcache.lisp;h=f8f0f354095e0efe8eeb99cc45e853de167338b2;hb=5ec8d0c1c8b7939818b75118b472fac1af554f9a;hp=627b660c29ee6c64409d5d6659f6a04610c2f119;hpb=cb7837b769ce190baec60a2159c33099816ea6e3;p=sbcl.git diff --git a/src/pcl/cache.lisp b/src/pcl/cache.lisp index 627b660..f8f0f35 100644 --- a/src/pcl/cache.lisp +++ b/src/pcl/cache.lisp @@ -256,27 +256,6 @@ (unless (boundp '*the-class-t*) (setq *the-class-t* nil)) -;;; Note that for SBCL, as for CMU CL, the WRAPPER of a built-in or -;;; structure class will be some other kind of SB-KERNEL:LAYOUT, but -;;; this shouldn't matter, since the only two slots that WRAPPER adds -;;; are meaningless in those cases. -(defstruct (wrapper - (:include sb-kernel:layout - ;; KLUDGE: In CMU CL, the initialization default - ;; for LAYOUT-INVALID was NIL. In SBCL, that has - ;; changed to :UNINITIALIZED, but PCL code might - ;; still expect NIL for the initialization - ;; default of WRAPPER-INVALID. Instead of trying - ;; to find out, I just overrode the LAYOUT - ;; default here. -- WHN 19991204 - (invalid nil)) - (:conc-name %wrapper-) - (:constructor make-wrapper-internal) - (:copier nil)) - (instance-slots-layout nil :type list) - (class-slots nil :type list)) -#-sb-fluid (declaim (sb-ext:freeze-type wrapper)) - (defmacro wrapper-class (wrapper) `(sb-kernel:class-pcl-class (sb-kernel:layout-class ,wrapper))) (defmacro wrapper-no-of-instance-slots (wrapper) @@ -344,16 +323,16 @@ :length length :class (sb-kernel:make-standard-class :name name :pcl-class class)))))) -;;; The following variable may be set to a standard-class that has +;;; The following variable may be set to a STANDARD-CLASS that has ;;; already been created by the lisp code and which is to be redefined -;;; by PCL. This allows standard-classes to be defined and used for +;;; by PCL. This allows STANDARD-CLASSes to be defined and used for ;;; type testing and dispatch before PCL is loaded. (defvar *pcl-class-boot* nil) ;;; In SBCL, as in CMU CL, the layouts (a.k.a wrappers) for built-in ;;; and structure classes already exist when PCL is initialized, so we ;;; don't necessarily always make a wrapper. Also, we help maintain -;;; the mapping between cl:class and pcl::class objects. +;;; the mapping between CL:CLASS and PCL::CLASS objects. (defun make-wrapper (length class) (cond ((typep class 'std-class)