X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Fdeftypes-for-target.lisp;h=ff2401d4bebe8ff6c23ffcbb0909d0986184bc70;hb=4cacd5df6c36c1815db4f09767017f5b85757ed1;hp=59149cc8255d5de5ed9f44fa2bc2cd9d4122706d;hpb=a530bbe337109d898d5b4a001fc8f1afa3b5dc39;p=sbcl.git diff --git a/src/code/deftypes-for-target.lisp b/src/code/deftypes-for-target.lisp index 59149cc..ff2401d 100644 --- a/src/code/deftypes-for-target.lisp +++ b/src/code/deftypes-for-target.lisp @@ -11,8 +11,7 @@ (in-package "SB!KERNEL") -(file-comment - "$Header$") +(/show0 "deftypes-for-target.lisp 14") ;;;; Now that DEFTYPE is set up, any pending requests for it can ;;;; be honored. @@ -70,12 +69,9 @@ #\n #\o #\p #\q #\r #\s #\t #\u #\v #\w #\x #\y #\z #\{ #\| #\} #\~)) -;;; FIXME: Would type inference be able to get more traction on this -;;; if it were defined as (AND SYMBOL (SATISFIES KEYWORDP))? (sb!xc:deftype keyword () - #!+sb-doc - "Type for any keyword symbol." - '(satisfies keywordp)) + ;; Defining this as (AND SYMBOL ..) lets (SUBTYPEP 'KEYWORD 'SYMBOL)=>T,T. + '(and symbol (satisfies keywordp))) (sb!xc:deftype eql (n) `(member ,n)) @@ -102,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)) @@ -114,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) @@ -123,9 +120,11 @@ ;;; a thing legal in places where we want the name of a file (sb!xc:deftype filename () '(or string pathname)) -;;; a legal arg to pathname functions +;;; legal args to pathname functions (sb!xc:deftype pathname-designator () '(or string pathname stream)) +(sb!xc:deftype logical-host-designator () + '(or host string)) ;;; a thing returned by the irrational functions. We assume that they ;;; never compute a rational result. @@ -133,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 * (*)))) @@ -181,3 +180,5 @@ `(integer 0 (,(ash 1 sb!vm:single-float-digits)))) (sb!xc:deftype double-float-significand () `(integer 0 (,(ash 1 sb!vm:double-float-digits)))) + +(/show0 "deftypes-for-target.lisp end of file")