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

diff --git a/src/code/target-type.lisp b/src/code/target-type.lisp
index de27d70..0a9e068 100644
--- a/src/code/target-type.lisp
+++ b/src/code/target-type.lisp
@@ -57,28 +57,12 @@
 	     (values nil nil))
 	 (values nil t)))
     (compound-type
-     ;; REMOVEME: old version
-     #|
-     (let ((certain? t))
-       (etypecase type
-	 (union-type
-	  (dolist (mem (union-type-types type) (values nil certain?))
-	    (multiple-value-bind (val win) (ctypep obj mem)
-	      (if win
-		  (when val (return (values t t)))
-		  (setf certain? nil)))))
-	 (intersection-type
-	  (dolist (mem (intersection-type-types type)
-		       (if certain? (values t t) (values nil nil)))
-	    (multiple-value-bind (val win) (ctypep obj mem)
-	      (if win
-		  (unless val (return (values nil t)))
-		  (setf certain? nil)))))))
-     |#
-     (let ((types (compound-type-types type)))
-       (etypecase type
-	 (intersection-type (every/type #'ctypep obj types))
-	 (union-type        (any/type   #'ctypep obj types)))))
+     (funcall (etypecase type
+		(intersection-type #'every/type)
+		(union-type #'any/type))
+	      #'ctypep
+	      obj
+	      (compound-type-types type)))
     (function-type
      (values (functionp obj) t))
     (unknown-type
@@ -105,29 +89,18 @@
 		(values (not res) t)
 		(values nil nil))))
 	 (satisfies
-	  ;; KLUDGE: This stuff might well blow up if we tried to execute it
-	  ;; when cross-compiling. But since for the foreseeable future the
-	  ;; only code we'll try to cross-compile is SBCL itself, and SBCL is
-	  ;; built without using SATISFIES types, it's arguably not important
-	  ;; to worry about this. -- WHN 19990210.
-	  (let ((fun (second hairy-spec)))
-	    (cond ((and (consp fun)
-			(eq (car fun) 'lambda))
-		   (values (not (null (funcall (coerce fun 'function) obj)))
-			   t))
-		  ((and (symbolp fun) (fboundp fun))
-		   (values (not (null (funcall fun obj))) t))
-		  (t
-		   (values nil nil))))))))))
+	  (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)
+		(values nil nil)))))))))
 
-;;; LAYOUT-OF  --  Exported
-;;;
-;;;    Return the layout for an object. This is the basic operation for
-;;; finding out the "type" of an object, and is used for generic function
-;;; dispatch. The standard doesn't seem to say as much as it should about what
-;;; this returns for built-in objects. For example, it seems that we must
-;;; return NULL rather than LIST when X is NIL so that GF's can specialize on
-;;; NULL.
+;;; Return the layout for an object. This is the basic operation for
+;;; finding out the "type" of an object, and is used for generic
+;;; function dispatch. The standard doesn't seem to say as much as it
+;;; should about what this returns for built-in objects. For example,
+;;; it seems that we must return NULL rather than LIST when X is NIL
+;;; so that GF's can specialize on NULL.
 #!-sb-fluid (declaim (inline layout-of))
 (defun layout-of (x)
   (declare (optimize (speed 3) (safety 0)))
@@ -139,9 +112,9 @@
 	 ;; run time in order to make it easier to build the cross-compiler.
 	 ;; If it doesn't work, something else will be needed..
 	 (locally
-	   ;; KLUDGE: In order to really make it run at run time (instead of
-	   ;; doing some weird broken thing at cold load time),
-	   ;; we need to suppress a DEFTRANSFORM.. -- WHN 19991004
+	   ;; 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))))
 	(t (svref *built-in-class-codes* (get-type x)))))
@@ -171,7 +144,7 @@
   (when *type-system-initialized*
     (dolist (sym '(values-specifier-type-cache-clear
 		   values-type-union-cache-clear
-		   type-union-cache-clear
+		   type-union2-cache-clear
 		   values-subtypep-cache-clear
 		   csubtypep-cache-clear
 		   type-intersection2-cache-clear
@@ -197,24 +170,7 @@
     (symbol
      (make-member-type :members (list x)))
     (number
-     (let* ((num (if (complexp x) (realpart x) x))
-	    (res (make-numeric-type
-		  :class (etypecase num
-			   (integer 'integer)
-			   (rational 'rational)
-			   (float 'float))
-		  :format (if (floatp num)
-			      (float-format-name num)
-			      nil))))
-       (cond ((complexp x)
-	      (setf (numeric-type-complexp res) :complex)
-	      (let ((imag (imagpart x)))
-		(setf (numeric-type-low res) (min num imag))
-		(setf (numeric-type-high res) (max num imag))))
-	     (t
-	      (setf (numeric-type-low res) num)
-	      (setf (numeric-type-high res) num)))
-       res))
+     (ctype-of-number x))
     (array
      (let ((etype (specifier-type (array-element-type x))))
        (make-array-type :dimensions (array-dimensions x)