0.8.8.21:

[sbcl.git] / src / code / deftypes-for-target.lisp

diff --git a/src/code/deftypes-for-target.lisp b/src/code/deftypes-for-target.lisp
index ab58e4e..5005775 100644 (file)
--- a/src/code/deftypes-for-target.lisp
+++ b/src/code/deftypes-for-target.lisp
@@ -24,11 +24,6 @@
 \f
 ;;;; 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 ()
@@ -120,9 +129,7 @@
 ;;; FIXME: could probably go away
 (sb!xc:deftype form () t)
 
-;;; Maclisp compatibility...
-;;; FIXME: should be STRING-DESIGNATOR (the term used in the ANSI spec)
-(sb!xc:deftype stringable () '(or string symbol character))
+(sb!xc:deftype string-designator () '(or string symbol character))
 
 ;;; a thing legal in places where we want the name of a file
 (sb!xc:deftype filename () '(or string pathname))
@@ -133,6 +140,10 @@
 (sb!xc:deftype logical-host-designator ()
   '(or host string))
 
+(sb!xc:deftype package-designator () '(or string-designator sb!xc:package))
+;;; a designator for a list of symbols
+(sb!xc:deftype symbols-designator () '(or list symbol))
+
 ;;; a thing returned by the irrational functions. We assume that they
 ;;; never compute a rational result.
 (sb!xc:deftype irrational ()
@@ -152,10 +163,7 @@
   `(or null integer))
 
 ;;; a valid argument to a stream function
-;;;
-;;; FIXME: should probably be STREAM-DESIGNATOR, after the term
-;;; used in the ANSI spec (if this is in fact exactly the same thing)
-(sb!xc:deftype streamlike () '(or stream (member nil t)))
+(sb!xc:deftype stream-designator () '(or stream (member nil t)))
 
 ;;; an object suitable for input to standard functions that accept
 ;;; "environment objects" (of the ANSI glossary)