projects
/
sbcl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
0.8.3.45.modular1:
[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
2d65b2f
..
0928858
100644
(file)
--- a/
src/code/deftypes-for-target.lisp
+++ b/
src/code/deftypes-for-target.lisp
@@
-54,7
+54,7
@@
(sb!xc:deftype extended-char ()
#!+sb-doc
(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 ()
'(and character (not base-char)))
(sb!xc:deftype standard-char ()
@@
-87,10
+87,12
@@
`(simple-array base-char (,size)))
(sb!xc:deftype string (&optional size)
`(or (array character (,size))
`(simple-array base-char (,size)))
(sb!xc:deftype string (&optional size)
`(or (array character (,size))
- (base-string ,size)))
+ (array nil (,size))
+ (base-string ,size)))
(sb!xc:deftype simple-string (&optional size)
`(or (simple-array character (,size))
(sb!xc:deftype simple-string (&optional size)
`(or (simple-array character (,size))
- (simple-base-string ,size)))
+ (simple-array nil (,size))
+ (simple-base-string ,size)))
(sb!xc:deftype bit-vector (&optional size)
`(array bit (,size)))
(sb!xc:deftype bit-vector (&optional size)
`(array bit (,size)))
@@
-101,8
+103,14
@@
;;;; some private types that we use in defining the standard functions,
;;;; or implementing declarations in standard compiler transforms
;;;; 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))
+;;; 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)))
;;; array rank, total size...
(sb!xc:deftype array-rank () `(integer 0 (,sb!xc:array-rank-limit)))