Add namespaced maps, fix backquote implementation

Namespaced maps are parsed to a regular :map AST token, but with an extra
`:map-prefix` key, which is the map-prefix lex token.

Author: plexus

parseclj-ast.el

@@ -137,6 +137,9 @@ on available options."
                                           pos
                                           :children children)
                        stack))
+      (:map-prefix (cons (a-assoc (car children)
+                                  :map-prefix opening-token)
+                         stack))
       (t (cons
           (parseclj-ast-node type pos :children children)
           stack)))))

parseclj-lex.el

@@ -54,7 +54,8 @@
                                       :reader-conditional
                                       :reader-conditional-splice
                                       :var
-                                      :deref)
+                                      :deref
+                                      :map-prefix)
   "Tokens that modify the form that follows.")
 
 (defvar parseclj-lex--prefix-2-tokens '(:metadata)
@@ -406,6 +407,16 @@ See `parseclj-lex-symbol', `parseclj-lex-symbol-start-p'."
       (right-char))
     (parseclj-lex-token :comment (buffer-substring-no-properties pos (point)) pos)))
 
+(defun parseclj-lex-map-prefix ()
+  "Return a lex token representing a map prefix."
+  (let ((pos (1- (point))))
+    (right-char)
+    (when (equal (char-after (point)) ?:)
+      (right-char))
+    (while (parseclj-lex-symbol-rest-p (char-after (point)))
+      (right-char))
+    (parseclj-lex-token :map-prefix (buffer-substring-no-properties pos (point)) pos)))
+
 (defun parseclj-lex-next ()
   "Consume characters at point and return the next lexical token.
 
@@ -448,7 +459,7 @@ See `parseclj-lex-token'."
 
        ((equal char ?`)
         (right-char)
-        (parseclj-lex-token :backquote "'" pos))
+        (parseclj-lex-token :backquote "`" pos))
 
        ((equal char ?~)
         (right-char)
@@ -502,6 +513,8 @@ See `parseclj-lex-token'."
             (parseclj-lex-token :var "#'" pos))
            ((equal char ?\")
             (parseclj-lex-regex))
+           ((equal char ?:)
+            (parseclj-lex-map-prefix))
            ((equal char ?\?)
             (right-char)
             (if (eq ?@ (char-after (point)))

test/parseclj-lex-test.el

@@ -326,6 +326,17 @@
     (goto-char 1)
     (should (equal (parseclj-lex-next) (parseclj-lex-token :tag "#foo/bar" 1)))))
 
+(ert-deftest parseclj-lex-test-quote ()
+  (with-temp-buffer
+    (insert "'foo")
+    (goto-char 1)
+    (should (equal (parseclj-lex-next) (parseclj-lex-token :quote "'" 1))))
+
+  (with-temp-buffer
+    (insert "`foo")
+    (goto-char 1)
+    (should (equal (parseclj-lex-next) (parseclj-lex-token :backquote "`" 1)))))
+
 (provide 'parseclj-lex-test)
 
 ;;; parseclj-lex-test.el ends here

test/parseclj-test.el

@@ -252,6 +252,18 @@
                                      (:form . "foo")
                                      (:value . foo)))))))))
 
+(ert-deftest parseclj--parse-namespaced-map-test ()
+  (should (equal
+           (parseclj-parse-clojure "#:foo.bar{}")
+           '((:node-type . :root)
+             (:position . 1)
+             (:children ((:map-prefix . ((:token-type . :map-prefix)
+                                         (:form . "#:foo.bar")
+                                         (:pos . 1)))
+                         (:node-type . :map)
+                         (:position . 10)
+                         (:children)))))))
+
 (ert-deftest parseclj--take-token-test ()
   (should (equal
            (parseclj--take-token