0.7.2.7:

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

diff --git a/src/code/cross-type.lisp b/src/code/cross-type.lisp
index b59bd3b..c6be1fc 100644 (file)
--- a/src/code/cross-type.lisp
+++ b/src/code/cross-type.lisp
@@ -14,9 +14,7 @@
 ;;; Is X a fixnum in the target Lisp?
 (defun fixnump (x)
   (and (integerp x)
-       (<= sb!vm:*target-most-negative-fixnum*
-          x
-          sb!vm:*target-most-positive-fixnum*)))
+       (<= sb!xc:most-negative-fixnum x sb!xc:most-positive-fixnum)))
 
 ;;; (This was a useful warning when trying to get bootstrapping
 ;;; to work, but it's mostly irrelevant noise now that the system
@@ -200,9 +198,9 @@
             ;; Common Lisp. (Some array types are too, but they
             ;; were picked off earlier.)
             (target-type-is-in
-             '(bit character complex cons float function integer keyword
-                   list nil null number rational real signed-byte symbol t
-                   unsigned-byte))
+             '(atom bit character complex cons float function integer keyword
+               list nil null number rational real signed-byte symbol t
+               unsigned-byte))
             (values (typep host-object target-type) t))
            (;; Floating point types are guaranteed to correspond,
             ;; too, but less exactly.
@@ -338,10 +336,6 @@
     (check-type type (or symbol cons))
     (cross-typep obj type)))
 
-(defparameter *universal-function-type*
-  (make-function-type :wild-args t
-                     :returns *wild-type*))
-
 (defun ctype-of (x)
   (typecase x
     (function
@@ -353,7 +347,7 @@
         ;; There's no ANSI way to find out what the function is
         ;; declared to be, so we just return the CTYPE for the
         ;; most-general function.
-        *universal-function-type*))
+        *universal-fun-type*))
     (symbol
      (make-member-type :members (list x)))
     (number