X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Fearly-type.lisp;h=5e21ecffc9df17f44218c50d80f06c0b5428eaf4;hb=63cef087068afc157283c0a05ae1f16b962303aa;hp=6b6468682563aa17c7891a05261490c8c67b00f4;hpb=0aafa73007d42f2bc8e626f98a243019b7e63284;p=sbcl.git diff --git a/src/code/early-type.lisp b/src/code/early-type.lisp index 6b64686..5e21ecf 100644 --- a/src/code/early-type.lisp +++ b/src/code/early-type.lisp @@ -14,88 +14,8 @@ ;;; Has the type system been properly initialized? (I.e. is it OK to ;;; use it?) (defvar *type-system-initialized* #+sb-xc-host nil) ; (set in cold load) - -;;; Use experimental type functionality? -;;; -;;; REMOVEME: Eventually the new type functionality should be stable -;;; enough that nothing depends on this, and we can remove it again. -(defvar *xtype?*) -(!cold-init-forms (setf *xtype?* nil)) -;;; Return the type structure corresponding to a type specifier. We -;;; pick off structure types as a special case. -;;; -;;; Note: VALUES-SPECIFIER-TYPE-CACHE-CLEAR must be called whenever a -;;; type is defined (or redefined). -(defun-cached (values-specifier-type - :hash-function (lambda (x) - ;; FIXME: the THE FIXNUM stuff is - ;; redundant in SBCL (or modern CMU - ;; CL) because of type inference. - (the fixnum - (logand (the fixnum (sxhash x)) - #x3FF))) - :hash-bits 10 - :init-wrapper !cold-init-forms) - ((orig eq)) - (let ((u (uncross orig))) - (or (info :type :builtin u) - (let ((spec (type-expand u))) - (cond - ((and (not (eq spec u)) - (info :type :builtin spec))) - ((eq (info :type :kind spec) :instance) - (sb!xc:find-class spec)) - ((typep spec 'class) - ;; There doesn't seem to be any way to translate - ;; (TYPEP SPEC 'BUILT-IN-CLASS) into something which can be - ;; executed on the host Common Lisp at cross-compilation time. - #+sb-xc-host (error - "stub: (TYPEP SPEC 'BUILT-IN-CLASS) on xc host") - (if (typep spec 'built-in-class) - (or (built-in-class-translation spec) spec) - spec)) - (t - (let* (;; FIXME: This automatic promotion of FOO-style - ;; specs to (FOO)-style specs violates the ANSI - ;; standard. Unfortunately, we can't fix the - ;; problem just by removing it, since then things - ;; downstream should break. But at some point we - ;; should fix this and the things downstream too. - (lspec (if (atom spec) (list spec) spec)) - (fun (info :type :translator (car lspec)))) - (cond (fun - (funcall fun lspec)) - ((or (and (consp spec) (symbolp (car spec))) - (symbolp spec)) - (when *type-system-initialized* - (signal 'parse-unknown-type :specifier spec)) - ;; (The RETURN-FROM here inhibits caching.) - (return-from values-specifier-type - (make-unknown-type :specifier spec))) - (t - (error "bad thing to be a type specifier: ~S" - spec)))))))))) - -;;; Like VALUES-SPECIFIER-TYPE, except that we guarantee to never -;;; return a VALUES type. -(defun specifier-type (x) - (let ((res (values-specifier-type x))) - (when (values-type-p res) - (error "VALUES type illegal in this context:~% ~S" x)) - res)) - -;;; Similar to MACROEXPAND, but expands DEFTYPEs. We don't bother -;;; returning a second value. -(defun type-expand (form) - (let ((def (cond ((symbolp form) - (info :type :expander form)) - ((and (consp form) (symbolp (car form))) - (info :type :expander (car form))) - (t nil)))) - (if def - (type-expand (funcall def (if (consp form) form (list form)))) - form))) +;;;; representations of types ;;; A HAIRY-TYPE represents anything too weird to be described ;;; reasonably or to be useful, such as NOT, SATISFIES, unknown types, @@ -125,7 +45,7 @@ ;; Lists of the type for each required and optional argument. (required nil :type list) (optional nil :type list) - ;; The type for the rest arg. NIL if there is no rest arg. + ;; The type for the rest arg. NIL if there is no &REST arg. (rest nil :type (or ctype null)) ;; true if &KEY arguments are specified (keyp nil :type boolean) @@ -141,31 +61,31 @@ (!define-type-class values) -(defstruct (function-type - (:include args-type - (class-info (type-class-or-lose 'function)))) - ;; True if the arguments are unrestrictive, i.e. *. +;;; (SPECIFIER-TYPE 'FUNCTION) and its subtypes +(defstruct (fun-type (:include args-type + (class-info (type-class-or-lose 'function)))) + ;; true if the arguments are unrestrictive, i.e. * (wild-args nil :type boolean) - ;; Type describing the return values. This is a values type + ;; type describing the return values. This is a values type ;; when multiple values were specified for the return. - (returns (required-argument) :type ctype)) + (returns (missing-arg) :type ctype)) -;;; The CONSTANT-TYPE structure represents a use of the -;;; CONSTANT-ARGUMENT "type specifier", which is only meaningful in -;;; function argument type specifiers used within the compiler. (It -;;; represents something that the compiler knows to be a constant.) +;;; The CONSTANT-TYPE structure represents a use of the CONSTANT-ARG +;;; "type specifier", which is only meaningful in function argument +;;; type specifiers used within the compiler. (It represents something +;;; that the compiler knows to be a constant.) (defstruct (constant-type (:include ctype (class-info (type-class-or-lose 'constant))) (:copier nil)) ;; The type which the argument must be a constant instance of for this type ;; specifier to win. - (type (required-argument) :type ctype)) + (type (missing-arg) :type ctype)) -;;; The NAMED-TYPE is used to represent *, T and NIL. These types must be -;;; super- or sub-types of all types, not just classes and * and NIL aren't -;;; classes anyway, so it wouldn't make much sense to make them built-in -;;; classes. +;;; The NAMED-TYPE is used to represent *, T and NIL. These types must +;;; be super- or sub-types of all types, not just classes and * and +;;; NIL aren't classes anyway, so it wouldn't make much sense to make +;;; them built-in classes. (defstruct (named-type (:include ctype (class-info (type-class-or-lose 'named))) (:copier nil)) @@ -183,10 +103,9 @@ ;;; A NUMERIC-TYPE represents any numeric type, including things ;;; such as FIXNUM. (defstruct (numeric-type (:include ctype - (class-info (type-class-or-lose - 'number))) - #!+negative-zero-is-not-zero - (:constructor %make-numeric-type)) + (class-info (type-class-or-lose 'number))) + (:constructor %make-numeric-type) + (:copier nil)) ;; the kind of numeric type we have, or NIL if not specified (just ;; NUMBER or COMPLEX) ;; @@ -196,23 +115,92 @@ ;; weird that comment above says "Numeric-Type is used to represent ;; all numeric types" but this slot doesn't allow COMPLEX as an ;; option.. how does this fall into "not specified" NIL case above? - (class nil :type (member integer rational float nil)) + ;; Perhaps someday we can switch to CLOS and make NUMERIC-TYPE + ;; be an abstract base class and INTEGER-TYPE, RATIONAL-TYPE, and + ;; whatnot be concrete subclasses.. + (class nil :type (member integer rational float nil) :read-only t) ;; "format" for a float type (i.e. type specifier for a CPU ;; representation of floating point, e.g. 'SINGLE-FLOAT -- nothing ;; to do with #'FORMAT), or NIL if not specified or not a float. ;; Formats which don't exist in a given implementation don't appear ;; here. - (format nil :type (or float-format null)) + (format nil :type (or float-format null) :read-only t) ;; Is this a complex numeric type? Null if unknown (only in NUMBER). ;; ;; FIXME: I'm bewildered by FOO-P names for things not intended to ;; interpreted as truth values. Perhaps rename this COMPLEXNESS? - (complexp :real :type (member :real :complex nil)) + (complexp :real :type (member :real :complex nil) :read-only t) ;; The upper and lower bounds on the value, or NIL if there is no ;; bound. If a list of a number, the bound is exclusive. Integer - ;; types never have exclusive bounds. - (low nil :type (or number cons null)) - (high nil :type (or number cons null))) + ;; types never have exclusive bounds, i.e. they may have them on + ;; input, but they're canonicalized to inclusive bounds before we + ;; store them here. + (low nil :type (or number cons null) :read-only t) + (high nil :type (or number cons null) :read-only t)) + +;;; Impose canonicalization rules for NUMERIC-TYPE. Note that in some +;;; cases, despite the name, we return *EMPTY-TYPE* instead of a +;;; NUMERIC-TYPE. +(defun make-numeric-type (&key class format (complexp :real) low high + enumerable) + ;; if interval is empty + (if (and low + high + (if (or (consp low) (consp high)) ; if either bound is exclusive + (>= (type-bound-number low) (type-bound-number high)) + (> low high))) + *empty-type* + (multiple-value-bind (canonical-low canonical-high) + (case class + (integer + ;; INTEGER types always have their LOW and HIGH bounds + ;; represented as inclusive, not exclusive values. + (values (if (consp low) + (1+ (type-bound-number low)) + low) + (if (consp high) + (1- (type-bound-number high)) + high))) + #!+negative-zero-is-not-zero + (float + ;; Canonicalize a low bound of (-0.0) to 0.0, and a high + ;; bound of (+0.0) to -0.0. + (values (if (and (consp low) + (floatp (car low)) + (zerop (car low)) + (minusp (float-sign (car low)))) + (float 0.0 (car low)) + low) + (if (and (consp high) + (floatp (car high)) + (zerop (car high)) + (plusp (float-sign (car high)))) + (float -0.0 (car high)) + high))) + (t + ;; no canonicalization necessary + (values low high))) + (%make-numeric-type :class class + :format format + :complexp complexp + :low canonical-low + :high canonical-high + :enumerable enumerable)))) + +(defun modified-numeric-type (base + &key + (class (numeric-type-class base)) + (format (numeric-type-format base)) + (complexp (numeric-type-complexp base)) + (low (numeric-type-low base)) + (high (numeric-type-high base)) + (enumerable (numeric-type-enumerable base))) + (make-numeric-type :class class + :format format + :complexp complexp + :low low + :high high + :enumerable enumerable)) ;;; An ARRAY-TYPE is used to represent any array type, including ;;; things such as SIMPLE-STRING. @@ -225,7 +213,7 @@ ;; Is this not a simple array type? (:MAYBE means that we don't know.) (complexp :maybe :type (member t nil :maybe)) ;; the element type as originally specified - (element-type (required-argument) :type ctype) + (element-type (missing-arg) :type ctype) ;; the element type as it is specialized in this implementation (specialized-element-type *wild-type* :type ctype)) @@ -287,7 +275,7 @@ type)) ;;; A CONS-TYPE is used to represent a CONS type. -(defstruct (cons-type (:include ctype (:class-info (type-class-or-lose 'cons))) +(defstruct (cons-type (:include ctype (class-info (type-class-or-lose 'cons))) (:constructor ;; ANSI says that for CAR and CDR subtype ;; specifiers '* is equivalent to T. In order @@ -304,8 +292,82 @@ ;; the CAR and CDR element types (to support ANSI (CONS FOO BAR) types) ;; ;; FIXME: Most or all other type structure slots could also be :READ-ONLY. - (car-type (required-argument) :type ctype :read-only t) - (cdr-type (required-argument) :type ctype :read-only t)) + (car-type (missing-arg) :type ctype :read-only t) + (cdr-type (missing-arg) :type ctype :read-only t)) + +;;;; type utilities + +;;; Return the type structure corresponding to a type specifier. We +;;; pick off structure types as a special case. +;;; +;;; Note: VALUES-SPECIFIER-TYPE-CACHE-CLEAR must be called whenever a +;;; type is defined (or redefined). +(defun-cached (values-specifier-type + :hash-function (lambda (x) + (logand (sxhash x) #x3FF)) + :hash-bits 10 + :init-wrapper !cold-init-forms) + ((orig eq)) + (let ((u (uncross orig))) + (or (info :type :builtin u) + (let ((spec (type-expand u))) + (cond + ((and (not (eq spec u)) + (info :type :builtin spec))) + ((eq (info :type :kind spec) :instance) + (sb!xc:find-class spec)) + ((typep spec 'class) + ;; There doesn't seem to be any way to translate + ;; (TYPEP SPEC 'BUILT-IN-CLASS) into something which can be + ;; executed on the host Common Lisp at cross-compilation time. + #+sb-xc-host (error + "stub: (TYPEP SPEC 'BUILT-IN-CLASS) on xc host") + (if (typep spec 'built-in-class) + (or (built-in-class-translation spec) spec) + spec)) + (t + (let* (;; FIXME: This automatic promotion of FOO-style + ;; specs to (FOO)-style specs violates the ANSI + ;; standard. Unfortunately, we can't fix the + ;; problem just by removing it, since then things + ;; downstream should break. But at some point we + ;; should fix this and the things downstream too. + (lspec (if (atom spec) (list spec) spec)) + (fun (info :type :translator (car lspec)))) + (cond (fun + (funcall fun lspec)) + ((or (and (consp spec) (symbolp (car spec))) + (symbolp spec)) + (when (and *type-system-initialized* + (not (eq (info :type :kind spec) + :forthcoming-defclass-type))) + (signal 'parse-unknown-type :specifier spec)) + ;; (The RETURN-FROM here inhibits caching.) + (return-from values-specifier-type + (make-unknown-type :specifier spec))) + (t + (error "bad thing to be a type specifier: ~S" + spec)))))))))) + +;;; This is like VALUES-SPECIFIER-TYPE, except that we guarantee to +;;; never return a VALUES type. +(defun specifier-type (x) + (let ((res (values-specifier-type x))) + (when (values-type-p res) + (error "VALUES type illegal in this context:~% ~S" x)) + res)) + +;;; Similar to MACROEXPAND, but expands DEFTYPEs. We don't bother +;;; returning a second value. +(defun type-expand (form) + (let ((def (cond ((symbolp form) + (info :type :expander form)) + ((and (consp form) (symbolp (car form))) + (info :type :expander (car form))) + (t nil)))) + (if def + (type-expand (funcall def (if (consp form) form (list form)))) + form))) ;;; Note that the type NAME has been (re)defined, updating the ;;; undefined warnings and VALUES-SPECIFIER-TYPE cache. @@ -315,5 +377,5 @@ (when (boundp 'sb!kernel::*values-specifier-type-cache-vector*) (values-specifier-type-cache-clear)) (values)) - + (!defun-from-collected-cold-init-forms !early-type-cold-init)