[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[nongnu] elpa/parseclj 2781f0cd7f 088/185: Vocab chage: closer/opener =>
From: |
ELPA Syncer |
Subject: |
[nongnu] elpa/parseclj 2781f0cd7f 088/185: Vocab chage: closer/opener => closing-token/opening-token |
Date: |
Tue, 28 Dec 2021 14:05:21 -0500 (EST) |
branch: elpa/parseclj
commit 2781f0cd7fc35626c133bfd744b897a6b9ccf5b9
Author: Arne Brasseur <arne@arnebrasseur.net>
Commit: Arne Brasseur <arne@arnebrasseur.net>
Vocab chage: closer/opener => closing-token/opening-token
---
parseclj-ast.el | 8 ++++----
parseclj.el | 16 ++++++++--------
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/parseclj-ast.el b/parseclj-ast.el
index afa91f8fc2..43a82bd6e9 100644
--- a/parseclj-ast.el
+++ b/parseclj-ast.el
@@ -75,9 +75,9 @@ Other ATTRIBUTES can be given as a flat list of key-value
pairs. "
stack))
(parseclj-ast--reduce-leaf stack token))))
-(defun parseclj-ast--reduce-branch (stack opener-token children)
- (let* ((pos (a-get opener-token :pos))
- (type (parseclj-lex-token-type opener-token))
+(defun parseclj-ast--reduce-branch (stack opening-token children)
+ (let* ((pos (a-get opening-token :pos))
+ (type (parseclj-lex-token-type opening-token))
(type (cl-case type
(:lparen :list)
(:lbracket :vector)
@@ -88,7 +88,7 @@ Other ATTRIBUTES can be given as a flat list of key-value
pairs. "
(:discard stack)
(:tag (list (parseclj-ast-node :tag
pos
- :tag (intern (substring (a-get
opener-token :form) 1))
+ :tag (intern (substring (a-get
opening-token :form) 1))
:children children)))
(t (cons
(parseclj-ast-node type pos :children children)
diff --git a/parseclj.el b/parseclj.el
index 1720f32fdf..6119058514 100644
--- a/parseclj.el
+++ b/parseclj.el
@@ -116,8 +116,8 @@ Takes a FORMAT string and optional ARGS to be passed to
can be handled with `condition-case'."
(signal 'parseclj-parse-error (list (apply #'format-message format args))))
-(defun parseclj--find-opener (stack closer-token)
- (cl-case (parseclj-lex-token-type closer-token)
+(defun parseclj--find-opening-token (stack closing-token)
+ (cl-case (parseclj-lex-token-type closing-token)
(:rparen :lparen)
(:rbracket :lbracket)
(:rbrace (parseclj-lex-token-type
@@ -126,15 +126,15 @@ can be handled with `condition-case'."
'(:lbrace :set)))
stack)))))
-(defun parseclj--reduce-coll (stack closer-token reduce-branch options)
+(defun parseclj--reduce-coll (stack closing-token reduce-branch options)
"Reduce collection based on the top of the stack"
- (let ((opener-type (parseclj--find-opener stack closer-token))
+ (let ((opening-token-type (parseclj--find-opening-token stack closing-token))
(fail-fast (a-get options :fail-fast t))
(coll nil))
- (while (and stack (not (eq (parseclj-lex-token-type (car stack))
opener-type)))
+ (while (and stack (not (eq (parseclj-lex-token-type (car stack))
opening-token-type)))
(push (pop stack) coll))
- (if (eq (parseclj-lex-token-type (car stack)) opener-type)
+ (if (eq (parseclj-lex-token-type (car stack)) opening-token-type)
(let ((node (pop stack)))
(when fail-fast
(when-let ((token (seq-find #'parseclj-lex-token? coll)))
@@ -145,8 +145,8 @@ can be handled with `condition-case'."
(if fail-fast
(parseclj--error "parseclj: Syntax Error at position %s, unmatched
%S"
- (a-get closer-token :pos)
- (parseclj-lex-token-type closer-token))
+ (a-get closing-token :pos)
+ (parseclj-lex-token-type closing-token))
;; Unwound the stack without finding a matching paren: return the
original stack and continue parsing
(reverse coll)))))
- [nongnu] elpa/parseclj 507720a632 170/185: Release 1.0, (continued)
- [nongnu] elpa/parseclj 507720a632 170/185: Release 1.0, ELPA Syncer, 2021/12/28
- [nongnu] elpa/parseclj 6d1c9c348a 184/185: Update CHANGELOG, ELPA Syncer, 2021/12/28
- [nongnu] elpa/parseclj 61513d2c99 164/185: Merge pull request #27 from clojure-emacs/shebang-and-symbolic-values, ELPA Syncer, 2021/12/28
- [nongnu] elpa/parseclj e6bce85062 159/185: Update the CHANGELOG, ELPA Syncer, 2021/12/28
- [nongnu] elpa/parseclj 1f7fe675ae 172/185: Merge pull request #31 from clojure-emacs/remove-a-el-part-2, ELPA Syncer, 2021/12/28
- [nongnu] elpa/parseclj a8c4cf30fb 185/185: Correctly bump versions, ELPA Syncer, 2021/12/28
- [nongnu] elpa/parseclj 7ae887b1de 037/185: Refactor clj-parse.el, ELPA Syncer, 2021/12/28
- [nongnu] elpa/parseclj a83816010e 039/185: Refactor clj-parse-test., ELPA Syncer, 2021/12/28
- [nongnu] elpa/parseclj 9d4c0b7b4b 041/185: Merge pull request #2 from volrath/tag-support, ELPA Syncer, 2021/12/28
- [nongnu] elpa/parseclj 879ac980a8 056/185: Treat numbers with trailing symbol characters as lex errors, ELPA Syncer, 2021/12/28
- [nongnu] elpa/parseclj 2781f0cd7f 088/185: Vocab chage: closer/opener => closing-token/opening-token,
ELPA Syncer <=
- [nongnu] elpa/parseclj 4fc37462ab 073/185: Make Travis use Cask, ELPA Syncer, 2021/12/28
- [nongnu] elpa/parseclj a71e57df4d 080/185: Rename clj-lex to parseclj-lex, ELPA Syncer, 2021/12/28
- [nongnu] elpa/parseclj 168027fed5 094/185: Merge pull request #7 from lambdaisland/reorganize-package, ELPA Syncer, 2021/12/28
- [nongnu] elpa/parseclj 45bd6a7431 109/185: Clean up tests, ELPA Syncer, 2021/12/28
- [nongnu] elpa/parseclj 1f8e449897 105/185: Simplify error messages, ELPA Syncer, 2021/12/28
- [nongnu] elpa/parseclj f362018ff1 112/185: Silence the byte-compiler about some unused vars., ELPA Syncer, 2021/12/28
- [nongnu] elpa/parseclj 70804992ee 122/185: Merge pull request #14 from lambdaisland/parseclj-lex-symbol-fix, ELPA Syncer, 2021/12/28
- [nongnu] elpa/parseclj 19ca5f5bd0 121/185: Stick to the previous Travis Trusty image, ELPA Syncer, 2021/12/28
- [nongnu] elpa/parseclj b2550e6456 133/185: Add docstring for `parseclj-lex--string-value`, ELPA Syncer, 2021/12/28
- [nongnu] elpa/parseclj 13059d8529 138/185: Minor checkdoc fixes, ELPA Syncer, 2021/12/28