Expose pr on (#1088)

* Expose clojure.core/pr-on

* Drop the pr-on docstring

* Bump CI tooling

* Print through core-pr-on

Author: borkdude

.github/workflows/ci.yml

@@ -14,11 +14,11 @@ jobs:
           fetch_depth: 0
 
       - name: Install clojure tools
-        uses: DeLaGuardo/setup-clojure@5.0
+        uses: DeLaGuardo/setup-clojure@13.7.0
         with:
-          cli: 1.10.1.763
+          cli: 'latest'
           lein: 2.9.3
-          bb: 0.8.2
+          bb: 'latest'
 
       - name: Prepare java
         uses: actions/setup-java@v2
@@ -37,11 +37,11 @@ jobs:
           fetch_depth: 0
 
       - name: Install clojure tools
-        uses: DeLaGuardo/setup-clojure@5.0
+        uses: DeLaGuardo/setup-clojure@13.7.0
         with:
-          cli: 1.10.1.763
+          cli: 'latest'
           lein: 2.9.3
-          bb: 0.8.2
+          bb: 'latest'
 
       - uses: actions/setup-node@v3
         with:
@@ -69,11 +69,11 @@ jobs:
           fetch_depth: 0
 
       - name: Install clojure tools
-        uses: DeLaGuardo/setup-clojure@5.0
+        uses: DeLaGuardo/setup-clojure@13.7.0
         with:
-          cli: 1.10.1.763
+          cli: 'latest'
           lein: 2.9.3
-          bb: 0.8.2
+          bb: 'latest'
 
       - uses: graalvm/setup-graalvm@v1
         with:
@@ -93,11 +93,11 @@ jobs:
           fetch_depth: 0
 
       - name: Install clojure tools
-        uses: DeLaGuardo/setup-clojure@5.0
+        uses: DeLaGuardo/setup-clojure@13.7.0
         with:
-          cli: 1.10.1.763
+          cli: 'latest'
           lein: 2.9.3
-          bb: 0.8.2
+          bb: 'latest'
 
       - name: Install planck
         run: HOMEBREW_NO_AUTO_UPDATE=1 brew install planck
@@ -123,7 +123,7 @@ jobs:
           sdk: '3.12.2'
 
       - name: Setup Clojure
-        uses: DeLaGuardo/setup-clojure@13.4
+        uses: DeLaGuardo/setup-clojure@13.7.0
         with:
           cli: 'latest'
 
@@ -164,9 +164,9 @@ jobs:
           components: 'native-image'
 
       - name: Install Clojure tools
-        uses: DeLaGuardo/setup-clojure@9.5
+        uses: DeLaGuardo/setup-clojure@13.7.0
         with:
-          bb: '1.0.165'
+          bb: 'latest'
           lein: '2.9.10'
 
       - name: Cache clojure dependencies

src/sci/impl/io.cljc

@@ -82,6 +82,16 @@
             (print-method x w))
           nil))
 
+#?(:clj (defn core-pr-on
+          [x w]
+          (binding [*print-length* @print-length
+                    *print-level* @print-level
+                    *print-meta* @print-meta
+                    *print-namespace-maps* @print-namespace-maps
+                    *print-readably* @print-readably
+                    *print-dup* @print-dup-var]
+            (pr-on x w))))
+
 #?(:cljd (defn pr
            [& objs]
            (binding [*out* @out
@@ -93,14 +103,7 @@
              (apply cljd.core/pr objs)))
    :clj (defn pr
           ([] nil)
-          ([x]
-           (binding [*print-length* @print-length
-                     *print-level* @print-level
-                     *print-meta* @print-meta
-                     *print-namespace-maps* @print-namespace-maps
-                     *print-readably* @print-readably
-                     *print-dup* @print-dup-var]
-             (pr-on x @out)))
+          ([x] (core-pr-on x @out))
           ([x & more]
            (pr x)
            (. ^java.io.Writer @out (append \space))

src/sci/impl/namespaces.cljc

@@ -1366,6 +1366,7 @@
      'newline (copy-var sci.impl.io/newline clojure-core-ns {:name 'newline})
      'flush (copy-core-var sci.impl.io/flush)
      'pr (copy-var sci.impl.io/pr clojure-core-ns {:name 'pr})
+     #?@(:clj ['pr-on (new-var 'pr-on sci.impl.io/core-pr-on clojure-core-ns {:private true})])
      'prn (copy-core-var sci.impl.io/prn)
      'print (copy-core-var sci.impl.io/print)
      'println (copy-core-var sci.impl.io/println)

test/sci/io_test.cljc

@@ -2,7 +2,7 @@
   (:require
    [clojure.edn :as edn]
    [clojure.string :as str]
-   [clojure.test :as test :refer [deftest is]]
+   [clojure.test :as test :refer [deftest is testing]]
    [sci.core :as sci]
    [sci.test-utils :as tu]))
 
@@ -37,6 +37,20 @@
     (is (= "\"hello\"" (sci/with-out-str (eval* "(pr \"hello\")"))))
     (is (= "\n" (sci/with-out-str (eval* "(newline)"))))))
 
+#?(:cljd nil
+   :clj
+   (deftest pr-on-test
+     (when-not tu/native?
+       (testing "clojure.core/pr-on prints to the writer it is given"
+         (let [w (java.io.StringWriter.)]
+           (tu/eval* "(@#'clojure.core/pr-on (range 5) w)" {:namespaces {'user {'w w}}})
+           (is (= "(0 1 2 3 4)" (str w)))))
+       (testing "and under the interpreter's print settings"
+         (let [w (java.io.StringWriter.)]
+           (tu/eval* "(binding [*print-length* 3] (@#'clojure.core/pr-on (range 10) w))"
+                     {:namespaces {'user {'w w}}})
+           (is (= "(0 1 2 ...)" (str w))))))))
+
 (deftest print-length-test
   (when-not tu/native?
     (is (str/includes?