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

diff --git a/src/code/pprint.lisp b/src/code/pprint.lisp
index 9b3f51e..d17ccfc 100644
--- a/src/code/pprint.lisp
+++ b/src/code/pprint.lisp
@@ -29,9 +29,9 @@
 (defconstant default-line-length 80)
 
 (defstruct (pretty-stream (:include sb!kernel:ansi-stream
-				    (:out #'pretty-out)
-				    (:sout #'pretty-sout)
-				    (:misc #'pretty-misc))
+				    (out #'pretty-out)
+				    (sout #'pretty-sout)
+				    (misc #'pretty-misc))
 			  (:constructor make-pretty-stream (target))
 			  (:copier nil))
   ;; Where the output is going to finally go.
@@ -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))))
@@ -847,12 +848,12 @@
 	     (pprint-dispatch-entry-priority e2)))))
 
 (macrolet ((frob (x)
-	     `(cons ',x #'(lambda (object) ,x))))
+	     `(cons ',x (lambda (object) ,x))))
   (defvar *precompiled-pprint-dispatch-funs*
     (list (frob (typep object 'array))
 	  (frob (and (consp object)
-		     (and (typep (car object) 'symbol)
-			  (typep (car object) '(satisfies fboundp)))))
+		     (symbolp (car object))
+		     (fboundp (car object))))
 	  (frob (typep object 'cons)))))
 
 (defun compute-test-fn (type)
@@ -876,12 +877,12 @@
 		      (destructuring-bind (type) (cdr type)
 			`(not ,(compute-test-expr type object))))
 		     (and
-		      `(and ,@(mapcar #'(lambda (type)
-					  (compute-test-expr type object))
+		      `(and ,@(mapcar (lambda (type)
+					(compute-test-expr type object))
 				      (cdr type))))
 		     (or
-		      `(or ,@(mapcar #'(lambda (type)
-					 (compute-test-expr type object))
+		      `(or ,@(mapcar (lambda (type)
+				       (compute-test-expr type object))
 				     (cdr type))))
 		     (t
 		      `(typep ,object ',type)))
@@ -898,8 +899,8 @@
 	 (new (make-pprint-dispatch-table
 	       :entries (copy-list (pprint-dispatch-table-entries orig))))
 	 (new-cons-entries (pprint-dispatch-table-cons-entries new)))
-    (maphash #'(lambda (key value)
-		 (setf (gethash key new-cons-entries) value))
+    (maphash (lambda (key value)
+	       (setf (gethash key new-cons-entries) value))
 	     (pprint-dispatch-table-cons-entries orig))
     new))
 
@@ -919,8 +920,8 @@
 	      (return entry)))))
     (if entry
 	(values (pprint-dispatch-entry-fun entry) t)
-	(values #'(lambda (stream object)
-		    (output-ugly-object object stream))
+	(values (lambda (stream object)
+		  (output-ugly-object object stream))
 		nil))))
 
 (defun set-pprint-dispatch (type function &optional
@@ -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)
@@ -1243,7 +1248,7 @@
     (pprint-fill stream (pprint-pop))
     (pprint-tagbody-guts stream)))
 
-(defun pprint-function-call (stream list &rest noise)
+(defun pprint-fun-call (stream list &rest noise)
   (declare (ignore noise))
   (funcall (formatter "~:<~^~W~^ ~:_~:I~@{~W~^ ~_~}~:>")
 	   stream
@@ -1265,8 +1270,8 @@
     ;; printers for regular types
     (/show0 "doing SET-PPRINT-DISPATCH for regular types")
     (set-pprint-dispatch 'array #'pprint-array)
-    (set-pprint-dispatch '(cons (and symbol (satisfies fboundp)))
-			 #'pprint-function-call -1)
+    (set-pprint-dispatch '(cons symbol)
+			 #'pprint-fun-call -1)
     (set-pprint-dispatch 'cons #'pprint-fill -2)
     ;; cons cells with interesting things for the car
     (/show0 "doing SET-PPRINT-DISPATCH for CONS with interesting CAR")
@@ -1361,5 +1366,4 @@
     (/show0 "leaving !PPRINT-COLD-INIT"))
 
   (setf *print-pprint-dispatch* (copy-pprint-dispatch nil))
-  (setf *pretty-printer* #'output-pretty-object)
   (setf *print-pretty* t))