X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcode%2Fpred.lisp;h=ada4bed3944be9a718a0851f98b8684c3d8ed098;hb=dc33d6a6b84f8338e603759cec8e25da29055d50;hp=dd6ccb2dd196a2641784873307fbfecb44ed7a3b;hpb=22b819c0cd0ca0ea5be52ba280b9e9e0b8e86210;p=sbcl.git

diff --git a/src/code/pred.lisp b/src/code/pred.lisp
index dd6ccb2..ada4bed 100644
--- a/src/code/pred.lisp
+++ b/src/code/pred.lisp
@@ -47,6 +47,8 @@
   (def-type-predicate-wrapper arrayp)
   (def-type-predicate-wrapper atom)
   (def-type-predicate-wrapper base-char-p)
+  (def-type-predicate-wrapper base-string-p)
+  #!+sb-unicode (def-type-predicate-wrapper character-string-p)
   (def-type-predicate-wrapper bignump)
   (def-type-predicate-wrapper bit-vector-p)
   (def-type-predicate-wrapper characterp)
@@ -63,6 +65,7 @@
   ;; the type it tests for in the Common Lisp type system, and since it's
   ;; only used in the implementation of a few specialized things.)
   (def-type-predicate-wrapper double-float-p)
+  (def-type-predicate-wrapper extended-char-p)
   (def-type-predicate-wrapper fdefn-p)
   (def-type-predicate-wrapper fixnump)
   (def-type-predicate-wrapper floatp)
@@ -77,8 +80,10 @@
   (def-type-predicate-wrapper ratiop)
   (def-type-predicate-wrapper realp)
   (def-type-predicate-wrapper short-float-p)
-  (def-type-predicate-wrapper sb!kernel:simple-array-p)
+  (def-type-predicate-wrapper simple-array-p)
   (def-type-predicate-wrapper simple-bit-vector-p)
+  (def-type-predicate-wrapper simple-base-string-p)
+  #!+sb-unicode (def-type-predicate-wrapper simple-character-string-p)
   (def-type-predicate-wrapper simple-string-p)
   (def-type-predicate-wrapper simple-vector-p)
   (def-type-predicate-wrapper single-float-p)
@@ -90,6 +95,7 @@
   (def-type-predicate-wrapper vectorp)
   (def-type-predicate-wrapper unsigned-byte-32-p)
   (def-type-predicate-wrapper signed-byte-32-p)
+  (def-type-predicate-wrapper simple-array-nil-p)
   (def-type-predicate-wrapper simple-array-unsigned-byte-2-p)
   (def-type-predicate-wrapper simple-array-unsigned-byte-4-p)
   (def-type-predicate-wrapper simple-array-unsigned-byte-8-p)
@@ -104,7 +110,8 @@
   #!+long-float (def-type-predicate-wrapper simple-array-long-float-p)
   (def-type-predicate-wrapper simple-array-complex-single-float-p)
   (def-type-predicate-wrapper simple-array-complex-double-float-p)
-  #!+long-float (def-type-predicate-wrapper simple-array-complex-long-float-p))
+  #!+long-float (def-type-predicate-wrapper simple-array-complex-long-float-p)
+  (def-type-predicate-wrapper vector-nil-p))
 
 ;;; Return the specifier for the type of object. This is not simply
 ;;; (TYPE-SPECIFIER (CTYPE-OF OBJECT)) because CTYPE-OF has different
@@ -113,19 +120,37 @@
 (defun type-of (object)
   #!+sb-doc
   "Return the type of OBJECT."
-  (if (typep object '(or function array complex))
-    (type-specifier (ctype-of object))
-    (let* ((classoid (layout-classoid (layout-of object)))
-	   (name (classoid-name classoid)))
-      (if (typep object 'instance)
-      (case name
-	(sb!alien-internals:alien-value
-	 `(sb!alien:alien
-	   ,(sb!alien-internals:unparse-alien-type
-	     (sb!alien-internals:alien-value-type object))))
-	(t
-	 (classoid-proper-name classoid)))
-      name))))
+  (typecase object
+    (fixnum
+     (cond
+       ((<= 0 object 1) 'bit)
+       ((< object 0) 'fixnum)
+       (t '(integer 0 #.sb!xc:most-positive-fixnum))))
+    (integer
+     (if (>= object 0)
+	 '(integer #.(1+ sb!xc:most-positive-fixnum))
+	 'bignum))
+    (standard-char 'standard-char)
+    (base-char 'base-char)
+    (extended-char 'extended-char)
+    ((member t) 'boolean)
+    (keyword 'keyword)
+    ((or array complex) (type-specifier (ctype-of object)))
+    (t
+     (let* ((classoid (layout-classoid (layout-of object)))
+	    (name (classoid-name classoid)))
+       (if (typep object 'instance)
+	   (case name
+	     (sb!alien-internals:alien-value
+	      `(sb!alien:alien
+		,(sb!alien-internals:unparse-alien-type
+		  (sb!alien-internals:alien-value-type object))))
+	     (t
+	      (let ((pname (classoid-proper-name classoid)))
+		(if (classoid-p pname)
+		    (classoid-pcl-class pname)
+		    pname))))
+	   name)))))
 
 ;;;; equality predicates