0.8.0.24:

[sbcl.git] / src / code / target-type.lisp

diff --git a/src/code/target-type.lisp b/src/code/target-type.lisp
index d024ace..4a1f65f 100644 (file)
--- a/src/code/target-type.lisp
+++ b/src/code/target-type.lisp
@@ -33,15 +33,15 @@
         named-type
         member-type
         array-type
-        sb!xc:built-in-class
+        built-in-classoid
         cons-type)
      (values (%typep obj type) t))
-    (sb!xc:class
+    (classoid
      (if (if (csubtypep type (specifier-type 'funcallable-instance))
             (funcallable-instance-p obj)
             (typep obj 'instance))
-        (if (eq (class-layout type)
-                (info :type :compiler-layout (sb!xc:class-name type)))
+        (if (eq (classoid-layout type)
+                (info :type :compiler-layout (classoid-name type)))
             (values (sb!xc:typep obj type) t)
             (values nil nil))
         (values nil t)))
@@ -58,6 +58,12 @@
      (values nil nil))
     (alien-type-type
      (values (alien-typep obj (alien-type-type-alien-type type)) t))
+    (negation-type
+     (multiple-value-bind (res win)
+        (ctypep obj (negation-type-type type))
+       (if win
+          (values (not res) t)
+          (values nil nil))))
     (hairy-type
      ;; Now the tricky stuff.
      (let* ((hairy-spec (hairy-type-specifier type))
@@ -123,16 +129,16 @@
           ;; KLUDGE: In order to really make this run at run time
           ;; (instead of doing some weird broken thing at cold load
           ;; time), we need to suppress a DEFTRANSFORM.. -- WHN 19991004
-          (declare (notinline sb!xc:find-class))
-          (class-layout (sb!xc:find-class 'null))))
+          (declare (notinline find-classoid))
+          (classoid-layout (find-classoid 'null))))
        (t (svref *built-in-class-codes* (widetag-of x)))))
 
-#!-sb-fluid (declaim (inline sb!xc:class-of))
-(defun sb!xc:class-of (object)
+#!-sb-fluid (declaim (inline classoid-of))
+(defun classoid-of (object)
   #!+sb-doc
   "Return the class of the supplied object, which may be any Lisp object, not
    just a CLOS STANDARD-OBJECT."
-  (layout-class (layout-of object)))
+  (layout-classoid (layout-of object)))
 
 ;;; Pull the type specifier out of a function object.
 (defun extract-fun-type (fun)
@@ -142,7 +148,10 @@
 
 ;;; Clear memoization of all type system operations that can be
 ;;; altered by type definition/redefinition.
+;;;
+;;; FIXME: This should be autogenerated.
 (defun clear-type-caches ()
+  (declare (special *type-system-initialized*))
   (when *type-system-initialized*
     (dolist (sym '(values-specifier-type-cache-clear
                   values-type-union-cache-clear
@@ -151,7 +160,7 @@
                   csubtypep-cache-clear
                   type-intersection2-cache-clear
                   values-type-intersection-cache-clear))
-      (funcall (symbol-function sym))))
+      (funcall (the function (symbol-function sym)))))
   (values))
 
 ;;; This is like TYPE-OF, only we return a CTYPE structure instead of
@@ -167,7 +176,7 @@
   (typecase x
     (function
      (if (funcallable-instance-p x)
-        (sb!xc:class-of x)
+        (classoid-of x)
         (extract-fun-type x)))
     (symbol
      (make-member-type :members (list x)))
@@ -182,7 +191,7 @@
     (cons
      (make-cons-type *universal-type* *universal-type*))
     (t
-     (sb!xc:class-of x))))
+     (classoid-of x))))
 
 ;;; Clear this cache on GC so that we don't hold onto too much garbage.
 (pushnew 'ctype-of-cache-clear *before-gc-hooks*)