X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcode%2Ftypedefs.lisp;h=23179304d5bd9a472fefd64d5c4231fadd35c109;hb=c41cb4c87eae7b04f844dca5f7edb5086c5d2d68;hp=3d0c69f67a100ec682f1cd39342c700b2367a788;hpb=83b88ebcc07cda4daec275fa851664495a840445;p=sbcl.git

diff --git a/src/code/typedefs.lisp b/src/code/typedefs.lisp
index 3d0c69f..2317930 100644
--- a/src/code/typedefs.lisp
+++ b/src/code/typedefs.lisp
@@ -27,7 +27,7 @@
 ;;; Define the translation from a type-specifier to a type structure for
 ;;; some particular type. Syntax is identical to DEFTYPE.
 (defmacro !def-type-translator (name arglist &body body)
-  (check-type name symbol)
+  (declare (type symbol name))
   ;; FIXME: Now that the T%CL hack is ancient history and we just use CL
   ;; instead, we can probably return to using PARSE-DEFMACRO here.
   ;;
@@ -43,7 +43,8 @@
       (if (eq '&whole (car arglist))
 	  (values (cadr arglist) (cddr arglist))
 	  (values (gensym) arglist))
-    (multiple-value-bind (forms decls) (parse-body body nil)
+    (multiple-value-bind (forms decls)
+	(parse-body body :doc-string-allowed nil)
       `(progn
 	 (!cold-init-forms
 	  (setf (info :type :translator ',name)
@@ -69,16 +70,26 @@
   ;; named TYPE-CLASS-INFO which is an accessor for the CTYPE structure
   ;; even though the TYPE-CLASS structure also exists in the system.
   ;; Rename this slot: TYPE-CLASS or ASSOCIATED-TYPE-CLASS or something.
-  (class-info (required-argument) :type type-class)
+  (class-info (missing-arg) :type type-class)
   ;; True if this type has a fixed number of members, and as such
   ;; could possibly be completely specified in a MEMBER type. This is
   ;; used by the MEMBER type methods.
   (enumerable nil :read-only t)
   ;; an arbitrary hash code used in EQ-style hashing of identity
   ;; (since EQ hashing can't be done portably)
-  (hash-value (random (1+ most-positive-fixnum))
+  (hash-value (random #.(ash 1 20))
 	      :type (and fixnum unsigned-byte)
-	      :read-only t))
+	      :read-only t)
+  ;; Can this object contain other types? A global property of our
+  ;; implementation (which unfortunately seems impossible to enforce
+  ;; with assertions or other in-the-code checks and constraints) is
+  ;; that subclasses which don't contain other types correspond to
+  ;; disjoint subsets (except of course for the NAMED-TYPE T, which
+  ;; covers everything). So NUMBER-TYPE is disjoint from CONS-TYPE is
+  ;; is disjoint from MEMBER-TYPE and so forth. But types which can
+  ;; contain other types, like HAIRY-TYPE and INTERSECTION-TYPE, can
+  ;; violate this rule.
+  (might-contain-other-types-p nil :read-only t))
 (def!method print-object ((ctype ctype) stream)
   (print-unreadable-object (ctype stream :type t)
     (prin1 (type-specifier ctype) stream)))
@@ -118,6 +129,15 @@
   (logand (logxor (ash (type-hash-value type1) -3)
 		  (type-hash-value type2))
 	  #xFF))
+#!-sb-fluid (declaim (inline type-list-cache-hash))
+(declaim (ftype (function (list) (unsigned-byte 8)) type-list-cache-hash))
+(defun type-list-cache-hash (types)
+  (logand (loop with res = 0
+             for type in types
+             for hash = (type-hash-value type)
+             do (setq res (logxor res hash))
+             finally (return res))
+	  #xFF))
 
 ;;;; cold loading initializations