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

diff --git a/src/code/pprint.lisp b/src/code/pprint.lisp
index d5ab150..9b3f51e 100644
--- a/src/code/pprint.lisp
+++ b/src/code/pprint.lisp
@@ -28,7 +28,7 @@
 
 (defconstant default-line-length 80)
 
-(defstruct (pretty-stream (:include sb!kernel:lisp-stream
+(defstruct (pretty-stream (:include sb!kernel:ansi-stream
 				    (:out #'pretty-out)
 				    (:sout #'pretty-sout)
 				    (:misc #'pretty-misc))
@@ -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]~]"
@@ -918,7 +918,7 @@
 	    (when (funcall (pprint-dispatch-entry-test-fn entry) object)
 	      (return entry)))))
     (if entry
-	(values (pprint-dispatch-entry-function entry) t)
+	(values (pprint-dispatch-entry-fun entry) t)
 	(values #'(lambda (stream object)
 		    (output-ugly-object object stream))
 		nil))))
@@ -932,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)
@@ -1248,8 +1251,8 @@
 
 ;;;; 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)
   (with-pretty-stream (stream)
     (funcall (pprint-dispatch object) stream object)))