X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Fpprint.lisp;h=d17ccfcafa4488e031c1814a1b5ee5a7a86e5283;hb=b7a8f5313a83dea33ce60551a4fb987b415c2cc6;hp=25fd9a0a7adb7a7408894da504c4245425f48952;hpb=4217a388a178099c43202df208c78ca81e0d9d1f;p=sbcl.git

diff --git a/src/code/pprint.lisp b/src/code/pprint.lisp
index 25fd9a0..d17ccfc 100644
--- a/src/code/pprint.lisp
+++ b/src/code/pprint.lisp
@@ -314,16 +314,17 @@
   ;; (In the PPRINT-LOGICAL-BLOCK form which calls us,
   ;; :PREFIX and :PER-LINE-PREFIX have hairy defaulting behavior,
   ;; and might end up being NIL.)
-  (declare (type (or null string prefix)))
+  (declare (type (or null string) prefix))
   ;; (But the defaulting behavior of PPRINT-LOGICAL-BLOCK :SUFFIX is
   ;; trivial, so it should always be a string.)
   (declare (type string suffix))
   (when prefix
+    (setq prefix (coerce prefix 'simple-string))
     (pretty-sout stream prefix 0 (length prefix)))
   (let* ((pending-blocks (pretty-stream-pending-blocks stream))
 	 (start (enqueue stream block-start
 			 :prefix (and per-line-p prefix)
-			 :suffix suffix
+			 :suffix (coerce suffix 'simple-string)
 			 :depth (length pending-blocks))))
     (setf (pretty-stream-pending-blocks stream)
 	  (cons start pending-blocks))))
@@ -974,7 +975,8 @@
 	     (stringp array)
 	     (bit-vector-p array))
 	 (output-ugly-object array stream))
-	((and *print-readably* (not (eq (array-element-type array) t)))
+	((and *print-readably*
+	      (not (array-readably-printable-p array)))
 	 (let ((*print-readably* nil))
 	   (error 'print-not-readable :object array)))
 	((vectorp array)
@@ -1005,7 +1007,7 @@
 				(index index)
 				(step (reduce #'* dims))
 				(count 0))
-			   (loop				
+			   (loop
 			     (pprint-pop)
 			     (output-guts stream index dims)
 			     (when (= (incf count) dim)