X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Fearly-type.lisp;h=53137bacba2d2b04c1ba8a13b60457c90c0f2f66;hb=f8893c7c658bf9d9e0757c63e47af2fdea810f04;hp=9999bffc76006b2438b594f69b75628d6512eb13;hpb=8871a1f72225f959a454a1b77f7a0e85642ba427;p=sbcl.git

diff --git a/src/code/early-type.lisp b/src/code/early-type.lisp
index 9999bff..53137ba 100644
--- a/src/code/early-type.lisp
+++ b/src/code/early-type.lisp
@@ -139,8 +139,6 @@
                      :rest rest
                      :allowp allowp))
 
-;;; FIXME: ANSI VALUES has a short form (without lambda list
-;;; keywords), which should be translated into a long one.
 (defun make-values-type (&key (args nil argsp)
                          required optional rest allowp)
   (if argsp
@@ -175,7 +173,14 @@
 ;;; (SPECIFIER-TYPE 'FUNCTION) and its subtypes
 (defstruct (fun-type (:include args-type
 			       (class-info (type-class-or-lose 'function)))
-                     (:constructor %make-fun-type))
+                     (:constructor
+                      %make-fun-type (&key required optional rest
+                                           keyp keywords allowp
+                                           wild-args
+                                           returns
+                                      &aux (rest (if (eq rest *empty-type*)
+                                                     nil
+                                                     rest)))))
   ;; true if the arguments are unrestrictive, i.e. *
   (wild-args nil :type boolean)
   ;; type describing the return values. This is a values type
@@ -330,7 +335,7 @@
 		     :enumerable enumerable))
 
 ;;; An ARRAY-TYPE is used to represent any array type, including
-;;; things such as SIMPLE-STRING.
+;;; things such as SIMPLE-BASE-STRING.
 (defstruct (array-type (:include ctype
 				 (class-info (type-class-or-lose 'array)))
                        (:constructor %make-array-type)
@@ -455,6 +460,24 @@
 	  (eq cdr-type *empty-type*))
       *empty-type*
       (%make-cons-type car-type cdr-type)))
+
+(defun cons-type-length-info (type)
+  (declare (type cons-type type))
+  (do ((min 1 (1+ min))
+       (cdr (cons-type-cdr-type type) (cons-type-cdr-type cdr)))
+      ((not (cons-type-p cdr))
+       (cond
+	 ((csubtypep cdr (specifier-type 'null))
+	  (values min t))
+	 ((csubtypep *universal-type* cdr)
+	  (values min nil))
+	 ((type/= (type-intersection (specifier-type 'cons) cdr) *empty-type*)
+	  (values min nil))
+	 ((type/= (type-intersection (specifier-type 'null) cdr) *empty-type*)
+	  (values min t))
+	 (t (values min :maybe))))
+    ()))
+       
 
 ;;;; type utilities
 
@@ -494,8 +517,9 @@
 		   (fun (info :type :translator (car lspec))))
 	      (cond (fun
 		     (funcall fun lspec))
-		    ((or (and (consp spec) (symbolp (car spec)))
-			 (symbolp spec))
+		    ((or (and (consp spec) (symbolp (car spec))
+			      (not (info :type :builtin (car spec))))
+			 (and (symbolp spec) (not (info :type :builtin spec))))
 		     (when (and *type-system-initialized*
                                 (not (eq (info :type :kind spec)
                                          :forthcoming-defclass-type)))
@@ -529,7 +553,7 @@
   (let ((def (cond ((symbolp form)
                     (info :type :expander form))
                    ((and (consp form) (symbolp (car form)))
-                    (info :type :expander (car form)))
+		    (info :type :expander (car form)))
                    (t nil))))
     (if def
         (type-expand (funcall def (if (consp form) form (list form))))