X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Fearly-type.lisp;h=6f341915618401c20283ddb22f05d281fa746f3a;hb=15d6e7c9a2c3234f95dfe278046fa2fee1b0c007;hp=bbb75ba39ddc0dbd558fc20bd3886199e13805aa;hpb=2768ed83de59354b21ea61de3dea358c53d1ae05;p=sbcl.git

diff --git a/src/code/early-type.lisp b/src/code/early-type.lisp
index bbb75ba..6f34191 100644
--- a/src/code/early-type.lisp
+++ b/src/code/early-type.lisp
@@ -11,10 +11,6 @@
 
 (!begin-collecting-cold-init-forms)
 
-;;; 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)
-
 ;;;; representations of types
 
 ;;; A HAIRY-TYPE represents anything too weird to be described
@@ -335,7 +331,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)
@@ -460,6 +456,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
 
@@ -499,8 +513,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)))
@@ -534,7 +549,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))))