X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Fpprint.lisp;h=f28a76f22ab91c8e0551b29d7929e087832801b0;hb=86210c4e406c1b2ff10cc3bac0e71435867db48b;hp=d268aca621b9828901929583d50826125181aa30;hpb=e0814eee6f6dea52db010b45a330100f2fe65832;p=sbcl.git

diff --git a/src/code/pprint.lisp b/src/code/pprint.lisp
index d268aca..f28a76f 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)
@@ -1243,7 +1243,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 +1265,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")