0.8.12.4:

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

diff --git a/src/pcl/defs.lisp b/src/pcl/defs.lisp
index 89177ba..c0bff27 100644 (file)
--- a/src/pcl/defs.lisp
+++ b/src/pcl/defs.lisp
@@ -83,51 +83,6 @@
   (parse-gspec spec
     (name (fdefine-carefully name new-value))))
 \f
-(declaim (special *the-class-t*
-                 *the-class-vector* *the-class-symbol*
-                 *the-class-string* *the-class-sequence*
-                 *the-class-rational* *the-class-ratio*
-                 *the-class-number* *the-class-null* *the-class-list*
-                 *the-class-integer* *the-class-float* *the-class-cons*
-                 *the-class-complex* *the-class-character*
-                 *the-class-bit-vector* *the-class-array*
-                 *the-class-stream*
-
-                 *the-class-slot-object*
-                 *the-class-structure-object*
-                 *the-class-std-object*
-                 *the-class-standard-object*
-                 *the-class-funcallable-standard-object*
-                 *the-class-class*
-                 *the-class-generic-function*
-                 *the-class-built-in-class*
-                 *the-class-slot-class*
-                 *the-class-condition-class*
-                 *the-class-structure-class*
-                 *the-class-std-class*
-                 *the-class-standard-class*
-                 *the-class-funcallable-standard-class*
-                 *the-class-method*
-                 *the-class-standard-method*
-                 *the-class-standard-reader-method*
-                 *the-class-standard-writer-method*
-                 *the-class-standard-boundp-method*
-                 *the-class-standard-generic-function*
-                 *the-class-standard-effective-slot-definition*
-
-                 *the-eslotd-standard-class-slots*
-                 *the-eslotd-funcallable-standard-class-slots*))
-
-(declaim (special *the-wrapper-of-t*
-                 *the-wrapper-of-vector* *the-wrapper-of-symbol*
-                 *the-wrapper-of-string* *the-wrapper-of-sequence*
-                 *the-wrapper-of-rational* *the-wrapper-of-ratio*
-                 *the-wrapper-of-number* *the-wrapper-of-null*
-                 *the-wrapper-of-list* *the-wrapper-of-integer*
-                 *the-wrapper-of-float* *the-wrapper-of-cons*
-                 *the-wrapper-of-complex* *the-wrapper-of-character*
-                 *the-wrapper-of-bit-vector* *the-wrapper-of-array*))
-\f
 ;;;; type specifier hackery
 
 ;;; internal to this file
@@ -418,10 +373,6 @@
     :accessor object-plist))
   (:metaclass std-class))
 
-(defclass documentation-mixin (plist-mixin)
-  ()
-  (:metaclass std-class))
-
 (defclass dependent-update-mixin (plist-mixin)
   ()
   (:metaclass std-class))
@@ -429,8 +380,7 @@
 ;;; The class CLASS is a specified basic class. It is the common
 ;;; superclass of any kind of class. That is, any class that can be a
 ;;; metaclass must have the class CLASS in its class precedence list.
-(defclass class (documentation-mixin
-                dependent-update-mixin
+(defclass class (dependent-update-mixin
                 definition-source-mixin
                 specializer)
   ((name
@@ -454,6 +404,9 @@
    (predicate-name
     :initform nil
     :reader class-predicate-name)
+   (documentation
+    :initform nil
+    :initarg :documentation)
    (finalized-p
     :initform nil
     :reader class-finalized-p)))
@@ -581,7 +534,7 @@
     :initarg :type
     :accessor slot-definition-type)
    (documentation
-    :initform ""
+    :initform nil
     :initarg :documentation)
    (class
     :initform nil
@@ -686,11 +639,9 @@
     :initform nil
     :initarg :fast-function            ;no writer
     :reader method-fast-function)
-;;;     (documentation
-;;;    :initform nil
-;;;    :initarg  :documentation
-;;;    :reader method-documentation)
-  ))
+   (documentation
+    :initform nil
+    :initarg :documentation)))
 
 (defclass standard-accessor-method (standard-method)
   ((slot-name :initform nil
@@ -708,11 +659,13 @@
 
 (defclass generic-function (dependent-update-mixin
                            definition-source-mixin
-                           documentation-mixin
                            funcallable-standard-object)
-  (;; We need to make a distinction between the methods initially set
+  ((documentation
+    :initform nil
+    :initarg :documentation)
+   ;; We need to make a distinction between the methods initially set
    ;; up by :METHOD options to DEFGENERIC and the ones set up later by
-   ;; DEFMETHOD, because ANSI's specifies that executing DEFGENERIC on
+   ;; DEFMETHOD, because ANSI specifies that executing DEFGENERIC on
    ;; an already-DEFGENERICed function clears the methods set by the
    ;; previous DEFGENERIC, but not methods set by DEFMETHOD. (Making
    ;; this distinction seems a little kludgy, but it has the positive
@@ -755,16 +708,17 @@
   (:default-initargs :method-class *the-class-standard-method*
                     :method-combination *standard-method-combination*))
 
-(defclass method-combination (standard-object) ())
+(defclass method-combination (standard-object)
+  ((documentation
+    :reader method-combination-documentation
+    :initform nil
+    :initarg :documentation)))
 
 (defclass standard-method-combination (definition-source-mixin
-                                       method-combination)
+                                      method-combination)
   ((type
     :reader method-combination-type
     :initarg :type)
-   (documentation
-    :reader method-combination-documentation
-    :initarg :documentation)
    (options
     :reader method-combination-options
     :initarg :options)))