0.7.13.pcl-class.1

[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 59149cc..ce70217 100644 (file)
--- 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")
 \f
 ;;;; 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,10 +98,16 @@
 (sb!xc:deftype simple-bit-vector (&optional size)
   `(simple-array bit (,size)))
 \f
-;;;; 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))
+;;;
+;;; FIXME: The SB!KERNEL:INSTANCE here really means CL:CLASS.
+;;; However, the CL:CLASS type is only defined once PCL is loaded,
+;;; which is before this is evaluated.  Once PCL is moved into cold
+;;; init, this might be fixable.
+(sb!xc:deftype type-specifier () '(or list symbol sb!kernel:instance))
 
 ;;; array rank, total size...
 (sb!xc:deftype array-rank () `(integer 0 (,sb!xc:array-rank-limit)))
@@ -114,7 +116,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 +125,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))
+  '(or string pathname #+sb-xc-host stream #-sb-xc-host file-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 +137,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 * (*))))
@@ -141,12 +145,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?
@@ -181,3 +193,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")