mirror of
git://git.sv.gnu.org/emacs.git
synced 2025-12-05 22:20:24 -08:00
Prefer incf to cl-incf in progmodes/*.el
* lisp/progmodes/bug-reference.el (bug-reference--overlay-bounds): * lisp/progmodes/c-ts-common.el (c-ts-common-statement-offset): * lisp/progmodes/compile.el (compilation--note-type): * lisp/progmodes/ebrowse.el (ebrowse-files-table) (ebrowse-fill-member-table, ebrowse-find-pattern) (ebrowse-draw-member-short-fn, ebrowse-gather-statistics): * lisp/progmodes/elixir-ts-mode.el (elixir-ts--electric-pair-string-delimiter): * lisp/progmodes/gdb-mi.el (gdb-thread-list-handler-custom): * lisp/progmodes/grep.el (grep-filter): * lisp/progmodes/hideif.el (hif-backward-comment, hif-__COUNTER__) (hif-token-concatenation, hif-find-define): * lisp/progmodes/js.el (js--pstate-is-toplevel-defun) (js-beginning-of-defun, js-end-of-defun, js--pitems-to-imenu) (js--imenu-to-flat, js-ts--syntax-propertize): * lisp/progmodes/tcl.el (tcl--syntax-of-quote): * lisp/progmodes/typescript-ts-mode.el (tsx-ts--syntax-propertize-captures): Prefer incf to cl-incf.
This commit is contained in:
Stefan Kangas
parent
99d116a8f4
commit
d1d85e0f35
11 changed files with 36 additions and 36 deletions
|
|
@ -138,7 +138,7 @@ to the highlighted and clickable region."
|
|||
(or (< (match-beginning i) m-b1)
|
||||
(> (match-end i) m-e1)))
|
||||
(throw 'within-bounds nil))
|
||||
(cl-incf i))
|
||||
(incf i))
|
||||
t)))
|
||||
;; All groups 2..10 are within bounds.
|
||||
(cons m-b1 m-e1)
|
||||
|
|
|
|||
|
|
@ -503,7 +503,7 @@ characters on the current line."
|
|||
(let ((parent (treesit-node-parent node)))
|
||||
;; Increment level for every bracket (with exception).
|
||||
(when (c-ts-common--node-is node 'block)
|
||||
(cl-incf level)
|
||||
(incf level)
|
||||
(save-excursion
|
||||
(goto-char (treesit-node-start node))
|
||||
;; Add an extra level if the opening bracket is on its own
|
||||
|
|
@ -515,12 +515,12 @@ characters on the current line."
|
|||
;; Add a level.
|
||||
((looking-back (rx bol (* whitespace))
|
||||
(line-beginning-position))
|
||||
(cl-incf level)))))
|
||||
(incf level)))))
|
||||
;; Fix bracketless statements.
|
||||
(when (and (c-ts-common--node-is parent
|
||||
'if 'do 'while 'for)
|
||||
(not (c-ts-common--node-is node 'block)))
|
||||
(cl-incf level))
|
||||
(incf level))
|
||||
;; Flatten "else if" statements.
|
||||
(when (and (c-ts-common--node-is node 'else)
|
||||
(c-ts-common--node-is node 'if)
|
||||
|
|
|
|||
|
|
@ -1641,9 +1641,9 @@ RULE is the name (symbol) of the rule used or nil if anonymous.
|
|||
"Note that a new message with severity TYPE was seen.
|
||||
This updates the appropriate variable used by the mode-line."
|
||||
(cl-case type
|
||||
(0 (cl-incf compilation-num-infos-found))
|
||||
(1 (cl-incf compilation-num-warnings-found))
|
||||
(2 (cl-incf compilation-num-errors-found))))
|
||||
(0 (incf compilation-num-infos-found))
|
||||
(1 (incf compilation-num-warnings-found))
|
||||
(2 (incf compilation-num-errors-found))))
|
||||
|
||||
(defun compilation-parse-errors (start end &rest rules)
|
||||
"Parse errors between START and END.
|
||||
|
|
|
|||
|
|
@ -593,7 +593,7 @@ MARKED-ONLY non-nil means include marked classes only."
|
|||
(ebrowse-for-all-trees (tree ebrowse--tree-table)
|
||||
(when (or (not marked-only) (ebrowse-ts-mark tree))
|
||||
(let ((class (ebrowse-ts-class tree)))
|
||||
(when (zerop (% (cl-incf i) 20))
|
||||
(when (zerop (% (incf i) 20))
|
||||
(ebrowse-show-progress "Preparing file list" (zerop i)))
|
||||
;; Add files mentioned in class description
|
||||
(let ((source-file (ebrowse-cs-source-file class))
|
||||
|
|
@ -864,7 +864,7 @@ type `ebrowse-hs' is set to the resulting table."
|
|||
(garbage-collect)
|
||||
;; For all classes...
|
||||
(ebrowse-for-all-trees (c ebrowse--tree-table)
|
||||
(when (zerop (% (cl-incf i) 10))
|
||||
(when (zerop (% (incf i) 10))
|
||||
(ebrowse-show-progress "Preparing member lookup" (zerop i)))
|
||||
(dolist (f ebrowse-member-list-accessors)
|
||||
(dolist (m (funcall f c))
|
||||
|
|
@ -1649,7 +1649,7 @@ INFO is a list (TREE-HEADER TREE-OR-MEMBER MEMBER-LIST)."
|
|||
when (re-search-forward pattern (+ start offset) t)
|
||||
return t
|
||||
never (bobp)
|
||||
do (cl-incf offset offset)))
|
||||
do (incf offset offset)))
|
||||
(cond (found
|
||||
(beginning-of-line)
|
||||
(run-hooks 'ebrowse-view/find-hook))
|
||||
|
|
@ -2689,7 +2689,7 @@ TREE is the class tree in which the members are found."
|
|||
mouse-face highlight
|
||||
ebrowse-tree ,tree
|
||||
help-echo "mouse-2: view definition; mouse-3: menu"))
|
||||
(cl-incf i)
|
||||
(incf i)
|
||||
(when (>= i ebrowse--n-columns)
|
||||
(setf i 0)
|
||||
(insert "\n")))))
|
||||
|
|
@ -4032,11 +4032,11 @@ NUMBER-OF-STATIC-VARIABLES:"
|
|||
(let ((classes 0) (member-functions 0) (member-variables 0)
|
||||
(static-functions 0) (static-variables 0))
|
||||
(ebrowse-for-all-trees (tree ebrowse--tree-table)
|
||||
(cl-incf classes)
|
||||
(cl-incf member-functions (length (ebrowse-ts-member-functions tree)))
|
||||
(cl-incf member-variables (length (ebrowse-ts-member-variables tree)))
|
||||
(cl-incf static-functions (length (ebrowse-ts-static-functions tree)))
|
||||
(cl-incf static-variables (length (ebrowse-ts-static-variables tree))))
|
||||
(incf classes)
|
||||
(incf member-functions (length (ebrowse-ts-member-functions tree)))
|
||||
(incf member-variables (length (ebrowse-ts-member-variables tree)))
|
||||
(incf static-functions (length (ebrowse-ts-static-functions tree)))
|
||||
(incf static-variables (length (ebrowse-ts-static-variables tree))))
|
||||
(list classes member-functions member-variables
|
||||
static-functions static-variables)))
|
||||
|
||||
|
|
|
|||
|
|
@ -658,7 +658,7 @@ Return nil if NODE is not a defun node or doesn't have a name."
|
|||
(eq last-command-event ?\")
|
||||
(let ((count 0))
|
||||
(while (eq (char-before (- (point) count)) last-command-event)
|
||||
(cl-incf count))
|
||||
(incf count))
|
||||
(= count 3))
|
||||
(eq (char-after) last-command-event))
|
||||
(save-excursion
|
||||
|
|
|
|||
|
|
@ -3545,7 +3545,7 @@ corresponding to the mode line clicked."
|
|||
(add-to-list 'gdb-threads-list
|
||||
(cons (gdb-mi--field thread 'id)
|
||||
thread))
|
||||
(cl-incf (if running
|
||||
(incf (if running
|
||||
gdb-running-threads-count
|
||||
gdb-stopped-threads-count))
|
||||
|
||||
|
|
|
|||
|
|
@ -648,7 +648,7 @@ This function is called from `compilation-filter-hook'."
|
|||
(replace-match (propertize (match-string 1)
|
||||
'face nil 'font-lock-face grep-match-face)
|
||||
t t)
|
||||
(cl-incf grep-num-matches-found))
|
||||
(incf grep-num-matches-found))
|
||||
;; Delete all remaining escape sequences
|
||||
(goto-char beg)
|
||||
(while (re-search-forward "\033\\[[0-9;]*[mK]" end 1)
|
||||
|
|
|
|||
|
|
@ -888,7 +888,7 @@ Assuming we've just performed a `hif-token-regexp' lookup."
|
|||
;; merge whites immediately ahead
|
||||
(setq ce (if (and we (= (1- p) we)) ws p))
|
||||
;; scan for end of line
|
||||
(while (and (< (cl-incf p) end)
|
||||
(while (and (< (incf p) end)
|
||||
(not (char-equal ?\n (char-after p)))
|
||||
(not (char-equal ?\r (char-after p)))))
|
||||
;; Merge with previous comment if immediately followed
|
||||
|
|
@ -913,7 +913,7 @@ Assuming we've just performed a `hif-token-regexp' lookup."
|
|||
(while (< (1+ p) end)
|
||||
(if (not (and (char-equal ?* (char-after p))
|
||||
(char-equal ?/ (char-after (1+ p)))))
|
||||
(cl-incf p)
|
||||
(incf p)
|
||||
;; found `*/', mark end pos
|
||||
(push (cons cmt (1+ (setq p (1+ p)))) cmtlist)
|
||||
(throw 'break nil)))
|
||||
|
|
@ -927,7 +927,7 @@ Assuming we've just performed a `hif-token-regexp' lookup."
|
|||
we p))
|
||||
(setq ws nil
|
||||
we nil)))
|
||||
(cl-incf p))
|
||||
(incf p))
|
||||
;; Goto beginning of the last comment, if we're within
|
||||
(setq cmt (car cmtlist)) ;; last cmt
|
||||
(setq cmt (if (and cmt
|
||||
|
|
@ -1531,7 +1531,7 @@ and `+='...)."
|
|||
|
||||
(defvar hif-__COUNTER__ 0)
|
||||
(defun hif-__COUNTER__ ()
|
||||
(prog1 hif-__COUNTER__ (cl-incf hif-__COUNTER__)))
|
||||
(prog1 hif-__COUNTER__ (incf hif-__COUNTER__)))
|
||||
|
||||
(defun hif-__cplusplus ()
|
||||
(and (string-match
|
||||
|
|
@ -1604,7 +1604,7 @@ and `+='...)."
|
|||
(push tk items) ; first item, in reverse order
|
||||
(setq tk 'hif-token-concat))
|
||||
(while (eq tk 'hif-token-concat)
|
||||
(cl-incf count)
|
||||
(incf count)
|
||||
;; 2+ item
|
||||
(setq l (cdr l)
|
||||
tk (car l))
|
||||
|
|
@ -2477,7 +2477,7 @@ first arg will be `hif-etc'."
|
|||
(tokens
|
||||
(and name
|
||||
(prog1 t
|
||||
(cl-incf hif-verbose-define-count)
|
||||
(incf hif-verbose-define-count)
|
||||
;; only show 1/50 to not slow down to much
|
||||
(if (and hide-ifdef-verbose
|
||||
(= (% hif-verbose-define-count 50) 1))
|
||||
|
|
|
|||
|
|
@ -982,7 +982,7 @@ top-most pitem. Otherwise, return nil."
|
|||
with func-depth = 0
|
||||
with func-pitem
|
||||
if (eq 'function (js--pitem-type pitem))
|
||||
do (cl-incf func-depth)
|
||||
do (incf func-depth)
|
||||
and do (setq func-pitem pitem)
|
||||
finally return (if (eq func-depth 1) func-pitem)))
|
||||
|
||||
|
|
@ -1017,7 +1017,7 @@ Return the pitem of the function we went to the beginning of."
|
|||
(setq arg (or arg 1))
|
||||
(let ((found))
|
||||
(while (and (not (eobp)) (< arg 0))
|
||||
(cl-incf arg)
|
||||
(incf arg)
|
||||
(when (and (not js-flat-functions)
|
||||
(or (eq (js-syntactic-context) 'function)
|
||||
(js--function-prologue-beginning)))
|
||||
|
|
@ -1360,7 +1360,7 @@ LIMIT defaults to point."
|
|||
"Value of `end-of-defun-function' for `js-mode'."
|
||||
(setq arg (or arg 1))
|
||||
(while (and (not (bobp)) (< arg 0))
|
||||
(cl-incf arg)
|
||||
(incf arg)
|
||||
(js-beginning-of-defun)
|
||||
(js-beginning-of-defun)
|
||||
(unless (bobp)
|
||||
|
|
@ -3180,7 +3180,7 @@ the broken-down class name of the item to insert."
|
|||
(setq pitem-name (js--pitem-strname pitem))
|
||||
(when (eq pitem-name t)
|
||||
(setq pitem-name (format "[unknown %s]"
|
||||
(cl-incf (car unknown-ctr)))))
|
||||
(incf (car unknown-ctr)))))
|
||||
|
||||
(cond
|
||||
((memq pitem-type '(function macro))
|
||||
|
|
@ -3255,7 +3255,7 @@ the broken-down class name of the item to insert."
|
|||
(ctr 0))
|
||||
|
||||
(while (gethash name2 symbols)
|
||||
(setq name2 (format "%s<%d>" name (cl-incf ctr))))
|
||||
(setq name2 (format "%s<%d>" name (incf ctr))))
|
||||
|
||||
(puthash name2 (cdr item) symbols))))
|
||||
|
||||
|
|
@ -4037,7 +4037,7 @@ See `treesit-thing-settings' for more information.")
|
|||
(syntax (pcase-exhaustive name
|
||||
('regexp
|
||||
(decf ns)
|
||||
(cl-incf ne)
|
||||
(incf ne)
|
||||
(string-to-syntax "\"/"))
|
||||
('jsx
|
||||
(string-to-syntax "|")))))
|
||||
|
|
|
|||
|
|
@ -432,9 +432,9 @@ This variable is generally set from `tcl-proc-regexp',
|
|||
(pcase (char-after (match-beginning 0))
|
||||
(?\\ (forward-char 1))
|
||||
(?\" (setq type 'matched))
|
||||
(?\{ (cl-incf depth))
|
||||
(?\{ (incf depth))
|
||||
(?\} (if (zerop depth) (setq type 'unmatched)
|
||||
(cl-incf depth)))))
|
||||
(incf depth)))))
|
||||
(when (> (line-beginning-position) pos)
|
||||
;; The quote is not on the same line as the deciding
|
||||
;; factor, so make sure we revisit this choice later.
|
||||
|
|
|
|||
|
|
@ -680,7 +680,7 @@ at least 3 (which is the default value)."
|
|||
('regexp
|
||||
(let ((syntax (string-to-syntax "\"/")))
|
||||
(decf ns)
|
||||
(cl-incf ne)
|
||||
(incf ne)
|
||||
(put-text-property ns (1+ ns) 'syntax-table syntax)
|
||||
(put-text-property (1- ne) ne 'syntax-table syntax)))
|
||||
;; We put punctuation syntax on all the balanced pair
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue