X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Ftypedefs.lisp;h=23179304d5bd9a472fefd64d5c4231fadd35c109;hb=c41cb4c87eae7b04f844dca5f7edb5086c5d2d68;hp=241732c0b69fc33976b6cd25b6be326f0daea1e0;hpb=1bdc658b910e7dcc76f606b2c7c9c64012b6ee11;p=sbcl.git diff --git a/src/code/typedefs.lisp b/src/code/typedefs.lisp index 241732c..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. ;; @@ -41,9 +41,10 @@ ;; package!) (multiple-value-bind (whole wholeless-arglist) (if (eq '&whole (car arglist)) - (values (cadr arglist) (cddr arglist)) - (values (gensym) arglist)) - (multiple-value-bind (forms decls) (parse-body body nil) + (values (cadr arglist) (cddr arglist)) + (values (gensym) arglist)) + (multiple-value-bind (forms decls) + (parse-body body :doc-string-allowed nil) `(progn (!cold-init-forms (setf (info :type :translator ',name) @@ -58,28 +59,37 @@ ;;; DEFVARs for these come later, after we have enough stuff defined. (declaim (special *wild-type* *universal-type* *empty-type*)) -;;; The XXX-Type structures include the CTYPE structure for some slots that -;;; apply to all types. +;;; the base class for the internal representation of types (def!struct (ctype (:conc-name type-) (:constructor nil) (:make-load-form-fun make-type-load-form) #-sb-xc-host (:pure t)) - ;; The class of this type. + ;; the class of this type ;; ;; FIXME: It's unnecessarily confusing to have a structure accessor ;; 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) - ;; 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 :type (member t 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)) + (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 #.(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))) @@ -89,72 +99,26 @@ (declare (type ctype type)) `(specifier-type ',(type-specifier type))) -;;;; utilities +;;;; miscellany -;;; Like ANY and EVERY, except that we handle two-arg uncertain -;;; predicates. If the result is uncertain, then we return DEFAULT -;;; from the block PUNT-TYPE-METHOD. If LIST-FIRST is true, then the -;;; list element is the first arg, otherwise the second. -;;; -;;; FIXME: The way that we return from PUNT-TYPE-METHOD rather ruins -;;; the analogy with SOME and EVERY, and completely surprised me (WHN) -;;; when I was trying to maintain code which uses these macros. I -;;; think it would be a good idea to redo these so that they really -;;; are analogous to EVERY and SOME. And then, while we're at it, we -;;; could also make them functions (perhaps inline) instead of macros. -(defmacro any-type-op (op thing list &key (default '(values nil nil)) - list-first) - (let ((n-this (gensym)) - (n-thing (gensym)) - (n-val (gensym)) - (n-win (gensym)) - (n-uncertain (gensym))) - `(let ((,n-thing ,thing) - (,n-uncertain nil)) - (dolist (,n-this ,list - (if ,n-uncertain - (return-from punt-type-method ,default) - nil)) - (multiple-value-bind (,n-val ,n-win) - ,(if list-first - `(,op ,n-this ,n-thing) - `(,op ,n-thing ,n-this)) - (unless ,n-win (setq ,n-uncertain t)) - (when ,n-val (return t))))))) -(defmacro every-type-op (op thing list &key (default '(values nil nil)) - list-first) - (let ((n-this (gensym)) - (n-thing (gensym)) - (n-val (gensym)) - (n-win (gensym))) - `(let ((,n-thing ,thing)) - (dolist (,n-this ,list t) - (multiple-value-bind (,n-val ,n-win) - ,(if list-first - `(,op ,n-this ,n-thing) - `(,op ,n-thing ,n-this)) - (unless ,n-win (return-from punt-type-method ,default)) - (unless ,n-val (return nil))))))) - -;;; Compute the intersection for types that intersect only when one is a -;;; hierarchical subtype of the other. -(defun vanilla-intersection (type1 type2) - (multiple-value-bind (stp1 win1) (csubtypep type1 type2) - (multiple-value-bind (stp2 win2) (csubtypep type2 type1) - (cond (stp1 (values type1 t)) - (stp2 (values type2 t)) - ((and win1 win2) (values *empty-type* t)) - (t - (values type1 nil)))))) - -(defun vanilla-union (type1 type2) +;;; Look for nice relationships for types that have nice relationships +;;; only when one is a hierarchical subtype of the other. +(defun hierarchical-intersection2 (type1 type2) + (multiple-value-bind (subtypep1 win1) (csubtypep type1 type2) + (multiple-value-bind (subtypep2 win2) (csubtypep type2 type1) + (cond (subtypep1 type1) + (subtypep2 type2) + ((and win1 win2) *empty-type*) + (t nil))))) +(defun hierarchical-union2 (type1 type2) (cond ((csubtypep type1 type2) type2) ((csubtypep type2 type1) type1) (t nil))) -;;; Hash two things (types) down to 8 bits. In CMU CL this was an EQ hash, but -;;; since it now needs to run in vanilla ANSI Common Lisp at cross-compile -;;; time, it's now based on the CTYPE-HASH-VALUE field instead. +;;; Hash two things (types) down to 8 bits. In CMU CL this was an EQ +;;; hash, but since it now needs to run in vanilla ANSI Common Lisp at +;;; cross-compile time, it's now based on the CTYPE-HASH-VALUE field +;;; instead. ;;; ;;; FIXME: This was a macro in CMU CL, and is now an INLINE function. Is ;;; it important for it to be INLINE, or could be become an ordinary @@ -165,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