X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fpcl%2Fdefs.lisp;h=77d79c9303bc25ffea5b8e25be760edc28356743;hb=3fe0010d2777b41e01ea9b4a0f894cfa40f7df1b;hp=f2477475a7deffd94ca2693b5c0218f11c4b1522;hpb=ff92598854bf7cae8d57fe49cef4d9a98e1ab345;p=sbcl.git

diff --git a/src/pcl/defs.lisp b/src/pcl/defs.lisp
index f247747..77d79c9 100644
--- a/src/pcl/defs.lisp
+++ b/src/pcl/defs.lisp
@@ -306,7 +306,8 @@
 				 ;; 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*")
 
@@ -327,6 +328,12 @@
 (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))
 
@@ -420,6 +427,10 @@
 (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)
@@ -689,7 +700,11 @@
     :initarg :method-combination
     :accessor generic-function-method-combination)
    (declarations
+    ;; KLUDGE: AMOP specifies :DECLARATIONS, while ANSI specifies
+    ;; :DECLARE.  Allow either (but FIXME: maybe a note or a warning
+    ;; might be appropriate).
     :initarg :declarations
+    :initarg :declare
     :initform ()
     :accessor generic-function-declarations)
    (arg-info