TRDR-67: add loc info to namespaced map literals

bronsa · bronsa · commit 6bc1352113f7 · 2021-07-13T18:24:49.000+01:00
diff --git a/src/main/cljs/cljs/tools/reader.cljs b/src/main/cljs/cljs/tools/reader.cljs
@@ -754,7 +754,8 @@
 
 (defn- read-namespaced-map
   [rdr _ opts pending-forms]
-  (let [token (read-token rdr :namespaced-map (read-char rdr))]
+  (let [[start-line start-column] (starting-line-col-info rdr)
+        token (read-token rdr :namespaced-map (read-char rdr))]
     (if-let [ns (cond
                   (= token ":")
                   (ns-name *ns*)
@@ -767,16 +768,25 @@
 
       (let [ch (read-past whitespace? rdr)]
         (if (identical? ch \{)
-          (let [items (read-delimited :namespaced-map \} rdr opts pending-forms)]
+          (let [items (read-delimited :namespaced-map \} rdr opts pending-forms)
+                [end-line end-column] (ending-line-col-info rdr)]
             (when (odd? (count items))
               (err/throw-odd-map rdr nil nil items))
             (let [keys (namespace-keys (str ns) (take-nth 2 items))
                   vals (take-nth 2 (rest items))]
               (when-not (= (count (set keys)) (count keys))
                 (err/throw-dup-keys rdr :namespaced-map keys))
-              (zipmap keys vals)))
-              (err/throw-ns-map-no-map rdr token)))
-          (err/throw-bad-ns rdr token))))
+              (with-meta (zipmap keys vals)
+                (when start-line
+                  (merge
+                   (when-let [file (get-file-name rdr)]
+                     {:file file})
+                   {:line start-line
+                    :column start-column
+                    :end-line end-line
+                    :end-column end-column})))))
+          (err/throw-ns-map-no-map rdr token)))
+      (err/throw-bad-ns rdr token))))
 
 (defn- macros [ch]
   (case ch
diff --git a/src/main/clojure/clojure/tools/reader.clj b/src/main/clojure/clojure/tools/reader.clj
@@ -752,7 +752,8 @@
 
 (defn- read-namespaced-map
   [rdr _ opts pending-forms]
-  (let [token (read-token rdr :namespaced-map (read-char rdr))]
+  (let [[start-line start-column] (starting-line-col-info rdr)
+        token (read-token rdr :namespaced-map (read-char rdr))]
     (if-let [ns (cond
                   (= token ":")
                   (ns-name *ns*)
@@ -765,13 +766,22 @@
 
       (let [ch (read-past whitespace? rdr)]
         (if (identical? ch \{)
-          (let [items (read-delimited :namespaced-map \} rdr opts pending-forms)]
+          (let [items (read-delimited :namespaced-map \} rdr opts pending-forms)
+                [end-line end-column] (ending-line-col-info rdr)]
             (when (odd? (count items))
               (err/throw-odd-map rdr nil nil items))
             (let [keys (take-nth 2 items)
                   vals (take-nth 2 (rest items))]
-
-              (RT/map (to-array (mapcat list (namespace-keys (str ns) keys) vals)))))
+              (with-meta
+                (RT/map (to-array (mapcat list (namespace-keys (str ns) keys) vals)))
+                (when start-line
+                  (merge
+                   (when-let [file (get-file-name rdr)]
+                     {:file file})
+                   {:line start-line
+                    :column start-column
+                    :end-line end-line
+                    :end-column end-column})))))
           (err/throw-ns-map-no-map rdr token)))
       (err/throw-bad-ns rdr token))))
 
