X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Ftypedefs.lisp;h=23179304d5bd9a472fefd64d5c4231fadd35c109;hb=93c8158fd4996e2a7184eb0f8d63812a7bc2562c;hp=6169aceafbb13bed42ab32a14ea34138c927dbd5;hpb=722703e7cbd3a4b279a4c1baab5d95df2c23cce9;p=sbcl.git diff --git a/src/code/typedefs.lisp b/src/code/typedefs.lisp index 6169ace..2317930 100644 --- a/src/code/typedefs.lisp +++ b/src/code/typedefs.lisp @@ -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) @@ -76,7 +77,7 @@ (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) ;; Can this object contain other types? A global property of our @@ -128,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