X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Ftarget-type.lisp;h=f8dccd315ed0a03a90ea63a29d53d486bfb4d5d6;hb=063f2d867cfdfee8a7cbab17e6c5054d9c6f3ad1;hp=e561d872b6cf00a2c8adfd12a2fa51bb88d0cdce;hpb=148e3820ad314a9b59d0133c1d60eaac4af9118b;p=sbcl.git

diff --git a/src/code/target-type.lisp b/src/code/target-type.lisp
index e561d87..f8dccd3 100644
--- a/src/code/target-type.lisp
+++ b/src/code/target-type.lisp
@@ -33,15 +33,16 @@
 	 named-type
 	 member-type
 	 array-type
-	 sb!xc:built-in-class
+        character-set-type
+	 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 +59,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 +130,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 +149,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
@@ -150,7 +160,8 @@
 		   values-subtypep-cache-clear
 		   csubtypep-cache-clear
 		   type-intersection2-cache-clear
-		   values-type-intersection-cache-clear))
+		   values-type-intersection-cache-clear
+                   type=-cache-clear))
       (funcall (the function (symbol-function sym)))))
   (values))
 
@@ -167,7 +178,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)))
@@ -181,8 +192,10 @@
 			:specialized-element-type etype)))
     (cons
      (make-cons-type *universal-type* *universal-type*))
+    (character
+     (specifier-type 'character))
     (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*)