X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Flate-type.lisp;h=e0b7317f0fb28850daa788b1fd3fec9b4c5a7c3d;hb=403bacffd903f8c5787a182f4133cffc69b55dc0;hp=296d88ce9654f26bd67abd08540f7b6fcb0987f8;hpb=2768ed83de59354b21ea61de3dea358c53d1ae05;p=sbcl.git

diff --git a/src/code/late-type.lisp b/src/code/late-type.lisp
index 296d88c..e0b7317 100644
--- a/src/code/late-type.lisp
+++ b/src/code/late-type.lisp
@@ -2207,25 +2207,21 @@
 		   (case eltype
 		     (bit 'bit-vector)
 		     (base-char 'base-string)
-		     (character 'string)
 		     (* 'vector)
 		     (t `(vector ,eltype)))
 		   (case eltype
 		     (bit `(bit-vector ,(car dims)))
 		     (base-char `(base-string ,(car dims)))
-		     (character `(string ,(car dims)))
 		     (t `(vector ,eltype ,(car dims)))))
 	       (if (eq (car dims) '*)
 		   (case eltype
 		     (bit 'simple-bit-vector)
 		     (base-char 'simple-base-string)
-		     (character 'simple-string)
 		     ((t) 'simple-vector)
 		     (t `(simple-array ,eltype (*))))
 		   (case eltype
 		     (bit `(simple-bit-vector ,(car dims)))
 		     (base-char `(simple-base-string ,(car dims)))
-		     (character `(simple-string ,(car dims)))
 		     ((t) `(simple-vector ,(car dims)))
 		     (t `(simple-array ,eltype ,dims))))))
 	  (t
@@ -2273,8 +2269,9 @@
 			  (specialized-element-type-maybe type2))
 		   t)))))
 
+;;; FIXME: is this dead?
 (!define-superclasses array
-  ((string string)
+  ((base-string base-string)
    (vector vector)
    (array))
   !cold-init-forms)
@@ -2628,6 +2625,8 @@
     ((type= type (specifier-type 'real)) 'real)
     ((type= type (specifier-type 'sequence)) 'sequence)
     ((type= type (specifier-type 'bignum)) 'bignum)
+    ((type= type (specifier-type 'simple-string)) 'simple-string)
+    ((type= type (specifier-type 'string)) 'string)
     (t `(or ,@(mapcar #'type-specifier (union-type-types type))))))
 
 ;;; Two union types are equal if they are each subtypes of each