X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fpcl%2Fdefs.lisp;h=534a6c2d4b9f0c84e1bf71f019550dab7c2d9000;hb=5e291412ff095a2016388eee8ac265e12d565119;hp=c0bff27d4d90744537b52bf5640ce9624dfcf6a8;hpb=1ae37c6f729950b6925275cea43546b701d8fde2;p=sbcl.git

diff --git a/src/pcl/defs.lisp b/src/pcl/defs.lisp
index c0bff27..534a6c2 100644
--- a/src/pcl/defs.lisp
+++ b/src/pcl/defs.lisp
@@ -216,19 +216,13 @@
 
 (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)))
 
@@ -312,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*")
 
@@ -333,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))
 
@@ -426,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)