0.8.21.45:
[sbcl.git] / src / pcl / defs.lisp
index 89177ba..534a6c2 100644 (file)
   (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
 
 (defun get-built-in-class-symbol (class-name)
   (or (cadr (assq class-name *built-in-class-symbols*))
-      (let ((symbol (intern (format nil
-                                   "*THE-CLASS-~A*"
-                                   (symbol-name class-name))
-                           *pcl-package*)))
+      (let ((symbol (make-class-symbol class-name)))
        (push (list class-name symbol) *built-in-class-symbols*)
        symbol)))
 
 (defun get-built-in-wrapper-symbol (class-name)
   (or (cadr (assq class-name *built-in-wrapper-symbols*))
-      (let ((symbol (intern (format nil
-                                   "*THE-WRAPPER-OF-~A*"
-                                   (symbol-name class-name))
-                           *pcl-package*)))
+      (let ((symbol (make-wrapper-symbol class-name)))
        (push (list class-name symbol) *built-in-wrapper-symbols*)
        symbol)))
 \f
                                 ;; CMU CL code did. -- WHN 20000715
                                 '(t instance
                                     funcallable-instance
-                                    function stream)))
+                                    function stream 
+                                    file-stream string-stream)))
                       sb-kernel::*built-in-classes*))))
 (/noshow "done setting up SB-PCL::*BUILT-IN-CLASSES*")
 \f
 (defclass stream (instance) ()
   (:metaclass built-in-class))
 
+(defclass file-stream (stream) ()
+  (:metaclass built-in-class))
+
+(defclass string-stream (stream) ()
+  (:metaclass built-in-class))
+
 (defclass slot-object (t) ()
   (:metaclass slot-class))
 
     :accessor object-plist))
   (:metaclass std-class))
 
-(defclass documentation-mixin (plist-mixin)
-  ()
-  (:metaclass std-class))
-
 (defclass dependent-update-mixin (plist-mixin)
   ()
   (:metaclass std-class))
 ;;; 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
    (predicate-name
     :initform nil
     :reader class-predicate-name)
+   (documentation
+    :initform nil
+    :initarg :documentation)
    (finalized-p
     :initform nil
     :reader class-finalized-p)))
 (defclass pcl-class (class)
   ((class-precedence-list
     :reader class-precedence-list)
+   ;; KLUDGE: see note in CPL-OR-NIL
+   (cpl-available-p
+    :reader cpl-available-p
+    :initform nil)
    (can-precede-list
     :initform ()
     :reader class-can-precede-list)
     :initarg :type
     :accessor slot-definition-type)
    (documentation
-    :initform ""
+    :initform nil
     :initarg :documentation)
    (class
     :initform nil
     :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
 
 (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
   (: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)))