branch: elpa/evil-numbers
commit 7e7e2e42f349ab0f361ca2069a6060accc2847d5
Author: Michael Markert <[email protected]>
Commit: Michael Markert <[email protected]>
Remove "support" for negative non-decimal literals.
Signed-off-by: Michael Markert <[email protected]>
---
evil-numbers.el | 19 ++++++++-----------
1 file changed, 8 insertions(+), 11 deletions(-)
diff --git a/evil-numbers.el b/evil-numbers.el
index 17b29046c6..aff57a1b79 100644
--- a/evil-numbers.el
+++ b/evil-numbers.el
@@ -56,7 +56,6 @@
(or
;; find binary literals
(when (looking-back "0[bB][01]*")
- ;; already ensured there's only one -
(skip-chars-backward "01")
(search-forward-regexp "[01]*")
(replace-match
@@ -65,22 +64,20 @@
t)
;; find octal literals
- (when (looking-back "0[oO]-?[0-7]*")
- ;; already ensured there's only one -
- (skip-chars-backward "-01234567")
- (search-forward-regexp "-?\\([0-7]+\\)")
+ (when (looking-back "0[oO][0-7]*")
+ (skip-chars-backward "01234567")
+ (search-forward-regexp "[0-7]+")
(replace-match
- (format (format "%%0%do" (- (match-end 1) (match-beginning 1)))
+ (format (format "%%0%do" (- (match-end 0) (match-beginning 0)))
(+ amount (string-to-number (match-string 0) 8))))
t)
;; find hex literals
- (when (looking-back "0[xX]-?[0-9a-fA-F]*")
- ;; already ensured there's only one -
- (skip-chars-backward "-0123456789abcdefABCDEF")
- (search-forward-regexp "-?\\([0-9a-fA-F]+\\)")
+ (when (looking-back "0[xX][0-9a-fA-F]*")
+ (skip-chars-backward "0123456789abcdefABCDEF")
+ (search-forward-regexp "[0-9a-fA-F]+")
(replace-match
- (format (format "%%0%dX" (- (match-end 1) (match-beginning 1)))
+ (format (format "%%0%dX" (- (match-end 0) (match-beginning 0)))
(+ amount (string-to-number (match-string 0) 16))))
t)