Add support for Clojure 1.9 namespaced maps

Author: stathissideris

src/rewrite_clj/node.clj

@@ -70,6 +70,7 @@
   [rewrite-clj.node.seq
    list-node
    map-node
+   namespaced-map-node
    set-node
    vector-node]
 

src/rewrite_clj/node/seq.clj

@@ -1,7 +1,7 @@
 (ns ^:no-doc rewrite-clj.node.seq
   (:require [rewrite-clj.node.protocols :as node]))
 
-;; ## Node
+;; ## Nodes
 
 (defrecord SeqNode [tag
                     format-string
@@ -34,7 +34,48 @@
   (toString [this]
     (node/string this)))
 
+(defrecord NamespacedMapNode [wrap-length children]
+  node/Node
+  (tag [this]
+    :namespaced-map)
+  (printable-only? [_] false)
+  (sexpr [this]
+    (let [n (node/sexpr (first children))]
+      (reduce-kv
+       (fn [m k v]
+         (if (keyword? k)
+           (cond (namespace k)
+                 (assoc m k v)
+                 (namespace n)
+                 (assoc m (keyword
+                           (str (namespace n) "/" (name n))
+                           (name k)) v)
+                 :else
+                 (assoc m (keyword (name n) (name k)) v))
+           (assoc m k v)))
+       {} (apply hash-map (node/sexprs (-> children second :children))))))
+  (length [_]
+    (+ wrap-length (node/sum-lengths children)))
+  (string [this]
+    (format "#%s{%s}"
+            (node/string (first children))
+            (node/concat-strings (-> children second :children))))
+
+  node/InnerNode
+  (inner? [_] true)
+  (children [_] children)
+  (replace-children [this children']
+    (node/assert-sexpr-count children' 2)
+    (assoc this :children children'))
+  (leader-length [_]
+    (dec wrap-length))
+
+  Object
+  (toString [this]
+    (node/string this)))
+
 (node/make-printable! SeqNode)
+(node/make-printable! NamespacedMapNode)
 
 ;; ## Constructors
 
@@ -57,3 +98,9 @@
   "Create a node representing an EDN map."
   [children]
   (->SeqNode :map "{%s}" 2 #(apply hash-map %) children))
+
+(defn namespaced-map-node
+  "Create a node representing an EDN map namespace."
+  [children]
+  (node/assert-sexpr-count children 2)
+  (->NamespacedMapNode 2 children))

src/rewrite_clj/parser/core.clj

@@ -6,7 +6,8 @@
              [keyword :refer [parse-keyword]]
              [string :refer [parse-string parse-regex]]
              [token :refer [parse-token]]
-             [whitespace :refer [parse-whitespace]]]))
+             [whitespace :refer [parse-whitespace]]]
+            [clojure.tools.reader.reader-types :as r]))
 
 ;; ## Base Parser
 
@@ -119,6 +120,9 @@
     \' (node/var-node (parse-printables reader :var 1 true))
     \= (node/eval-node (parse-printables reader :eval 1 true))
     \_ (node/uneval-node (parse-printables reader :uneval 1 true))
+    \: (do
+         (r/unread reader \:)
+         (node/namespaced-map-node (parse-printables reader :keyword 2 true)))
     \? (do
          ;; we need to examine the next character, so consume one (known \?)
          (reader/next reader)