X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Ftypecheckfuns.lisp;h=eeaeb0ab4a45199df415348f4d51b1a901192a97;hb=0b96758f3645dff3e681d82cc97ddab1faae27ac;hp=b36fe1735f6bd10fbbba07e3b1f21ac99d83531a;hpb=e33fb894f991b2926d8f3bace9058e4c0b2c3a37;p=sbcl.git

diff --git a/src/code/typecheckfuns.lisp b/src/code/typecheckfuns.lisp
index b36fe17..eeaeb0a 100644
--- a/src/code/typecheckfuns.lisp
+++ b/src/code/typecheckfuns.lisp
@@ -122,7 +122,7 @@
 
 ;;; Memoize the FORM which returns a typecheckfun for TYPESPEC.
 (defmacro memoized-typecheckfun-form (form typespec)
-  (let ((n-typespec (gensym "TYPESPEC")))
+  (with-unique-names (n-typespec)
     `(let ((,n-typespec ,typespec))
        (or (gethash ,n-typespec *typecheckfuns*)
 	   (setf (gethash ,n-typespec *typecheckfuns*)
@@ -186,7 +186,7 @@
       (setf (gethash typespec *typecheckfuns*) unmemoized-typecheckfun)
       ;; UNMEMOIZED-TYPECHECKFUN shouldn't be NIL unless the compiler
       ;; knew that the memo would exist, so we shouldn't be here.
-      (error "internal error: no typecheckfun memo for ~%  ~S" typespec)))
+      (bug "no typecheckfun memo for ~S" typespec)))
 
 (defun ctype-needs-to-be-interpreted-p (ctype)
   ;; What we should really do is factor out the code in
@@ -199,7 +199,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 +211,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
@@ -221,7 +225,7 @@
       (let* ((typespec (second typespec-form))
 	     (ctype (specifier-type typespec)))
 	(aver (= 2 (length typespec-form)))
-	(cond ((structure-class-p ctype)
+	(cond ((structure-classoid-p ctype)
 	       `(structure-object-typecheckfun ,typespec-form))
 	      ((ctype-needs-to-be-interpreted-p ctype)
 	       whole) ; i.e. give up compiler macro