luciano/babashka
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix #1199: print-method impls on records (#1200)

Browse source
This commit is contained in:
Michiel Borkent 2022-03-05 17:11:11 +01:00 committed by GitHub
parent f0f87f0794
commit 3f49ad3b89
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
resources/META-INF/babashka/deps.edn
View file

@ -124,7 +124,6 @@
io.lambdaforge/datalog-parser {:mvn/version "0.1.9"} io.lambdaforge/datalog-parser {:mvn/version "0.1.9"}
clj-stacktrace/clj-stacktrace {:mvn/version "0.2.8"} clj-stacktrace/clj-stacktrace {:mvn/version "0.2.8"}
clojure-msgpack/clojure-msgpack {:mvn/version "1.2.1"} clojure-msgpack/clojure-msgpack {:mvn/version "1.2.1"}
cli-matic {:git/url "https://github.com/l3nz/cli-matic.git", :git/sha "9cd53ba7336363e3d06650dbad413b6f8b06e471"}
cli-matic/cli-matic {:git/url "https://github.com/l3nz/cli-matic.git", :git/sha "9cd53ba7336363e3d06650dbad413b6f8b06e471"}} cli-matic/cli-matic {:git/url "https://github.com/l3nz/cli-matic.git", :git/sha "9cd53ba7336363e3d06650dbad413b6f8b06e471"}}
:classpath-overrides {org.clojure/clojure nil :classpath-overrides {org.clojure/clojure nil
org.clojure/spec.alpha nil}} org.clojure/spec.alpha nil}}

2
sci

@ -1 +1 @@
Subproject commit 84bad66a31bc04fe45ccd54711f5eb19c3581cc6 Subproject commit a668e0a81d03ed869d427b0961c06e18a999119a

7
src/babashka/main.clj
View file

@ -54,7 +54,8 @@
[sci.impl.namespaces :as sci-namespaces] [sci.impl.namespaces :as sci-namespaces]
[sci.impl.types :as sci-types] [sci.impl.types :as sci-types]
[sci.impl.unrestrict :refer [*unrestricted*]] [sci.impl.unrestrict :refer [*unrestricted*]]
[sci.impl.vars :as vars]) [sci.impl.vars :as vars]
[sci.impl.io :as sio])
(:gen-class)) (:gen-class))
(def windows? (def windows?
@ -876,13 +877,13 @@ Use bb run --help to show this help output.
(or (not run) (or (not run)
(:prn cli-opts))) (:prn cli-opts)))
(if-let [pr-f (cond shell-out println (if-let [pr-f (cond shell-out println
edn-out prn)] edn-out sio/prn)]
(if (sequential? res) (if (sequential? res)
(doseq [l res (doseq [l res
:while (not (pipe-signal-received?))] :while (not (pipe-signal-received?))]
(pr-f l)) (pr-f l))
(pr-f res)) (pr-f res))
(prn res)))) 0]] (sio/prn res)))) 0]]
(if stream? (if stream?
(recur) (recur)
res))))) res)))))

2
test/babashka/main_test.clj
View file

@ -127,7 +127,7 @@
(is (= "localhost" (bb "#ordered/map ([:test \"localhost\"])" (is (= "localhost" (bb "#ordered/map ([:test \"localhost\"])"
"(:test *input*)")))) "(:test *input*)"))))
(testing "bb doesn't wait for input if *input* isn't used" (testing "bb doesn't wait for input if *input* isn't used"
(is (= "2\n" (test-utils/normalize (with-out-str (main/main "(inc 1)"))))))) (is (= "2\n" (test-utils/normalize (sci/with-out-str (main/main "(inc 1)")))))))
(deftest println-test (deftest println-test
(is (= "hello\n" (test-utils/bb nil "(println \"hello\")")))) (is (= "hello\n" (test-utils/bb nil "(println \"hello\")"))))