[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[nongnu] elpa/evil-numbers ab6d436454 074/145: Cleanup: use '--' separat
From: |
ELPA Syncer |
Subject: |
[nongnu] elpa/evil-numbers ab6d436454 074/145: Cleanup: use '--' separator for private functions |
Date: |
Thu, 6 Jan 2022 03:00:20 -0500 (EST) |
branch: elpa/evil-numbers
commit ab6d436454626b4df4cb2f4dc1729807e8f841ef
Author: Campbell Barton <ideasman42@gmail.com>
Commit: Campbell Barton <ideasman42@gmail.com>
Cleanup: use '--' separator for private functions
Currently package-lint-current-buffer warns about breaking
the convention of using dashes for separators.
While this can't be changed with the public functions,
the convention can be used for private functions.
This also has the advantage of abbreviating function display
with nameless-mode.
---
evil-numbers.el | 44 ++++++++++++++++++++++----------------------
1 file changed, 22 insertions(+), 22 deletions(-)
diff --git a/evil-numbers.el b/evil-numbers.el
index 6502d832d7..f6140094d4 100644
--- a/evil-numbers.el
+++ b/evil-numbers.el
@@ -69,7 +69,7 @@
(require 'evil)
-(defconst evil-numbers/superscript-alist
+(defconst evil-numbers--superscript-alist
(cons
(cons ?- ?⁻)
(cons
@@ -79,7 +79,7 @@
(aref "⁰¹²³⁴⁵⁶⁷⁸⁹" i)))
(number-sequence 0 9)))))
-(defconst evil-numbers/subscript-alist
+(defconst evil-numbers--subscript-alist
(cons
(cons ?- ?₋)
(cons
@@ -100,11 +100,11 @@
:type 'boolean
:options '(nil t))
-(defun evil-numbers/swap-alist (alist)
+(defun evil-numbers--swap-alist (alist)
"Swap association list ALIST."
(mapcar (lambda (x) (cons (cdr x) (car x))) alist))
-(defun evil-numbers/translate-with-alist (alist string)
+(defun evil-numbers--translate-with-alist (alist string)
"Translate every symbol in STRING using ALIST."
(funcall
(if (stringp string) #'concat (lambda (x) x))
@@ -158,7 +158,7 @@ number with a + sign."
(save-match-data
;; forward-char, so that we do not match the number directly behind us.
(forward-char)
- (if (not (evil-numbers/search-number))
+ (if (not (evil-numbers--search-number))
(error "No number at point or until end of line")
(let ((replace-with
(lambda (from to)
@@ -195,13 +195,13 @@ number with a + sign."
t))))
(or
;; Find binary literals.
- (evil-numbers/search-and-replace "0[bB][01]+" "01" "\\([01]+\\)"
amount 2)
+ (evil-numbers--search-and-replace "0[bB][01]+" "01" "\\([01]+\\)"
amount 2)
;; Find octal literals.
- (evil-numbers/search-and-replace "0[oO][0-7]+" "01234567"
"\\([0-7]+\\)" amount 8)
+ (evil-numbers--search-and-replace "0[oO][0-7]+" "01234567"
"\\([0-7]+\\)" amount 8)
;; Find hex literals.
- (evil-numbers/search-and-replace "0[xX][0-9a-fA-F]*"
+ (evil-numbers--search-and-replace "0[xX][0-9a-fA-F]*"
"0123456789abcdefABCDEF"
"\\([0-9a-fA-F]+\\)" amount 16)
@@ -209,22 +209,22 @@ number with a + sign."
(funcall
replace-with
(lambda (x)
- (evil-numbers/translate-with-alist
- evil-numbers/superscript-alist x))
+ (evil-numbers--translate-with-alist
+ evil-numbers--superscript-alist x))
(lambda (x)
- (evil-numbers/translate-with-alist
- (evil-numbers/swap-alist evil-numbers/superscript-alist)
+ (evil-numbers--translate-with-alist
+ (evil-numbers--swap-alist evil-numbers--superscript-alist)
x)))
;; Find subscript literals.
(funcall
replace-with
(lambda (x)
- (evil-numbers/translate-with-alist
- evil-numbers/subscript-alist x))
+ (evil-numbers--translate-with-alist
+ evil-numbers--subscript-alist x))
(lambda (x)
- (evil-numbers/translate-with-alist
- (evil-numbers/swap-alist evil-numbers/subscript-alist)
+ (evil-numbers--translate-with-alist
+ (evil-numbers--swap-alist evil-numbers--subscript-alist)
x)))
;; Find normal decimal literals.
@@ -263,7 +263,7 @@ on."
;;; Utilities.
-(defun evil-numbers/search-number ()
+(defun evil-numbers--search-number ()
"Return non-nil if a number literal at or after point.
If point is already within or after a literal it stays.
@@ -294,7 +294,7 @@ decimal: [0-9]+, e.g. 42 or 23"
;; Skip format specifiers and interpret as boolean.
(<= 0 (skip-chars-forward "bBoOxX"))))))
-(defun evil-numbers/search-and-replace (look-back skip-back search-forward inc
base)
+(defun evil-numbers--search-and-replace (look-back skip-back search-forward
inc base)
"Perform the increment/decrement on the current line.
When looking back at LOOK-BACK skip chars SKIP-BACK backwards,
@@ -303,22 +303,22 @@ and return non-nil."
(when (looking-back look-back (point-at-bol))
(skip-chars-backward skip-back)
(search-forward-regexp search-forward)
- (replace-match (evil-numbers/format (+ inc (string-to-number (match-string
1) base))
+ (replace-match (evil-numbers--format (+ inc (string-to-number
(match-string 1) base))
(if evil-numbers/padDefault (length
(match-string 1)) 1)
base))
;; Moves point one position back to conform with VIM.
(forward-char -1)
t))
-(defun evil-numbers/format (num width base)
+(defun evil-numbers--format (num width base)
"Format NUM with at least WIDTH space in BASE."
(cond
- ((= base 2) (evil-numbers/format-binary num width))
+ ((= base 2) (evil-numbers-format-binary num width))
((= base 8) (format (format "%%0%do" width) num))
((= base 16) (format (format "%%0%dX" width) num))
(t "")))
-(defun evil-numbers/format-binary (number &optional width fillchar)
+(defun evil-numbers-format-binary (number &optional width fillchar)
"Format NUMBER as binary.
Fill up to WIDTH with FILLCHAR (defaults to ?0) if binary
representation of NUMBER is smaller."
- [nongnu] elpa/evil-numbers d988041c1f 056/145: List myself as maintainer, (continued)
- [nongnu] elpa/evil-numbers d988041c1f 056/145: List myself as maintainer, ELPA Syncer, 2022/01/06
- [nongnu] elpa/evil-numbers c2cfdd1eb1 058/145: Merge pull request #6 from hlissner/patch-1, ELPA Syncer, 2022/01/06
- [nongnu] elpa/evil-numbers 02de70f481 062/145: Quiet checkdoc warnings, ELPA Syncer, 2022/01/06
- [nongnu] elpa/evil-numbers 6fa8e02e3b 073/145: Cleanup: avoid right shift, ELPA Syncer, 2022/01/06
- [nongnu] elpa/evil-numbers 963e78cb44 069/145: Change repo URLs in Readme too, ELPA Syncer, 2022/01/06
- [nongnu] elpa/evil-numbers 26ec2d4a52 066/145: Use lexical binding, remove unused function 'pad', ELPA Syncer, 2022/01/06
- [nongnu] elpa/evil-numbers a75c4b0a24 071/145: Cleanup: replace tabs with spaces, ELPA Syncer, 2022/01/06
- [nongnu] elpa/evil-numbers 626ea72a21 084/145: Cleanup: add missing argument to doc-string, ELPA Syncer, 2022/01/06
- [nongnu] elpa/evil-numbers 15dcea1be0 087/145: Fix #20 The cursor moves when increment/decrement fails, ELPA Syncer, 2022/01/06
- [nongnu] elpa/evil-numbers 5622da311d 070/145: Cleanup: spelling, use full sentences, ELPA Syncer, 2022/01/06
- [nongnu] elpa/evil-numbers ab6d436454 074/145: Cleanup: use '--' separator for private functions,
ELPA Syncer <=
- [nongnu] elpa/evil-numbers ff3bcf4efd 068/145: Change repo URLs, ELPA Syncer, 2022/01/06
- [nongnu] elpa/evil-numbers 6483ab668b 103/145: Cleanup: use '?' instead of '*' for matching sign, ELPA Syncer, 2022/01/06
- [nongnu] elpa/evil-numbers 43036127c1 105/145: Cleanup: line length < 80, spelling, ELPA Syncer, 2022/01/06
- [nongnu] elpa/evil-numbers 0bbf3a8161 109/145: Cleanup: store unicode subscript/superscript in constants, ELPA Syncer, 2022/01/06
- [nongnu] elpa/evil-numbers d09a0e676a 125/145: Fix #25 increment steps to the next line, ELPA Syncer, 2022/01/06
- [nongnu] elpa/evil-numbers 08f0c1ee93 145/145: Cleanup: warnings for tests, ELPA Syncer, 2022/01/06
- [nongnu] elpa/evil-numbers e1b60f3b75 133/145: Fix #27 Number directly before the cursor manipulated in some cases, ELPA Syncer, 2022/01/06
- [nongnu] elpa/evil-numbers 3bd94723f8 134/145: Cleanup: indentation, ELPA Syncer, 2022/01/06
- [nongnu] elpa/evil-numbers 0d66b63f42 116/145: CHANGELOG.org: update with recent fixes, ELPA Syncer, 2022/01/06
- [nongnu] elpa/evil-numbers 1acf90638b 128/145: Bump to 0.6, ELPA Syncer, 2022/01/06