X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcode%2Fpprint.lisp;h=b87e9ee0400d9ef3e834083f8aad37fd57f2a3d6;hb=cd13034f9415f64cdaa05893a4ac5ff1e95c97bd;hp=baf408865f38810ff545b75a87c4cb552e714c5c;hpb=8ac4c19014a23665e5842d0a989cb9d22d1592ed;p=sbcl.git

diff --git a/src/code/pprint.lisp b/src/code/pprint.lisp
index baf4088..b87e9ee 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))))
@@ -810,17 +811,6 @@
 	    (pprint-dispatch-entry-priority entry)
 	    (pprint-dispatch-entry-initial-p entry))))
 
-(defstruct (pprint-dispatch-table (:copier nil))
-  ;; A list of all the entries (except for CONS entries below) in highest
-  ;; to lowest priority.
-  (entries nil :type list)
-  ;; A hash table mapping things to entries for type specifiers of the
-  ;; form (CONS (MEMBER <thing>)). If the type specifier is of this form,
-  ;; we put it in this hash table instead of the regular entries table.
-  (cons-entries (make-hash-table :test 'eql)))
-(def!method print-object ((table pprint-dispatch-table) stream)
-  (print-unreadable-object (table stream :type t :identity t)))
-
 (defun cons-type-specifier-p (spec)
   (and (consp spec)
        (eq (car spec) 'cons)
@@ -925,38 +915,43 @@
 
 (defun set-pprint-dispatch (type function &optional
 			    (priority 0) (table *print-pprint-dispatch*))
-  (declare (type (or null function) function)
+  (declare (type (or null callable) 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))
-			 (pprint-dispatch-table-cons-entries table))
-		(make-pprint-dispatch-entry :type type
-					    :priority priority
-					    :fun function))
-	  (let ((list (delete type (pprint-dispatch-table-entries table)
-			      :key #'pprint-dispatch-entry-type
-			      :test #'equal))
-		(entry (make-pprint-dispatch-entry
-			:type type
-			:test-fn (compute-test-fn type)
-			:priority priority
-			:fun function)))
-	    (do ((prev nil next)
-		 (next list (cdr next)))
-		((null next)
-		 (if prev
-		     (setf (cdr prev) (list entry))
-		     (setf list (list entry))))
-	      (when (entry< (car next) entry)
-		(if prev
-		    (setf (cdr prev) (cons entry next))
-		    (setf list (cons entry next)))
-		(return)))
-	    (setf (pprint-dispatch-table-entries table) list)))
+      ;; KLUDGE: this impairs debuggability, and probably isn't even
+      ;; conforming -- maybe we should not coerce to function, but
+      ;; cater downstream (in PPRINT-DISPATCH-ENTRY) for having
+      ;; callables here.
+      (let ((function (%coerce-callable-to-fun function)))
+	(if (cons-type-specifier-p type)
+	    (setf (gethash (second (second type))
+			   (pprint-dispatch-table-cons-entries table))
+		  (make-pprint-dispatch-entry :type type
+					      :priority priority
+					      :fun function))
+	    (let ((list (delete type (pprint-dispatch-table-entries table)
+				:key #'pprint-dispatch-entry-type
+				:test #'equal))
+		  (entry (make-pprint-dispatch-entry
+			  :type type
+			  :test-fn (compute-test-fn type)
+			  :priority priority
+			  :fun function)))
+	      (do ((prev nil next)
+		   (next list (cdr next)))
+		  ((null next)
+		   (if prev
+		       (setf (cdr prev) (list entry))
+		       (setf list (list entry))))
+		(when (entry< (car next) entry)
+		  (if prev
+		      (setf (cdr prev) (cons entry next))
+		      (setf list (cons entry next)))
+		  (return)))
+	      (setf (pprint-dispatch-table-entries table) list))))
       (if (cons-type-specifier-p type)
 	  (remhash (second (second type))
 		   (pprint-dispatch-table-cons-entries table))
@@ -974,7 +969,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 +1001,7 @@
 				(index index)
 				(step (reduce #'* dims))
 				(count 0))
-			   (loop				
+			   (loop
 			     (pprint-pop)
 			     (output-guts stream index dims)
 			     (when (= (incf count) dim)
@@ -1018,6 +1014,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))
@@ -1364,5 +1369,4 @@
     (/show0 "leaving !PPRINT-COLD-INIT"))
 
   (setf *print-pprint-dispatch* (copy-pprint-dispatch nil))
-  (setf *pretty-printer* #'output-pretty-object)
   (setf *print-pretty* t))