diff --git a/lib/chibi/show/column.scm b/lib/chibi/show/column.scm index 82d60d5a..d49af877 100644 --- a/lib/chibi/show/column.scm +++ b/lib/chibi/show/column.scm @@ -40,11 +40,11 @@ (return nothing)))) nothing)) (define (generate) - (if (and resume (list-queue-empty? queue)) - (call-with-current-continuation - (lambda (cc) - (set! return cc) - (resume nothing)))) + (when (and resume (list-queue-empty? queue)) + (call-with-current-continuation + (lambda (cc) + (set! return cc) + (resume nothing)))) (if (list-queue-empty? queue) eof (list-queue-remove-front! queue))) diff --git a/lib/chibi/show/pretty.scm b/lib/chibi/show/pretty.scm index fd507546..bfe9e734 100644 --- a/lib/chibi/show/pretty.scm +++ b/lib/chibi/show/pretty.scm @@ -1,5 +1,5 @@ ;; pretty.scm -- pretty printing format combinator -;; Copyright (c) 2006-2013 Alex Shinn. All rights reserved. +;; Copyright (c) 2006-2018 Alex Shinn. All rights reserved. ;; BSD-style license: http://synthcode.com/license.txt ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; @@ -348,15 +348,21 @@ (define (pretty obj) (fn () - (each (pp obj (extract-shared-objects obj #t)) - fl))) + (call-with-output + (each (pp obj (extract-shared-objects obj #t)) + fl) + displayed))) (define (pretty-shared obj) (fn () - (each (pp obj (extract-shared-objects obj #f)) - fl))) + (call-with-output + (each (pp obj (extract-shared-objects obj #f)) + fl) + displayed))) (define (pretty-simply obj) (fn () - (each (pp obj (extract-shared-objects #f #f)) - fl))) + (call-with-output + (each (pp obj (extract-shared-objects #f #f)) + fl) + displayed)))