X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Fearly-type.lisp;h=0af428157eacbfe6d067541c25d03492e2381b45;hb=ab6263cd50869be699c7afea271d626f83a5a27d;hp=d9d6a10068226612926a49e23aba44bc756d585c;hpb=322be917a6b06f5741b0da8a6621a4f1e881bf11;p=sbcl.git

diff --git a/src/code/early-type.lisp b/src/code/early-type.lisp
index d9d6a10..0af4281 100644
--- a/src/code/early-type.lisp
+++ b/src/code/early-type.lisp
@@ -23,10 +23,11 @@
 ;;; the original type spec.
 (defstruct (hairy-type (:include ctype
 				 (class-info (type-class-or-lose 'hairy))
-				 (enumerable t))
+				 (enumerable t)
+				 (might-contain-other-types-p t))
 		       (:copier nil)
 		       #!+cmu (:pure nil))
-  ;; the Common Lisp type-specifier
+  ;; the Common Lisp type-specifier of the type we represent
   (specifier nil :type t))
 
 (!define-type-class hairy)
@@ -57,7 +58,9 @@
 (defstruct (values-type
 	    (:include args-type
 		      (class-info (type-class-or-lose 'values)))
+            (:constructor %make-values-type)
 	    (:copier nil)))
+(define-cached-synonym make-values-type)
 
 (!define-type-class values)
 
@@ -70,10 +73,10 @@
   ;; when multiple values were specified for the return.
   (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)))
@@ -206,6 +209,7 @@
 ;;; things such as SIMPLE-STRING.
 (defstruct (array-type (:include ctype
 				 (class-info (type-class-or-lose 'array)))
+                       (:constructor %make-array-type)
 		       (:copier nil))
   ;; the dimensions of the array, or * if unspecified. If a dimension
   ;; is unspecified, it is *.
@@ -216,6 +220,7 @@
   (element-type (missing-arg) :type ctype)
   ;; the element type as it is specialized in this implementation
   (specialized-element-type *wild-type* :type ctype))
+(define-cached-synonym make-array-type)
 
 ;;; A MEMBER-TYPE represent a use of the MEMBER type specifier. We
 ;;; bother with this at this level because MEMBER types are fairly
@@ -230,7 +235,8 @@
 
 ;;; A COMPOUND-TYPE is a type defined out of a set of types, the
 ;;; common parent of UNION-TYPE and INTERSECTION-TYPE.
-(defstruct (compound-type (:include ctype)
+(defstruct (compound-type (:include ctype
+				    (might-contain-other-types-p t))
 			  (:constructor nil)
 			  (:copier nil))
   (types nil :type list :read-only t))
@@ -246,6 +252,7 @@
 				 (class-info (type-class-or-lose 'union)))
 		       (:constructor %make-union-type (enumerable types))
 		       (:copier nil)))
+(define-cached-synonym make-union-type)
 
 ;;; An INTERSECTION-TYPE represents a use of the AND type specifier
 ;;; which we couldn't canonicalize to something simpler. Canonical form:
@@ -275,7 +282,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,15 +311,10 @@
 ;;; 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)))
+                                (logand (sxhash x) #x3FF))
 	       :hash-bits 10
 	       :init-wrapper !cold-init-forms)
-	      ((orig eq))
+	      ((orig equal))
   (let ((u (uncross orig)))
     (or (info :type :builtin u)
 	(let ((spec (type-expand u)))
@@ -343,7 +345,9 @@
 		     (funcall fun lspec))
 		    ((or (and (consp spec) (symbolp (car spec)))
 			 (symbolp spec))
-		     (when *type-system-initialized*
+		     (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
@@ -352,14 +356,20 @@
 		     (error "bad thing to be a type specifier: ~S"
 			    spec))))))))))
 
-;;; Like VALUES-SPECIFIER-TYPE, except that we guarantee to never
-;;; return a VALUES type.
+;;; 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))
 
+(defun single-value-specifier-type (x)
+  (let ((res (specifier-type x)))
+    (if (eq res *wild-type*)
+        *universal-type*
+        res)))
+
 ;;; Similar to MACROEXPAND, but expands DEFTYPEs. We don't bother
 ;;; returning a second value.
 (defun type-expand (form)