simon/scittle
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Update to newest SCI with print-fn

Browse source
This commit is contained in:
Michiel Borkent 2021-09-22 23:22:21 +02:00
parent 2f323eb267
commit b5789ed71d
3 changed files with 6 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
deps.edn
View file

@ -3,7 +3,7 @@
:deps :deps
{org.clojure/clojure {:mvn/version "1.10.3"} {org.clojure/clojure {:mvn/version "1.10.3"}
borkdude/sci {:git/url "https://github.com/borkdude/sci" borkdude/sci {:git/url "https://github.com/borkdude/sci"
:sha "1ae916d4ab972b0a38da3a18665c5fb176401ebc"} :sha "315e5ee6d6ce0b7f6ccac641ed79adde65dea666"}
reagent/reagent {:mvn/version "1.0.0"} reagent/reagent {:mvn/version "1.0.0"}
cljsjs/react {:mvn/version "17.0.2-0"} cljsjs/react {:mvn/version "17.0.2-0"}
cljsjs/react-dom {:mvn/version "17.0.2-0"} cljsjs/react-dom {:mvn/version "17.0.2-0"}

16
src/scittle/core.cljs
View file

@ -5,8 +5,7 @@
[goog.string] [goog.string]
[sci.core :as sci] [sci.core :as sci]
[scittle.impl.common :refer [cljns]] [scittle.impl.common :refer [cljns]]
[scittle.impl.error :as error] [scittle.impl.error :as error]))
[scittle.impl.io :as io]))
(clojure.core/defmacro time (clojure.core/defmacro time
"Evaluates expr and prints the time it took. Returns the value of expr." "Evaluates expr and prints the time it took. Returns the value of expr."
@ -21,17 +20,9 @@
(def stns (sci/create-ns 'sci.script-tag nil)) (def stns (sci/create-ns 'sci.script-tag nil))
(def rns (sci/create-ns 'cljs.reader nil)) (def rns (sci/create-ns 'cljs.reader nil))
'clojure.core {}
(def namespaces (def namespaces
{'clojure.core {'clojure.core
{'*print-fn* io/print-fn {'time (sci/copy-var time cljns)
'*print-newline* io/print-newline
;; 'with-out-str (sci/copy-var io/with-out-str cljns)
'prn (sci/copy-var io/prn cljns)
'print (sci/copy-var io/print cljns)
'println (sci/copy-var io/println cljns)
'time (sci/copy-var time cljns)
'system-time (sci/copy-var system-time cljns) 'system-time (sci/copy-var system-time cljns)
'random-uuid random-uuid 'random-uuid random-uuid
'read-string (sci/copy-var read-string rns)} 'read-string (sci/copy-var read-string rns)}
@ -95,3 +86,6 @@
(js/document.addEventListener (js/document.addEventListener
"DOMContentLoaded" "DOMContentLoaded"
(fn [] (when-not @auto-load-disabled? (eval-script-tags))), false) (fn [] (when-not @auto-load-disabled? (eval-script-tags))), false)
(enable-console-print!)
(sci/alter-var-root sci/print-fn (constantly *print-fn*))

35
src/scittle/impl/io.cljs
View file

@ -1,35 +0,0 @@
(ns scittle.impl.io
(:refer-clojure :exclude [prn print println with-out-str])
(:require
[cljs.core :as c]
[goog.string]
[sci.core :as sci]
[scittle.impl.common :refer [cljns]]))
(def print-fn (sci/copy-var *print-fn* cljns))
(def print-newline (sci/copy-var *print-newline* cljns))
(defn println [& objs]
(binding [*print-fn* @print-fn
*print-newline* @print-newline]
(apply c/println objs)))
(defn prn [& objs]
(binding [*print-fn* @print-fn
*print-newline* @print-newline]
(apply c/prn objs)))
(defn print [& objs]
(binding [*print-fn* @print-fn]
(apply c/print objs)))
(defn ^:macro with-out-str
"Evaluates exprs in a context in which *print-fn* is bound to .append
on a fresh StringBuffer. Returns the string created by any nested
printing calls."
[_ _ & body]
`(let [sb# (goog.string/StringBuffer.)]
(binding [cljs.core/*print-newline* true
cljs.core/*print-fn* (fn [x#] (.append sb# x#))]
~@body)
(cljs.core/str sb#)))