0.8.0.60:

[sbcl.git] / src / pcl / early-low.lisp

diff --git a/src/pcl/early-low.lisp b/src/pcl/early-low.lisp
index 0d75984..abca534 100644 (file)
--- a/src/pcl/early-low.lisp
+++ b/src/pcl/early-low.lisp
@@ -53,10 +53,15 @@
 ;;; 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)))))
+
+(defun condition-type-p (type)
+  (and (symbolp type)
+       (condition-classoid-p (find-classoid type nil))))
 \f
 (/show "finished with early-low.lisp")