Read strings through edamame.core/reader on the JVM

Author: borkdude

src/sci/impl/interpreter.cljc

@@ -3,7 +3,7 @@
   (:refer-clojure :exclude [destructure macroexpand macroexpand-1])
   (:require
    #?(:cljd [edamame.impl.cljd-reader-types :as r]
-      :default [clojure.tools.reader.reader-types :as r])
+      :cljs [clojure.tools.reader.reader-types :as r])
    [sci.ctx-store :as store]
    [sci.impl.analyzer :as ana]
    #?(:cljd [sci.impl.evaluator :as evaluator])
@@ -96,7 +96,8 @@
       parser/data-readers @parser/data-readers
       #?@(:clj [utils/warn-on-reflection-var @utils/warn-on-reflection-var
                 utils/unchecked-math-var @utils/unchecked-math-var])}
-     (let [reader (r/indexing-push-back-reader (r/string-push-back-reader s))
+     (let [reader #?(:clj (parser/reader s)
+                     :default (r/indexing-push-back-reader (r/string-push-back-reader s)))
            eval-string+? (when opts (:sci.impl/eval-string+ opts))]
        (loop [ret nil]
          (let [expr (parser/parse-next ctx reader)]

src/sci/impl/load.cljc

@@ -30,7 +30,8 @@
 (defn load-string*
   "Low level load-string* that doesn't install any bindings"
   [ctx s]
-  (let [rdr (r/indexing-push-back-reader (r/string-push-back-reader s))]
+  (let [rdr #?(:clj (parser/reader s)
+               :default (r/indexing-push-back-reader (r/string-push-back-reader s)))]
     (load-reader* ctx rdr)))
 
 (defn load-reader [reader]
@@ -42,7 +43,8 @@
       (load-reader* ctx reader))))
 
 (defn load-string [s]
-  (let [rdr (r/indexing-push-back-reader (r/string-push-back-reader s))]
+  (let [rdr #?(:clj (parser/reader s)
+               :default (r/indexing-push-back-reader (r/string-push-back-reader s)))]
     (load-reader rdr)))
 
 (defn handle-refer-all [the-current-ns the-loaded-ns include-sym? rename-sym only]