X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Fdeftypes-for-target.lisp;h=2d65b2f40afb56637fc231a98e103e8752728f38;hb=2db3b6b4cb740d5b6512459c223859f747807b09;hp=ee87d6d5eeab5b555cd332dcf9e9bb4393173bce;hpb=ce02ab2ecd9c6ae2e570abd8c93ebf3be55bbdad;p=sbcl.git diff --git a/src/code/deftypes-for-target.lisp b/src/code/deftypes-for-target.lisp index ee87d6d..2d65b2f 100644 --- a/src/code/deftypes-for-target.lisp +++ b/src/code/deftypes-for-target.lisp @@ -98,7 +98,8 @@ (sb!xc:deftype simple-bit-vector (&optional size) `(simple-array bit (,size))) -;;;; some private types that we use in defining the standard functions +;;;; some private types that we use in defining the standard functions, +;;;; or implementing declarations in standard compiler transforms ;;; a type specifier (sb!xc:deftype type-specifier () '(or list symbol sb!xc:class)) @@ -110,7 +111,7 @@ ;;; something legal in an evaluated context ;;; FIXME: could probably go away -(sb!xc:deftype form () 't) +(sb!xc:deftype form () t) ;;; Maclisp compatibility... ;;; FIXME: should be STRING-DESIGNATOR (the term used in the ANSI spec) @@ -121,7 +122,7 @@ ;;; legal args to pathname functions (sb!xc:deftype pathname-designator () - '(or string pathname stream)) + '(or string pathname #+sb-xc-host stream #-sb-xc-host file-stream)) (sb!xc:deftype logical-host-designator () '(or host string)) @@ -131,7 +132,7 @@ '(or float (complex float))) ;;; character components -(sb!xc:deftype char-code () `(integer 0 (,char-code-limit))) +(sb!xc:deftype char-code () `(integer 0 (,sb!xc:char-code-limit))) ;;; a consed sequence result. If a vector, is a simple array. (sb!xc:deftype consed-sequence () '(or list (simple-array * (*)))) @@ -139,12 +140,20 @@ ;;; the :END arg to a sequence (sb!xc:deftype sequence-end () '(or null index)) +;;; the :COUNT arg to a sequence +(sb!xc:deftype sequence-count () + `(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))) +;;; an object suitable for input to standard functions that accept +;;; "environment objects" (of the ANSI glossary) +(sb!xc:deftype lexenv-designator () '(or lexenv null)) + ;;; a thing that can be passed to FUNCALL & friends ;;; ;;; FIXME: should be FUNCTION-DESIGNATOR?