mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-06-30 15:00:21 +02:00
Code Activity

pretty-print is a lambda*

Browse source 
* module/ice-9/pretty-print.scm (pretty-print): Fix to always be a
  define*. Shouldn't change behavior, but it will be more
  introspectible.
This commit is contained in:
Andy Wingo 2009-12-28 16:37:59 +01:00
parent 9a9d82c28c
commit c1ff4aa786
1 changed files with 10 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

27
module/ice-9/pretty-print.scm
View file

@ -1,6 +1,6 @@
;;;; -*-scheme-*- ;;;; -*-scheme-*-
;;;; ;;;;
;;;; Copyright (C) 2001, 2004, 2006 Free Software Foundation, Inc. ;;;; Copyright (C) 2001, 2004, 2006, 2009 Free Software Foundation, Inc.
;;;; ;;;;
;;;; This library is free software; you can redistribute it and/or ;;;; This library is free software; you can redistribute it and/or
;;;; modify it under the terms of the GNU Lesser General Public ;;;; modify it under the terms of the GNU Lesser General Public
@ -17,8 +17,8 @@
;;;; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ;;;; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
;;;; ;;;;
(define-module (ice-9 pretty-print) (define-module (ice-9 pretty-print)
:use-module (ice-9 optargs) #:export (pretty-print))
:export (pretty-print))
;; From SLIB. ;; From SLIB.
@ -250,7 +250,12 @@
(rev-string-append l 0)) (rev-string-append l 0))
(define (pretty-print obj . opts) (define* (pretty-print obj #:optional port
#:key
(port* (or port (current-output-port)) #:port)
(width 79)
(display? #f)
(per-line-prefix ""))
"Pretty-print OBJ on PORT, which is a keyword argument defaulting to "Pretty-print OBJ on PORT, which is a keyword argument defaulting to
the current output port. Formatting can be controlled by a number of the current output port. Formatting can be controlled by a number of
keyword arguments: Each line in the output is preceded by the string keyword arguments: Each line in the output is preceded by the string
@ -260,19 +265,7 @@ true, display rather than write representation will be used.
Instead of with a keyword argument, you can also specify the output Instead of with a keyword argument, you can also specify the output
port directly after OBJ, like (pretty-print OBJ PORT)." port directly after OBJ, like (pretty-print OBJ PORT)."
(if (pair? opts)
(if (keyword? (car opts))
(apply pretty-print-with-keys obj opts)
(apply pretty-print-with-keys obj #:port (car opts) (cdr opts)))
(pretty-print-with-keys obj)))
(define* (pretty-print-with-keys obj
#:key
(port (current-output-port))
(width 79)
(display? #f)
(per-line-prefix ""))
(generic-write obj display? (generic-write obj display?
(- width (string-length per-line-prefix)) (- width (string-length per-line-prefix))
per-line-prefix per-line-prefix
(lambda (s) (display s port) #t))) (lambda (s) (display s port*) #t)))