branch: elpa/parseclj
commit bad1fb8745bbf8d72e252006abbdb7aa4f4a7906
Merge: 2588470302 aeac6a1755
Author: Arne Brasseur <[email protected]>
Commit: GitHub <[email protected]>
Merge pull request #12 from lambdaisland/nested-2-items-reduction
Loop reduction over the first 2 elements of the stack
---
parseclj-lex.el | 4 ++--
parseclj-parser.el | 14 +++++++++-----
test/parseclj-lex-test.el | 14 ++++++--------
test/parseclj-test-data.el | 28 ++++++++++++++++++++++++++--
4 files changed, 43 insertions(+), 17 deletions(-)
diff --git a/parseclj-lex.el b/parseclj-lex.el
index d835457903..1d4f28a5b5 100644
--- a/parseclj-lex.el
+++ b/parseclj-lex.el
@@ -297,11 +297,11 @@ token is returned."
(right-char 7)
(parseclj-lex-token :character (buffer-substring-no-properties pos
(point)) pos))
- ((equal (char-after (point)) ?u)
+ ((string-match-p "^u[0-9a-fA-F]\\{4\\}" (parseclj-lex-lookahead 5))
(right-char 5)
(parseclj-lex-token :character (buffer-substring-no-properties pos
(point)) pos))
- ((equal (char-after (point)) ?o)
+ ((string-match-p "^o[0-8]\\{3\\}" (parseclj-lex-lookahead 4))
(right-char 4)
(parseclj-lex-token :character (buffer-substring-no-properties pos
(point)) pos))
diff --git a/parseclj-parser.el b/parseclj-parser.el
index 1e07d2d0a7..83303d45b5 100644
--- a/parseclj-parser.el
+++ b/parseclj-parser.el
@@ -205,13 +205,17 @@ functions. Additionally the following options are
recognized
;; Reduce based on top two items on the stack (special prefixed elements)
(let* ((top-value (parseclj--take-value stack value-p))
(opening-token (parseclj--take-token (nthcdr (length top-value)
stack) value-p '(:discard :tag)))
- (new-stack (nthcdr (+ (length top-value) (length opening-token))
stack)))
- (when (and top-value opening-token)
+ new-stack)
+ (while (and top-value opening-token)
;; (message "Reducing...")
;; (message " - STACK %S" stack)
- ;; (message " - OPENING_TOKEN %S" opening-token)
- ;; (message " - TOP_VALUE %S\n" top-value)
- (setq stack (funcall reduce-branch new-stack (car opening-token)
(append (cdr opening-token) top-value) options))))
+ ;; (message " - OPENING-TOKEN %S" opening-token)
+ ;; (message " - TOP-VALUE %S" top-value)
+ (setq new-stack (nthcdr (+ (length top-value) (length
opening-token)) stack))
+ (setq stack (funcall reduce-branch new-stack (car opening-token)
(append (cdr opening-token) top-value) options))
+
+ (setq top-value (parseclj--take-value stack value-p))
+ (setq opening-token (parseclj--take-token (nthcdr (length top-value)
stack) value-p '(:discard :tag)))))
(setq token (parseclj-lex-next)))
diff --git a/test/parseclj-lex-test.el b/test/parseclj-lex-test.el
index 6589809c48..eae02a07af 100644
--- a/test/parseclj-lex-test.el
+++ b/test/parseclj-lex-test.el
@@ -114,15 +114,13 @@
(should (equal (parseclj-lex-next) (parseclj-lex-token :character "\\c"
30))))
(with-temp-buffer
- (insert "\\newline\\return\\space\\tab\\a\\b\\c")
+ (insert "\\u \\v \\w")
(goto-char 1)
- (should (equal (parseclj-lex-next) (parseclj-lex-token :character
"\\newline" 1)))
- (should (equal (parseclj-lex-next) (parseclj-lex-token :character
"\\return" 9)))
- (should (equal (parseclj-lex-next) (parseclj-lex-token :character
"\\space" 16)))
- (should (equal (parseclj-lex-next) (parseclj-lex-token :character "\\tab"
22)))
- (should (equal (parseclj-lex-next) (parseclj-lex-token :character "\\a"
26)))
- (should (equal (parseclj-lex-next) (parseclj-lex-token :character "\\b"
28)))
- (should (equal (parseclj-lex-next) (parseclj-lex-token :character "\\c"
30))))
+ (should (equal (parseclj-lex-next) (parseclj-lex-token :character "\\u"
1)))
+ (should (equal (parseclj-lex-next) (parseclj-lex-token :whitespace " " 3)))
+ (should (equal (parseclj-lex-next) (parseclj-lex-token :character "\\v"
4)))
+ (should (equal (parseclj-lex-next) (parseclj-lex-token :whitespace " " 6)))
+ (should (equal (parseclj-lex-next) (parseclj-lex-token :character "\\w"
7))))
(with-temp-buffer
(insert "\\u0078\\o170")
diff --git a/test/parseclj-test-data.el b/test/parseclj-test-data.el
index 28a03d91dc..a390e77c2f 100644
--- a/test/parseclj-test-data.el
+++ b/test/parseclj-test-data.el
@@ -275,7 +275,7 @@
(:value . 12)))))))))
- "tag"
+ "tag-1"
(a-list
:source "#foo/bar [1]"
:ast '((:node-type . :root)
@@ -290,7 +290,7 @@
(:form . "1")
(:value .
1))))))))))))
- "nested-tag"
+ "tag-2"
(a-list
:source "(fn #param :param-name 1)"
:ast '((:node-type . :root)
@@ -313,6 +313,30 @@
(:form . "1")
(:value . 1)))))))))
+ "nested-tags"
+ (a-list
+ :source "[#lazy-error #error {:cause \"Divide by zero\"}]"
+ :ast '((:node-type . :root)
+ (:position . 1)
+ (:children ((:node-type . :vector)
+ (:position . 1)
+ (:children ((:node-type . :tag)
+ (:position . 2)
+ (:tag . lazy-error)
+ (:children ((:node-type . :tag)
+ (:position . 14)
+ (:tag . error)
+ (:children ((:node-type .
:map)
+ (:position . 21)
+ (:children
((:node-type . :keyword)
+
(:position . 22)
+
(:form . ":cause")
+
(:value . :cause))
+
((:node-type . :string)
+
(:position . 29)
+
(:form . "\"Divide by zero\"")
+
(:value . "Divide by zero")))))))))))))
+
"booleans"
(a-list
:source "[nil true false]"
