From d4f5e578666d44840292640658cd17a8e6e161bd Mon Sep 17 00:00:00 2001 From: Michiel Borkent Date: Mon, 16 Aug 2021 22:57:59 +0200 Subject: [PATCH] [#959] Add *print-readably* and *flush-on-newline* --- sci | 2 +- src/babashka/impl/pprint.clj | 4 +++- test/babashka/main_test.clj | 5 +++++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/sci b/sci index a83009b8..1bacd92d 160000 --- a/sci +++ b/sci @@ -1 +1 @@ -Subproject commit a83009b81b68d60e0c1dd91f3a730e117599a122 +Subproject commit 1bacd92dd03d753c84b01a70f9fceb61fc96b667 diff --git a/src/babashka/impl/pprint.clj b/src/babashka/impl/pprint.clj index d1420cc4..d750ef73 100644 --- a/src/babashka/impl/pprint.clj +++ b/src/babashka/impl/pprint.clj @@ -89,7 +89,9 @@ (pprint s @sci/out)) ([s writer] (binding [pprint/*print-right-margin* @print-right-margin - pprint/*print-pprint-dispatch* @print-pprint-dispatch] + pprint/*print-pprint-dispatch* @print-pprint-dispatch + *print-meta* @sci/print-meta + *print-readably* @sci/print-readably] (pprint/pprint s writer)))) (defn cl-format diff --git a/test/babashka/main_test.clj b/test/babashka/main_test.clj index 8854383d..e6e03a93 100644 --- a/test/babashka/main_test.clj +++ b/test/babashka/main_test.clj @@ -700,6 +700,11 @@ true"))) (vec (pmap f (map str (range 10000))))"))))) +(deftest print-readably-test + (is (= "\"foo\"" (bb nil "-e" "(binding [*print-readably* true] (pr-str \"foo\"))"))) + (is (= "foo" (bb nil "-e" "(binding [*print-readably* false] (pr-str \"foo\"))"))) + (is (= "foo\n" (bb nil "-e" "(binding [*print-readably* false] (with-out-str (clojure.pprint/pprint \"foo\")))")))) + ;;;; Scratch (comment