X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fpcl%2Fearly-low.lisp;h=7fca8d34d80e7f5ba34bf2eb96154f3e15f50bb7;hb=260a9146f02374a9cfbd9deb53283ee493f3729f;hp=5db39e878d41cf3e9fa4c426fad587fa839985fc;hpb=2912f5f6c2acb2da3b9fcc0f5afd1ca89782a9f8;p=sbcl.git

diff --git a/src/pcl/early-low.lisp b/src/pcl/early-low.lisp
index 5db39e8..7fca8d3 100644
--- a/src/pcl/early-low.lisp
+++ b/src/pcl/early-low.lisp
@@ -42,7 +42,7 @@
 ;;;     #-SB-FLUID (FIND-PACKAGE NAME)
 ;;;     #+SB-FLUID `(FIND-PACKAGE ,NAME))
 ;;; and use that to replace all three variables.)
-(defvar *pcl-package*		     (find-package "SB-PCL"))
+(defvar *pcl-package*                (find-package "SB-PCL"))
 
 ;;; This excludes structure types created with the :TYPE option to
 ;;; DEFSTRUCT. It also doesn't try to deal with types created by
@@ -55,58 +55,72 @@
   (and (symbolp type)
        (not (condition-type-p type))
        (let ((classoid (find-classoid type nil)))
-	 (and classoid
-	      (typep (layout-info
-		      (classoid-layout classoid))
-		     'defstruct-description)))))
+         (and classoid
+              (typep (layout-info
+                      (classoid-layout classoid))
+                     'defstruct-description)))))
+
+;;; Symbol contruction utilities
+(defun format-symbol (package format-string &rest format-arguments)
+  (without-package-locks
+   (intern (apply #'format nil format-string format-arguments) package)))
+
+(defun make-class-symbol (class-name)
+  (format-symbol *pcl-package* "*THE-CLASS-~A*" (symbol-name class-name)))
+
+(defun make-wrapper-symbol (class-name)
+  (format-symbol *pcl-package* "*THE-WRAPPER-~A*" (symbol-name class-name)))
 
 (defun condition-type-p (type)
   (and (symbolp type)
        (condition-classoid-p (find-classoid type nil))))
 
 (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-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-file-stream*
+                  *the-class-string-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-class-slot-object*
+                  *the-class-structure-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-global-reader-method*
+                  *the-class-global-writer-method*
+                  *the-class-global-boundp-method*
+                  *the-class-standard-generic-function*
+                  *the-class-standard-effective-slot-definition*
 
-		  *the-eslotd-standard-class-slots*
-		  *the-eslotd-funcallable-standard-class-slots*))
+                  *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*))
+                  *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*))
 
 (/show "finished with early-low.lisp")