X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Fpprint.lisp;h=00085798e5999050a969a0db7e439c8283d83038;hb=85bc4001453f09c80c4b9662dd5cf23f0b1fbaed;hp=a6ccaa774657921919aeead2e88d98cf58089e9f;hpb=718b3ccc610d1255f928fa75059f035638b57f94;p=sbcl.git

diff --git a/src/code/pprint.lisp b/src/code/pprint.lisp
index a6ccaa7..0008579 100644
--- a/src/code/pprint.lisp
+++ b/src/code/pprint.lisp
@@ -802,7 +802,7 @@
   ;; T iff one of the original entries.
   (initial-p *building-initial-table* :type (member t nil))
   ;; and the associated function
-  (function (missing-arg) :type function))
+  (fun (missing-arg) :type function))
 (def!method print-object ((entry pprint-dispatch-entry) stream)
   (print-unreadable-object (entry stream :type t)
     (format stream "type=~S, priority=~S~@[ [initial]~]"
@@ -847,7 +847,7 @@
 	     (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)
@@ -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
@@ -933,14 +932,17 @@
       (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
-					    :function function))
+		(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 :function function)))
+			:type type
+			:test-fn (compute-test-fn type)
+			:priority priority
+			:fun function)))
 	    (do ((prev nil next)
 		 (next list (cdr next)))
 		((null next)
@@ -1241,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
@@ -1249,10 +1251,9 @@
 
 ;;;; the interface seen by regular (ugly) printer and initialization routines
 
-;;; OUTPUT-PRETTY-OBJECT is called by OUTPUT-OBJECT when *PRINT-PRETTY* is
-;;; bound to T.
+;;; OUTPUT-PRETTY-OBJECT is called by OUTPUT-OBJECT when
+;;; *PRINT-PRETTY* is true.
 (defun output-pretty-object (object stream)
-  (/show0 "entering OUTPUT-PRETTY-OBJECT")
   (with-pretty-stream (stream)
     (funcall (pprint-dispatch object) stream object)))
 
@@ -1265,7 +1266,7 @@
     (/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)
+			 #'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")