Skip to content

Commit

Permalink
10.0.4
Browse files Browse the repository at this point in the history
  • Loading branch information
viebel committed Dec 18, 2018
1 parent cdd6c90 commit 2343981
Show file tree
Hide file tree
Showing 7 changed files with 994 additions and 999 deletions.
2 changes: 1 addition & 1 deletion project.clj
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
(defproject viebel/klipse-clj "10.0.3"
(defproject viebel/klipse-clj "10.0.4"
:description "Self-hosted clojurescript library"
:license "GPL-3.0"
:url "https://github.com/viebel/klipse-clj"
Expand Down
8 changes: 5 additions & 3 deletions src/klipse_clj/lang/clojure.cljs
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
(ex-message error)
(when (ex-cause error) (str ": " (ex-cause error)))))
(catch js/Object e
e)))
(str "Exception: ") e)))

(defn result-as-str [{:keys [ns form warning error value success?] :as args} opts]
(let [status (if error :error :ok)
Expand Down Expand Up @@ -125,7 +125,8 @@
(let [c (chan)
max-eval-duration (max max-eval-duration min-max-eval-duration)
the-emits (if compile-display-guard (partial my-emits max-eval-duration) original-emits)]
(with-redefs [compiler/emits the-emits]
(with-redefs [;compiler/emits the-emits
]
(cljs/eval-str st
s
"compile.klipse"
Expand All @@ -143,7 +144,8 @@
(defn core-eval-an-exp [s {:keys [static-fns external-libs max-eval-duration verbose? st ns] :or {static-fns false external-libs nil max-eval-duration min-max-eval-duration verbose? false st nil}}]
(let [c (chan)
max-eval-duration (max max-eval-duration min-max-eval-duration)]
(with-redefs [compiler/emits (partial my-emits max-eval-duration)]
(with-redefs [;compiler/emits (partial my-emits max-eval-duration) ;; TODO Dec 19 2018 - it breaks simple compilation
]
; we have to set `env/*compiler*` because `binding` and core.async don't play well together (https://www.reddit.com/r/Clojure/comments/4wrjw5/withredefs_doesnt_play_well_with_coreasync/) and the code of `eval-str` uses `binding` of `env/*compiler*`.
(cljs/eval-str st
s
Expand Down
2 changes: 1 addition & 1 deletion target/public/cljs-out/dev/cljsc_opts.edn
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{:main klipse-clj.lang.clojure, :preloads [figwheel.core figwheel.main figwheel.repl.preload devtools.preload], :output-to "target/public/cljs-out/dev-main.js", :output-dir "target/public/cljs-out/dev", :asset-path "/cljs-out/dev", :aot-cache false, :closure-defines #:figwheel.repl{connect-url "ws://localhost:5015/figwheel-connect?fwprocess=1e5629&fwbuild=dev"}, :repl-requires ([figwheel.repl :refer-macros [conns focus]] [figwheel.main :refer-macros [stop-builds start-builds build-once reset clean status]] [cljs.pprint :refer [pprint] :refer-macros [pp]] [cljs.repl :refer-macros [source doc find-doc apropos dir pst]])}
{:main klipse-clj.lang.clojure, :preloads [figwheel.core figwheel.main figwheel.repl.preload devtools.preload], :output-to "target/public/cljs-out/dev-main.js", :output-dir "target/public/cljs-out/dev", :asset-path "/cljs-out/dev", :aot-cache false, :closure-defines #:figwheel.repl{connect-url "ws://localhost:5015/figwheel-connect?fwprocess=44b1a2&fwbuild=dev"}, :repl-requires ([figwheel.repl :refer-macros [conns focus]] [figwheel.main :refer-macros [stop-builds start-builds build-once reset clean status]] [cljs.pprint :refer [pprint] :refer-macros [pp]] [cljs.repl :refer-macros [source doc find-doc apropos dir pst]])}
8 changes: 5 additions & 3 deletions target/public/cljs-out/dev/klipse_clj/lang/clojure.cljs
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
(ex-message error)
(when (ex-cause error) (str ": " (ex-cause error)))))
(catch js/Object e
e)))
(str "Exception: ") e)))

(defn result-as-str [{:keys [ns form warning error value success?] :as args} opts]
(let [status (if error :error :ok)
Expand Down Expand Up @@ -125,7 +125,8 @@
(let [c (chan)
max-eval-duration (max max-eval-duration min-max-eval-duration)
the-emits (if compile-display-guard (partial my-emits max-eval-duration) original-emits)]
(with-redefs [compiler/emits the-emits]
(with-redefs [;compiler/emits the-emits
]
(cljs/eval-str st
s
"compile.klipse"
Expand All @@ -143,7 +144,8 @@
(defn core-eval-an-exp [s {:keys [static-fns external-libs max-eval-duration verbose? st ns] :or {static-fns false external-libs nil max-eval-duration min-max-eval-duration verbose? false st nil}}]
(let [c (chan)
max-eval-duration (max max-eval-duration min-max-eval-duration)]
(with-redefs [compiler/emits (partial my-emits max-eval-duration)]
(with-redefs [;compiler/emits (partial my-emits max-eval-duration) ;; TODO Dec 19 2018 - it breaks simple compilation
]
; we have to set `env/*compiler*` because `binding` and core.async don't play well together (https://www.reddit.com/r/Clojure/comments/4wrjw5/withredefs_doesnt_play_well_with_coreasync/) and the code of `eval-str` uses `binding` of `env/*compiler*`.
(cljs/eval-str st
s
Expand Down

Large diffs are not rendered by default.

0 comments on commit 2343981

Please sign in to comment.