X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Fdeftypes-for-target.lisp;h=4e657c9ddeba23809a9f9316db204f9d26671c2d;hb=a53deb94a224bc903d00a5075acf562488cab06a;hp=ab58e4e9fe65e23df3e3d48e133b869bb131c84e;hpb=cd1f265dd851941557ed3f764248c339c07493a9;p=sbcl.git

diff --git a/src/code/deftypes-for-target.lisp b/src/code/deftypes-for-target.lisp
index ab58e4e..4e657c9 100644
--- a/src/code/deftypes-for-target.lisp
+++ b/src/code/deftypes-for-target.lisp
@@ -24,11 +24,6 @@
 
 ;;;; standard types
 
-;;; also has a definition in src/code/class.lisp, but we need it
-;;; earlier for array specialization.
-(sb!xc:deftype fixnum ()
-  '(integer #.sb!xc:most-negative-fixnum #.sb!xc:most-positive-fixnum))
-
 (sb!xc:deftype boolean () '(member t nil))
 
 (sb!xc:deftype mod (n)
@@ -38,7 +33,7 @@
 
 (sb!xc:deftype signed-byte (&optional s)
   (cond ((eq s '*) 'integer)
-	((and (integerp s) (> s 1))
+	((and (integerp s) (> s 0))
 	 (let ((bound (ash 1 (1- s))))
 	   `(integer ,(- bound) ,(1- bound))))
 	(t
@@ -51,6 +46,14 @@
 	(t
 	 (error "bad size specified for UNSIGNED-BYTE type specifier: ~S" s))))
 
+;;; ANSI got UNSIGNED-BYTE wrong, prohibiting (UNSIGNED-BYTE 0).
+;;; Since this is actually a substantial impediment to clarity...
+(sb!xc:deftype unsigned-byte* (&optional s)
+  (cond
+    ((eq s '*) '(integer 0))
+    ((zerop s) '(integer 0 0))
+    (t `(unsigned-byte ,s))))
+
 (sb!xc:deftype bit () '(integer 0 1))
 
 (sb!xc:deftype compiled-function () 'function)
@@ -59,7 +62,7 @@
 
 (sb!xc:deftype extended-char ()
   #!+sb-doc
-  "Type of characters that aren't base-char's. None in CMU CL."
+  "Type of CHARACTERs that aren't BASE-CHARs."
   '(and character (not base-char)))
 
 (sb!xc:deftype standard-char ()
@@ -111,6 +114,12 @@
 ;;; semistandard types
 (sb!xc:deftype generalized-boolean () t)
 
+(sb!xc:deftype format-control ()
+  '(or string function))
+
+(sb!xc:deftype restart-designator ()
+  '(or (and symbol (not null)) restart))
+
 ;;; array rank, total size...
 (sb!xc:deftype array-rank () `(integer 0 (,sb!xc:array-rank-limit)))
 (sb!xc:deftype array-total-size ()