X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Fpprint.lisp;h=32df69b532c19a799dbc94484a7df4c2f435c80c;hb=62be7b271a57e0a125ccb0e68a6dd6cb54c75739;hp=f28a76f22ab91c8e0551b29d7929e087832801b0;hpb=67d2b80e478824a46317419f076ab1f6b020f6b1;p=sbcl.git

diff --git a/src/code/pprint.lisp b/src/code/pprint.lisp
index f28a76f..32df69b 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))))
@@ -928,6 +929,8 @@
   (declare (type (or null function) function)
 	   (type real priority)
 	   (type pprint-dispatch-table table))
+  (/show0 "entering SET-PPRINT-DISPATCH, TYPE=...")
+  (/hexstr type)
   (if function
       (if (cons-type-specifier-p type)
 	  (setf (gethash (second (second type))
@@ -962,6 +965,7 @@
 		(delete type (pprint-dispatch-table-entries table)
 			:key #'pprint-dispatch-entry-type
 			:test #'equal))))
+  (/show0 "about to return NIL from SET-PPRINT-DISPATCH")
   nil)
 
 ;;;; standard pretty-printing routines
@@ -971,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)
@@ -1002,7 +1007,7 @@
 				(index index)
 				(step (reduce #'* dims))
 				(count 0))
-			   (loop				
+			   (loop
 			     (pprint-pop)
 			     (output-guts stream index dims)
 			     (when (= (incf count) dim)
@@ -1015,6 +1020,15 @@
 
 (defun pprint-lambda-list (stream lambda-list &rest noise)
   (declare (ignore noise))
+  (when (and (consp lambda-list)
+	     (member (car lambda-list) *backq-tokens*))
+    ;; if this thing looks like a backquoty thing, then we don't want
+    ;; to destructure it, we want to output it straight away.  [ this
+    ;; is the exception to the normal processing: if we did this
+    ;; generally we would find lambda lists such as (FUNCTION FOO)
+    ;; being printed as #'FOO ]  -- CSR, 2003-12-07
+    (output-object lambda-list stream)
+    (return-from pprint-lambda-list nil))
   (pprint-logical-block (stream lambda-list :prefix "(" :suffix ")")
     (let ((state :required)
 	  (first t))
@@ -1361,5 +1375,4 @@
     (/show0 "leaving !PPRINT-COLD-INIT"))
 
   (setf *print-pprint-dispatch* (copy-pprint-dispatch nil))
-  (setf *pretty-printer* #'output-pretty-object)
   (setf *print-pretty* t))