CLJS-3407: bump tools.reader to 1.3.7

script/vendorize_deps

@@ -7,7 +7,7 @@ cd src/main/clojure/cljs
 
 DJSON_RELEASE="2.4.0"
 TRANSIT_RELEASE="1.0.329"
-TREADER_RELEASE="1.3.6"
+TREADER_RELEASE="1.3.7"
 
 rm -rf data.json
 git clone -b "v$DJSON_RELEASE" --depth 1 [email protected]:clojure/data.json.git

src/main/clojure/cljs/vendor/clojure/tools/reader.clj

@@ -378,7 +378,7 @@
       (let [o (read* rdr true nil opts pending-forms)]
         (if (instance? IMeta o)
           (let [m (if (and line (seq? o))
-                    (assoc m :line line :column column)
+                    (merge {:line line :column column} m)
                     m)]
             (if (instance? IObj o)
               (with-meta o (merge (meta o) m))
@@ -1022,10 +1022,12 @@
   ([] (read+string (source-logging-push-back-reader *in*)))
   ([stream] (read+string stream true nil))
   ([^SourceLoggingPushbackReader stream eof-error? eof-value]
-   (let [o (log-source stream (read stream eof-error? eof-value))
-         s (.trim (str (:buffer @(.source-log-frames stream))))]
+   (let [^StringBuilder buf (doto (:buffer @(.source-log-frames stream)) (.setLength 0))
+         o (log-source stream (read stream eof-error? eof-value))
+         s (.trim (str buf))]
      [o s]))
   ([opts ^SourceLoggingPushbackReader stream]
-   (let [o (log-source stream (read opts stream))
-         s (.trim (str (:buffer @(.source-log-frames stream))))]
+   (let [^StringBuilder buf (doto (:buffer @(.source-log-frames stream)) (.setLength 0))
+         o (log-source stream (read opts stream))
+         s (.trim (str buf))]
      [o s])))

src/main/clojure/cljs/vendor/clojure/tools/reader/reader_types.clj

@@ -317,7 +317,7 @@
   [reader f]
   (let [frame (.source-log-frames ^SourceLoggingPushbackReader reader)
         ^StringBuilder buffer (:buffer @frame)
-        new-frame (assoc-in @frame [:offset] (.length buffer))]
+        new-frame (assoc @frame :offset (.length buffer))]
     (with-bindings {frame new-frame}
       (let [ret (f)]
         (if (instance? clojure.lang.IObj ret)