emacs-elpa-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[nongnu] elpa/parseclj 9e0b51e39c 160/185: revert tabs to spaces, addres


From: ELPA Syncer
Subject: [nongnu] elpa/parseclj 9e0b51e39c 160/185: revert tabs to spaces, address minor review comments
Date: Tue, 28 Dec 2021 14:05:32 -0500 (EST)

branch: elpa/parseclj
commit 9e0b51e39c8696b25dc4860d2ccf6aa792e678cf
Author: chaos <chaos@localhost>
Commit: chaos <chaos@localhost>

    revert tabs to spaces, address minor review comments
---
 .dir-locals.el     |  1 +
 parseclj-parser.el | 73 +++++++++++++++++++++++++++---------------------------
 2 files changed, 38 insertions(+), 36 deletions(-)

diff --git a/.dir-locals.el b/.dir-locals.el
index ab85ded9a1..c45357d77a 100644
--- a/.dir-locals.el
+++ b/.dir-locals.el
@@ -1,5 +1,6 @@
 ((emacs-lisp-mode
   (buffer-save-without-query . t)
+  (indent-tabs-mode . nil)
   (eval . (flycheck-mode))
   (eval . (checkdoc-minor-mode))
   (sentence-end-double-space . t)
diff --git a/parseclj-parser.el b/parseclj-parser.el
index 1ae84fbed0..fe3bb3c818 100644
--- a/parseclj-parser.el
+++ b/parseclj-parser.el
@@ -71,43 +71,44 @@ OPTIONS is an association list.  This list is also passed 
down to the
 REDUCE-BRANCH function.  See `parseclj-parser' for more information on
 available options."
   (let ((opening-token-type (parseclj--find-opening-token stack closing-token))
-       (fail-fast (a-get options :fail-fast t)))
+        (fail-fast (a-get options :fail-fast t))
+        (collection nil))
     (if (not opening-token-type)
-       (if fail-fast
-           (parseclj--error "At position %s, unmatched %S"
-                            (a-get closing-token :pos)
-                            (parseclj-lex-token-type closing-token))
-
-         stack)
-
-      (let ((collection nil))
-       ;; unwind the stack until opening-token-type is found, adding to 
collection
-       (while (and stack (not (eq (parseclj-lex-token-type (car stack)) 
opening-token-type)))
-         (push (pop stack) collection))
-
-       ;; did we find the right token?
-       (if (eq (parseclj-lex-token-type (car stack)) opening-token-type)
-           (progn
-             (when fail-fast
-               ;; any unreduced tokens left: bail early
-               (when-let ((token (seq-find #'parseclj-lex-token-p collection)))
-                 (parseclj--error "At position %s, unmatched %S"
-                                  (a-get token :pos)
-                                  (parseclj-lex-token-type token))))
-
-             ;; all good, call the reducer so it can return an updated stack 
with a
-             ;; new node at the top.
-             (let ((opening-token (pop stack)))
-               (funcall reduce-branch stack opening-token collection options)))
-
-         ;; Unwound the stack without finding a matching paren: either bail 
early
-         ;; or return the original stack and continue parsing
-         (if fail-fast
-             (parseclj--error "At position %s, unmatched %S"
-                              (a-get closing-token :pos)
-                              (parseclj-lex-token-type closing-token))
-
-           (reverse collection)))))))
+        (if fail-fast
+            (parseclj--error "At position %s, unmatched %S"
+                             (a-get closing-token :pos)
+                             (parseclj-lex-token-type closing-token))
+
+          stack)
+
+      (progn
+        ;; unwind the stack until opening-token-type is found, adding to 
collection
+        (while (and stack (not (eq (parseclj-lex-token-type (car stack)) 
opening-token-type)))
+          (push (pop stack) collection))
+
+        ;; did we find the right token?
+        (if (eq (parseclj-lex-token-type (car stack)) opening-token-type)
+            (progn
+              (when fail-fast
+                ;; any unreduced tokens left: bail early
+                (when-let ((token (seq-find #'parseclj-lex-token-p 
collection)))
+                  (parseclj--error "At position %s, unmatched %S"
+                                   (a-get token :pos)
+                                   (parseclj-lex-token-type token))))
+
+              ;; all good, call the reducer so it can return an updated stack 
with a
+              ;; new node at the top.
+              (let ((opening-token (pop stack)))
+                (funcall reduce-branch stack opening-token collection 
options)))
+
+          ;; Unwound the stack without finding a matching paren: either bail 
early
+          ;; or return the original stack and continue parsing
+          (if fail-fast
+              (parseclj--error "At position %s, unmatched %S"
+                               (a-get closing-token :pos)
+                               (parseclj-lex-token-type closing-token))
+
+            (reverse collection)))))))
 
 (defun parseclj--take-value (stack value-p)
   "Scan STACK until a value is found.



reply via email to

[Prev in Thread] Current Thread [Next in Thread]