Skip to content

Commit

Permalink
better display error in reading phase
Browse files Browse the repository at this point in the history
  • Loading branch information
viebel committed Dec 18, 2018
1 parent 6d14175 commit ade7543
Show file tree
Hide file tree
Showing 208 changed files with 36,209 additions and 36,160 deletions.
2 changes: 1 addition & 1 deletion deps.edn
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
:deps {org.clojure/clojure {:mvn/version "1.10.0-RC5"}
org.clojure/clojurescript {:git/url "https://github.com/clojure/clojurescript" :sha "6ccb629e365f46a9516e4defeced652cce9d4d35"} #_{:mvn/version "1.10.238"}
org.clojure/spec.alpha {:mvn/version "0.2.176"}
org.clojure/tools.reader {:mvn/version "1.3.0"}
org.clojure/tools.reader {:mvn/version "1.3.2"}
org.clojure/core.async {:mvn/version "0.4.474"}
im.chit/purnam {:mvn/version "0.5.2"}
viebel/codemirror-parinfer {:mvn/version "0.0.3"}
Expand Down
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 "7.6.9"
(defproject viebel/klipse-clj "10.0.1"
:description "Self-hosted clojurescript library"
:license "GPL-3.0"
:url "https://github.com/viebel/klipse-clj"
Expand Down
17 changes: 14 additions & 3 deletions src/klipse_clj/lang/clojure.cljs
Original file line number Diff line number Diff line change
Expand Up @@ -59,11 +59,22 @@
(when verbose? (js/console.info "update-current-ns:" (str ns)))
(reset! current-ns ns)))

(defn- reader-error?
[e]
(= :reader-exception (:type (ex-data e))))

(defn- error-message [error]
(if (instance? ExceptionInfo error)
(ex-message error)
(.-message error)))
(defn display-err [error]
(try
(if (-> (ex-data (ex-cause error))
(contains? :clojure.error/phase))
(cond
(-> (ex-data (ex-cause error))
(contains? :clojure.error/phase))
(error->str (ex-cause error))
(reader-error? error) (str "Syntax error reading source." "\n" (error-message error))
:else
(str (ex-message error)
(when (ex-cause error) (str ": " (ex-cause error)))))
(catch js/Object e
Expand Down Expand Up @@ -219,7 +230,7 @@
(go
(try
(<! (create-state-eval))
(loop [[exp rest-exps] (first-exp-and-rest s @st @current-ns-eval)
(loop [[exp rest-exps] (first-exp-and-rest s @st @current-ns-eval)
last-res nil]
(if (not (empty? exp))
(let [res (<! (core-eval-an-exp exp (assoc opts :st @st :ns current-ns-eval)))]
Expand Down
2 changes: 1 addition & 1 deletion target/public/cljs-out/dev/cljs/analyzer.cljc.cache.json

Large diffs are not rendered by default.

4,734 changes: 2,367 additions & 2,367 deletions target/public/cljs-out/dev/cljs/analyzer.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion target/public/cljs-out/dev/cljs/analyzer.js.map

Large diffs are not rendered by default.

Large diffs are not rendered by default.

124 changes: 62 additions & 62 deletions target/public/cljs-out/dev/cljs/analyzer/api.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit ade7543

Please sign in to comment.