fix(TRDR-75): backport TRDR-19 to edn reader

Author: bronsa

src/main/cljs/cljs/tools/reader/edn.cljs

@@ -53,14 +53,16 @@
 
       :else
       (loop [sb (StringBuffer.)
-             ch (do (unread rdr initch) initch)]
+             ch initch]
         (if (or (whitespace? ch)
                 (macro-terminating? ch)
                 (nil? ch))
-          (str sb)
+          (do (when-not (nil? ch)
+                (unread rdr ch))
+              (str sb))
           (if (not-constituent? ch)
             (err/throw-bad-char rdr kind ch)
-            (recur (doto sb (.append (read-char rdr))) (peek-char rdr))))))))
+            (recur (doto sb (.append ch)) (read-char rdr))))))))
 
 (declare read-tagged)
 

src/main/clojure/clojure/tools/reader/edn.clj

@@ -56,7 +56,8 @@
         (if (or (whitespace? ch)
                 (macro-terminating? ch)
                 (nil? ch))
-          (do (unread rdr ch)
+          (do (when ch
+                (unread rdr ch))
               (str sb))
           (if (not-constituent? ch)
             (err/throw-bad-char rdr kind ch)