[Guile-commits] 14/18: truncated-print: use call-with-truncating-output-string

[Andy Wingo]

wingo pushed a commit to branch main
in repository guile.

commit 0e4334406a791dc904eb6acc3c1a0ecdda8f9066
Author: Andy Wingo <wingo@pobox.com>
AuthorDate: Fri Jun 2 22:15:38 2023 +0200

    truncated-print: use call-with-truncating-output-string
    
    * module/ice-9/pretty-print.scm (truncated-print): Use new
    call-with-truncating-output-string, to allow for early bailout when
    printing large records.
---
 module/ice-9/pretty-print.scm | 63 +++++++++++++++++++++----------------------
 1 file changed, 31 insertions(+), 32 deletions(-)

diff --git a/module/ice-9/pretty-print.scm b/module/ice-9/pretty-print.scm
index 35a47088c..21a80e9a5 100644
--- a/module/ice-9/pretty-print.scm
+++ b/module/ice-9/pretty-print.scm
@@ -385,30 +385,26 @@ sub-expression, via the @var{breadth-first?} keyword 
argument."
             (lp (cdr x) (- width 1 (string-length str))))))))
 
     (define (truncate-string str width)
-      ;; width is < (string-length str)
-      (let lp ((fixes '(("#<" . ">")
-                        ("#(" . ")")
-                        ("(" . ")")
-                        ("\"" . "\""))))
-        (cond
-         ((null? fixes)
-          "#")
-         ((and (string-prefix? (caar fixes) str)
-               (string-suffix? (cdar fixes) str)
-               (>= (string-length str)
-                   width
-                   (+ (string-length (caar fixes))
-                      (string-length (cdar fixes))
-                      ellipsis-width)))
-          (format #f "~a~a~a~a"
-                  (caar fixes)
-                  (substring str (string-length (caar fixes))
-                             (- width (string-length (cdar fixes))
-                                ellipsis-width))
-                  ellipsis
-                  (cdar fixes)))
-         (else
-          (lp (cdr fixes))))))
+      (unless (< width (string-length str))
+        (error "precondition failed"))
+      (or (or-map (match-lambda
+                    ((prefix . suffix)
+                     (and (string-prefix? prefix str)
+                          (<= (+ (string-length prefix)
+                                 (string-length suffix)
+                                 ellipsis-width)
+                              width)
+                          (format #f "~a~a~a"
+                                  (substring str 0
+                                             (- width (string-length suffix)
+                                                ellipsis-width))
+                                  ellipsis
+                                  suffix))))
+                  '(("#<" . ">")
+                    ("#(" . ")")
+                    ("(" . ")")
+                    ("\"" . "\"")))
+          "#"))
 
     (define* (print x width #:key inner?)
       (cond
@@ -448,9 +444,9 @@ sub-expression, via the @var{breadth-first?} keyword 
argument."
          ;; the truncated bitvector would print as #1b(...), so we print by 
hand.
          ((>= width (+ 2 ellipsis-width))
           (format #t "#*")
-          (array-for-each (lambda (xi) (format #t (if xi "1" "0")))
+          (array-for-each (lambda (xi) (display (if xi "1" "0")))
                           (make-shared-array x list (- width 2 
ellipsis-width)))
-          (format #t ellipsis))
+          (display ellipsis))
          (else
           (display "#"))))
        ((and (array? x) (not (string? x)))
@@ -483,12 +479,15 @@ sub-expression, via the @var{breadth-first?} keyword 
argument."
          (else
           (display "#"))))
        (else
-        (let* ((str (with-output-to-string
-                      (lambda () (if display? (display x) (write x)))))
-               (len (string-length str)))
-          (display (if (<= (string-length str) width)
-                       str
-                       (truncate-string str width)))))))
+        (call-with-truncating-output-string
+         (lambda (port)
+           (if display? (display x port) (write x port)))
+         (lambda (full-str)
+           (display full-str))
+         (lambda (partial-str)
+           (display (truncate-string partial-str width)))
+         #:max-column width
+         #:allow-newline? #f))))
 
     (with-output-to-port port
       (lambda ()