X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Fdeftypes-for-target.lisp;h=0928858c8100d3485579523ed01653fa505f4ee1;hb=4b58efcd710097cf7cc9b1a1bed8b0e1bd6eb3b8;hp=2d65b2f40afb56637fc231a98e103e8752728f38;hpb=b0fab8a8c774f4e2921877c408ecca0b39d38676;p=sbcl.git diff --git a/src/code/deftypes-for-target.lisp b/src/code/deftypes-for-target.lisp index 2d65b2f..0928858 100644 --- 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 - "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 () @@ -87,10 +87,12 @@ `(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)) - (simple-base-string ,size))) + (simple-array nil (,size)) + (simple-base-string ,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 -;;; 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)))