From 32de6647dc2dea724978c9d2a512c7307acc3753 Mon Sep 17 00:00:00 2001 From: Matthew Flatt Date: Wed, 28 Apr 2010 08:55:16 -0600 Subject: [PATCH] fix HtDP language printing --- collects/lang/htdp-langs.rkt | 6 +++--- collects/lang/private/advanced-funs.rkt | 7 ++++++- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/collects/lang/htdp-langs.rkt b/collects/lang/htdp-langs.rkt index 63b0e97a07..bb8ae1b4ce 100644 --- a/collects/lang/htdp-langs.rkt +++ b/collects/lang/htdp-langs.rkt @@ -201,11 +201,11 @@ [(drscheme:language:simple-settings-insert-newlines settings) (if (number? width) (parameterize ([pretty-print-columns width]) - (pretty-print converted-value port)) - (pretty-print converted-value port))] + (pretty-write converted-value port)) + (pretty-write converted-value port))] [else (parameterize ([pretty-print-columns 'infinity]) - (pretty-print converted-value port)) + (pretty-write converted-value port)) (newline port)]))))) settings width)) diff --git a/collects/lang/private/advanced-funs.rkt b/collects/lang/private/advanced-funs.rkt index eea94b3150..585461c2b8 100644 --- a/collects/lang/private/advanced-funs.rkt +++ b/collects/lang/private/advanced-funs.rkt @@ -8,6 +8,11 @@ scheme/port "../posn.ss" (for-syntax scheme/base)) + + (define pp + (let ([pretty-print (lambda (v) + (pretty-write v))]) + pretty-print)) (provide-and-document procedures @@ -35,7 +40,7 @@ "to print the argument to stdout (without quotes on symbols and strings, etc.)") (write (any -> void) "to print the argument to stdout (in a traditional style that is somewhere between print and display)") - (pretty-print (any -> void) + ((pp pretty-print) (any -> void) "like write, but with standard newlines and indentation") (printf (string any ... -> void) "to format the rest of the arguments according to the first argument and print it to stdout")