X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fpcl%2Fearly-low.lisp;h=cfad90f782a44990aa9c4ad9dcb2eb7d759081db;hb=ff92598854bf7cae8d57fe49cef4d9a98e1ab345;hp=0d75984edadaa306cf7fea20df41e85f26d0eef8;hpb=2d3cb6dba6461e98744eca2a1df4f770cea468ca;p=sbcl.git

diff --git a/src/pcl/early-low.lisp b/src/pcl/early-low.lisp
index 0d75984..cfad90f 100644
--- a/src/pcl/early-low.lisp
+++ b/src/pcl/early-low.lisp
@@ -53,10 +53,71 @@
 ;;; it needs a more mnemonic name. -- WHN 19991204
 (defun structure-type-p (type)
   (and (symbolp type)
-       (let ((classoid (sb-kernel:find-classoid type nil)))
+       (not (condition-type-p type))
+       (let ((classoid (find-classoid type nil)))
 	 (and classoid
-	      (typep (sb-kernel:layout-info
-		      (sb-kernel:classoid-layout classoid))
-		     'sb-kernel:defstruct-description)))))
+	      (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-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*))
 
 (/show "finished with early-low.lisp")