X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcode%2Fpprint.lisp;h=f28a76f22ab91c8e0551b29d7929e087832801b0;hb=67d2b80e478824a46317419f076ab1f6b020f6b1;hp=390149c9cfeddac1d0d00bd867e94cb2e8395b80;hpb=ac5d2a6c225757504606c0a8538af7fdfc3ff5a3;p=sbcl.git

diff --git a/src/code/pprint.lisp b/src/code/pprint.lisp
index 390149c..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.
@@ -847,12 +847,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 +876,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,14 +898,13 @@
 	 (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))
 
 (defun pprint-dispatch (object &optional (table *print-pprint-dispatch*))
   (declare (type (or pprint-dispatch-table null) table))
-  (/show0 "entering PPRINT-DISPATCH")
   (let* ((table (or table *initial-pprint-dispatch*))
 	 (cons-entry
 	  (and (consp object)
@@ -920,8 +919,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
@@ -1244,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
@@ -1266,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")