branch: elpa/parseclj
commit b40670a56147214f0486763529897cb688a09692
Author: Arne Brasseur <[email protected]>
Commit: Arne Brasseur <[email protected]>
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.
---
parseclj-ast.el | 3 +++
parseclj-lex.el | 17 +++++++++++++++--
test/parseclj-lex-test.el | 11 +++++++++++
test/parseclj-test.el | 12 ++++++++++++
4 files changed, 41 insertions(+), 2 deletions(-)
diff --git a/parseclj-ast.el b/parseclj-ast.el
index dd3cc86475..e7b3cebc71 100644
--- a/parseclj-ast.el
+++ b/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)))))
diff --git a/parseclj-lex.el b/parseclj-lex.el
index 6a53f55b05..5f73d90d43 100644
--- a/parseclj-lex.el
+++ b/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)))
diff --git a/test/parseclj-lex-test.el b/test/parseclj-lex-test.el
index 10cdac81d3..289fa72026 100644
--- a/test/parseclj-lex-test.el
+++ b/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
diff --git a/test/parseclj-test.el b/test/parseclj-test.el
index afc447b7cd..a25d2e4e3b 100644
--- a/test/parseclj-test.el
+++ b/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
