X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Ftarget-type.lisp;h=6bbc5ddb66e899e2b1a01e136797445914b181e4;hb=e4d1085d9572b5ebf110093a04914725e4c583d4;hp=a3ec9c689eb1ac4fd3b44e35fed23ca935ced429;hpb=416152f084604094445a758ff399871132dff2bd;p=sbcl.git

diff --git a/src/code/target-type.lisp b/src/code/target-type.lisp
index a3ec9c6..6bbc5dd 100644
--- a/src/code/target-type.lisp
+++ b/src/code/target-type.lisp
@@ -13,17 +13,6 @@
 
 (!begin-collecting-cold-init-forms)
 
-;;; Just call %TYPEP.
-;;;
-;;; Note that when cross-compiling, SB!XC:TYPEP is interpreted as
-;;; a test that the host Lisp object OBJECT translates to a target SBCL
-;;; type TYPE. (This behavior is needed e.g. to test for the validity of
-;;; numeric subtype bounds read when cross-compiling.)
-(defun typep (object type)
-  #!+sb-doc
-  "Return T iff OBJECT is of type TYPE."
-  (%typep object type))
-
 ;;; If TYPE is a type that we can do a compile-time test on, then
 ;;; return whether the object is of that type as the first value and
 ;;; second value true. Otherwise return NIL, NIL.
@@ -63,7 +52,7 @@
 	      #'ctypep
 	      obj
 	      (compound-type-types type)))
-    (function-type
+    (fun-type
      (values (functionp obj) t))
     (unknown-type
      (values nil nil))
@@ -117,7 +106,7 @@
 	   ;; 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)))))
+	(t (svref *built-in-class-codes* (widetag-of x)))))
 
 #!-sb-fluid (declaim (inline sb!xc:class-of))
 (defun sb!xc:class-of (object)
@@ -127,15 +116,8 @@
   (layout-class (layout-of object)))
 
 ;;; Pull the type specifier out of a function object.
-(defun extract-function-type (fun)
-  (typecase fun
-    ;; FIXME: byte compiler to be deleted completely
-    #|
-    (byte-function (byte-function-type fun))
-    (byte-closure (byte-function-type (byte-closure-function fun)))
-    |#
-    (t
-     (specifier-type (%function-type (%closure-function fun))))))
+(defun extract-fun-type (fun)
+  (specifier-type (%simple-fun-type (%closure-fun fun))))
 
 ;;;; miscellaneous interfaces
 
@@ -153,10 +135,10 @@
       (funcall (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))
@@ -167,7 +149,7 @@
     (function
      (if (funcallable-instance-p x)
 	 (sb!xc:class-of x)
-	 (extract-function-type x)))
+	 (extract-fun-type x)))
     (symbol
      (make-member-type :members (list x)))
     (number