branch: elpa/parseclj
commit 49c715ed22be999421ff52de21c5516e45d46a8d
Author: Arne Brasseur <[email protected]>
Commit: Arne Brasseur <[email protected]>
For prefix-2 elements: pass children to reduce in right order
---
parseclj-parser.el | 2 +-
test/parseclj-test.el | 10 +++++-----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/parseclj-parser.el b/parseclj-parser.el
index d16f504a8c..ef04e16ef7 100644
--- a/parseclj-parser.el
+++ b/parseclj-parser.el
@@ -235,7 +235,7 @@ functions. Additionally the following options are recognized
new-stack)
(while (and top-value-1 top-value-2 opening-token)
(setq new-stack (nthcdr (apply #'+ (mapcar #'length (list
top-value-1 top-value-2 opening-token))) stack))
- (setq stack (funcall reduce-branch new-stack (car opening-token)
(append (cdr opening-token) top-value-1 top-value-2) options))
+ (setq stack (funcall reduce-branch new-stack (car opening-token)
(append (cdr opening-token) top-value-2 top-value-1) options))
;; recur
(setq top-value-1 (parseclj--take-value stack value-p))
diff --git a/test/parseclj-test.el b/test/parseclj-test.el
index 1b8e795d52..afc447b7cd 100644
--- a/test/parseclj-test.el
+++ b/test/parseclj-test.el
@@ -218,15 +218,15 @@
(:position . 1)
(:children ((:node-type . :with-meta)
(:position . 1)
- (:children ((:node-type . :vector)
+ (:children ((:node-type . :map)
+ (:position . 2)
+ (:children))
+ ((:node-type . :vector)
(:position . 5)
(:children ((:node-type . :number)
(:position . 6)
(:form . "123")
- (:value . 123))))
- ((:node-type . :map)
- (:position . 2)
- (:children)))))))))
+ (:value . 123)))))))))))
(ert-deftest parseclj--parse-var-test ()
(should (equal