X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;ds=inline;f=src%2Fcode%2Fpprint.lisp;h=25fd9a0a7adb7a7408894da504c4245425f48952;hb=6c4d4d984b1af6b2a73568cec3ab9c8795cff2da;hp=d268aca621b9828901929583d50826125181aa30;hpb=e0814eee6f6dea52db010b45a330100f2fe65832;p=sbcl.git

diff --git a/src/code/pprint.lisp b/src/code/pprint.lisp
index d268aca..25fd9a0 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.
@@ -851,8 +851,8 @@
   (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)
@@ -928,6 +928,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 +964,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
@@ -1243,7 +1246,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 +1268,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 +1364,4 @@
     (/show0 "leaving !PPRINT-COLD-INIT"))
 
   (setf *print-pprint-dispatch* (copy-pprint-dispatch nil))
-  (setf *pretty-printer* #'output-pretty-object)
   (setf *print-pretty* t))