X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Ftarget-type.lisp;h=fc5250b5a118811ea9a57686376d27680f48f458;hb=2d3cb6dba6461e98744eca2a1df4f770cea468ca;hp=0c254486a4f15e9e5c08ebe9bcd9feb61e30be14;hpb=4eb1a6d3ad2b7dcc19ac0ec979a1eb1eb049659a;p=sbcl.git

diff --git a/src/code/target-type.lisp b/src/code/target-type.lisp
index 0c25448..fc5250b 100644
--- 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))
@@ -81,7 +87,26 @@
 	  (let ((predicate-name (second hairy-spec)))
 	    (declare (type symbol predicate-name)) ; by ANSI spec of SATISFIES
 	    (if (fboundp predicate-name)
-		(values (not (null (funcall predicate-name obj))) t)
+		(let* (;; "Is OBJ of the SATISFIES type?" represented
+		       ;; as a generalized boolean.
+		       ;;
+		       ;; (Why IGNORE-ERRORS? This code is used to try to
+		       ;; check type relationships at compile time. 
+		       ;; Passing only-slightly-twisted types like
+		       ;; (AND INTEGER (SATISFIES ODDP)) into the
+		       ;; rather-significantly-twisted type dispatch
+		       ;; system can easily give rise to oddities like
+		       ;; calling predicates like ODDP on values they
+		       ;; don't like. (E.g. on OBJ=#\NEWLINE when the
+		       ;; above type is tested for TYPE= against
+		       ;; STANDARD-CHAR, represented as a
+		       ;; MEMBER-TYPE.) In such cases, NIL seems to be
+		       ;; an appropriate answer to "is OBJ of the
+		       ;; SATISFIES type?")
+		       (gbool (ignore-errors (funcall predicate-name obj)))
+		       ;; RAW coerced to a pure BOOLEAN value
+		       (bool (not (not gbool))))
+		  (values bool t))
 		(values nil nil)))))))))
 
 ;;; Return the layout for an object. This is the basic operation for
@@ -104,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)
@@ -132,13 +157,13 @@
 		   csubtypep-cache-clear
 		   type-intersection2-cache-clear
 		   values-type-intersection-cache-clear))
-      (funcall (symbol-function sym))))
+      (funcall (the function (symbol-function sym)))))
   (values))
 
-;;; Like TYPE-OF, only we return a CTYPE structure instead of a type
-;;; specifier, and we try to return the type most useful for type
-;;; checking, rather than trying to come up with the one that the user
-;;; might find most informative.
+;;; This is like TYPE-OF, only we return a CTYPE structure instead of
+;;; a type specifier, and we try to return the type most useful for
+;;; type checking, rather than trying to come up with the one that the
+;;; user might find most informative.
 (declaim (ftype (function (t) ctype) ctype-of))
 (defun-cached (ctype-of
 	       :hash-function (lambda (x) (logand (sxhash x) #x1FF))
@@ -148,7 +173,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)))
@@ -163,7 +188,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*)