X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Ftypecheckfuns.lisp;h=e4a0d8b15b1c69275c82a2411f5d7c2e154c94dc;hb=3fe0010d2777b41e01ea9b4a0f894cfa40f7df1b;hp=9f3bee915dfae3f14a9e25bc708e22a02437fd10;hpb=670010e3f3dcd62efaf23f61abdc73950edb88c6;p=sbcl.git

diff --git a/src/code/typecheckfuns.lisp b/src/code/typecheckfuns.lisp
index 9f3bee9..e4a0d8b 100644
--- a/src/code/typecheckfuns.lisp
+++ b/src/code/typecheckfuns.lisp
@@ -130,20 +130,26 @@
 
 #+sb-xc
 (defun !typecheckfuns-cold-init ()
+  (/show0 "in typecheckfuns-cold-init")
   (setf *typecheckfuns* (make-hash-table :test 'equal))
   ;; Initialize the table of common typespecs.
   (setf *common-typespecs* #.*compile-time-common-typespecs*)
   ;; Initialize *TYPECHECKFUNS* with typecheckfuns for common typespecs.
+  (/show0 "typecheckfuns-cold-init initial setfs done")
   (macrolet ((macro ()
 	       `(progn
 		  ,@(map 'list
 			 (lambda (typespec)
-			   `(setf (gethash ',typespec *typecheckfuns*)
-				  (lambda (arg)
-				    (unless (typep arg ',typespec)
-				      (typecheck-failure arg ',typespec))
-				    (values))))
-			 *common-typespecs*))))
+			   `(progn
+                              (/show0 "setf")
+                              (setf (gethash ',typespec *typecheckfuns*)
+                                    (progn
+                                      (/show0 "lambda")
+                                      (lambda (arg)                                      
+                                        (unless (typep arg ',typespec)
+                                          (typecheck-failure arg ',typespec))
+                                        (values))))))
+                         *common-typespecs*))))
     (macro))
   (values))
 
@@ -199,7 +205,11 @@
 	   (member-type-p ctype)
 	   (numeric-type-p ctype)
 	   (array-type-p ctype)
-	   (cons-type-p ctype))))
+           (cons-type-p ctype)
+           (intersection-type-p ctype)
+           (union-type-p ctype)
+           (negation-type-p ctype)
+           (character-set-type-p ctype))))
 
 ;;; Evaluate (at load/execute time) to a function which checks that
 ;;; its argument is of the specified type.
@@ -207,7 +217,7 @@
 ;;; The name is slightly misleading, since some cases are memoized, so
 ;;; we might reuse a value which was made earlier instead of creating
 ;;; a new one from scratch.
-(declaim (ftype (function (t) function) typespec-typecheckfun))
+(declaim (ftype (sfunction (t) function) typespec-typecheckfun))
 (defun typespec-typecheckfun (typespec)
   ;; a general-purpose default case, hopefully overridden by the
   ;; DEFINE-COMPILER-MACRO implementation