X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Fdeftypes-for-target.lisp;h=50057757991a76f1555cb9f5f07dd84e4c3acff3;hb=15e14ef1ccd3ab6f4711632435a40493dc4cdd9d;hp=0928858c8100d3485579523ed01653fa505f4ee1;hpb=403bacffd903f8c5787a182f4133cffc69b55dc0;p=sbcl.git diff --git a/src/code/deftypes-for-target.lisp b/src/code/deftypes-for-target.lisp index 0928858..5005775 100644 --- a/src/code/deftypes-for-target.lisp +++ b/src/code/deftypes-for-target.lisp @@ -33,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 @@ -46,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) @@ -121,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)) @@ -134,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 () @@ -153,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)