From ae37a1cc3d93d3703b43c5ab2d10f1f3e146cf90 Mon Sep 17 00:00:00 2001 From: Stefan Kangas Date: Sun, 23 Feb 2025 00:13:21 +0100 Subject: Prefer incf to cl-incf in emacs-lisp/*.el * lisp/emacs-lisp/backtrace.el (backtrace--print-func-and-args): * lisp/emacs-lisp/bindat.el (bindat--type): * lisp/emacs-lisp/bytecomp.el (byte-recompile-directory): * lisp/emacs-lisp/chart.el (chart-file-count): * lisp/emacs-lisp/cl-extra.el (cl-parse-integer, cl--print-table): * lisp/emacs-lisp/cl-generic.el (cl--defmethod-doc-pos): * lisp/emacs-lisp/cl-indent.el (common-lisp-loop-part-indentation) (common-lisp-indent-function-1, lisp-indent-defmethod): * lisp/emacs-lisp/cl-lib.el (cl--set-substring): * lisp/emacs-lisp/cl-macs.el (cl--parse-loop-clause): * lisp/emacs-lisp/cl-preloaded.el (cl-struct-define): * lisp/emacs-lisp/cl-print.el (cl-print--cons-tail) (cl-print--vector-contents, cl-print--struct-contents) (cl-print--string-props): * lisp/emacs-lisp/cl-seq.el (cl-substitute): * lisp/emacs-lisp/comp-cstr.el (comp--range-union) (comp--range-intersection): * lisp/emacs-lisp/comp.el (comp-vec-append, comp--gen-counter) (comp--op-case, comp--limplify-lap-inst, comp--limplify-block) (comp--limplify-function, comp--maybe-add-vmvar, comp--fwprop*): * lisp/emacs-lisp/edebug.el (edebug--called-interactively-skip): * lisp/emacs-lisp/eldoc.el (eldoc--invoke-strategy): * lisp/emacs-lisp/elp.el (elp--make-wrapper): * lisp/emacs-lisp/ert-x.el (ert-kill-all-test-buffers): * lisp/emacs-lisp/ert.el (ert--stats-set-test-and-result) (ert-write-junit-test-summary-report): * lisp/emacs-lisp/memory-report.el (memory-report--symbol-plist) (memory-report--object-size-1): * lisp/emacs-lisp/oclosure.el (oclosure--index-table) (oclosure--define-functions): * lisp/emacs-lisp/package.el (package-menu--perform-transaction): * lisp/emacs-lisp/smie.el (smie-set-prec2tab, smie-prec2->grammar) (smie-config--guess, smie-config--guess-1): * lisp/emacs-lisp/syntax.el (syntax-propertize-rules) (syntax-ppss--update-stats): * lisp/emacs-lisp/track-changes.el (track-changes--after): Prefer incf to cl-incf. --- lisp/emacs-lisp/comp.el | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'lisp/emacs-lisp/comp.el') diff --git a/lisp/emacs-lisp/comp.el b/lisp/emacs-lisp/comp.el index 2baf4ec4b74..e7ccbbf12c7 100644 --- a/lisp/emacs-lisp/comp.el +++ b/lisp/emacs-lisp/comp.el @@ -334,7 +334,7 @@ Useful to hook into pass checkers.") "Append ELT into VEC. Returns ELT." (puthash (comp-vec-end vec) elt (comp-vec-data vec)) - (cl-incf (comp-vec-end vec)) + (incf (comp-vec-end vec)) elt) (defsubst comp-vec-prepend (vec elt) @@ -492,7 +492,7 @@ non local exit (ends with an `unreachable' insn).")) "Return a sequential number generator." (let ((n -1)) (lambda () - (cl-incf n)))) + (incf n)))) (cl-defstruct (comp-func (:copier nil)) "LIMPLE representation of a function." @@ -1302,7 +1302,7 @@ and the annotation emission." ;; ,(concat "LAP op " op-name))) ;; Emit the stack adjustment if present. ,(when (and sp-delta (not (eq 0 sp-delta))) - `(cl-incf (comp--sp) ,sp-delta)) + `(incf (comp--sp) ,sp-delta)) ,@(comp--body-eff body op-name sp-delta)) else collect `(',op (signal 'native-ice @@ -1336,7 +1336,7 @@ and the annotation emission." (make--comp-mvar :constant arg) (comp--slot+1)))) (byte-call - (cl-incf (comp--sp) (- arg)) + (incf (comp--sp) (- arg)) (comp--emit-set-call (comp--callref 'funcall (1+ arg) (comp--sp)))) (byte-unbind (comp--emit (comp--call 'helper_unbind_n @@ -1491,19 +1491,19 @@ and the annotation emission." (byte-numberp auto) (byte-integerp auto) (byte-listN - (cl-incf (comp--sp) (- 1 arg)) + (incf (comp--sp) (- 1 arg)) (comp--emit-set-call (comp--callref 'list arg (comp--sp)))) (byte-concatN - (cl-incf (comp--sp) (- 1 arg)) + (incf (comp--sp) (- 1 arg)) (comp--emit-set-call (comp--callref 'concat arg (comp--sp)))) (byte-insertN - (cl-incf (comp--sp) (- 1 arg)) + (incf (comp--sp) (- 1 arg)) (comp--emit-set-call (comp--callref 'insert arg (comp--sp)))) (byte-stack-set (comp--copy-slot (1+ (comp--sp)) (- (comp--sp) arg -1))) (byte-stack-set2 (cl-assert nil)) ;; TODO (byte-discardN - (cl-incf (comp--sp) (- arg))) + (incf (comp--sp) (- arg))) (byte-switch ;; Assume to follow the emission of a setimm. ;; This is checked into comp--emit-switch. @@ -1513,7 +1513,7 @@ and the annotation emission." (byte-constant (comp--emit-setimm arg)) (byte-discardN-preserve-tos - (cl-incf (comp--sp) (- arg)) + (incf (comp--sp) (- arg)) (comp--copy-slot (+ arg (comp--sp))))))) (defun comp--emit-narg-prologue (minarg nonrest rest) @@ -1722,7 +1722,7 @@ into the C code forwarding the compilation unit." for inst = (car inst-cell) for next-inst = (car-safe (cdr inst-cell)) do (comp--limplify-lap-inst inst) - (cl-incf (comp-limplify-pc comp-pass)) + (incf (comp-limplify-pc comp-pass)) when (comp--lap-fall-through-p inst) do (pcase next-inst (`(TAG ,_label . ,label-sp) @@ -1755,7 +1755,7 @@ into the C code forwarding the compilation unit." (let ((args (comp-func-l-args func))) (if (comp-args-p args) (cl-loop for i below (comp-args-max args) - do (cl-incf (comp--sp)) + do (incf (comp--sp)) (comp--emit `(set-par-to-local ,(comp--slot) ,i))) (comp--emit-narg-prologue (comp-args-base-min args) (comp-nargs-nonrest args) @@ -1901,7 +1901,7 @@ Return OP otherwise." (if-let* ((match (eql (comp-mvar-slot op) (comp-mvar-slot cmp-res))) (new-mvar (make--comp-mvar :slot - (- (cl-incf (comp-func-vframe-size comp-func)))))) + (- (incf (comp-func-vframe-size comp-func)))))) (progn (push `(assume ,new-mvar ,op) (cdr insns-seq)) new-mvar) @@ -2768,7 +2768,7 @@ Return t if something was changed." (comp--copy-insn insn)) do (comp--fwprop-insn insn) - (cl-incf i) + (incf i) when (and (null modified) (not (equal insn orig-insn))) do (setf modified t)) when (> i comp--fwprop-max-insns-scan) -- cgit v1.2.3