cljs.repl/repl:

* need to wrap -setup call in cljs.compiler/with-core-cljs so that bootstrapping evals works
clojure · Mar 18, 2015 · 9c1230e · 9c1230e
1 parent 868b6d6
commit 9c1230e
Showing 1 changed file with 9 additions and 7 deletions.
diff --git a/src/clj/cljs/repl.clj b/src/clj/cljs/repl.clj
@@ -701,13 +701,15 @@
              is-special-fn? (set (keys special-fns))
              request-prompt (Object.)
              request-exit (Object.)
-             opts (try
-                    (if-let [merge-opts (:merge-opts (-setup repl-env opts))]
-                      (merge opts merge-opts)
-                      opts)
-                    (catch Throwable e
-                      (caught e repl-env opts)
-                      opts))
+             opts (comp/with-core-cljs opts
+                    (fn []
+                      (try
+                        (if-let [merge-opts (:merge-opts (-setup repl-env opts))]
+                          (merge opts merge-opts)
+                          opts)
+                        (catch Throwable e
+                          (caught e repl-env opts)
+                          opts))))
              read-eval-print
              (fn []
                (let [input (binding [*ns* (create-ns ana/*cljs-ns*)