X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fgeneric%2Fvm-type.lisp;h=e43b2d44c183b84d5e0937fbc38bc130ad44617c;hb=a163c70e2bef35bf482a785dbfd9c545b4fcd555;hp=3bec6e1ec54d9388116bfad262c9ad8f991c9f47;hpb=9767de1cecfe50560fe1da69fd458b6148a66da3;p=sbcl.git

diff --git a/src/compiler/generic/vm-type.lisp b/src/compiler/generic/vm-type.lisp
index 3bec6e1..e43b2d4 100644
--- a/src/compiler/generic/vm-type.lisp
+++ b/src/compiler/generic/vm-type.lisp
@@ -33,7 +33,7 @@
   `(single-float ,low ,high))
 
 ;;; an index into an integer
-(sb!xc:deftype bit-index () `(integer 0 ,most-positive-fixnum))
+(sb!xc:deftype bit-index () `(integer 0 ,sb!xc:most-positive-fixnum))
 
 ;;; worst-case values for float attributes
 (sb!xc:deftype float-exponent ()
@@ -43,6 +43,9 @@
   #!-long-float `(integer 0 ,sb!vm:double-float-digits)
   #!+long-float `(integer 0 ,sb!vm:long-float-digits))
 (sb!xc:deftype float-radix () '(integer 2 2))
+(sb!xc:deftype float-int-exponent ()
+  #!-long-float 'double-float-int-exponent
+  #!+long-float 'long-float-int-exponent)
 
 ;;; a code for BOOLE
 (sb!xc:deftype boole-code () '(unsigned-byte 4))
@@ -119,10 +122,42 @@
 		;; them on the fly this way? (Call the new array
 		;; *SPECIALIZED-ARRAY-ELEMENT-SPECIFIER-TYPES* or something..)
 		(let ((stype (specifier-type stype-name)))
+		  (aver (not (unknown-type-p stype)))
 		  (when (csubtypep eltype stype)
 		    (return stype))))))
     type))
 
+(defun sb!xc:upgraded-array-element-type (spec &optional environment)
+  #!+sb-doc
+  "Return the element type that will actually be used to implement an array
+   with the specifier :ELEMENT-TYPE Spec."
+  (declare (ignore environment))
+  (if (unknown-type-p (specifier-type spec))
+      (error "undefined type: ~S" spec)
+      (type-specifier (array-type-specialized-element-type
+		       (specifier-type `(array ,spec))))))
+
+(defun sb!xc:upgraded-complex-part-type (spec &optional environment)
+  #!+sb-doc
+  "Return the element type of the most specialized COMPLEX number type that
+   can hold parts of type SPEC."
+  (declare (ignore environment))
+  (if (unknown-type-p (specifier-type spec))
+      (error "undefined type: ~S" spec)
+      (let ((ctype (specifier-type `(complex ,spec))))
+	(cond
+	  ((eq ctype *empty-type*) '(eql 0))
+	  ((csubtypep ctype (specifier-type '(complex single-float)))
+	   'single-float)
+	  ((csubtypep ctype (specifier-type '(complex double-float)))
+	   'double-float)
+	  #!+long-float
+	  ((csubtypep ctype (specifier-type '(complex long-float)))
+	   'long-float)
+	  ((csubtypep ctype (specifier-type '(complex rational)))
+	   'rational)
+	  (t 'real)))))
+
 ;;; Return the most specific integer type that can be quickly checked that
 ;;; includes the given type.
 (defun containing-integer-type (subtype)