Use lexical-binding for all of CL, and clean up its namespace.
* lisp/emacs-lisp/cl-lib.el: Use lexical-binding.
(cl-map-extents, cl-maclisp-member): Remove.
(cl--set-elt, cl--set-nthcdr, cl--set-buffer-substring)
(cl--set-substring, cl--block-wrapper, cl--block-throw)
(cl--compiling-file, cl--mapcar-many, cl--do-subst): Use "cl--" prefix.
* lisp/emacs-lisp/cl-extra.el: Use lexical-binding.
(cl--mapcar-many, cl--map-keymap-recursively, cl--map-intervals)
(cl--map-overlays, cl--set-frame-visible-p, cl--progv-save)
(cl--progv-before, cl--progv-after, cl--finite-do, cl--set-getf)
(cl--do-remf, cl--do-prettyprint): Use "cl--" prefix.
* lisp/emacs-lisp/cl-seq.el: Use lexical-binding.
(cl--parsing-keywords, cl--check-key, cl--check-test-nokey)
(cl--check-test, cl--check-match): Use "cl--" prefix and backquotes.
(cl--alist, cl--sublis-rec, cl--nsublis-rec, cl--tree-equal-rec):
* lisp/emacs-lisp/cl-macs.el (cl--lambda-list-keywords): Use "cl--" prefix.
* lisp/edmacro.el (edmacro-mismatch): Simplify to remove dependence on
CL's internals.
2012-06-11 11:52:50 -04:00
|
|
|
;;; cl-seq.el --- Common Lisp features, part 3 -*- lexical-binding: t -*-
|
1993-07-30 20:15:09 +00:00
|
|
|
|
2025-01-01 07:39:17 +00:00
|
|
|
;; Copyright (C) 1993, 2001-2025 Free Software Foundation, Inc.
|
1993-07-30 20:15:09 +00:00
|
|
|
|
|
|
|
;; Author: Dave Gillespie <daveg@synaptics.com>
|
* lisp/emacs-lisp/package.el: Include obsolete packages from archives.
Use lexical-binding.
(package-archive-contents): Change format; include obsolete packages.
(package-desc): Use `dir' to mark builtin packages.
(package--from-builtin): Set the `dir' field to `builtin'.
(generated-autoload-file, version-control): Declare.
(package-compute-transaction): Change first arg and return value to be
lists of package-descs. Adjust to new package-archive-contents format.
(package--add-to-archive-contents): Adjust to new
package-archive-contents format.
(package-download-transaction): Arg is now a list of package-descs.
(package-install): If `pkg' is a package name, pass it as
a requirement, so it is subject to the usual (e.g. disabled) checks.
(describe-package): Accept package-desc as well.
(describe-package-1): Describe a specific package-desc. Add links to
other package-descs for the same package name.
(package-menu-describe-package): Pass the actual package-desc.
(package-menu-mode): Add to tabulated-list-revert-hook so revert-buffer
works correctly.
(package-desc-status): New function.
(package-menu--refresh): New function, extracted
from package-menu--generate.
(package-menu--generate): Use it.
(package-delete): Update package-alist.
(package-menu-execute): Don't call package-initialize.
* lisp/progmodes/idlw-toolbar.el, lisp/progmodes/idlw-shell.el,
lisp/progmodes/idlw-help.el, lisp/progmodes/idlw-complete-structtag.el,
lisp/progmodes/ebnf-yac.el, lisp/progmodes/ebnf-otz.el,
lisp/progmodes/ebnf-iso.el, lisp/progmodes/ebnf-ebx.el,
lisp/progmodes/ebnf-dtd.el, lisp/progmodes/ebnf-bnf.el,
lisp/progmodes/ebnf-abn.el, lisp/emacs-lisp/package-x.el,
lisp/emacs-lisp/cl-seq.el, lisp/emacs-lisp/cl-macs.el
lisp/cedet/data-debug.el, lisp/cedet/cedet-idutils.el:
Neuter the "Version:" header.
2013-06-25 12:13:49 -04:00
|
|
|
;; Old-Version: 2.02
|
1993-07-30 20:15:09 +00:00
|
|
|
;; Keywords: extensions
|
2010-08-29 12:17:13 -04:00
|
|
|
;; Package: emacs
|
1993-07-30 20:15:09 +00:00
|
|
|
|
|
|
|
;; This file is part of GNU Emacs.
|
|
|
|
|
2008-05-06 03:21:21 +00:00
|
|
|
;; GNU Emacs is free software: you can redistribute it and/or modify
|
1993-07-30 20:15:09 +00:00
|
|
|
;; it under the terms of the GNU General Public License as published by
|
2008-05-06 03:21:21 +00:00
|
|
|
;; the Free Software Foundation, either version 3 of the License, or
|
|
|
|
;; (at your option) any later version.
|
1993-07-30 20:15:09 +00:00
|
|
|
|
|
|
|
;; GNU Emacs is distributed in the hope that it will be useful,
|
|
|
|
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
;; GNU General Public License for more details.
|
|
|
|
|
|
|
|
;; You should have received a copy of the GNU General Public License
|
2017-09-13 15:52:52 -07:00
|
|
|
;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>.
|
1993-07-30 20:15:09 +00:00
|
|
|
|
1994-06-17 20:04:22 +00:00
|
|
|
;;; Commentary:
|
1993-07-30 20:15:09 +00:00
|
|
|
|
|
|
|
;; These are extensions to Emacs Lisp that provide a degree of
|
|
|
|
;; Common Lisp compatibility, beyond what is already built-in
|
|
|
|
;; in Emacs Lisp.
|
|
|
|
;;
|
|
|
|
;; This package was written by Dave Gillespie; it is a complete
|
|
|
|
;; rewrite of Cesar Quiroz's original cl.el package of December 1986.
|
|
|
|
;;
|
|
|
|
;; Bug reports, comments, and suggestions are welcome!
|
|
|
|
|
|
|
|
;; This file contains the Common Lisp sequence and list functions
|
|
|
|
;; which take keyword arguments.
|
|
|
|
|
|
|
|
;; See cl.el for Change Log.
|
|
|
|
|
|
|
|
|
1994-06-17 20:04:22 +00:00
|
|
|
;;; Code:
|
1993-07-30 20:15:09 +00:00
|
|
|
|
2012-06-03 21:05:17 -04:00
|
|
|
(require 'cl-lib)
|
1993-07-30 20:15:09 +00:00
|
|
|
|
Use lexical-binding for all of CL, and clean up its namespace.
* lisp/emacs-lisp/cl-lib.el: Use lexical-binding.
(cl-map-extents, cl-maclisp-member): Remove.
(cl--set-elt, cl--set-nthcdr, cl--set-buffer-substring)
(cl--set-substring, cl--block-wrapper, cl--block-throw)
(cl--compiling-file, cl--mapcar-many, cl--do-subst): Use "cl--" prefix.
* lisp/emacs-lisp/cl-extra.el: Use lexical-binding.
(cl--mapcar-many, cl--map-keymap-recursively, cl--map-intervals)
(cl--map-overlays, cl--set-frame-visible-p, cl--progv-save)
(cl--progv-before, cl--progv-after, cl--finite-do, cl--set-getf)
(cl--do-remf, cl--do-prettyprint): Use "cl--" prefix.
* lisp/emacs-lisp/cl-seq.el: Use lexical-binding.
(cl--parsing-keywords, cl--check-key, cl--check-test-nokey)
(cl--check-test, cl--check-match): Use "cl--" prefix and backquotes.
(cl--alist, cl--sublis-rec, cl--nsublis-rec, cl--tree-equal-rec):
* lisp/emacs-lisp/cl-macs.el (cl--lambda-list-keywords): Use "cl--" prefix.
* lisp/edmacro.el (edmacro-mismatch): Simplify to remove dependence on
CL's internals.
2012-06-11 11:52:50 -04:00
|
|
|
;; Keyword parsing.
|
|
|
|
;; This is special-cased here so that we can compile
|
|
|
|
;; this file independent from cl-macs.
|
1993-07-30 20:15:09 +00:00
|
|
|
|
Use lexical-binding for all of CL, and clean up its namespace.
* lisp/emacs-lisp/cl-lib.el: Use lexical-binding.
(cl-map-extents, cl-maclisp-member): Remove.
(cl--set-elt, cl--set-nthcdr, cl--set-buffer-substring)
(cl--set-substring, cl--block-wrapper, cl--block-throw)
(cl--compiling-file, cl--mapcar-many, cl--do-subst): Use "cl--" prefix.
* lisp/emacs-lisp/cl-extra.el: Use lexical-binding.
(cl--mapcar-many, cl--map-keymap-recursively, cl--map-intervals)
(cl--map-overlays, cl--set-frame-visible-p, cl--progv-save)
(cl--progv-before, cl--progv-after, cl--finite-do, cl--set-getf)
(cl--do-remf, cl--do-prettyprint): Use "cl--" prefix.
* lisp/emacs-lisp/cl-seq.el: Use lexical-binding.
(cl--parsing-keywords, cl--check-key, cl--check-test-nokey)
(cl--check-test, cl--check-match): Use "cl--" prefix and backquotes.
(cl--alist, cl--sublis-rec, cl--nsublis-rec, cl--tree-equal-rec):
* lisp/emacs-lisp/cl-macs.el (cl--lambda-list-keywords): Use "cl--" prefix.
* lisp/edmacro.el (edmacro-mismatch): Simplify to remove dependence on
CL's internals.
2012-06-11 11:52:50 -04:00
|
|
|
(defmacro cl--parsing-keywords (kwords other-keys &rest body)
|
Use `declare' in defmacros.
* lisp/window.el (save-selected-window):
* lisp/subr.el (with-temp-file, with-temp-message, with-syntax-table):
* lisp/progmodes/python.el (def-python-skeleton):
* lisp/net/dbus.el (dbus-ignore-errors):
* lisp/jka-cmpr-hook.el (with-auto-compression-mode):
* lisp/international/mule.el (with-category-table):
* lisp/emacs-lisp/timer.el (with-timeout):
* lisp/emacs-lisp/lisp-mnt.el (lm-with-file):
* lisp/emacs-lisp/eieio.el (with-slots):
* lisp/emacs-lisp/easymenu.el (easy-menu-define):
* lisp/emacs-lisp/debug.el (debugger-env-macro):
* lisp/emacs-lisp/cl-compat.el (Multiple-value-bind, Multiple-value-setq)
(Multiple-value-call, Multiple-value-prog1):
* lisp/emacs-lisp/cl-seq.el (cl-parsing-keywords, cl-check-key)
(cl-check-test-nokey, cl-check-test, cl-check-match): Move indent and
edebug rule to definition.
* lisp/emacs-lisp/lisp-mode.el (save-selected-window)
(with-current-buffer, combine-after-change-calls)
(with-output-to-string, with-temp-file, with-temp-buffer)
(with-temp-message, with-syntax-table, read-if, eval-after-load)
(dolist, dotimes, when, unless):
* lisp/emacs-lisp/byte-run.el (inline): Remove indent rule, redundant.
2010-08-30 15:03:05 +02:00
|
|
|
(declare (indent 2) (debug (sexp sexp &rest form)))
|
Use lexical-binding for all of CL, and clean up its namespace.
* lisp/emacs-lisp/cl-lib.el: Use lexical-binding.
(cl-map-extents, cl-maclisp-member): Remove.
(cl--set-elt, cl--set-nthcdr, cl--set-buffer-substring)
(cl--set-substring, cl--block-wrapper, cl--block-throw)
(cl--compiling-file, cl--mapcar-many, cl--do-subst): Use "cl--" prefix.
* lisp/emacs-lisp/cl-extra.el: Use lexical-binding.
(cl--mapcar-many, cl--map-keymap-recursively, cl--map-intervals)
(cl--map-overlays, cl--set-frame-visible-p, cl--progv-save)
(cl--progv-before, cl--progv-after, cl--finite-do, cl--set-getf)
(cl--do-remf, cl--do-prettyprint): Use "cl--" prefix.
* lisp/emacs-lisp/cl-seq.el: Use lexical-binding.
(cl--parsing-keywords, cl--check-key, cl--check-test-nokey)
(cl--check-test, cl--check-match): Use "cl--" prefix and backquotes.
(cl--alist, cl--sublis-rec, cl--nsublis-rec, cl--tree-equal-rec):
* lisp/emacs-lisp/cl-macs.el (cl--lambda-list-keywords): Use "cl--" prefix.
* lisp/edmacro.el (edmacro-mismatch): Simplify to remove dependence on
CL's internals.
2012-06-11 11:52:50 -04:00
|
|
|
`(let* ,(mapcar
|
|
|
|
(lambda (x)
|
|
|
|
(let* ((var (if (consp x) (car x) x))
|
|
|
|
(mem `(car (cdr (memq ',var cl-keys)))))
|
|
|
|
(if (eq var :test-not)
|
|
|
|
(setq mem `(and ,mem (setq cl-test ,mem) t)))
|
|
|
|
(if (eq var :if-not)
|
|
|
|
(setq mem `(and ,mem (setq cl-if ,mem) t)))
|
|
|
|
(list (intern
|
|
|
|
(format "cl-%s" (substring (symbol-name var) 1)))
|
|
|
|
(if (consp x) `(or ,mem ,(car (cdr x))) mem))))
|
|
|
|
kwords)
|
|
|
|
,@(append
|
|
|
|
(and (not (eq other-keys t))
|
|
|
|
(list
|
|
|
|
(list 'let '((cl-keys-temp cl-keys))
|
|
|
|
(list 'while 'cl-keys-temp
|
|
|
|
(list 'or (list 'memq '(car cl-keys-temp)
|
|
|
|
(list 'quote
|
|
|
|
(mapcar
|
2020-11-16 17:03:45 +01:00
|
|
|
(lambda (x)
|
|
|
|
(if (consp x)
|
|
|
|
(car x) x))
|
Use lexical-binding for all of CL, and clean up its namespace.
* lisp/emacs-lisp/cl-lib.el: Use lexical-binding.
(cl-map-extents, cl-maclisp-member): Remove.
(cl--set-elt, cl--set-nthcdr, cl--set-buffer-substring)
(cl--set-substring, cl--block-wrapper, cl--block-throw)
(cl--compiling-file, cl--mapcar-many, cl--do-subst): Use "cl--" prefix.
* lisp/emacs-lisp/cl-extra.el: Use lexical-binding.
(cl--mapcar-many, cl--map-keymap-recursively, cl--map-intervals)
(cl--map-overlays, cl--set-frame-visible-p, cl--progv-save)
(cl--progv-before, cl--progv-after, cl--finite-do, cl--set-getf)
(cl--do-remf, cl--do-prettyprint): Use "cl--" prefix.
* lisp/emacs-lisp/cl-seq.el: Use lexical-binding.
(cl--parsing-keywords, cl--check-key, cl--check-test-nokey)
(cl--check-test, cl--check-match): Use "cl--" prefix and backquotes.
(cl--alist, cl--sublis-rec, cl--nsublis-rec, cl--tree-equal-rec):
* lisp/emacs-lisp/cl-macs.el (cl--lambda-list-keywords): Use "cl--" prefix.
* lisp/edmacro.el (edmacro-mismatch): Simplify to remove dependence on
CL's internals.
2012-06-11 11:52:50 -04:00
|
|
|
(append kwords
|
|
|
|
other-keys))))
|
|
|
|
'(car (cdr (memq (quote :allow-other-keys)
|
|
|
|
cl-keys)))
|
|
|
|
'(error "Bad keyword argument %s"
|
|
|
|
(car cl-keys-temp)))
|
|
|
|
'(setq cl-keys-temp (cdr (cdr cl-keys-temp)))))))
|
|
|
|
body)))
|
|
|
|
|
|
|
|
(defmacro cl--check-key (x) ;Expects `cl-key' in context of generated code.
|
Use `declare' in defmacros.
* lisp/window.el (save-selected-window):
* lisp/subr.el (with-temp-file, with-temp-message, with-syntax-table):
* lisp/progmodes/python.el (def-python-skeleton):
* lisp/net/dbus.el (dbus-ignore-errors):
* lisp/jka-cmpr-hook.el (with-auto-compression-mode):
* lisp/international/mule.el (with-category-table):
* lisp/emacs-lisp/timer.el (with-timeout):
* lisp/emacs-lisp/lisp-mnt.el (lm-with-file):
* lisp/emacs-lisp/eieio.el (with-slots):
* lisp/emacs-lisp/easymenu.el (easy-menu-define):
* lisp/emacs-lisp/debug.el (debugger-env-macro):
* lisp/emacs-lisp/cl-compat.el (Multiple-value-bind, Multiple-value-setq)
(Multiple-value-call, Multiple-value-prog1):
* lisp/emacs-lisp/cl-seq.el (cl-parsing-keywords, cl-check-key)
(cl-check-test-nokey, cl-check-test, cl-check-match): Move indent and
edebug rule to definition.
* lisp/emacs-lisp/lisp-mode.el (save-selected-window)
(with-current-buffer, combine-after-change-calls)
(with-output-to-string, with-temp-file, with-temp-buffer)
(with-temp-message, with-syntax-table, read-if, eval-after-load)
(dolist, dotimes, when, unless):
* lisp/emacs-lisp/byte-run.el (inline): Remove indent rule, redundant.
2010-08-30 15:03:05 +02:00
|
|
|
(declare (debug edebug-forms))
|
Use lexical-binding for all of CL, and clean up its namespace.
* lisp/emacs-lisp/cl-lib.el: Use lexical-binding.
(cl-map-extents, cl-maclisp-member): Remove.
(cl--set-elt, cl--set-nthcdr, cl--set-buffer-substring)
(cl--set-substring, cl--block-wrapper, cl--block-throw)
(cl--compiling-file, cl--mapcar-many, cl--do-subst): Use "cl--" prefix.
* lisp/emacs-lisp/cl-extra.el: Use lexical-binding.
(cl--mapcar-many, cl--map-keymap-recursively, cl--map-intervals)
(cl--map-overlays, cl--set-frame-visible-p, cl--progv-save)
(cl--progv-before, cl--progv-after, cl--finite-do, cl--set-getf)
(cl--do-remf, cl--do-prettyprint): Use "cl--" prefix.
* lisp/emacs-lisp/cl-seq.el: Use lexical-binding.
(cl--parsing-keywords, cl--check-key, cl--check-test-nokey)
(cl--check-test, cl--check-match): Use "cl--" prefix and backquotes.
(cl--alist, cl--sublis-rec, cl--nsublis-rec, cl--tree-equal-rec):
* lisp/emacs-lisp/cl-macs.el (cl--lambda-list-keywords): Use "cl--" prefix.
* lisp/edmacro.el (edmacro-mismatch): Simplify to remove dependence on
CL's internals.
2012-06-11 11:52:50 -04:00
|
|
|
`(if cl-key (funcall cl-key ,x) ,x))
|
1993-07-30 20:15:09 +00:00
|
|
|
|
Use lexical-binding for all of CL, and clean up its namespace.
* lisp/emacs-lisp/cl-lib.el: Use lexical-binding.
(cl-map-extents, cl-maclisp-member): Remove.
(cl--set-elt, cl--set-nthcdr, cl--set-buffer-substring)
(cl--set-substring, cl--block-wrapper, cl--block-throw)
(cl--compiling-file, cl--mapcar-many, cl--do-subst): Use "cl--" prefix.
* lisp/emacs-lisp/cl-extra.el: Use lexical-binding.
(cl--mapcar-many, cl--map-keymap-recursively, cl--map-intervals)
(cl--map-overlays, cl--set-frame-visible-p, cl--progv-save)
(cl--progv-before, cl--progv-after, cl--finite-do, cl--set-getf)
(cl--do-remf, cl--do-prettyprint): Use "cl--" prefix.
* lisp/emacs-lisp/cl-seq.el: Use lexical-binding.
(cl--parsing-keywords, cl--check-key, cl--check-test-nokey)
(cl--check-test, cl--check-match): Use "cl--" prefix and backquotes.
(cl--alist, cl--sublis-rec, cl--nsublis-rec, cl--tree-equal-rec):
* lisp/emacs-lisp/cl-macs.el (cl--lambda-list-keywords): Use "cl--" prefix.
* lisp/edmacro.el (edmacro-mismatch): Simplify to remove dependence on
CL's internals.
2012-06-11 11:52:50 -04:00
|
|
|
(defmacro cl--check-test-nokey (item x) ;cl-test cl-if cl-test-not cl-if-not.
|
Use `declare' in defmacros.
* lisp/window.el (save-selected-window):
* lisp/subr.el (with-temp-file, with-temp-message, with-syntax-table):
* lisp/progmodes/python.el (def-python-skeleton):
* lisp/net/dbus.el (dbus-ignore-errors):
* lisp/jka-cmpr-hook.el (with-auto-compression-mode):
* lisp/international/mule.el (with-category-table):
* lisp/emacs-lisp/timer.el (with-timeout):
* lisp/emacs-lisp/lisp-mnt.el (lm-with-file):
* lisp/emacs-lisp/eieio.el (with-slots):
* lisp/emacs-lisp/easymenu.el (easy-menu-define):
* lisp/emacs-lisp/debug.el (debugger-env-macro):
* lisp/emacs-lisp/cl-compat.el (Multiple-value-bind, Multiple-value-setq)
(Multiple-value-call, Multiple-value-prog1):
* lisp/emacs-lisp/cl-seq.el (cl-parsing-keywords, cl-check-key)
(cl-check-test-nokey, cl-check-test, cl-check-match): Move indent and
edebug rule to definition.
* lisp/emacs-lisp/lisp-mode.el (save-selected-window)
(with-current-buffer, combine-after-change-calls)
(with-output-to-string, with-temp-file, with-temp-buffer)
(with-temp-message, with-syntax-table, read-if, eval-after-load)
(dolist, dotimes, when, unless):
* lisp/emacs-lisp/byte-run.el (inline): Remove indent rule, redundant.
2010-08-30 15:03:05 +02:00
|
|
|
(declare (debug edebug-forms))
|
Use lexical-binding for all of CL, and clean up its namespace.
* lisp/emacs-lisp/cl-lib.el: Use lexical-binding.
(cl-map-extents, cl-maclisp-member): Remove.
(cl--set-elt, cl--set-nthcdr, cl--set-buffer-substring)
(cl--set-substring, cl--block-wrapper, cl--block-throw)
(cl--compiling-file, cl--mapcar-many, cl--do-subst): Use "cl--" prefix.
* lisp/emacs-lisp/cl-extra.el: Use lexical-binding.
(cl--mapcar-many, cl--map-keymap-recursively, cl--map-intervals)
(cl--map-overlays, cl--set-frame-visible-p, cl--progv-save)
(cl--progv-before, cl--progv-after, cl--finite-do, cl--set-getf)
(cl--do-remf, cl--do-prettyprint): Use "cl--" prefix.
* lisp/emacs-lisp/cl-seq.el: Use lexical-binding.
(cl--parsing-keywords, cl--check-key, cl--check-test-nokey)
(cl--check-test, cl--check-match): Use "cl--" prefix and backquotes.
(cl--alist, cl--sublis-rec, cl--nsublis-rec, cl--tree-equal-rec):
* lisp/emacs-lisp/cl-macs.el (cl--lambda-list-keywords): Use "cl--" prefix.
* lisp/edmacro.el (edmacro-mismatch): Simplify to remove dependence on
CL's internals.
2012-06-11 11:52:50 -04:00
|
|
|
`(cond
|
|
|
|
(cl-test (eq (not (funcall cl-test ,item ,x))
|
|
|
|
cl-test-not))
|
|
|
|
(cl-if (eq (not (funcall cl-if ,x)) cl-if-not))
|
|
|
|
(t (eql ,item ,x))))
|
|
|
|
|
|
|
|
(defmacro cl--check-test (item x) ;all of the above.
|
Use `declare' in defmacros.
* lisp/window.el (save-selected-window):
* lisp/subr.el (with-temp-file, with-temp-message, with-syntax-table):
* lisp/progmodes/python.el (def-python-skeleton):
* lisp/net/dbus.el (dbus-ignore-errors):
* lisp/jka-cmpr-hook.el (with-auto-compression-mode):
* lisp/international/mule.el (with-category-table):
* lisp/emacs-lisp/timer.el (with-timeout):
* lisp/emacs-lisp/lisp-mnt.el (lm-with-file):
* lisp/emacs-lisp/eieio.el (with-slots):
* lisp/emacs-lisp/easymenu.el (easy-menu-define):
* lisp/emacs-lisp/debug.el (debugger-env-macro):
* lisp/emacs-lisp/cl-compat.el (Multiple-value-bind, Multiple-value-setq)
(Multiple-value-call, Multiple-value-prog1):
* lisp/emacs-lisp/cl-seq.el (cl-parsing-keywords, cl-check-key)
(cl-check-test-nokey, cl-check-test, cl-check-match): Move indent and
edebug rule to definition.
* lisp/emacs-lisp/lisp-mode.el (save-selected-window)
(with-current-buffer, combine-after-change-calls)
(with-output-to-string, with-temp-file, with-temp-buffer)
(with-temp-message, with-syntax-table, read-if, eval-after-load)
(dolist, dotimes, when, unless):
* lisp/emacs-lisp/byte-run.el (inline): Remove indent rule, redundant.
2010-08-30 15:03:05 +02:00
|
|
|
(declare (debug edebug-forms))
|
Use lexical-binding for all of CL, and clean up its namespace.
* lisp/emacs-lisp/cl-lib.el: Use lexical-binding.
(cl-map-extents, cl-maclisp-member): Remove.
(cl--set-elt, cl--set-nthcdr, cl--set-buffer-substring)
(cl--set-substring, cl--block-wrapper, cl--block-throw)
(cl--compiling-file, cl--mapcar-many, cl--do-subst): Use "cl--" prefix.
* lisp/emacs-lisp/cl-extra.el: Use lexical-binding.
(cl--mapcar-many, cl--map-keymap-recursively, cl--map-intervals)
(cl--map-overlays, cl--set-frame-visible-p, cl--progv-save)
(cl--progv-before, cl--progv-after, cl--finite-do, cl--set-getf)
(cl--do-remf, cl--do-prettyprint): Use "cl--" prefix.
* lisp/emacs-lisp/cl-seq.el: Use lexical-binding.
(cl--parsing-keywords, cl--check-key, cl--check-test-nokey)
(cl--check-test, cl--check-match): Use "cl--" prefix and backquotes.
(cl--alist, cl--sublis-rec, cl--nsublis-rec, cl--tree-equal-rec):
* lisp/emacs-lisp/cl-macs.el (cl--lambda-list-keywords): Use "cl--" prefix.
* lisp/edmacro.el (edmacro-mismatch): Simplify to remove dependence on
CL's internals.
2012-06-11 11:52:50 -04:00
|
|
|
`(cl--check-test-nokey ,item (cl--check-key ,x)))
|
1993-07-30 20:15:09 +00:00
|
|
|
|
Use lexical-binding for all of CL, and clean up its namespace.
* lisp/emacs-lisp/cl-lib.el: Use lexical-binding.
(cl-map-extents, cl-maclisp-member): Remove.
(cl--set-elt, cl--set-nthcdr, cl--set-buffer-substring)
(cl--set-substring, cl--block-wrapper, cl--block-throw)
(cl--compiling-file, cl--mapcar-many, cl--do-subst): Use "cl--" prefix.
* lisp/emacs-lisp/cl-extra.el: Use lexical-binding.
(cl--mapcar-many, cl--map-keymap-recursively, cl--map-intervals)
(cl--map-overlays, cl--set-frame-visible-p, cl--progv-save)
(cl--progv-before, cl--progv-after, cl--finite-do, cl--set-getf)
(cl--do-remf, cl--do-prettyprint): Use "cl--" prefix.
* lisp/emacs-lisp/cl-seq.el: Use lexical-binding.
(cl--parsing-keywords, cl--check-key, cl--check-test-nokey)
(cl--check-test, cl--check-match): Use "cl--" prefix and backquotes.
(cl--alist, cl--sublis-rec, cl--nsublis-rec, cl--tree-equal-rec):
* lisp/emacs-lisp/cl-macs.el (cl--lambda-list-keywords): Use "cl--" prefix.
* lisp/edmacro.el (edmacro-mismatch): Simplify to remove dependence on
CL's internals.
2012-06-11 11:52:50 -04:00
|
|
|
(defmacro cl--check-match (x y) ;cl-key cl-test cl-test-not
|
Use `declare' in defmacros.
* lisp/window.el (save-selected-window):
* lisp/subr.el (with-temp-file, with-temp-message, with-syntax-table):
* lisp/progmodes/python.el (def-python-skeleton):
* lisp/net/dbus.el (dbus-ignore-errors):
* lisp/jka-cmpr-hook.el (with-auto-compression-mode):
* lisp/international/mule.el (with-category-table):
* lisp/emacs-lisp/timer.el (with-timeout):
* lisp/emacs-lisp/lisp-mnt.el (lm-with-file):
* lisp/emacs-lisp/eieio.el (with-slots):
* lisp/emacs-lisp/easymenu.el (easy-menu-define):
* lisp/emacs-lisp/debug.el (debugger-env-macro):
* lisp/emacs-lisp/cl-compat.el (Multiple-value-bind, Multiple-value-setq)
(Multiple-value-call, Multiple-value-prog1):
* lisp/emacs-lisp/cl-seq.el (cl-parsing-keywords, cl-check-key)
(cl-check-test-nokey, cl-check-test, cl-check-match): Move indent and
edebug rule to definition.
* lisp/emacs-lisp/lisp-mode.el (save-selected-window)
(with-current-buffer, combine-after-change-calls)
(with-output-to-string, with-temp-file, with-temp-buffer)
(with-temp-message, with-syntax-table, read-if, eval-after-load)
(dolist, dotimes, when, unless):
* lisp/emacs-lisp/byte-run.el (inline): Remove indent rule, redundant.
2010-08-30 15:03:05 +02:00
|
|
|
(declare (debug edebug-forms))
|
Use lexical-binding for all of CL, and clean up its namespace.
* lisp/emacs-lisp/cl-lib.el: Use lexical-binding.
(cl-map-extents, cl-maclisp-member): Remove.
(cl--set-elt, cl--set-nthcdr, cl--set-buffer-substring)
(cl--set-substring, cl--block-wrapper, cl--block-throw)
(cl--compiling-file, cl--mapcar-many, cl--do-subst): Use "cl--" prefix.
* lisp/emacs-lisp/cl-extra.el: Use lexical-binding.
(cl--mapcar-many, cl--map-keymap-recursively, cl--map-intervals)
(cl--map-overlays, cl--set-frame-visible-p, cl--progv-save)
(cl--progv-before, cl--progv-after, cl--finite-do, cl--set-getf)
(cl--do-remf, cl--do-prettyprint): Use "cl--" prefix.
* lisp/emacs-lisp/cl-seq.el: Use lexical-binding.
(cl--parsing-keywords, cl--check-key, cl--check-test-nokey)
(cl--check-test, cl--check-match): Use "cl--" prefix and backquotes.
(cl--alist, cl--sublis-rec, cl--nsublis-rec, cl--tree-equal-rec):
* lisp/emacs-lisp/cl-macs.el (cl--lambda-list-keywords): Use "cl--" prefix.
* lisp/edmacro.el (edmacro-mismatch): Simplify to remove dependence on
CL's internals.
2012-06-11 11:52:50 -04:00
|
|
|
(setq x `(cl--check-key ,x) y `(cl--check-key ,y))
|
|
|
|
`(if cl-test
|
|
|
|
(eq (not (funcall cl-test ,x ,y)) cl-test-not)
|
|
|
|
(eql ,x ,y)))
|
1993-07-30 20:15:09 +00:00
|
|
|
|
2012-12-06 16:29:29 -05:00
|
|
|
;; Yuck! These vars are set/bound by cl--parsing-keywords to match :if :test
|
|
|
|
;; and :key keyword args, and they are also accessed (sometimes) via dynamic
|
|
|
|
;; scoping (and some of those accesses are from macro-expanded code).
|
1993-07-30 20:15:09 +00:00
|
|
|
(defvar cl-test) (defvar cl-test-not)
|
|
|
|
(defvar cl-if) (defvar cl-if-not)
|
|
|
|
(defvar cl-key)
|
|
|
|
|
2019-02-18 13:16:57 -05:00
|
|
|
;;;###autoload
|
|
|
|
(defun cl-endp (x)
|
|
|
|
"Return true if X is the empty list; false if it is a cons.
|
|
|
|
Signal an error if X is not a list."
|
Inline side-effect-free declarations in cl-lib.el
* lisp/emacs-lisp/cl-macs.el: Move side-effect-free declarations from
here...
* lisp/emacs-lisp/cl-extra.el (cl-gcd, cl-lcm, cl-isqrt, cl-floor)
(cl-ceiling, cl-truncate, cl-round, cl-mod, cl-rem, cl-signum)
(cl-subseq, cl-list-length, cl-get, cl-getf):
* lisp/emacs-lisp/cl-lib.el (cl-plusp, cl-minusp, cl-oddp, cl-evenp)
(cl-fifth, cl-sixth, cl-seventh, cl-eighth, cl-ninth, cl-tenth)
(cl-ldiff, cl-pairlis):
* lisp/emacs-lisp/cl-seq.el (cl-endp): ...to have them inline here.
* lisp/emacs-lisp/cl-macs.el: Move side-effect-and-error-free
declarations from here...
* lisp/emacs-lisp/cl-extra.el (cl-equalp, cl-random-state-p):
* lisp/emacs-lisp/cl-lib.el (cl-list*, cl-acons): ...to have them inline
here. (Bug#76247)
2025-02-13 04:24:05 +01:00
|
|
|
(declare (side-effect-free t))
|
2019-02-18 13:16:57 -05:00
|
|
|
(cl-check-type x list)
|
|
|
|
(null x))
|
|
|
|
|
2007-06-27 18:59:03 +00:00
|
|
|
;;;###autoload
|
2012-06-03 21:05:17 -04:00
|
|
|
(defun cl-reduce (cl-func cl-seq &rest cl-keys)
|
(reduce, fill, replace, remove*, remove-if, remove-if-not, delete*, delete-if,
delete-if-not, remove-duplicates, delete-duplicates, substitute, substitute-if,
substitute-if-not, nsubstitute, nsubstitute-if, nsubstitute-if-not, find,
find-if, find-if-not, position, position-if, position-if-not, count, count-if,
count-if-not, mismatch, search, sort*, stable-sort, merge, member*, member-if,
member-if-not, assoc*, assoc-if, assoc-if-not, rassoc*, rassoc-if,
rassoc-if-not, union, nunion, intersection, nintersection, set-difference,
nset-difference, set-exclusive-or, nset-exclusive-or, subsetp, subst-if,
subst-if-not, nsubst, nsubst-if, nsubst-if-not, sublis, nsublis, tree-equal):
Improve argument/docstring consistency.
2005-05-20 14:30:34 +00:00
|
|
|
"Reduce two-argument FUNCTION across SEQ.
|
|
|
|
\nKeywords supported: :start :end :from-end :initial-value :key
|
2016-07-18 14:12:50 +02:00
|
|
|
|
|
|
|
Return the result of calling FUNCTION with the first and the
|
|
|
|
second element of SEQ, then calling FUNCTION with that result and
|
|
|
|
the third element of SEQ, then with that result and the fourth
|
|
|
|
element of SEQ, etc.
|
|
|
|
|
2019-10-07 17:54:18 +01:00
|
|
|
If :INITIAL-VALUE is specified, it is logically added to the
|
|
|
|
front of SEQ (or the back if :FROM-END is non-nil). If SEQ is
|
|
|
|
empty, return :INITIAL-VALUE and FUNCTION is not called.
|
|
|
|
|
|
|
|
If SEQ is empty and no :INITIAL-VALUE is specified, then return
|
|
|
|
the result of calling FUNCTION with zero arguments. This is the
|
|
|
|
only case where FUNCTION is called with fewer than two arguments.
|
|
|
|
|
|
|
|
If SEQ contains exactly one element and no :INITIAL-VALUE is
|
|
|
|
specified, then return that element and FUNCTION is not called.
|
2019-10-07 06:32:36 +02:00
|
|
|
|
2022-08-18 15:06:56 +02:00
|
|
|
If :FROM-END is non-nil, the reduction occurs from the back of
|
|
|
|
the SEQ moving forward, and the order of arguments to the
|
|
|
|
FUNCTION is also reversed.
|
|
|
|
|
(reduce, fill, replace, remove*, remove-if, remove-if-not, delete*, delete-if,
delete-if-not, remove-duplicates, delete-duplicates, substitute, substitute-if,
substitute-if-not, nsubstitute, nsubstitute-if, nsubstitute-if-not, find,
find-if, find-if-not, position, position-if, position-if-not, count, count-if,
count-if-not, mismatch, search, sort*, stable-sort, merge, member*, member-if,
member-if-not, assoc*, assoc-if, assoc-if-not, rassoc*, rassoc-if,
rassoc-if-not, union, nunion, intersection, nintersection, set-difference,
nset-difference, set-exclusive-or, nset-exclusive-or, subsetp, subst-if,
subst-if-not, nsubst, nsubst-if, nsubst-if-not, sublis, nsublis, tree-equal):
Improve argument/docstring consistency.
2005-05-20 14:30:34 +00:00
|
|
|
\n(fn FUNCTION SEQ [KEYWORD VALUE]...)"
|
Inline important-return-value declarations in cl-lib.el
These declarations are now properly added to 'cl-lib.el' itself, or to
'cl-loaddefs.el'. This means that they will now correctly show up
immediately when loading 'cl-lib.el', instead of only after 'cl-macs.el'
is pulled in by an autoload. C.f. Bug#76247.
I did not considered worth reproducing everywhere the list saying which
functions among the below belong to these two categories:
1. Functions that are side-effect-free except for the behavior of
functions passed as argument.
2. Functions that mutate and return a list.
AFAIU, this is not actionable with our current byte-compiler, i.e. we
can't add any extra declarations based on it. However, if the list
should be needed at some point, for example due to improvements in the
compiler, this commit will be where to find it. In the worst case, and
with more work, it's also deducible from the source code itself.
* lisp/emacs-lisp/cl-macs.el: Move important-return-value declarations
from here...
* lisp/emacs-lisp/cl-extra.el (cl-map, cl-maplist, cl-mapcan)
(cl-mapcon, cl-some, cl-every, cl-notany, cl-notevery, cl-nreconc):
* lisp/emacs-lisp/cl-lib.el (cl-mapcar, cl-adjoin, cl-subst):
* lisp/emacs-lisp/cl-seq.el (cl-reduce, cl-remove, cl-remove-if)
(cl-remove-if-not, cl-delete, cl-delete-if, cl-delete-if-not)
(cl-remove-duplicates, cl-delete-duplicates, cl-substitute)
(cl-substitute-if, cl-substitute-if-not, cl-nsubstitute)
(cl-nsubstitute-if, cl-nsubstitute-if-not, cl-find, cl-find-if)
(cl-find-if-not, cl-position, cl-position-if, cl-position-if-not)
(cl-count, cl-count-if, cl-count-if-not, cl-mismatch, cl-search)
(cl-sort, cl-stable-sort, cl-merge, cl-member, cl-member-if)
(cl-member-if-not, cl-assoc, cl-assoc-if, cl-assoc-if-not, cl-rassoc)
(cl-rassoc-if, cl-rassoc-if-not, cl-union, cl-nunion, cl-intersection)
(cl-nintersection, cl-set-difference, cl-nset-difference)
(cl-set-exclusive-or, cl-nset-exclusive-or, cl-subsetp, cl-subst-if)
(cl-subst-if-not, cl-nsubst, cl-nsubst-if, cl-nsubst-if-not, cl-sublis)
(cl-nsublis, cl-tree-equal): ...to have them inline here.
2025-02-14 22:46:07 +01:00
|
|
|
(declare (important-return-value t))
|
Use lexical-binding for all of CL, and clean up its namespace.
* lisp/emacs-lisp/cl-lib.el: Use lexical-binding.
(cl-map-extents, cl-maclisp-member): Remove.
(cl--set-elt, cl--set-nthcdr, cl--set-buffer-substring)
(cl--set-substring, cl--block-wrapper, cl--block-throw)
(cl--compiling-file, cl--mapcar-many, cl--do-subst): Use "cl--" prefix.
* lisp/emacs-lisp/cl-extra.el: Use lexical-binding.
(cl--mapcar-many, cl--map-keymap-recursively, cl--map-intervals)
(cl--map-overlays, cl--set-frame-visible-p, cl--progv-save)
(cl--progv-before, cl--progv-after, cl--finite-do, cl--set-getf)
(cl--do-remf, cl--do-prettyprint): Use "cl--" prefix.
* lisp/emacs-lisp/cl-seq.el: Use lexical-binding.
(cl--parsing-keywords, cl--check-key, cl--check-test-nokey)
(cl--check-test, cl--check-match): Use "cl--" prefix and backquotes.
(cl--alist, cl--sublis-rec, cl--nsublis-rec, cl--tree-equal-rec):
* lisp/emacs-lisp/cl-macs.el (cl--lambda-list-keywords): Use "cl--" prefix.
* lisp/edmacro.el (edmacro-mismatch): Simplify to remove dependence on
CL's internals.
2012-06-11 11:52:50 -04:00
|
|
|
(cl--parsing-keywords (:from-end (:start 0) :end :initial-value :key) ()
|
1993-07-30 20:15:09 +00:00
|
|
|
(or (listp cl-seq) (setq cl-seq (append cl-seq nil)))
|
2012-06-03 21:05:17 -04:00
|
|
|
(setq cl-seq (cl-subseq cl-seq cl-start cl-end))
|
1993-07-30 20:15:09 +00:00
|
|
|
(if cl-from-end (setq cl-seq (nreverse cl-seq)))
|
2000-05-05 20:01:01 +00:00
|
|
|
(let ((cl-accum (cond ((memq :initial-value cl-keys) cl-initial-value)
|
Use lexical-binding for all of CL, and clean up its namespace.
* lisp/emacs-lisp/cl-lib.el: Use lexical-binding.
(cl-map-extents, cl-maclisp-member): Remove.
(cl--set-elt, cl--set-nthcdr, cl--set-buffer-substring)
(cl--set-substring, cl--block-wrapper, cl--block-throw)
(cl--compiling-file, cl--mapcar-many, cl--do-subst): Use "cl--" prefix.
* lisp/emacs-lisp/cl-extra.el: Use lexical-binding.
(cl--mapcar-many, cl--map-keymap-recursively, cl--map-intervals)
(cl--map-overlays, cl--set-frame-visible-p, cl--progv-save)
(cl--progv-before, cl--progv-after, cl--finite-do, cl--set-getf)
(cl--do-remf, cl--do-prettyprint): Use "cl--" prefix.
* lisp/emacs-lisp/cl-seq.el: Use lexical-binding.
(cl--parsing-keywords, cl--check-key, cl--check-test-nokey)
(cl--check-test, cl--check-match): Use "cl--" prefix and backquotes.
(cl--alist, cl--sublis-rec, cl--nsublis-rec, cl--tree-equal-rec):
* lisp/emacs-lisp/cl-macs.el (cl--lambda-list-keywords): Use "cl--" prefix.
* lisp/edmacro.el (edmacro-mismatch): Simplify to remove dependence on
CL's internals.
2012-06-11 11:52:50 -04:00
|
|
|
(cl-seq (cl--check-key (pop cl-seq)))
|
1993-07-30 20:15:09 +00:00
|
|
|
(t (funcall cl-func)))))
|
|
|
|
(if cl-from-end
|
|
|
|
(while cl-seq
|
Use lexical-binding for all of CL, and clean up its namespace.
* lisp/emacs-lisp/cl-lib.el: Use lexical-binding.
(cl-map-extents, cl-maclisp-member): Remove.
(cl--set-elt, cl--set-nthcdr, cl--set-buffer-substring)
(cl--set-substring, cl--block-wrapper, cl--block-throw)
(cl--compiling-file, cl--mapcar-many, cl--do-subst): Use "cl--" prefix.
* lisp/emacs-lisp/cl-extra.el: Use lexical-binding.
(cl--mapcar-many, cl--map-keymap-recursively, cl--map-intervals)
(cl--map-overlays, cl--set-frame-visible-p, cl--progv-save)
(cl--progv-before, cl--progv-after, cl--finite-do, cl--set-getf)
(cl--do-remf, cl--do-prettyprint): Use "cl--" prefix.
* lisp/emacs-lisp/cl-seq.el: Use lexical-binding.
(cl--parsing-keywords, cl--check-key, cl--check-test-nokey)
(cl--check-test, cl--check-match): Use "cl--" prefix and backquotes.
(cl--alist, cl--sublis-rec, cl--nsublis-rec, cl--tree-equal-rec):
* lisp/emacs-lisp/cl-macs.el (cl--lambda-list-keywords): Use "cl--" prefix.
* lisp/edmacro.el (edmacro-mismatch): Simplify to remove dependence on
CL's internals.
2012-06-11 11:52:50 -04:00
|
|
|
(setq cl-accum (funcall cl-func (cl--check-key (pop cl-seq))
|
1993-07-30 20:15:09 +00:00
|
|
|
cl-accum)))
|
|
|
|
(while cl-seq
|
|
|
|
(setq cl-accum (funcall cl-func cl-accum
|
Use lexical-binding for all of CL, and clean up its namespace.
* lisp/emacs-lisp/cl-lib.el: Use lexical-binding.
(cl-map-extents, cl-maclisp-member): Remove.
(cl--set-elt, cl--set-nthcdr, cl--set-buffer-substring)
(cl--set-substring, cl--block-wrapper, cl--block-throw)
(cl--compiling-file, cl--mapcar-many, cl--do-subst): Use "cl--" prefix.
* lisp/emacs-lisp/cl-extra.el: Use lexical-binding.
(cl--mapcar-many, cl--map-keymap-recursively, cl--map-intervals)
(cl--map-overlays, cl--set-frame-visible-p, cl--progv-save)
(cl--progv-before, cl--progv-after, cl--finite-do, cl--set-getf)
(cl--do-remf, cl--do-prettyprint): Use "cl--" prefix.
* lisp/emacs-lisp/cl-seq.el: Use lexical-binding.
(cl--parsing-keywords, cl--check-key, cl--check-test-nokey)
(cl--check-test, cl--check-match): Use "cl--" prefix and backquotes.
(cl--alist, cl--sublis-rec, cl--nsublis-rec, cl--tree-equal-rec):
* lisp/emacs-lisp/cl-macs.el (cl--lambda-list-keywords): Use "cl--" prefix.
* lisp/edmacro.el (edmacro-mismatch): Simplify to remove dependence on
CL's internals.
2012-06-11 11:52:50 -04:00
|
|
|
(cl--check-key (pop cl-seq))))))
|
1993-07-30 20:15:09 +00:00
|
|
|
cl-accum)))
|
|
|
|
|
2007-06-27 18:59:03 +00:00
|
|
|
;;;###autoload
|
2016-08-13 13:25:15 +09:00
|
|
|
(defun cl-fill (cl-seq cl-item &rest cl-keys)
|
1993-07-30 20:15:09 +00:00
|
|
|
"Fill the elements of SEQ with ITEM.
|
(reduce, fill, replace, remove*, remove-if, remove-if-not, delete*, delete-if,
delete-if-not, remove-duplicates, delete-duplicates, substitute, substitute-if,
substitute-if-not, nsubstitute, nsubstitute-if, nsubstitute-if-not, find,
find-if, find-if-not, position, position-if, position-if-not, count, count-if,
count-if-not, mismatch, search, sort*, stable-sort, merge, member*, member-if,
member-if-not, assoc*, assoc-if, assoc-if-not, rassoc*, rassoc-if,
rassoc-if-not, union, nunion, intersection, nintersection, set-difference,
nset-difference, set-exclusive-or, nset-exclusive-or, subsetp, subst-if,
subst-if-not, nsubst, nsubst-if, nsubst-if-not, sublis, nsublis, tree-equal):
Improve argument/docstring consistency.
2005-05-20 14:30:34 +00:00
|
|
|
\nKeywords supported: :start :end
|
|
|
|
\n(fn SEQ ITEM [KEYWORD VALUE]...)"
|
Use lexical-binding for all of CL, and clean up its namespace.
* lisp/emacs-lisp/cl-lib.el: Use lexical-binding.
(cl-map-extents, cl-maclisp-member): Remove.
(cl--set-elt, cl--set-nthcdr, cl--set-buffer-substring)
(cl--set-substring, cl--block-wrapper, cl--block-throw)
(cl--compiling-file, cl--mapcar-many, cl--do-subst): Use "cl--" prefix.
* lisp/emacs-lisp/cl-extra.el: Use lexical-binding.
(cl--mapcar-many, cl--map-keymap-recursively, cl--map-intervals)
(cl--map-overlays, cl--set-frame-visible-p, cl--progv-save)
(cl--progv-before, cl--progv-after, cl--finite-do, cl--set-getf)
(cl--do-remf, cl--do-prettyprint): Use "cl--" prefix.
* lisp/emacs-lisp/cl-seq.el: Use lexical-binding.
(cl--parsing-keywords, cl--check-key, cl--check-test-nokey)
(cl--check-test, cl--check-match): Use "cl--" prefix and backquotes.
(cl--alist, cl--sublis-rec, cl--nsublis-rec, cl--tree-equal-rec):
* lisp/emacs-lisp/cl-macs.el (cl--lambda-list-keywords): Use "cl--" prefix.
* lisp/edmacro.el (edmacro-mismatch): Simplify to remove dependence on
CL's internals.
2012-06-11 11:52:50 -04:00
|
|
|
(cl--parsing-keywords ((:start 0) :end) ()
|
2016-08-13 13:25:15 +09:00
|
|
|
(if (listp cl-seq)
|
|
|
|
(let ((p (nthcdr cl-start cl-seq))
|
2016-10-20 19:51:55 +09:00
|
|
|
(n (and cl-end (- cl-end cl-start))))
|
Prefer decf to cl-decf
* lisp/auth-source-pass.el (auth-source-pass--find-match-many):
* lisp/calendar/time-date.el (decoded-time-add)
(decoded-time--alter-month, decoded-time--alter-day):
* lisp/dired.el (dired--move-to-next-line):
* lisp/dom.el (dom-pp):
* lisp/emacs-lisp/cl-macs.el (cl--transform-lambda):
* lisp/emacs-lisp/cl-print.el (cl-print-to-string-with-limit):
* lisp/emacs-lisp/cl-seq.el (cl-fill, cl-replace, cl-substitute):
* lisp/emacs-lisp/comp-cstr.el (comp--range-union)
(comp--range-intersection):
* lisp/emacs-lisp/comp.el (comp-vec-prepend, comp--emit-narg-prologue):
* lisp/emacs-lisp/edebug.el (edebug--strip-instrumentation):
* lisp/emacs-lisp/eldoc.el (eldoc--invoke-strategy):
* lisp/emacs-lisp/pp.el (pp--format-definition):
* lisp/emacs-lisp/smie.el (smie-config--guess-1):
* lisp/eshell/esh-io.el (eshell-close-handle, eshell-set-output-handle):
* lisp/gnus/gnus-async.el (gnus-async-prefetch-article):
* lisp/gnus/gnus-group.el (gnus-group-mark-group)
(gnus-group-yank-group):
* lisp/gnus/gnus-salt.el (gnus-tree-forward-line):
* lisp/gnus/gnus-score.el (gnus-decay-scores):
* lisp/gnus/gnus-srvr.el (gnus-browse-toggle-subscription-at-point):
* lisp/gnus/gnus-sum.el (gnus-build-sparse-threads, gnus-parent-headers)
(gnus-update-marks, gnus-summary-work-articles)
(gnus-summary-refer-parent-article, gnus-summary-next-thread)
(gnus-read-header, gnus-summary-insert-new-articles):
* lisp/gnus/gnus-topic.el (gnus-topic-forward-topic):
* lisp/gnus/gnus.el (gnus-short-group-name):
* lisp/gnus/message.el (message-remove-first-header)
(message-shorten-references, message-insert-screenshot):
* lisp/gnus/mm-url.el (mm-url-insert):
* lisp/gnus/nnselect.el (nnselect-push-info):
* lisp/ibuffer.el (ibuffer-backward-line, ibuffer-forward-line)
(ibuffer-map-lines):
* lisp/icomplete.el (icomplete--render-vertical):
* lisp/image/image-dired-external.el (image-dired-create-thumb-1):
* lisp/image/image-dired.el (image-dired-delete-char):
* lisp/mail/ietf-drums-date.el (ietf-drums-date--tokenize-string):
* lisp/mh-e/mh-utils.el (mh-sub-folders-parse):
* lisp/minibuffer.el (minibuffer-completion-help):
* lisp/mpc.el (mpc-cmd-move, mpc-songpointer-refresh-hairy):
* lisp/net/eww.el (eww-process-text-input):
* lisp/net/pop3.el (pop3-wait-for-messages, pop3-uidl-stat)
(pop3-uidl-dele):
* lisp/net/shr-color.el (shr-color-hue-to-rgb):
* lisp/play/5x5.el (5x5-up, 5x5-left):
* lisp/play/decipher.el (decipher-read-alphabet, decipher--digram-total)
(decipher-analyze-buffer):
* lisp/play/hanoi.el (hanoi-insert-ring, hanoi-move-ring):
* lisp/profiler.el (profiler-format-number)
(profiler-calltree-build-unified):
* lisp/progmodes/antlr-mode.el (antlr-next-rule, antlr-indent-line):
* lisp/progmodes/c-ts-common.el (c-ts-common-statement-offset):
* lisp/progmodes/ebrowse.el
(ebrowse-cyclic-display-next/previous-member-list):
* lisp/progmodes/hideif.el (hif-backward-comment):
* lisp/progmodes/js.el (js-beginning-of-defun, js-end-of-defun)
(js-ts--syntax-propertize):
* lisp/progmodes/typescript-ts-mode.el
(tsx-ts--syntax-propertize-captures):
* lisp/rect.el (rectangle--*-char):
* lisp/term.el (term-emulate-terminal):
* lisp/textmodes/reftex-cite.el (reftex-do-citation):
* lisp/textmodes/reftex-index.el (reftex-index-next-phrase):
* lisp/textmodes/reftex-parse.el (reftex-init-section-numbers):
* lisp/textmodes/reftex-sel.el (reftex-select-unmark):
* lisp/textmodes/reftex.el (reftex-silence-toc-markers):
* lisp/treesit.el (treesit-navigate-thing):
* lisp/vc/diff-mode.el (diff-sanity-check-context-hunk-half,
(diff-sanity-check-hunk):
* lisp/vc/pcvs-util.el (cvs-first):
* lisp/vc/smerge-mode.el (smerge-get-current):
* lisp/vc/vc-hg.el (vc-hg--glob-to-pcre):
* test/lisp/net/socks-tests.el
(socks-tests-perform-hello-world-http-request):
* test/src/buffer-tests.el (test-overlay-randomly): Prefer decf to
cl-defc in all code where we can.
2025-02-22 19:06:11 +01:00
|
|
|
(while (and p (or (null n) (>= (decf n) 0)))
|
2016-08-13 13:25:15 +09:00
|
|
|
(setcar p cl-item)
|
1993-07-30 20:15:09 +00:00
|
|
|
(setq p (cdr p))))
|
2016-08-13 13:25:15 +09:00
|
|
|
(or cl-end (setq cl-end (length cl-seq)))
|
|
|
|
(if (and (= cl-start 0) (= cl-end (length cl-seq)))
|
|
|
|
(fillarray cl-seq cl-item)
|
1993-07-30 20:15:09 +00:00
|
|
|
(while (< cl-start cl-end)
|
2016-08-13 13:25:15 +09:00
|
|
|
(aset cl-seq cl-start cl-item)
|
1993-07-30 20:15:09 +00:00
|
|
|
(setq cl-start (1+ cl-start)))))
|
2016-08-13 13:25:15 +09:00
|
|
|
cl-seq))
|
1993-07-30 20:15:09 +00:00
|
|
|
|
2007-06-27 18:59:03 +00:00
|
|
|
;;;###autoload
|
2012-06-03 21:05:17 -04:00
|
|
|
(defun cl-replace (cl-seq1 cl-seq2 &rest cl-keys)
|
1993-07-30 20:15:09 +00:00
|
|
|
"Replace the elements of SEQ1 with the elements of SEQ2.
|
|
|
|
SEQ1 is destructively modified, then returned.
|
(reduce, fill, replace, remove*, remove-if, remove-if-not, delete*, delete-if,
delete-if-not, remove-duplicates, delete-duplicates, substitute, substitute-if,
substitute-if-not, nsubstitute, nsubstitute-if, nsubstitute-if-not, find,
find-if, find-if-not, position, position-if, position-if-not, count, count-if,
count-if-not, mismatch, search, sort*, stable-sort, merge, member*, member-if,
member-if-not, assoc*, assoc-if, assoc-if-not, rassoc*, rassoc-if,
rassoc-if-not, union, nunion, intersection, nintersection, set-difference,
nset-difference, set-exclusive-or, nset-exclusive-or, subsetp, subst-if,
subst-if-not, nsubst, nsubst-if, nsubst-if-not, sublis, nsublis, tree-equal):
Improve argument/docstring consistency.
2005-05-20 14:30:34 +00:00
|
|
|
\nKeywords supported: :start1 :end1 :start2 :end2
|
|
|
|
\n(fn SEQ1 SEQ2 [KEYWORD VALUE]...)"
|
Use lexical-binding for all of CL, and clean up its namespace.
* lisp/emacs-lisp/cl-lib.el: Use lexical-binding.
(cl-map-extents, cl-maclisp-member): Remove.
(cl--set-elt, cl--set-nthcdr, cl--set-buffer-substring)
(cl--set-substring, cl--block-wrapper, cl--block-throw)
(cl--compiling-file, cl--mapcar-many, cl--do-subst): Use "cl--" prefix.
* lisp/emacs-lisp/cl-extra.el: Use lexical-binding.
(cl--mapcar-many, cl--map-keymap-recursively, cl--map-intervals)
(cl--map-overlays, cl--set-frame-visible-p, cl--progv-save)
(cl--progv-before, cl--progv-after, cl--finite-do, cl--set-getf)
(cl--do-remf, cl--do-prettyprint): Use "cl--" prefix.
* lisp/emacs-lisp/cl-seq.el: Use lexical-binding.
(cl--parsing-keywords, cl--check-key, cl--check-test-nokey)
(cl--check-test, cl--check-match): Use "cl--" prefix and backquotes.
(cl--alist, cl--sublis-rec, cl--nsublis-rec, cl--tree-equal-rec):
* lisp/emacs-lisp/cl-macs.el (cl--lambda-list-keywords): Use "cl--" prefix.
* lisp/edmacro.el (edmacro-mismatch): Simplify to remove dependence on
CL's internals.
2012-06-11 11:52:50 -04:00
|
|
|
(cl--parsing-keywords ((:start1 0) :end1 (:start2 0) :end2) ()
|
1993-07-30 20:15:09 +00:00
|
|
|
(if (and (eq cl-seq1 cl-seq2) (<= cl-start2 cl-start1))
|
|
|
|
(or (= cl-start1 cl-start2)
|
|
|
|
(let* ((cl-len (length cl-seq1))
|
|
|
|
(cl-n (min (- (or cl-end1 cl-len) cl-start1)
|
|
|
|
(- (or cl-end2 cl-len) cl-start2))))
|
|
|
|
(while (>= (setq cl-n (1- cl-n)) 0)
|
2014-04-21 23:18:15 -04:00
|
|
|
(setf (elt cl-seq1 (+ cl-start1 cl-n))
|
1993-07-30 20:15:09 +00:00
|
|
|
(elt cl-seq2 (+ cl-start2 cl-n))))))
|
|
|
|
(if (listp cl-seq1)
|
|
|
|
(let ((cl-p1 (nthcdr cl-start1 cl-seq1))
|
2016-10-20 19:51:55 +09:00
|
|
|
(cl-n1 (and cl-end1 (- cl-end1 cl-start1))))
|
1993-07-30 20:15:09 +00:00
|
|
|
(if (listp cl-seq2)
|
|
|
|
(let ((cl-p2 (nthcdr cl-start2 cl-seq2))
|
2016-10-20 19:51:55 +09:00
|
|
|
(cl-n (cond ((and cl-n1 cl-end2)
|
|
|
|
(min cl-n1 (- cl-end2 cl-start2)))
|
|
|
|
((and cl-n1 (null cl-end2)) cl-n1)
|
|
|
|
((and (null cl-n1) cl-end2) (- cl-end2 cl-start2)))))
|
Prefer decf to cl-decf
* lisp/auth-source-pass.el (auth-source-pass--find-match-many):
* lisp/calendar/time-date.el (decoded-time-add)
(decoded-time--alter-month, decoded-time--alter-day):
* lisp/dired.el (dired--move-to-next-line):
* lisp/dom.el (dom-pp):
* lisp/emacs-lisp/cl-macs.el (cl--transform-lambda):
* lisp/emacs-lisp/cl-print.el (cl-print-to-string-with-limit):
* lisp/emacs-lisp/cl-seq.el (cl-fill, cl-replace, cl-substitute):
* lisp/emacs-lisp/comp-cstr.el (comp--range-union)
(comp--range-intersection):
* lisp/emacs-lisp/comp.el (comp-vec-prepend, comp--emit-narg-prologue):
* lisp/emacs-lisp/edebug.el (edebug--strip-instrumentation):
* lisp/emacs-lisp/eldoc.el (eldoc--invoke-strategy):
* lisp/emacs-lisp/pp.el (pp--format-definition):
* lisp/emacs-lisp/smie.el (smie-config--guess-1):
* lisp/eshell/esh-io.el (eshell-close-handle, eshell-set-output-handle):
* lisp/gnus/gnus-async.el (gnus-async-prefetch-article):
* lisp/gnus/gnus-group.el (gnus-group-mark-group)
(gnus-group-yank-group):
* lisp/gnus/gnus-salt.el (gnus-tree-forward-line):
* lisp/gnus/gnus-score.el (gnus-decay-scores):
* lisp/gnus/gnus-srvr.el (gnus-browse-toggle-subscription-at-point):
* lisp/gnus/gnus-sum.el (gnus-build-sparse-threads, gnus-parent-headers)
(gnus-update-marks, gnus-summary-work-articles)
(gnus-summary-refer-parent-article, gnus-summary-next-thread)
(gnus-read-header, gnus-summary-insert-new-articles):
* lisp/gnus/gnus-topic.el (gnus-topic-forward-topic):
* lisp/gnus/gnus.el (gnus-short-group-name):
* lisp/gnus/message.el (message-remove-first-header)
(message-shorten-references, message-insert-screenshot):
* lisp/gnus/mm-url.el (mm-url-insert):
* lisp/gnus/nnselect.el (nnselect-push-info):
* lisp/ibuffer.el (ibuffer-backward-line, ibuffer-forward-line)
(ibuffer-map-lines):
* lisp/icomplete.el (icomplete--render-vertical):
* lisp/image/image-dired-external.el (image-dired-create-thumb-1):
* lisp/image/image-dired.el (image-dired-delete-char):
* lisp/mail/ietf-drums-date.el (ietf-drums-date--tokenize-string):
* lisp/mh-e/mh-utils.el (mh-sub-folders-parse):
* lisp/minibuffer.el (minibuffer-completion-help):
* lisp/mpc.el (mpc-cmd-move, mpc-songpointer-refresh-hairy):
* lisp/net/eww.el (eww-process-text-input):
* lisp/net/pop3.el (pop3-wait-for-messages, pop3-uidl-stat)
(pop3-uidl-dele):
* lisp/net/shr-color.el (shr-color-hue-to-rgb):
* lisp/play/5x5.el (5x5-up, 5x5-left):
* lisp/play/decipher.el (decipher-read-alphabet, decipher--digram-total)
(decipher-analyze-buffer):
* lisp/play/hanoi.el (hanoi-insert-ring, hanoi-move-ring):
* lisp/profiler.el (profiler-format-number)
(profiler-calltree-build-unified):
* lisp/progmodes/antlr-mode.el (antlr-next-rule, antlr-indent-line):
* lisp/progmodes/c-ts-common.el (c-ts-common-statement-offset):
* lisp/progmodes/ebrowse.el
(ebrowse-cyclic-display-next/previous-member-list):
* lisp/progmodes/hideif.el (hif-backward-comment):
* lisp/progmodes/js.el (js-beginning-of-defun, js-end-of-defun)
(js-ts--syntax-propertize):
* lisp/progmodes/typescript-ts-mode.el
(tsx-ts--syntax-propertize-captures):
* lisp/rect.el (rectangle--*-char):
* lisp/term.el (term-emulate-terminal):
* lisp/textmodes/reftex-cite.el (reftex-do-citation):
* lisp/textmodes/reftex-index.el (reftex-index-next-phrase):
* lisp/textmodes/reftex-parse.el (reftex-init-section-numbers):
* lisp/textmodes/reftex-sel.el (reftex-select-unmark):
* lisp/textmodes/reftex.el (reftex-silence-toc-markers):
* lisp/treesit.el (treesit-navigate-thing):
* lisp/vc/diff-mode.el (diff-sanity-check-context-hunk-half,
(diff-sanity-check-hunk):
* lisp/vc/pcvs-util.el (cvs-first):
* lisp/vc/smerge-mode.el (smerge-get-current):
* lisp/vc/vc-hg.el (vc-hg--glob-to-pcre):
* test/lisp/net/socks-tests.el
(socks-tests-perform-hello-world-http-request):
* test/src/buffer-tests.el (test-overlay-randomly): Prefer decf to
cl-defc in all code where we can.
2025-02-22 19:06:11 +01:00
|
|
|
(while (and cl-p1 cl-p2 (or (null cl-n) (>= (decf cl-n) 0)))
|
1993-07-30 20:15:09 +00:00
|
|
|
(setcar cl-p1 (car cl-p2))
|
|
|
|
(setq cl-p1 (cdr cl-p1) cl-p2 (cdr cl-p2))))
|
2016-10-20 19:51:55 +09:00
|
|
|
(setq cl-end2 (if (null cl-n1)
|
|
|
|
(or cl-end2 (length cl-seq2))
|
|
|
|
(min (or cl-end2 (length cl-seq2))
|
|
|
|
(+ cl-start2 cl-n1))))
|
1993-07-30 20:15:09 +00:00
|
|
|
(while (and cl-p1 (< cl-start2 cl-end2))
|
|
|
|
(setcar cl-p1 (aref cl-seq2 cl-start2))
|
|
|
|
(setq cl-p1 (cdr cl-p1) cl-start2 (1+ cl-start2)))))
|
|
|
|
(setq cl-end1 (min (or cl-end1 (length cl-seq1))
|
|
|
|
(+ cl-start1 (- (or cl-end2 (length cl-seq2))
|
|
|
|
cl-start2))))
|
|
|
|
(if (listp cl-seq2)
|
|
|
|
(let ((cl-p2 (nthcdr cl-start2 cl-seq2)))
|
|
|
|
(while (< cl-start1 cl-end1)
|
|
|
|
(aset cl-seq1 cl-start1 (car cl-p2))
|
|
|
|
(setq cl-p2 (cdr cl-p2) cl-start1 (1+ cl-start1))))
|
|
|
|
(while (< cl-start1 cl-end1)
|
|
|
|
(aset cl-seq1 cl-start1 (aref cl-seq2 cl-start2))
|
|
|
|
(setq cl-start2 (1+ cl-start2) cl-start1 (1+ cl-start1))))))
|
|
|
|
cl-seq1))
|
|
|
|
|
2007-06-27 18:59:03 +00:00
|
|
|
;;;###autoload
|
2012-06-03 21:05:17 -04:00
|
|
|
(defun cl-remove (cl-item cl-seq &rest cl-keys)
|
1993-07-30 20:15:09 +00:00
|
|
|
"Remove all occurrences of ITEM in SEQ.
|
|
|
|
This is a non-destructive function; it makes a copy of SEQ if necessary
|
|
|
|
to avoid corrupting the original SEQ.
|
(reduce, fill, replace, remove*, remove-if, remove-if-not, delete*, delete-if,
delete-if-not, remove-duplicates, delete-duplicates, substitute, substitute-if,
substitute-if-not, nsubstitute, nsubstitute-if, nsubstitute-if-not, find,
find-if, find-if-not, position, position-if, position-if-not, count, count-if,
count-if-not, mismatch, search, sort*, stable-sort, merge, member*, member-if,
member-if-not, assoc*, assoc-if, assoc-if-not, rassoc*, rassoc-if,
rassoc-if-not, union, nunion, intersection, nintersection, set-difference,
nset-difference, set-exclusive-or, nset-exclusive-or, subsetp, subst-if,
subst-if-not, nsubst, nsubst-if, nsubst-if-not, sublis, nsublis, tree-equal):
Improve argument/docstring consistency.
2005-05-20 14:30:34 +00:00
|
|
|
\nKeywords supported: :test :test-not :key :count :start :end :from-end
|
|
|
|
\n(fn ITEM SEQ [KEYWORD VALUE]...)"
|
Inline important-return-value declarations in cl-lib.el
These declarations are now properly added to 'cl-lib.el' itself, or to
'cl-loaddefs.el'. This means that they will now correctly show up
immediately when loading 'cl-lib.el', instead of only after 'cl-macs.el'
is pulled in by an autoload. C.f. Bug#76247.
I did not considered worth reproducing everywhere the list saying which
functions among the below belong to these two categories:
1. Functions that are side-effect-free except for the behavior of
functions passed as argument.
2. Functions that mutate and return a list.
AFAIU, this is not actionable with our current byte-compiler, i.e. we
can't add any extra declarations based on it. However, if the list
should be needed at some point, for example due to improvements in the
compiler, this commit will be where to find it. In the worst case, and
with more work, it's also deducible from the source code itself.
* lisp/emacs-lisp/cl-macs.el: Move important-return-value declarations
from here...
* lisp/emacs-lisp/cl-extra.el (cl-map, cl-maplist, cl-mapcan)
(cl-mapcon, cl-some, cl-every, cl-notany, cl-notevery, cl-nreconc):
* lisp/emacs-lisp/cl-lib.el (cl-mapcar, cl-adjoin, cl-subst):
* lisp/emacs-lisp/cl-seq.el (cl-reduce, cl-remove, cl-remove-if)
(cl-remove-if-not, cl-delete, cl-delete-if, cl-delete-if-not)
(cl-remove-duplicates, cl-delete-duplicates, cl-substitute)
(cl-substitute-if, cl-substitute-if-not, cl-nsubstitute)
(cl-nsubstitute-if, cl-nsubstitute-if-not, cl-find, cl-find-if)
(cl-find-if-not, cl-position, cl-position-if, cl-position-if-not)
(cl-count, cl-count-if, cl-count-if-not, cl-mismatch, cl-search)
(cl-sort, cl-stable-sort, cl-merge, cl-member, cl-member-if)
(cl-member-if-not, cl-assoc, cl-assoc-if, cl-assoc-if-not, cl-rassoc)
(cl-rassoc-if, cl-rassoc-if-not, cl-union, cl-nunion, cl-intersection)
(cl-nintersection, cl-set-difference, cl-nset-difference)
(cl-set-exclusive-or, cl-nset-exclusive-or, cl-subsetp, cl-subst-if)
(cl-subst-if-not, cl-nsubst, cl-nsubst-if, cl-nsubst-if-not, cl-sublis)
(cl-nsublis, cl-tree-equal): ...to have them inline here.
2025-02-14 22:46:07 +01:00
|
|
|
(declare (important-return-value t))
|
Use lexical-binding for all of CL, and clean up its namespace.
* lisp/emacs-lisp/cl-lib.el: Use lexical-binding.
(cl-map-extents, cl-maclisp-member): Remove.
(cl--set-elt, cl--set-nthcdr, cl--set-buffer-substring)
(cl--set-substring, cl--block-wrapper, cl--block-throw)
(cl--compiling-file, cl--mapcar-many, cl--do-subst): Use "cl--" prefix.
* lisp/emacs-lisp/cl-extra.el: Use lexical-binding.
(cl--mapcar-many, cl--map-keymap-recursively, cl--map-intervals)
(cl--map-overlays, cl--set-frame-visible-p, cl--progv-save)
(cl--progv-before, cl--progv-after, cl--finite-do, cl--set-getf)
(cl--do-remf, cl--do-prettyprint): Use "cl--" prefix.
* lisp/emacs-lisp/cl-seq.el: Use lexical-binding.
(cl--parsing-keywords, cl--check-key, cl--check-test-nokey)
(cl--check-test, cl--check-match): Use "cl--" prefix and backquotes.
(cl--alist, cl--sublis-rec, cl--nsublis-rec, cl--tree-equal-rec):
* lisp/emacs-lisp/cl-macs.el (cl--lambda-list-keywords): Use "cl--" prefix.
* lisp/edmacro.el (edmacro-mismatch): Simplify to remove dependence on
CL's internals.
2012-06-11 11:52:50 -04:00
|
|
|
(cl--parsing-keywords (:test :test-not :key :if :if-not :count :from-end
|
1993-07-30 20:15:09 +00:00
|
|
|
(:start 0) :end) ()
|
2016-10-20 19:51:55 +09:00
|
|
|
(let ((len (length cl-seq)))
|
|
|
|
(if (<= (or cl-count (setq cl-count len)) 0)
|
1993-07-30 20:15:09 +00:00
|
|
|
cl-seq
|
2016-10-20 19:51:55 +09:00
|
|
|
(if (or (nlistp cl-seq) (and cl-from-end (< cl-count (/ len 2))))
|
2012-05-17 16:04:56 -04:00
|
|
|
(let ((cl-i (cl--position cl-item cl-seq cl-start cl-end
|
|
|
|
cl-from-end)))
|
1993-07-30 20:15:09 +00:00
|
|
|
(if cl-i
|
2012-06-03 21:05:17 -04:00
|
|
|
(let ((cl-res (apply 'cl-delete cl-item (append cl-seq nil)
|
1993-07-30 20:15:09 +00:00
|
|
|
(append (if cl-from-end
|
2000-05-05 20:01:01 +00:00
|
|
|
(list :end (1+ cl-i))
|
|
|
|
(list :start cl-i))
|
1993-07-30 20:15:09 +00:00
|
|
|
cl-keys))))
|
|
|
|
(if (listp cl-seq) cl-res
|
|
|
|
(if (stringp cl-seq) (concat cl-res) (vconcat cl-res))))
|
|
|
|
cl-seq))
|
2016-10-20 19:51:55 +09:00
|
|
|
(setq cl-end (- (or cl-end len) cl-start))
|
1993-07-30 20:15:09 +00:00
|
|
|
(if (= cl-start 0)
|
|
|
|
(while (and cl-seq (> cl-end 0)
|
Use lexical-binding for all of CL, and clean up its namespace.
* lisp/emacs-lisp/cl-lib.el: Use lexical-binding.
(cl-map-extents, cl-maclisp-member): Remove.
(cl--set-elt, cl--set-nthcdr, cl--set-buffer-substring)
(cl--set-substring, cl--block-wrapper, cl--block-throw)
(cl--compiling-file, cl--mapcar-many, cl--do-subst): Use "cl--" prefix.
* lisp/emacs-lisp/cl-extra.el: Use lexical-binding.
(cl--mapcar-many, cl--map-keymap-recursively, cl--map-intervals)
(cl--map-overlays, cl--set-frame-visible-p, cl--progv-save)
(cl--progv-before, cl--progv-after, cl--finite-do, cl--set-getf)
(cl--do-remf, cl--do-prettyprint): Use "cl--" prefix.
* lisp/emacs-lisp/cl-seq.el: Use lexical-binding.
(cl--parsing-keywords, cl--check-key, cl--check-test-nokey)
(cl--check-test, cl--check-match): Use "cl--" prefix and backquotes.
(cl--alist, cl--sublis-rec, cl--nsublis-rec, cl--tree-equal-rec):
* lisp/emacs-lisp/cl-macs.el (cl--lambda-list-keywords): Use "cl--" prefix.
* lisp/edmacro.el (edmacro-mismatch): Simplify to remove dependence on
CL's internals.
2012-06-11 11:52:50 -04:00
|
|
|
(cl--check-test cl-item (car cl-seq))
|
1993-07-30 20:15:09 +00:00
|
|
|
(setq cl-end (1- cl-end) cl-seq (cdr cl-seq))
|
|
|
|
(> (setq cl-count (1- cl-count)) 0))))
|
|
|
|
(if (and (> cl-count 0) (> cl-end 0))
|
|
|
|
(let ((cl-p (if (> cl-start 0) (nthcdr cl-start cl-seq)
|
|
|
|
(setq cl-end (1- cl-end)) (cdr cl-seq))))
|
|
|
|
(while (and cl-p (> cl-end 0)
|
Use lexical-binding for all of CL, and clean up its namespace.
* lisp/emacs-lisp/cl-lib.el: Use lexical-binding.
(cl-map-extents, cl-maclisp-member): Remove.
(cl--set-elt, cl--set-nthcdr, cl--set-buffer-substring)
(cl--set-substring, cl--block-wrapper, cl--block-throw)
(cl--compiling-file, cl--mapcar-many, cl--do-subst): Use "cl--" prefix.
* lisp/emacs-lisp/cl-extra.el: Use lexical-binding.
(cl--mapcar-many, cl--map-keymap-recursively, cl--map-intervals)
(cl--map-overlays, cl--set-frame-visible-p, cl--progv-save)
(cl--progv-before, cl--progv-after, cl--finite-do, cl--set-getf)
(cl--do-remf, cl--do-prettyprint): Use "cl--" prefix.
* lisp/emacs-lisp/cl-seq.el: Use lexical-binding.
(cl--parsing-keywords, cl--check-key, cl--check-test-nokey)
(cl--check-test, cl--check-match): Use "cl--" prefix and backquotes.
(cl--alist, cl--sublis-rec, cl--nsublis-rec, cl--tree-equal-rec):
* lisp/emacs-lisp/cl-macs.el (cl--lambda-list-keywords): Use "cl--" prefix.
* lisp/edmacro.el (edmacro-mismatch): Simplify to remove dependence on
CL's internals.
2012-06-11 11:52:50 -04:00
|
|
|
(not (cl--check-test cl-item (car cl-p))))
|
1993-07-30 20:15:09 +00:00
|
|
|
(setq cl-p (cdr cl-p) cl-end (1- cl-end)))
|
|
|
|
(if (and cl-p (> cl-end 0))
|
2012-06-03 21:05:17 -04:00
|
|
|
(nconc (cl-ldiff cl-seq cl-p)
|
1993-07-30 20:15:09 +00:00
|
|
|
(if (= cl-count 1) (cdr cl-p)
|
|
|
|
(and (cdr cl-p)
|
2012-06-03 21:05:17 -04:00
|
|
|
(apply 'cl-delete cl-item
|
1993-07-30 20:15:09 +00:00
|
|
|
(copy-sequence (cdr cl-p))
|
2000-05-05 20:01:01 +00:00
|
|
|
:start 0 :end (1- cl-end)
|
|
|
|
:count (1- cl-count) cl-keys))))
|
1993-07-30 20:15:09 +00:00
|
|
|
cl-seq))
|
2016-10-20 19:51:55 +09:00
|
|
|
cl-seq))))))
|
1993-07-30 20:15:09 +00:00
|
|
|
|
2007-06-27 18:59:03 +00:00
|
|
|
;;;###autoload
|
2012-06-03 21:05:17 -04:00
|
|
|
(defun cl-remove-if (cl-pred cl-list &rest cl-keys)
|
1993-07-30 20:15:09 +00:00
|
|
|
"Remove all items satisfying PREDICATE in SEQ.
|
|
|
|
This is a non-destructive function; it makes a copy of SEQ if necessary
|
|
|
|
to avoid corrupting the original SEQ.
|
(reduce, fill, replace, remove*, remove-if, remove-if-not, delete*, delete-if,
delete-if-not, remove-duplicates, delete-duplicates, substitute, substitute-if,
substitute-if-not, nsubstitute, nsubstitute-if, nsubstitute-if-not, find,
find-if, find-if-not, position, position-if, position-if-not, count, count-if,
count-if-not, mismatch, search, sort*, stable-sort, merge, member*, member-if,
member-if-not, assoc*, assoc-if, assoc-if-not, rassoc*, rassoc-if,
rassoc-if-not, union, nunion, intersection, nintersection, set-difference,
nset-difference, set-exclusive-or, nset-exclusive-or, subsetp, subst-if,
subst-if-not, nsubst, nsubst-if, nsubst-if-not, sublis, nsublis, tree-equal):
Improve argument/docstring consistency.
2005-05-20 14:30:34 +00:00
|
|
|
\nKeywords supported: :key :count :start :end :from-end
|
|
|
|
\n(fn PREDICATE SEQ [KEYWORD VALUE]...)"
|
Inline important-return-value declarations in cl-lib.el
These declarations are now properly added to 'cl-lib.el' itself, or to
'cl-loaddefs.el'. This means that they will now correctly show up
immediately when loading 'cl-lib.el', instead of only after 'cl-macs.el'
is pulled in by an autoload. C.f. Bug#76247.
I did not considered worth reproducing everywhere the list saying which
functions among the below belong to these two categories:
1. Functions that are side-effect-free except for the behavior of
functions passed as argument.
2. Functions that mutate and return a list.
AFAIU, this is not actionable with our current byte-compiler, i.e. we
can't add any extra declarations based on it. However, if the list
should be needed at some point, for example due to improvements in the
compiler, this commit will be where to find it. In the worst case, and
with more work, it's also deducible from the source code itself.
* lisp/emacs-lisp/cl-macs.el: Move important-return-value declarations
from here...
* lisp/emacs-lisp/cl-extra.el (cl-map, cl-maplist, cl-mapcan)
(cl-mapcon, cl-some, cl-every, cl-notany, cl-notevery, cl-nreconc):
* lisp/emacs-lisp/cl-lib.el (cl-mapcar, cl-adjoin, cl-subst):
* lisp/emacs-lisp/cl-seq.el (cl-reduce, cl-remove, cl-remove-if)
(cl-remove-if-not, cl-delete, cl-delete-if, cl-delete-if-not)
(cl-remove-duplicates, cl-delete-duplicates, cl-substitute)
(cl-substitute-if, cl-substitute-if-not, cl-nsubstitute)
(cl-nsubstitute-if, cl-nsubstitute-if-not, cl-find, cl-find-if)
(cl-find-if-not, cl-position, cl-position-if, cl-position-if-not)
(cl-count, cl-count-if, cl-count-if-not, cl-mismatch, cl-search)
(cl-sort, cl-stable-sort, cl-merge, cl-member, cl-member-if)
(cl-member-if-not, cl-assoc, cl-assoc-if, cl-assoc-if-not, cl-rassoc)
(cl-rassoc-if, cl-rassoc-if-not, cl-union, cl-nunion, cl-intersection)
(cl-nintersection, cl-set-difference, cl-nset-difference)
(cl-set-exclusive-or, cl-nset-exclusive-or, cl-subsetp, cl-subst-if)
(cl-subst-if-not, cl-nsubst, cl-nsubst-if, cl-nsubst-if-not, cl-sublis)
(cl-nsublis, cl-tree-equal): ...to have them inline here.
2025-02-14 22:46:07 +01:00
|
|
|
(declare (important-return-value t))
|
2012-06-03 21:05:17 -04:00
|
|
|
(apply 'cl-remove nil cl-list :if cl-pred cl-keys))
|
1993-07-30 20:15:09 +00:00
|
|
|
|
2007-06-27 18:59:03 +00:00
|
|
|
;;;###autoload
|
2012-06-03 21:05:17 -04:00
|
|
|
(defun cl-remove-if-not (cl-pred cl-list &rest cl-keys)
|
1993-07-30 20:15:09 +00:00
|
|
|
"Remove all items not satisfying PREDICATE in SEQ.
|
|
|
|
This is a non-destructive function; it makes a copy of SEQ if necessary
|
|
|
|
to avoid corrupting the original SEQ.
|
(reduce, fill, replace, remove*, remove-if, remove-if-not, delete*, delete-if,
delete-if-not, remove-duplicates, delete-duplicates, substitute, substitute-if,
substitute-if-not, nsubstitute, nsubstitute-if, nsubstitute-if-not, find,
find-if, find-if-not, position, position-if, position-if-not, count, count-if,
count-if-not, mismatch, search, sort*, stable-sort, merge, member*, member-if,
member-if-not, assoc*, assoc-if, assoc-if-not, rassoc*, rassoc-if,
rassoc-if-not, union, nunion, intersection, nintersection, set-difference,
nset-difference, set-exclusive-or, nset-exclusive-or, subsetp, subst-if,
subst-if-not, nsubst, nsubst-if, nsubst-if-not, sublis, nsublis, tree-equal):
Improve argument/docstring consistency.
2005-05-20 14:30:34 +00:00
|
|
|
\nKeywords supported: :key :count :start :end :from-end
|
|
|
|
\n(fn PREDICATE SEQ [KEYWORD VALUE]...)"
|
Inline important-return-value declarations in cl-lib.el
These declarations are now properly added to 'cl-lib.el' itself, or to
'cl-loaddefs.el'. This means that they will now correctly show up
immediately when loading 'cl-lib.el', instead of only after 'cl-macs.el'
is pulled in by an autoload. C.f. Bug#76247.
I did not considered worth reproducing everywhere the list saying which
functions among the below belong to these two categories:
1. Functions that are side-effect-free except for the behavior of
functions passed as argument.
2. Functions that mutate and return a list.
AFAIU, this is not actionable with our current byte-compiler, i.e. we
can't add any extra declarations based on it. However, if the list
should be needed at some point, for example due to improvements in the
compiler, this commit will be where to find it. In the worst case, and
with more work, it's also deducible from the source code itself.
* lisp/emacs-lisp/cl-macs.el: Move important-return-value declarations
from here...
* lisp/emacs-lisp/cl-extra.el (cl-map, cl-maplist, cl-mapcan)
(cl-mapcon, cl-some, cl-every, cl-notany, cl-notevery, cl-nreconc):
* lisp/emacs-lisp/cl-lib.el (cl-mapcar, cl-adjoin, cl-subst):
* lisp/emacs-lisp/cl-seq.el (cl-reduce, cl-remove, cl-remove-if)
(cl-remove-if-not, cl-delete, cl-delete-if, cl-delete-if-not)
(cl-remove-duplicates, cl-delete-duplicates, cl-substitute)
(cl-substitute-if, cl-substitute-if-not, cl-nsubstitute)
(cl-nsubstitute-if, cl-nsubstitute-if-not, cl-find, cl-find-if)
(cl-find-if-not, cl-position, cl-position-if, cl-position-if-not)
(cl-count, cl-count-if, cl-count-if-not, cl-mismatch, cl-search)
(cl-sort, cl-stable-sort, cl-merge, cl-member, cl-member-if)
(cl-member-if-not, cl-assoc, cl-assoc-if, cl-assoc-if-not, cl-rassoc)
(cl-rassoc-if, cl-rassoc-if-not, cl-union, cl-nunion, cl-intersection)
(cl-nintersection, cl-set-difference, cl-nset-difference)
(cl-set-exclusive-or, cl-nset-exclusive-or, cl-subsetp, cl-subst-if)
(cl-subst-if-not, cl-nsubst, cl-nsubst-if, cl-nsubst-if-not, cl-sublis)
(cl-nsublis, cl-tree-equal): ...to have them inline here.
2025-02-14 22:46:07 +01:00
|
|
|
(declare (important-return-value t))
|
2012-06-03 21:05:17 -04:00
|
|
|
(apply 'cl-remove nil cl-list :if-not cl-pred cl-keys))
|
1993-07-30 20:15:09 +00:00
|
|
|
|
2007-06-27 18:59:03 +00:00
|
|
|
;;;###autoload
|
2012-06-03 21:05:17 -04:00
|
|
|
(defun cl-delete (cl-item cl-seq &rest cl-keys)
|
1993-07-30 20:15:09 +00:00
|
|
|
"Remove all occurrences of ITEM in SEQ.
|
|
|
|
This is a destructive function; it reuses the storage of SEQ whenever possible.
|
(reduce, fill, replace, remove*, remove-if, remove-if-not, delete*, delete-if,
delete-if-not, remove-duplicates, delete-duplicates, substitute, substitute-if,
substitute-if-not, nsubstitute, nsubstitute-if, nsubstitute-if-not, find,
find-if, find-if-not, position, position-if, position-if-not, count, count-if,
count-if-not, mismatch, search, sort*, stable-sort, merge, member*, member-if,
member-if-not, assoc*, assoc-if, assoc-if-not, rassoc*, rassoc-if,
rassoc-if-not, union, nunion, intersection, nintersection, set-difference,
nset-difference, set-exclusive-or, nset-exclusive-or, subsetp, subst-if,
subst-if-not, nsubst, nsubst-if, nsubst-if-not, sublis, nsublis, tree-equal):
Improve argument/docstring consistency.
2005-05-20 14:30:34 +00:00
|
|
|
\nKeywords supported: :test :test-not :key :count :start :end :from-end
|
|
|
|
\n(fn ITEM SEQ [KEYWORD VALUE]...)"
|
Inline important-return-value declarations in cl-lib.el
These declarations are now properly added to 'cl-lib.el' itself, or to
'cl-loaddefs.el'. This means that they will now correctly show up
immediately when loading 'cl-lib.el', instead of only after 'cl-macs.el'
is pulled in by an autoload. C.f. Bug#76247.
I did not considered worth reproducing everywhere the list saying which
functions among the below belong to these two categories:
1. Functions that are side-effect-free except for the behavior of
functions passed as argument.
2. Functions that mutate and return a list.
AFAIU, this is not actionable with our current byte-compiler, i.e. we
can't add any extra declarations based on it. However, if the list
should be needed at some point, for example due to improvements in the
compiler, this commit will be where to find it. In the worst case, and
with more work, it's also deducible from the source code itself.
* lisp/emacs-lisp/cl-macs.el: Move important-return-value declarations
from here...
* lisp/emacs-lisp/cl-extra.el (cl-map, cl-maplist, cl-mapcan)
(cl-mapcon, cl-some, cl-every, cl-notany, cl-notevery, cl-nreconc):
* lisp/emacs-lisp/cl-lib.el (cl-mapcar, cl-adjoin, cl-subst):
* lisp/emacs-lisp/cl-seq.el (cl-reduce, cl-remove, cl-remove-if)
(cl-remove-if-not, cl-delete, cl-delete-if, cl-delete-if-not)
(cl-remove-duplicates, cl-delete-duplicates, cl-substitute)
(cl-substitute-if, cl-substitute-if-not, cl-nsubstitute)
(cl-nsubstitute-if, cl-nsubstitute-if-not, cl-find, cl-find-if)
(cl-find-if-not, cl-position, cl-position-if, cl-position-if-not)
(cl-count, cl-count-if, cl-count-if-not, cl-mismatch, cl-search)
(cl-sort, cl-stable-sort, cl-merge, cl-member, cl-member-if)
(cl-member-if-not, cl-assoc, cl-assoc-if, cl-assoc-if-not, cl-rassoc)
(cl-rassoc-if, cl-rassoc-if-not, cl-union, cl-nunion, cl-intersection)
(cl-nintersection, cl-set-difference, cl-nset-difference)
(cl-set-exclusive-or, cl-nset-exclusive-or, cl-subsetp, cl-subst-if)
(cl-subst-if-not, cl-nsubst, cl-nsubst-if, cl-nsubst-if-not, cl-sublis)
(cl-nsublis, cl-tree-equal): ...to have them inline here.
2025-02-14 22:46:07 +01:00
|
|
|
(declare (important-return-value t))
|
Use lexical-binding for all of CL, and clean up its namespace.
* lisp/emacs-lisp/cl-lib.el: Use lexical-binding.
(cl-map-extents, cl-maclisp-member): Remove.
(cl--set-elt, cl--set-nthcdr, cl--set-buffer-substring)
(cl--set-substring, cl--block-wrapper, cl--block-throw)
(cl--compiling-file, cl--mapcar-many, cl--do-subst): Use "cl--" prefix.
* lisp/emacs-lisp/cl-extra.el: Use lexical-binding.
(cl--mapcar-many, cl--map-keymap-recursively, cl--map-intervals)
(cl--map-overlays, cl--set-frame-visible-p, cl--progv-save)
(cl--progv-before, cl--progv-after, cl--finite-do, cl--set-getf)
(cl--do-remf, cl--do-prettyprint): Use "cl--" prefix.
* lisp/emacs-lisp/cl-seq.el: Use lexical-binding.
(cl--parsing-keywords, cl--check-key, cl--check-test-nokey)
(cl--check-test, cl--check-match): Use "cl--" prefix and backquotes.
(cl--alist, cl--sublis-rec, cl--nsublis-rec, cl--tree-equal-rec):
* lisp/emacs-lisp/cl-macs.el (cl--lambda-list-keywords): Use "cl--" prefix.
* lisp/edmacro.el (edmacro-mismatch): Simplify to remove dependence on
CL's internals.
2012-06-11 11:52:50 -04:00
|
|
|
(cl--parsing-keywords (:test :test-not :key :if :if-not :count :from-end
|
1993-07-30 20:15:09 +00:00
|
|
|
(:start 0) :end) ()
|
2016-10-20 19:51:55 +09:00
|
|
|
(let ((len (length cl-seq)))
|
|
|
|
(if (<= (or cl-count (setq cl-count len)) 0)
|
1993-07-30 20:15:09 +00:00
|
|
|
cl-seq
|
|
|
|
(if (listp cl-seq)
|
2016-10-20 19:51:55 +09:00
|
|
|
(if (and cl-from-end (< cl-count (/ len 2)))
|
1993-07-30 20:15:09 +00:00
|
|
|
(let (cl-i)
|
|
|
|
(while (and (>= (setq cl-count (1- cl-count)) 0)
|
2012-05-17 16:04:56 -04:00
|
|
|
(setq cl-i (cl--position cl-item cl-seq cl-start
|
2016-10-20 19:51:55 +09:00
|
|
|
cl-end cl-from-end)))
|
1993-07-30 20:15:09 +00:00
|
|
|
(if (= cl-i 0) (setq cl-seq (cdr cl-seq))
|
|
|
|
(let ((cl-tail (nthcdr (1- cl-i) cl-seq)))
|
|
|
|
(setcdr cl-tail (cdr (cdr cl-tail)))))
|
|
|
|
(setq cl-end cl-i))
|
|
|
|
cl-seq)
|
2016-10-20 19:51:55 +09:00
|
|
|
(setq cl-end (- (or cl-end len) cl-start))
|
1993-07-30 20:15:09 +00:00
|
|
|
(if (= cl-start 0)
|
|
|
|
(progn
|
|
|
|
(while (and cl-seq
|
|
|
|
(> cl-end 0)
|
Use lexical-binding for all of CL, and clean up its namespace.
* lisp/emacs-lisp/cl-lib.el: Use lexical-binding.
(cl-map-extents, cl-maclisp-member): Remove.
(cl--set-elt, cl--set-nthcdr, cl--set-buffer-substring)
(cl--set-substring, cl--block-wrapper, cl--block-throw)
(cl--compiling-file, cl--mapcar-many, cl--do-subst): Use "cl--" prefix.
* lisp/emacs-lisp/cl-extra.el: Use lexical-binding.
(cl--mapcar-many, cl--map-keymap-recursively, cl--map-intervals)
(cl--map-overlays, cl--set-frame-visible-p, cl--progv-save)
(cl--progv-before, cl--progv-after, cl--finite-do, cl--set-getf)
(cl--do-remf, cl--do-prettyprint): Use "cl--" prefix.
* lisp/emacs-lisp/cl-seq.el: Use lexical-binding.
(cl--parsing-keywords, cl--check-key, cl--check-test-nokey)
(cl--check-test, cl--check-match): Use "cl--" prefix and backquotes.
(cl--alist, cl--sublis-rec, cl--nsublis-rec, cl--tree-equal-rec):
* lisp/emacs-lisp/cl-macs.el (cl--lambda-list-keywords): Use "cl--" prefix.
* lisp/edmacro.el (edmacro-mismatch): Simplify to remove dependence on
CL's internals.
2012-06-11 11:52:50 -04:00
|
|
|
(cl--check-test cl-item (car cl-seq))
|
1993-07-30 20:15:09 +00:00
|
|
|
(setq cl-end (1- cl-end) cl-seq (cdr cl-seq))
|
|
|
|
(> (setq cl-count (1- cl-count)) 0)))
|
|
|
|
(setq cl-end (1- cl-end)))
|
|
|
|
(setq cl-start (1- cl-start)))
|
|
|
|
(if (and (> cl-count 0) (> cl-end 0))
|
|
|
|
(let ((cl-p (nthcdr cl-start cl-seq)))
|
|
|
|
(while (and (cdr cl-p) (> cl-end 0))
|
Use lexical-binding for all of CL, and clean up its namespace.
* lisp/emacs-lisp/cl-lib.el: Use lexical-binding.
(cl-map-extents, cl-maclisp-member): Remove.
(cl--set-elt, cl--set-nthcdr, cl--set-buffer-substring)
(cl--set-substring, cl--block-wrapper, cl--block-throw)
(cl--compiling-file, cl--mapcar-many, cl--do-subst): Use "cl--" prefix.
* lisp/emacs-lisp/cl-extra.el: Use lexical-binding.
(cl--mapcar-many, cl--map-keymap-recursively, cl--map-intervals)
(cl--map-overlays, cl--set-frame-visible-p, cl--progv-save)
(cl--progv-before, cl--progv-after, cl--finite-do, cl--set-getf)
(cl--do-remf, cl--do-prettyprint): Use "cl--" prefix.
* lisp/emacs-lisp/cl-seq.el: Use lexical-binding.
(cl--parsing-keywords, cl--check-key, cl--check-test-nokey)
(cl--check-test, cl--check-match): Use "cl--" prefix and backquotes.
(cl--alist, cl--sublis-rec, cl--nsublis-rec, cl--tree-equal-rec):
* lisp/emacs-lisp/cl-macs.el (cl--lambda-list-keywords): Use "cl--" prefix.
* lisp/edmacro.el (edmacro-mismatch): Simplify to remove dependence on
CL's internals.
2012-06-11 11:52:50 -04:00
|
|
|
(if (cl--check-test cl-item (car (cdr cl-p)))
|
1993-07-30 20:15:09 +00:00
|
|
|
(progn
|
|
|
|
(setcdr cl-p (cdr (cdr cl-p)))
|
|
|
|
(if (= (setq cl-count (1- cl-count)) 0)
|
|
|
|
(setq cl-end 1)))
|
|
|
|
(setq cl-p (cdr cl-p)))
|
|
|
|
(setq cl-end (1- cl-end)))))
|
|
|
|
cl-seq)
|
2016-10-20 19:51:55 +09:00
|
|
|
(apply 'cl-remove cl-item cl-seq cl-keys))))))
|
1993-07-30 20:15:09 +00:00
|
|
|
|
2007-06-27 18:59:03 +00:00
|
|
|
;;;###autoload
|
2012-06-03 21:05:17 -04:00
|
|
|
(defun cl-delete-if (cl-pred cl-list &rest cl-keys)
|
1993-07-30 20:15:09 +00:00
|
|
|
"Remove all items satisfying PREDICATE in SEQ.
|
|
|
|
This is a destructive function; it reuses the storage of SEQ whenever possible.
|
(reduce, fill, replace, remove*, remove-if, remove-if-not, delete*, delete-if,
delete-if-not, remove-duplicates, delete-duplicates, substitute, substitute-if,
substitute-if-not, nsubstitute, nsubstitute-if, nsubstitute-if-not, find,
find-if, find-if-not, position, position-if, position-if-not, count, count-if,
count-if-not, mismatch, search, sort*, stable-sort, merge, member*, member-if,
member-if-not, assoc*, assoc-if, assoc-if-not, rassoc*, rassoc-if,
rassoc-if-not, union, nunion, intersection, nintersection, set-difference,
nset-difference, set-exclusive-or, nset-exclusive-or, subsetp, subst-if,
subst-if-not, nsubst, nsubst-if, nsubst-if-not, sublis, nsublis, tree-equal):
Improve argument/docstring consistency.
2005-05-20 14:30:34 +00:00
|
|
|
\nKeywords supported: :key :count :start :end :from-end
|
|
|
|
\n(fn PREDICATE SEQ [KEYWORD VALUE]...)"
|
Inline important-return-value declarations in cl-lib.el
These declarations are now properly added to 'cl-lib.el' itself, or to
'cl-loaddefs.el'. This means that they will now correctly show up
immediately when loading 'cl-lib.el', instead of only after 'cl-macs.el'
is pulled in by an autoload. C.f. Bug#76247.
I did not considered worth reproducing everywhere the list saying which
functions among the below belong to these two categories:
1. Functions that are side-effect-free except for the behavior of
functions passed as argument.
2. Functions that mutate and return a list.
AFAIU, this is not actionable with our current byte-compiler, i.e. we
can't add any extra declarations based on it. However, if the list
should be needed at some point, for example due to improvements in the
compiler, this commit will be where to find it. In the worst case, and
with more work, it's also deducible from the source code itself.
* lisp/emacs-lisp/cl-macs.el: Move important-return-value declarations
from here...
* lisp/emacs-lisp/cl-extra.el (cl-map, cl-maplist, cl-mapcan)
(cl-mapcon, cl-some, cl-every, cl-notany, cl-notevery, cl-nreconc):
* lisp/emacs-lisp/cl-lib.el (cl-mapcar, cl-adjoin, cl-subst):
* lisp/emacs-lisp/cl-seq.el (cl-reduce, cl-remove, cl-remove-if)
(cl-remove-if-not, cl-delete, cl-delete-if, cl-delete-if-not)
(cl-remove-duplicates, cl-delete-duplicates, cl-substitute)
(cl-substitute-if, cl-substitute-if-not, cl-nsubstitute)
(cl-nsubstitute-if, cl-nsubstitute-if-not, cl-find, cl-find-if)
(cl-find-if-not, cl-position, cl-position-if, cl-position-if-not)
(cl-count, cl-count-if, cl-count-if-not, cl-mismatch, cl-search)
(cl-sort, cl-stable-sort, cl-merge, cl-member, cl-member-if)
(cl-member-if-not, cl-assoc, cl-assoc-if, cl-assoc-if-not, cl-rassoc)
(cl-rassoc-if, cl-rassoc-if-not, cl-union, cl-nunion, cl-intersection)
(cl-nintersection, cl-set-difference, cl-nset-difference)
(cl-set-exclusive-or, cl-nset-exclusive-or, cl-subsetp, cl-subst-if)
(cl-subst-if-not, cl-nsubst, cl-nsubst-if, cl-nsubst-if-not, cl-sublis)
(cl-nsublis, cl-tree-equal): ...to have them inline here.
2025-02-14 22:46:07 +01:00
|
|
|
(declare (important-return-value t))
|
2012-06-03 21:05:17 -04:00
|
|
|
(apply 'cl-delete nil cl-list :if cl-pred cl-keys))
|
1993-07-30 20:15:09 +00:00
|
|
|
|
2007-06-27 18:59:03 +00:00
|
|
|
;;;###autoload
|
2012-06-03 21:05:17 -04:00
|
|
|
(defun cl-delete-if-not (cl-pred cl-list &rest cl-keys)
|
1993-07-30 20:15:09 +00:00
|
|
|
"Remove all items not satisfying PREDICATE in SEQ.
|
|
|
|
This is a destructive function; it reuses the storage of SEQ whenever possible.
|
(reduce, fill, replace, remove*, remove-if, remove-if-not, delete*, delete-if,
delete-if-not, remove-duplicates, delete-duplicates, substitute, substitute-if,
substitute-if-not, nsubstitute, nsubstitute-if, nsubstitute-if-not, find,
find-if, find-if-not, position, position-if, position-if-not, count, count-if,
count-if-not, mismatch, search, sort*, stable-sort, merge, member*, member-if,
member-if-not, assoc*, assoc-if, assoc-if-not, rassoc*, rassoc-if,
rassoc-if-not, union, nunion, intersection, nintersection, set-difference,
nset-difference, set-exclusive-or, nset-exclusive-or, subsetp, subst-if,
subst-if-not, nsubst, nsubst-if, nsubst-if-not, sublis, nsublis, tree-equal):
Improve argument/docstring consistency.
2005-05-20 14:30:34 +00:00
|
|
|
\nKeywords supported: :key :count :start :end :from-end
|
|
|
|
\n(fn PREDICATE SEQ [KEYWORD VALUE]...)"
|
Inline important-return-value declarations in cl-lib.el
These declarations are now properly added to 'cl-lib.el' itself, or to
'cl-loaddefs.el'. This means that they will now correctly show up
immediately when loading 'cl-lib.el', instead of only after 'cl-macs.el'
is pulled in by an autoload. C.f. Bug#76247.
I did not considered worth reproducing everywhere the list saying which
functions among the below belong to these two categories:
1. Functions that are side-effect-free except for the behavior of
functions passed as argument.
2. Functions that mutate and return a list.
AFAIU, this is not actionable with our current byte-compiler, i.e. we
can't add any extra declarations based on it. However, if the list
should be needed at some point, for example due to improvements in the
compiler, this commit will be where to find it. In the worst case, and
with more work, it's also deducible from the source code itself.
* lisp/emacs-lisp/cl-macs.el: Move important-return-value declarations
from here...
* lisp/emacs-lisp/cl-extra.el (cl-map, cl-maplist, cl-mapcan)
(cl-mapcon, cl-some, cl-every, cl-notany, cl-notevery, cl-nreconc):
* lisp/emacs-lisp/cl-lib.el (cl-mapcar, cl-adjoin, cl-subst):
* lisp/emacs-lisp/cl-seq.el (cl-reduce, cl-remove, cl-remove-if)
(cl-remove-if-not, cl-delete, cl-delete-if, cl-delete-if-not)
(cl-remove-duplicates, cl-delete-duplicates, cl-substitute)
(cl-substitute-if, cl-substitute-if-not, cl-nsubstitute)
(cl-nsubstitute-if, cl-nsubstitute-if-not, cl-find, cl-find-if)
(cl-find-if-not, cl-position, cl-position-if, cl-position-if-not)
(cl-count, cl-count-if, cl-count-if-not, cl-mismatch, cl-search)
(cl-sort, cl-stable-sort, cl-merge, cl-member, cl-member-if)
(cl-member-if-not, cl-assoc, cl-assoc-if, cl-assoc-if-not, cl-rassoc)
(cl-rassoc-if, cl-rassoc-if-not, cl-union, cl-nunion, cl-intersection)
(cl-nintersection, cl-set-difference, cl-nset-difference)
(cl-set-exclusive-or, cl-nset-exclusive-or, cl-subsetp, cl-subst-if)
(cl-subst-if-not, cl-nsubst, cl-nsubst-if, cl-nsubst-if-not, cl-sublis)
(cl-nsublis, cl-tree-equal): ...to have them inline here.
2025-02-14 22:46:07 +01:00
|
|
|
(declare (important-return-value t))
|
2012-06-03 21:05:17 -04:00
|
|
|
(apply 'cl-delete nil cl-list :if-not cl-pred cl-keys))
|
1993-07-30 20:15:09 +00:00
|
|
|
|
2007-06-27 18:59:03 +00:00
|
|
|
;;;###autoload
|
2012-06-03 21:05:17 -04:00
|
|
|
(defun cl-remove-duplicates (cl-seq &rest cl-keys)
|
1993-07-30 20:15:09 +00:00
|
|
|
"Return a copy of SEQ with all duplicate elements removed.
|
(reduce, fill, replace, remove*, remove-if, remove-if-not, delete*, delete-if,
delete-if-not, remove-duplicates, delete-duplicates, substitute, substitute-if,
substitute-if-not, nsubstitute, nsubstitute-if, nsubstitute-if-not, find,
find-if, find-if-not, position, position-if, position-if-not, count, count-if,
count-if-not, mismatch, search, sort*, stable-sort, merge, member*, member-if,
member-if-not, assoc*, assoc-if, assoc-if-not, rassoc*, rassoc-if,
rassoc-if-not, union, nunion, intersection, nintersection, set-difference,
nset-difference, set-exclusive-or, nset-exclusive-or, subsetp, subst-if,
subst-if-not, nsubst, nsubst-if, nsubst-if-not, sublis, nsublis, tree-equal):
Improve argument/docstring consistency.
2005-05-20 14:30:34 +00:00
|
|
|
\nKeywords supported: :test :test-not :key :start :end :from-end
|
|
|
|
\n(fn SEQ [KEYWORD VALUE]...)"
|
Inline important-return-value declarations in cl-lib.el
These declarations are now properly added to 'cl-lib.el' itself, or to
'cl-loaddefs.el'. This means that they will now correctly show up
immediately when loading 'cl-lib.el', instead of only after 'cl-macs.el'
is pulled in by an autoload. C.f. Bug#76247.
I did not considered worth reproducing everywhere the list saying which
functions among the below belong to these two categories:
1. Functions that are side-effect-free except for the behavior of
functions passed as argument.
2. Functions that mutate and return a list.
AFAIU, this is not actionable with our current byte-compiler, i.e. we
can't add any extra declarations based on it. However, if the list
should be needed at some point, for example due to improvements in the
compiler, this commit will be where to find it. In the worst case, and
with more work, it's also deducible from the source code itself.
* lisp/emacs-lisp/cl-macs.el: Move important-return-value declarations
from here...
* lisp/emacs-lisp/cl-extra.el (cl-map, cl-maplist, cl-mapcan)
(cl-mapcon, cl-some, cl-every, cl-notany, cl-notevery, cl-nreconc):
* lisp/emacs-lisp/cl-lib.el (cl-mapcar, cl-adjoin, cl-subst):
* lisp/emacs-lisp/cl-seq.el (cl-reduce, cl-remove, cl-remove-if)
(cl-remove-if-not, cl-delete, cl-delete-if, cl-delete-if-not)
(cl-remove-duplicates, cl-delete-duplicates, cl-substitute)
(cl-substitute-if, cl-substitute-if-not, cl-nsubstitute)
(cl-nsubstitute-if, cl-nsubstitute-if-not, cl-find, cl-find-if)
(cl-find-if-not, cl-position, cl-position-if, cl-position-if-not)
(cl-count, cl-count-if, cl-count-if-not, cl-mismatch, cl-search)
(cl-sort, cl-stable-sort, cl-merge, cl-member, cl-member-if)
(cl-member-if-not, cl-assoc, cl-assoc-if, cl-assoc-if-not, cl-rassoc)
(cl-rassoc-if, cl-rassoc-if-not, cl-union, cl-nunion, cl-intersection)
(cl-nintersection, cl-set-difference, cl-nset-difference)
(cl-set-exclusive-or, cl-nset-exclusive-or, cl-subsetp, cl-subst-if)
(cl-subst-if-not, cl-nsubst, cl-nsubst-if, cl-nsubst-if-not, cl-sublis)
(cl-nsublis, cl-tree-equal): ...to have them inline here.
2025-02-14 22:46:07 +01:00
|
|
|
(declare (important-return-value t))
|
2012-05-17 16:04:56 -04:00
|
|
|
(cl--delete-duplicates cl-seq cl-keys t))
|
1993-07-30 20:15:09 +00:00
|
|
|
|
2007-06-27 18:59:03 +00:00
|
|
|
;;;###autoload
|
2012-06-03 21:05:17 -04:00
|
|
|
(defun cl-delete-duplicates (cl-seq &rest cl-keys)
|
1993-07-30 20:15:09 +00:00
|
|
|
"Remove all duplicate elements from SEQ (destructively).
|
(reduce, fill, replace, remove*, remove-if, remove-if-not, delete*, delete-if,
delete-if-not, remove-duplicates, delete-duplicates, substitute, substitute-if,
substitute-if-not, nsubstitute, nsubstitute-if, nsubstitute-if-not, find,
find-if, find-if-not, position, position-if, position-if-not, count, count-if,
count-if-not, mismatch, search, sort*, stable-sort, merge, member*, member-if,
member-if-not, assoc*, assoc-if, assoc-if-not, rassoc*, rassoc-if,
rassoc-if-not, union, nunion, intersection, nintersection, set-difference,
nset-difference, set-exclusive-or, nset-exclusive-or, subsetp, subst-if,
subst-if-not, nsubst, nsubst-if, nsubst-if-not, sublis, nsublis, tree-equal):
Improve argument/docstring consistency.
2005-05-20 14:30:34 +00:00
|
|
|
\nKeywords supported: :test :test-not :key :start :end :from-end
|
|
|
|
\n(fn SEQ [KEYWORD VALUE]...)"
|
Inline important-return-value declarations in cl-lib.el
These declarations are now properly added to 'cl-lib.el' itself, or to
'cl-loaddefs.el'. This means that they will now correctly show up
immediately when loading 'cl-lib.el', instead of only after 'cl-macs.el'
is pulled in by an autoload. C.f. Bug#76247.
I did not considered worth reproducing everywhere the list saying which
functions among the below belong to these two categories:
1. Functions that are side-effect-free except for the behavior of
functions passed as argument.
2. Functions that mutate and return a list.
AFAIU, this is not actionable with our current byte-compiler, i.e. we
can't add any extra declarations based on it. However, if the list
should be needed at some point, for example due to improvements in the
compiler, this commit will be where to find it. In the worst case, and
with more work, it's also deducible from the source code itself.
* lisp/emacs-lisp/cl-macs.el: Move important-return-value declarations
from here...
* lisp/emacs-lisp/cl-extra.el (cl-map, cl-maplist, cl-mapcan)
(cl-mapcon, cl-some, cl-every, cl-notany, cl-notevery, cl-nreconc):
* lisp/emacs-lisp/cl-lib.el (cl-mapcar, cl-adjoin, cl-subst):
* lisp/emacs-lisp/cl-seq.el (cl-reduce, cl-remove, cl-remove-if)
(cl-remove-if-not, cl-delete, cl-delete-if, cl-delete-if-not)
(cl-remove-duplicates, cl-delete-duplicates, cl-substitute)
(cl-substitute-if, cl-substitute-if-not, cl-nsubstitute)
(cl-nsubstitute-if, cl-nsubstitute-if-not, cl-find, cl-find-if)
(cl-find-if-not, cl-position, cl-position-if, cl-position-if-not)
(cl-count, cl-count-if, cl-count-if-not, cl-mismatch, cl-search)
(cl-sort, cl-stable-sort, cl-merge, cl-member, cl-member-if)
(cl-member-if-not, cl-assoc, cl-assoc-if, cl-assoc-if-not, cl-rassoc)
(cl-rassoc-if, cl-rassoc-if-not, cl-union, cl-nunion, cl-intersection)
(cl-nintersection, cl-set-difference, cl-nset-difference)
(cl-set-exclusive-or, cl-nset-exclusive-or, cl-subsetp, cl-subst-if)
(cl-subst-if-not, cl-nsubst, cl-nsubst-if, cl-nsubst-if-not, cl-sublis)
(cl-nsublis, cl-tree-equal): ...to have them inline here.
2025-02-14 22:46:07 +01:00
|
|
|
(declare (important-return-value t))
|
2012-05-17 16:04:56 -04:00
|
|
|
(cl--delete-duplicates cl-seq cl-keys nil))
|
1993-07-30 20:15:09 +00:00
|
|
|
|
2012-05-17 16:04:56 -04:00
|
|
|
(defun cl--delete-duplicates (cl-seq cl-keys cl-copy)
|
1993-07-30 20:15:09 +00:00
|
|
|
(if (listp cl-seq)
|
2012-12-06 16:29:29 -05:00
|
|
|
(cl--parsing-keywords
|
2016-08-10 23:23:18 +09:00
|
|
|
;; We need to parse :if, otherwise `cl-if' is unbound.
|
|
|
|
(:test :test-not :key (:start 0) :end :from-end :if)
|
1993-07-30 20:15:09 +00:00
|
|
|
()
|
|
|
|
(if cl-from-end
|
|
|
|
(let ((cl-p (nthcdr cl-start cl-seq)) cl-i)
|
|
|
|
(setq cl-end (- (or cl-end (length cl-seq)) cl-start))
|
|
|
|
(while (> cl-end 1)
|
|
|
|
(setq cl-i 0)
|
Use lexical-binding for all of CL, and clean up its namespace.
* lisp/emacs-lisp/cl-lib.el: Use lexical-binding.
(cl-map-extents, cl-maclisp-member): Remove.
(cl--set-elt, cl--set-nthcdr, cl--set-buffer-substring)
(cl--set-substring, cl--block-wrapper, cl--block-throw)
(cl--compiling-file, cl--mapcar-many, cl--do-subst): Use "cl--" prefix.
* lisp/emacs-lisp/cl-extra.el: Use lexical-binding.
(cl--mapcar-many, cl--map-keymap-recursively, cl--map-intervals)
(cl--map-overlays, cl--set-frame-visible-p, cl--progv-save)
(cl--progv-before, cl--progv-after, cl--finite-do, cl--set-getf)
(cl--do-remf, cl--do-prettyprint): Use "cl--" prefix.
* lisp/emacs-lisp/cl-seq.el: Use lexical-binding.
(cl--parsing-keywords, cl--check-key, cl--check-test-nokey)
(cl--check-test, cl--check-match): Use "cl--" prefix and backquotes.
(cl--alist, cl--sublis-rec, cl--nsublis-rec, cl--tree-equal-rec):
* lisp/emacs-lisp/cl-macs.el (cl--lambda-list-keywords): Use "cl--" prefix.
* lisp/edmacro.el (edmacro-mismatch): Simplify to remove dependence on
CL's internals.
2012-06-11 11:52:50 -04:00
|
|
|
(while (setq cl-i (cl--position (cl--check-key (car cl-p))
|
2012-05-17 16:04:56 -04:00
|
|
|
(cdr cl-p) cl-i (1- cl-end)))
|
1993-07-30 20:15:09 +00:00
|
|
|
(if cl-copy (setq cl-seq (copy-sequence cl-seq)
|
|
|
|
cl-p (nthcdr cl-start cl-seq) cl-copy nil))
|
|
|
|
(let ((cl-tail (nthcdr cl-i cl-p)))
|
|
|
|
(setcdr cl-tail (cdr (cdr cl-tail))))
|
|
|
|
(setq cl-end (1- cl-end)))
|
|
|
|
(setq cl-p (cdr cl-p) cl-end (1- cl-end)
|
|
|
|
cl-start (1+ cl-start)))
|
|
|
|
cl-seq)
|
|
|
|
(setq cl-end (- (or cl-end (length cl-seq)) cl-start))
|
|
|
|
(while (and (cdr cl-seq) (= cl-start 0) (> cl-end 1)
|
Use lexical-binding for all of CL, and clean up its namespace.
* lisp/emacs-lisp/cl-lib.el: Use lexical-binding.
(cl-map-extents, cl-maclisp-member): Remove.
(cl--set-elt, cl--set-nthcdr, cl--set-buffer-substring)
(cl--set-substring, cl--block-wrapper, cl--block-throw)
(cl--compiling-file, cl--mapcar-many, cl--do-subst): Use "cl--" prefix.
* lisp/emacs-lisp/cl-extra.el: Use lexical-binding.
(cl--mapcar-many, cl--map-keymap-recursively, cl--map-intervals)
(cl--map-overlays, cl--set-frame-visible-p, cl--progv-save)
(cl--progv-before, cl--progv-after, cl--finite-do, cl--set-getf)
(cl--do-remf, cl--do-prettyprint): Use "cl--" prefix.
* lisp/emacs-lisp/cl-seq.el: Use lexical-binding.
(cl--parsing-keywords, cl--check-key, cl--check-test-nokey)
(cl--check-test, cl--check-match): Use "cl--" prefix and backquotes.
(cl--alist, cl--sublis-rec, cl--nsublis-rec, cl--tree-equal-rec):
* lisp/emacs-lisp/cl-macs.el (cl--lambda-list-keywords): Use "cl--" prefix.
* lisp/edmacro.el (edmacro-mismatch): Simplify to remove dependence on
CL's internals.
2012-06-11 11:52:50 -04:00
|
|
|
(cl--position (cl--check-key (car cl-seq))
|
2012-05-17 16:04:56 -04:00
|
|
|
(cdr cl-seq) 0 (1- cl-end)))
|
1993-07-30 20:15:09 +00:00
|
|
|
(setq cl-seq (cdr cl-seq) cl-end (1- cl-end)))
|
|
|
|
(let ((cl-p (if (> cl-start 0) (nthcdr (1- cl-start) cl-seq)
|
|
|
|
(setq cl-end (1- cl-end) cl-start 1) cl-seq)))
|
|
|
|
(while (and (cdr (cdr cl-p)) (> cl-end 1))
|
Use lexical-binding for all of CL, and clean up its namespace.
* lisp/emacs-lisp/cl-lib.el: Use lexical-binding.
(cl-map-extents, cl-maclisp-member): Remove.
(cl--set-elt, cl--set-nthcdr, cl--set-buffer-substring)
(cl--set-substring, cl--block-wrapper, cl--block-throw)
(cl--compiling-file, cl--mapcar-many, cl--do-subst): Use "cl--" prefix.
* lisp/emacs-lisp/cl-extra.el: Use lexical-binding.
(cl--mapcar-many, cl--map-keymap-recursively, cl--map-intervals)
(cl--map-overlays, cl--set-frame-visible-p, cl--progv-save)
(cl--progv-before, cl--progv-after, cl--finite-do, cl--set-getf)
(cl--do-remf, cl--do-prettyprint): Use "cl--" prefix.
* lisp/emacs-lisp/cl-seq.el: Use lexical-binding.
(cl--parsing-keywords, cl--check-key, cl--check-test-nokey)
(cl--check-test, cl--check-match): Use "cl--" prefix and backquotes.
(cl--alist, cl--sublis-rec, cl--nsublis-rec, cl--tree-equal-rec):
* lisp/emacs-lisp/cl-macs.el (cl--lambda-list-keywords): Use "cl--" prefix.
* lisp/edmacro.el (edmacro-mismatch): Simplify to remove dependence on
CL's internals.
2012-06-11 11:52:50 -04:00
|
|
|
(if (cl--position (cl--check-key (car (cdr cl-p)))
|
2012-05-17 16:04:56 -04:00
|
|
|
(cdr (cdr cl-p)) 0 (1- cl-end))
|
1993-07-30 20:15:09 +00:00
|
|
|
(progn
|
|
|
|
(if cl-copy (setq cl-seq (copy-sequence cl-seq)
|
|
|
|
cl-p (nthcdr (1- cl-start) cl-seq)
|
|
|
|
cl-copy nil))
|
|
|
|
(setcdr cl-p (cdr (cdr cl-p))))
|
|
|
|
(setq cl-p (cdr cl-p)))
|
|
|
|
(setq cl-end (1- cl-end) cl-start (1+ cl-start)))
|
|
|
|
cl-seq)))
|
2012-05-17 16:04:56 -04:00
|
|
|
(let ((cl-res (cl--delete-duplicates (append cl-seq nil) cl-keys nil)))
|
1993-07-30 20:15:09 +00:00
|
|
|
(if (stringp cl-seq) (concat cl-res) (vconcat cl-res)))))
|
|
|
|
|
2007-06-27 18:59:03 +00:00
|
|
|
;;;###autoload
|
2012-06-03 21:05:17 -04:00
|
|
|
(defun cl-substitute (cl-new cl-old cl-seq &rest cl-keys)
|
1993-07-30 20:15:09 +00:00
|
|
|
"Substitute NEW for OLD in SEQ.
|
|
|
|
This is a non-destructive function; it makes a copy of SEQ if necessary
|
|
|
|
to avoid corrupting the original SEQ.
|
(reduce, fill, replace, remove*, remove-if, remove-if-not, delete*, delete-if,
delete-if-not, remove-duplicates, delete-duplicates, substitute, substitute-if,
substitute-if-not, nsubstitute, nsubstitute-if, nsubstitute-if-not, find,
find-if, find-if-not, position, position-if, position-if-not, count, count-if,
count-if-not, mismatch, search, sort*, stable-sort, merge, member*, member-if,
member-if-not, assoc*, assoc-if, assoc-if-not, rassoc*, rassoc-if,
rassoc-if-not, union, nunion, intersection, nintersection, set-difference,
nset-difference, set-exclusive-or, nset-exclusive-or, subsetp, subst-if,
subst-if-not, nsubst, nsubst-if, nsubst-if-not, sublis, nsublis, tree-equal):
Improve argument/docstring consistency.
2005-05-20 14:30:34 +00:00
|
|
|
\nKeywords supported: :test :test-not :key :count :start :end :from-end
|
|
|
|
\n(fn NEW OLD SEQ [KEYWORD VALUE]...)"
|
Inline important-return-value declarations in cl-lib.el
These declarations are now properly added to 'cl-lib.el' itself, or to
'cl-loaddefs.el'. This means that they will now correctly show up
immediately when loading 'cl-lib.el', instead of only after 'cl-macs.el'
is pulled in by an autoload. C.f. Bug#76247.
I did not considered worth reproducing everywhere the list saying which
functions among the below belong to these two categories:
1. Functions that are side-effect-free except for the behavior of
functions passed as argument.
2. Functions that mutate and return a list.
AFAIU, this is not actionable with our current byte-compiler, i.e. we
can't add any extra declarations based on it. However, if the list
should be needed at some point, for example due to improvements in the
compiler, this commit will be where to find it. In the worst case, and
with more work, it's also deducible from the source code itself.
* lisp/emacs-lisp/cl-macs.el: Move important-return-value declarations
from here...
* lisp/emacs-lisp/cl-extra.el (cl-map, cl-maplist, cl-mapcan)
(cl-mapcon, cl-some, cl-every, cl-notany, cl-notevery, cl-nreconc):
* lisp/emacs-lisp/cl-lib.el (cl-mapcar, cl-adjoin, cl-subst):
* lisp/emacs-lisp/cl-seq.el (cl-reduce, cl-remove, cl-remove-if)
(cl-remove-if-not, cl-delete, cl-delete-if, cl-delete-if-not)
(cl-remove-duplicates, cl-delete-duplicates, cl-substitute)
(cl-substitute-if, cl-substitute-if-not, cl-nsubstitute)
(cl-nsubstitute-if, cl-nsubstitute-if-not, cl-find, cl-find-if)
(cl-find-if-not, cl-position, cl-position-if, cl-position-if-not)
(cl-count, cl-count-if, cl-count-if-not, cl-mismatch, cl-search)
(cl-sort, cl-stable-sort, cl-merge, cl-member, cl-member-if)
(cl-member-if-not, cl-assoc, cl-assoc-if, cl-assoc-if-not, cl-rassoc)
(cl-rassoc-if, cl-rassoc-if-not, cl-union, cl-nunion, cl-intersection)
(cl-nintersection, cl-set-difference, cl-nset-difference)
(cl-set-exclusive-or, cl-nset-exclusive-or, cl-subsetp, cl-subst-if)
(cl-subst-if-not, cl-nsubst, cl-nsubst-if, cl-nsubst-if-not, cl-sublis)
(cl-nsublis, cl-tree-equal): ...to have them inline here.
2025-02-14 22:46:07 +01:00
|
|
|
(declare (important-return-value t))
|
Use lexical-binding for all of CL, and clean up its namespace.
* lisp/emacs-lisp/cl-lib.el: Use lexical-binding.
(cl-map-extents, cl-maclisp-member): Remove.
(cl--set-elt, cl--set-nthcdr, cl--set-buffer-substring)
(cl--set-substring, cl--block-wrapper, cl--block-throw)
(cl--compiling-file, cl--mapcar-many, cl--do-subst): Use "cl--" prefix.
* lisp/emacs-lisp/cl-extra.el: Use lexical-binding.
(cl--mapcar-many, cl--map-keymap-recursively, cl--map-intervals)
(cl--map-overlays, cl--set-frame-visible-p, cl--progv-save)
(cl--progv-before, cl--progv-after, cl--finite-do, cl--set-getf)
(cl--do-remf, cl--do-prettyprint): Use "cl--" prefix.
* lisp/emacs-lisp/cl-seq.el: Use lexical-binding.
(cl--parsing-keywords, cl--check-key, cl--check-test-nokey)
(cl--check-test, cl--check-match): Use "cl--" prefix and backquotes.
(cl--alist, cl--sublis-rec, cl--nsublis-rec, cl--tree-equal-rec):
* lisp/emacs-lisp/cl-macs.el (cl--lambda-list-keywords): Use "cl--" prefix.
* lisp/edmacro.el (edmacro-mismatch): Simplify to remove dependence on
CL's internals.
2012-06-11 11:52:50 -04:00
|
|
|
(cl--parsing-keywords (:test :test-not :key :if :if-not :count
|
1993-07-30 20:15:09 +00:00
|
|
|
(:start 0) :end :from-end) ()
|
|
|
|
(if (or (eq cl-old cl-new)
|
2016-10-20 19:51:55 +09:00
|
|
|
(<= (or cl-count (setq cl-from-end nil
|
|
|
|
cl-count (length cl-seq))) 0))
|
1993-07-30 20:15:09 +00:00
|
|
|
cl-seq
|
2012-05-17 16:04:56 -04:00
|
|
|
(let ((cl-i (cl--position cl-old cl-seq cl-start cl-end)))
|
1993-07-30 20:15:09 +00:00
|
|
|
(if (not cl-i)
|
|
|
|
cl-seq
|
|
|
|
(setq cl-seq (copy-sequence cl-seq))
|
2016-10-20 19:51:55 +09:00
|
|
|
(unless cl-from-end
|
|
|
|
(setf (elt cl-seq cl-i) cl-new)
|
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.
2025-02-23 00:13:21 +01:00
|
|
|
(incf cl-i)
|
Prefer decf to cl-decf
* lisp/auth-source-pass.el (auth-source-pass--find-match-many):
* lisp/calendar/time-date.el (decoded-time-add)
(decoded-time--alter-month, decoded-time--alter-day):
* lisp/dired.el (dired--move-to-next-line):
* lisp/dom.el (dom-pp):
* lisp/emacs-lisp/cl-macs.el (cl--transform-lambda):
* lisp/emacs-lisp/cl-print.el (cl-print-to-string-with-limit):
* lisp/emacs-lisp/cl-seq.el (cl-fill, cl-replace, cl-substitute):
* lisp/emacs-lisp/comp-cstr.el (comp--range-union)
(comp--range-intersection):
* lisp/emacs-lisp/comp.el (comp-vec-prepend, comp--emit-narg-prologue):
* lisp/emacs-lisp/edebug.el (edebug--strip-instrumentation):
* lisp/emacs-lisp/eldoc.el (eldoc--invoke-strategy):
* lisp/emacs-lisp/pp.el (pp--format-definition):
* lisp/emacs-lisp/smie.el (smie-config--guess-1):
* lisp/eshell/esh-io.el (eshell-close-handle, eshell-set-output-handle):
* lisp/gnus/gnus-async.el (gnus-async-prefetch-article):
* lisp/gnus/gnus-group.el (gnus-group-mark-group)
(gnus-group-yank-group):
* lisp/gnus/gnus-salt.el (gnus-tree-forward-line):
* lisp/gnus/gnus-score.el (gnus-decay-scores):
* lisp/gnus/gnus-srvr.el (gnus-browse-toggle-subscription-at-point):
* lisp/gnus/gnus-sum.el (gnus-build-sparse-threads, gnus-parent-headers)
(gnus-update-marks, gnus-summary-work-articles)
(gnus-summary-refer-parent-article, gnus-summary-next-thread)
(gnus-read-header, gnus-summary-insert-new-articles):
* lisp/gnus/gnus-topic.el (gnus-topic-forward-topic):
* lisp/gnus/gnus.el (gnus-short-group-name):
* lisp/gnus/message.el (message-remove-first-header)
(message-shorten-references, message-insert-screenshot):
* lisp/gnus/mm-url.el (mm-url-insert):
* lisp/gnus/nnselect.el (nnselect-push-info):
* lisp/ibuffer.el (ibuffer-backward-line, ibuffer-forward-line)
(ibuffer-map-lines):
* lisp/icomplete.el (icomplete--render-vertical):
* lisp/image/image-dired-external.el (image-dired-create-thumb-1):
* lisp/image/image-dired.el (image-dired-delete-char):
* lisp/mail/ietf-drums-date.el (ietf-drums-date--tokenize-string):
* lisp/mh-e/mh-utils.el (mh-sub-folders-parse):
* lisp/minibuffer.el (minibuffer-completion-help):
* lisp/mpc.el (mpc-cmd-move, mpc-songpointer-refresh-hairy):
* lisp/net/eww.el (eww-process-text-input):
* lisp/net/pop3.el (pop3-wait-for-messages, pop3-uidl-stat)
(pop3-uidl-dele):
* lisp/net/shr-color.el (shr-color-hue-to-rgb):
* lisp/play/5x5.el (5x5-up, 5x5-left):
* lisp/play/decipher.el (decipher-read-alphabet, decipher--digram-total)
(decipher-analyze-buffer):
* lisp/play/hanoi.el (hanoi-insert-ring, hanoi-move-ring):
* lisp/profiler.el (profiler-format-number)
(profiler-calltree-build-unified):
* lisp/progmodes/antlr-mode.el (antlr-next-rule, antlr-indent-line):
* lisp/progmodes/c-ts-common.el (c-ts-common-statement-offset):
* lisp/progmodes/ebrowse.el
(ebrowse-cyclic-display-next/previous-member-list):
* lisp/progmodes/hideif.el (hif-backward-comment):
* lisp/progmodes/js.el (js-beginning-of-defun, js-end-of-defun)
(js-ts--syntax-propertize):
* lisp/progmodes/typescript-ts-mode.el
(tsx-ts--syntax-propertize-captures):
* lisp/rect.el (rectangle--*-char):
* lisp/term.el (term-emulate-terminal):
* lisp/textmodes/reftex-cite.el (reftex-do-citation):
* lisp/textmodes/reftex-index.el (reftex-index-next-phrase):
* lisp/textmodes/reftex-parse.el (reftex-init-section-numbers):
* lisp/textmodes/reftex-sel.el (reftex-select-unmark):
* lisp/textmodes/reftex.el (reftex-silence-toc-markers):
* lisp/treesit.el (treesit-navigate-thing):
* lisp/vc/diff-mode.el (diff-sanity-check-context-hunk-half,
(diff-sanity-check-hunk):
* lisp/vc/pcvs-util.el (cvs-first):
* lisp/vc/smerge-mode.el (smerge-get-current):
* lisp/vc/vc-hg.el (vc-hg--glob-to-pcre):
* test/lisp/net/socks-tests.el
(socks-tests-perform-hello-world-http-request):
* test/src/buffer-tests.el (test-overlay-randomly): Prefer decf to
cl-defc in all code where we can.
2025-02-22 19:06:11 +01:00
|
|
|
(decf cl-count))
|
2012-06-03 21:05:17 -04:00
|
|
|
(apply 'cl-nsubstitute cl-new cl-old cl-seq :count cl-count
|
2000-05-05 20:01:01 +00:00
|
|
|
:start cl-i cl-keys))))))
|
1993-07-30 20:15:09 +00:00
|
|
|
|
2007-06-27 18:59:03 +00:00
|
|
|
;;;###autoload
|
2012-06-03 21:05:17 -04:00
|
|
|
(defun cl-substitute-if (cl-new cl-pred cl-list &rest cl-keys)
|
1993-07-30 20:15:09 +00:00
|
|
|
"Substitute NEW for all items satisfying PREDICATE in SEQ.
|
|
|
|
This is a non-destructive function; it makes a copy of SEQ if necessary
|
|
|
|
to avoid corrupting the original SEQ.
|
(reduce, fill, replace, remove*, remove-if, remove-if-not, delete*, delete-if,
delete-if-not, remove-duplicates, delete-duplicates, substitute, substitute-if,
substitute-if-not, nsubstitute, nsubstitute-if, nsubstitute-if-not, find,
find-if, find-if-not, position, position-if, position-if-not, count, count-if,
count-if-not, mismatch, search, sort*, stable-sort, merge, member*, member-if,
member-if-not, assoc*, assoc-if, assoc-if-not, rassoc*, rassoc-if,
rassoc-if-not, union, nunion, intersection, nintersection, set-difference,
nset-difference, set-exclusive-or, nset-exclusive-or, subsetp, subst-if,
subst-if-not, nsubst, nsubst-if, nsubst-if-not, sublis, nsublis, tree-equal):
Improve argument/docstring consistency.
2005-05-20 14:30:34 +00:00
|
|
|
\nKeywords supported: :key :count :start :end :from-end
|
|
|
|
\n(fn NEW PREDICATE SEQ [KEYWORD VALUE]...)"
|
Inline important-return-value declarations in cl-lib.el
These declarations are now properly added to 'cl-lib.el' itself, or to
'cl-loaddefs.el'. This means that they will now correctly show up
immediately when loading 'cl-lib.el', instead of only after 'cl-macs.el'
is pulled in by an autoload. C.f. Bug#76247.
I did not considered worth reproducing everywhere the list saying which
functions among the below belong to these two categories:
1. Functions that are side-effect-free except for the behavior of
functions passed as argument.
2. Functions that mutate and return a list.
AFAIU, this is not actionable with our current byte-compiler, i.e. we
can't add any extra declarations based on it. However, if the list
should be needed at some point, for example due to improvements in the
compiler, this commit will be where to find it. In the worst case, and
with more work, it's also deducible from the source code itself.
* lisp/emacs-lisp/cl-macs.el: Move important-return-value declarations
from here...
* lisp/emacs-lisp/cl-extra.el (cl-map, cl-maplist, cl-mapcan)
(cl-mapcon, cl-some, cl-every, cl-notany, cl-notevery, cl-nreconc):
* lisp/emacs-lisp/cl-lib.el (cl-mapcar, cl-adjoin, cl-subst):
* lisp/emacs-lisp/cl-seq.el (cl-reduce, cl-remove, cl-remove-if)
(cl-remove-if-not, cl-delete, cl-delete-if, cl-delete-if-not)
(cl-remove-duplicates, cl-delete-duplicates, cl-substitute)
(cl-substitute-if, cl-substitute-if-not, cl-nsubstitute)
(cl-nsubstitute-if, cl-nsubstitute-if-not, cl-find, cl-find-if)
(cl-find-if-not, cl-position, cl-position-if, cl-position-if-not)
(cl-count, cl-count-if, cl-count-if-not, cl-mismatch, cl-search)
(cl-sort, cl-stable-sort, cl-merge, cl-member, cl-member-if)
(cl-member-if-not, cl-assoc, cl-assoc-if, cl-assoc-if-not, cl-rassoc)
(cl-rassoc-if, cl-rassoc-if-not, cl-union, cl-nunion, cl-intersection)
(cl-nintersection, cl-set-difference, cl-nset-difference)
(cl-set-exclusive-or, cl-nset-exclusive-or, cl-subsetp, cl-subst-if)
(cl-subst-if-not, cl-nsubst, cl-nsubst-if, cl-nsubst-if-not, cl-sublis)
(cl-nsublis, cl-tree-equal): ...to have them inline here.
2025-02-14 22:46:07 +01:00
|
|
|
(declare (important-return-value t))
|
2012-06-03 21:05:17 -04:00
|
|
|
(apply 'cl-substitute cl-new nil cl-list :if cl-pred cl-keys))
|
1993-07-30 20:15:09 +00:00
|
|
|
|
2007-06-27 18:59:03 +00:00
|
|
|
;;;###autoload
|
2012-06-03 21:05:17 -04:00
|
|
|
(defun cl-substitute-if-not (cl-new cl-pred cl-list &rest cl-keys)
|
1993-07-30 20:15:09 +00:00
|
|
|
"Substitute NEW for all items not satisfying PREDICATE in SEQ.
|
|
|
|
This is a non-destructive function; it makes a copy of SEQ if necessary
|
|
|
|
to avoid corrupting the original SEQ.
|
(reduce, fill, replace, remove*, remove-if, remove-if-not, delete*, delete-if,
delete-if-not, remove-duplicates, delete-duplicates, substitute, substitute-if,
substitute-if-not, nsubstitute, nsubstitute-if, nsubstitute-if-not, find,
find-if, find-if-not, position, position-if, position-if-not, count, count-if,
count-if-not, mismatch, search, sort*, stable-sort, merge, member*, member-if,
member-if-not, assoc*, assoc-if, assoc-if-not, rassoc*, rassoc-if,
rassoc-if-not, union, nunion, intersection, nintersection, set-difference,
nset-difference, set-exclusive-or, nset-exclusive-or, subsetp, subst-if,
subst-if-not, nsubst, nsubst-if, nsubst-if-not, sublis, nsublis, tree-equal):
Improve argument/docstring consistency.
2005-05-20 14:30:34 +00:00
|
|
|
\nKeywords supported: :key :count :start :end :from-end
|
|
|
|
\n(fn NEW PREDICATE SEQ [KEYWORD VALUE]...)"
|
Inline important-return-value declarations in cl-lib.el
These declarations are now properly added to 'cl-lib.el' itself, or to
'cl-loaddefs.el'. This means that they will now correctly show up
immediately when loading 'cl-lib.el', instead of only after 'cl-macs.el'
is pulled in by an autoload. C.f. Bug#76247.
I did not considered worth reproducing everywhere the list saying which
functions among the below belong to these two categories:
1. Functions that are side-effect-free except for the behavior of
functions passed as argument.
2. Functions that mutate and return a list.
AFAIU, this is not actionable with our current byte-compiler, i.e. we
can't add any extra declarations based on it. However, if the list
should be needed at some point, for example due to improvements in the
compiler, this commit will be where to find it. In the worst case, and
with more work, it's also deducible from the source code itself.
* lisp/emacs-lisp/cl-macs.el: Move important-return-value declarations
from here...
* lisp/emacs-lisp/cl-extra.el (cl-map, cl-maplist, cl-mapcan)
(cl-mapcon, cl-some, cl-every, cl-notany, cl-notevery, cl-nreconc):
* lisp/emacs-lisp/cl-lib.el (cl-mapcar, cl-adjoin, cl-subst):
* lisp/emacs-lisp/cl-seq.el (cl-reduce, cl-remove, cl-remove-if)
(cl-remove-if-not, cl-delete, cl-delete-if, cl-delete-if-not)
(cl-remove-duplicates, cl-delete-duplicates, cl-substitute)
(cl-substitute-if, cl-substitute-if-not, cl-nsubstitute)
(cl-nsubstitute-if, cl-nsubstitute-if-not, cl-find, cl-find-if)
(cl-find-if-not, cl-position, cl-position-if, cl-position-if-not)
(cl-count, cl-count-if, cl-count-if-not, cl-mismatch, cl-search)
(cl-sort, cl-stable-sort, cl-merge, cl-member, cl-member-if)
(cl-member-if-not, cl-assoc, cl-assoc-if, cl-assoc-if-not, cl-rassoc)
(cl-rassoc-if, cl-rassoc-if-not, cl-union, cl-nunion, cl-intersection)
(cl-nintersection, cl-set-difference, cl-nset-difference)
(cl-set-exclusive-or, cl-nset-exclusive-or, cl-subsetp, cl-subst-if)
(cl-subst-if-not, cl-nsubst, cl-nsubst-if, cl-nsubst-if-not, cl-sublis)
(cl-nsublis, cl-tree-equal): ...to have them inline here.
2025-02-14 22:46:07 +01:00
|
|
|
(declare (important-return-value t))
|
2012-06-03 21:05:17 -04:00
|
|
|
(apply 'cl-substitute cl-new nil cl-list :if-not cl-pred cl-keys))
|
1993-07-30 20:15:09 +00:00
|
|
|
|
2007-06-27 18:59:03 +00:00
|
|
|
;;;###autoload
|
2024-05-08 12:13:48 +02:00
|
|
|
(defun cl-nsubstitute (cl-new cl-old seq &rest cl-keys)
|
1993-07-30 20:15:09 +00:00
|
|
|
"Substitute NEW for OLD in SEQ.
|
|
|
|
This is a destructive function; it reuses the storage of SEQ whenever possible.
|
(reduce, fill, replace, remove*, remove-if, remove-if-not, delete*, delete-if,
delete-if-not, remove-duplicates, delete-duplicates, substitute, substitute-if,
substitute-if-not, nsubstitute, nsubstitute-if, nsubstitute-if-not, find,
find-if, find-if-not, position, position-if, position-if-not, count, count-if,
count-if-not, mismatch, search, sort*, stable-sort, merge, member*, member-if,
member-if-not, assoc*, assoc-if, assoc-if-not, rassoc*, rassoc-if,
rassoc-if-not, union, nunion, intersection, nintersection, set-difference,
nset-difference, set-exclusive-or, nset-exclusive-or, subsetp, subst-if,
subst-if-not, nsubst, nsubst-if, nsubst-if-not, sublis, nsublis, tree-equal):
Improve argument/docstring consistency.
2005-05-20 14:30:34 +00:00
|
|
|
\nKeywords supported: :test :test-not :key :count :start :end :from-end
|
|
|
|
\n(fn NEW OLD SEQ [KEYWORD VALUE]...)"
|
Inline important-return-value declarations in cl-lib.el
These declarations are now properly added to 'cl-lib.el' itself, or to
'cl-loaddefs.el'. This means that they will now correctly show up
immediately when loading 'cl-lib.el', instead of only after 'cl-macs.el'
is pulled in by an autoload. C.f. Bug#76247.
I did not considered worth reproducing everywhere the list saying which
functions among the below belong to these two categories:
1. Functions that are side-effect-free except for the behavior of
functions passed as argument.
2. Functions that mutate and return a list.
AFAIU, this is not actionable with our current byte-compiler, i.e. we
can't add any extra declarations based on it. However, if the list
should be needed at some point, for example due to improvements in the
compiler, this commit will be where to find it. In the worst case, and
with more work, it's also deducible from the source code itself.
* lisp/emacs-lisp/cl-macs.el: Move important-return-value declarations
from here...
* lisp/emacs-lisp/cl-extra.el (cl-map, cl-maplist, cl-mapcan)
(cl-mapcon, cl-some, cl-every, cl-notany, cl-notevery, cl-nreconc):
* lisp/emacs-lisp/cl-lib.el (cl-mapcar, cl-adjoin, cl-subst):
* lisp/emacs-lisp/cl-seq.el (cl-reduce, cl-remove, cl-remove-if)
(cl-remove-if-not, cl-delete, cl-delete-if, cl-delete-if-not)
(cl-remove-duplicates, cl-delete-duplicates, cl-substitute)
(cl-substitute-if, cl-substitute-if-not, cl-nsubstitute)
(cl-nsubstitute-if, cl-nsubstitute-if-not, cl-find, cl-find-if)
(cl-find-if-not, cl-position, cl-position-if, cl-position-if-not)
(cl-count, cl-count-if, cl-count-if-not, cl-mismatch, cl-search)
(cl-sort, cl-stable-sort, cl-merge, cl-member, cl-member-if)
(cl-member-if-not, cl-assoc, cl-assoc-if, cl-assoc-if-not, cl-rassoc)
(cl-rassoc-if, cl-rassoc-if-not, cl-union, cl-nunion, cl-intersection)
(cl-nintersection, cl-set-difference, cl-nset-difference)
(cl-set-exclusive-or, cl-nset-exclusive-or, cl-subsetp, cl-subst-if)
(cl-subst-if-not, cl-nsubst, cl-nsubst-if, cl-nsubst-if-not, cl-sublis)
(cl-nsublis, cl-tree-equal): ...to have them inline here.
2025-02-14 22:46:07 +01:00
|
|
|
(declare (important-return-value t))
|
Use lexical-binding for all of CL, and clean up its namespace.
* lisp/emacs-lisp/cl-lib.el: Use lexical-binding.
(cl-map-extents, cl-maclisp-member): Remove.
(cl--set-elt, cl--set-nthcdr, cl--set-buffer-substring)
(cl--set-substring, cl--block-wrapper, cl--block-throw)
(cl--compiling-file, cl--mapcar-many, cl--do-subst): Use "cl--" prefix.
* lisp/emacs-lisp/cl-extra.el: Use lexical-binding.
(cl--mapcar-many, cl--map-keymap-recursively, cl--map-intervals)
(cl--map-overlays, cl--set-frame-visible-p, cl--progv-save)
(cl--progv-before, cl--progv-after, cl--finite-do, cl--set-getf)
(cl--do-remf, cl--do-prettyprint): Use "cl--" prefix.
* lisp/emacs-lisp/cl-seq.el: Use lexical-binding.
(cl--parsing-keywords, cl--check-key, cl--check-test-nokey)
(cl--check-test, cl--check-match): Use "cl--" prefix and backquotes.
(cl--alist, cl--sublis-rec, cl--nsublis-rec, cl--tree-equal-rec):
* lisp/emacs-lisp/cl-macs.el (cl--lambda-list-keywords): Use "cl--" prefix.
* lisp/edmacro.el (edmacro-mismatch): Simplify to remove dependence on
CL's internals.
2012-06-11 11:52:50 -04:00
|
|
|
(cl--parsing-keywords (:test :test-not :key :if :if-not :count
|
1993-07-30 20:15:09 +00:00
|
|
|
(:start 0) :end :from-end) ()
|
2024-05-08 12:13:48 +02:00
|
|
|
(let* ((cl-seq (if (stringp seq) (string-to-vector seq) seq))
|
|
|
|
(len (length cl-seq)))
|
2016-10-20 19:51:55 +09:00
|
|
|
(or (eq cl-old cl-new) (<= (or cl-count (setq cl-count len)) 0)
|
|
|
|
(if (and (listp cl-seq) (or (not cl-from-end) (> cl-count (/ len 2))))
|
1993-07-30 20:15:09 +00:00
|
|
|
(let ((cl-p (nthcdr cl-start cl-seq)))
|
2016-10-20 19:51:55 +09:00
|
|
|
(setq cl-end (- (or cl-end len) cl-start))
|
1993-07-30 20:15:09 +00:00
|
|
|
(while (and cl-p (> cl-end 0) (> cl-count 0))
|
Use lexical-binding for all of CL, and clean up its namespace.
* lisp/emacs-lisp/cl-lib.el: Use lexical-binding.
(cl-map-extents, cl-maclisp-member): Remove.
(cl--set-elt, cl--set-nthcdr, cl--set-buffer-substring)
(cl--set-substring, cl--block-wrapper, cl--block-throw)
(cl--compiling-file, cl--mapcar-many, cl--do-subst): Use "cl--" prefix.
* lisp/emacs-lisp/cl-extra.el: Use lexical-binding.
(cl--mapcar-many, cl--map-keymap-recursively, cl--map-intervals)
(cl--map-overlays, cl--set-frame-visible-p, cl--progv-save)
(cl--progv-before, cl--progv-after, cl--finite-do, cl--set-getf)
(cl--do-remf, cl--do-prettyprint): Use "cl--" prefix.
* lisp/emacs-lisp/cl-seq.el: Use lexical-binding.
(cl--parsing-keywords, cl--check-key, cl--check-test-nokey)
(cl--check-test, cl--check-match): Use "cl--" prefix and backquotes.
(cl--alist, cl--sublis-rec, cl--nsublis-rec, cl--tree-equal-rec):
* lisp/emacs-lisp/cl-macs.el (cl--lambda-list-keywords): Use "cl--" prefix.
* lisp/edmacro.el (edmacro-mismatch): Simplify to remove dependence on
CL's internals.
2012-06-11 11:52:50 -04:00
|
|
|
(if (cl--check-test cl-old (car cl-p))
|
1993-07-30 20:15:09 +00:00
|
|
|
(progn
|
|
|
|
(setcar cl-p cl-new)
|
|
|
|
(setq cl-count (1- cl-count))))
|
|
|
|
(setq cl-p (cdr cl-p) cl-end (1- cl-end))))
|
2016-10-20 19:51:55 +09:00
|
|
|
(or cl-end (setq cl-end len))
|
1993-07-30 20:15:09 +00:00
|
|
|
(if cl-from-end
|
|
|
|
(while (and (< cl-start cl-end) (> cl-count 0))
|
|
|
|
(setq cl-end (1- cl-end))
|
Use lexical-binding for all of CL, and clean up its namespace.
* lisp/emacs-lisp/cl-lib.el: Use lexical-binding.
(cl-map-extents, cl-maclisp-member): Remove.
(cl--set-elt, cl--set-nthcdr, cl--set-buffer-substring)
(cl--set-substring, cl--block-wrapper, cl--block-throw)
(cl--compiling-file, cl--mapcar-many, cl--do-subst): Use "cl--" prefix.
* lisp/emacs-lisp/cl-extra.el: Use lexical-binding.
(cl--mapcar-many, cl--map-keymap-recursively, cl--map-intervals)
(cl--map-overlays, cl--set-frame-visible-p, cl--progv-save)
(cl--progv-before, cl--progv-after, cl--finite-do, cl--set-getf)
(cl--do-remf, cl--do-prettyprint): Use "cl--" prefix.
* lisp/emacs-lisp/cl-seq.el: Use lexical-binding.
(cl--parsing-keywords, cl--check-key, cl--check-test-nokey)
(cl--check-test, cl--check-match): Use "cl--" prefix and backquotes.
(cl--alist, cl--sublis-rec, cl--nsublis-rec, cl--tree-equal-rec):
* lisp/emacs-lisp/cl-macs.el (cl--lambda-list-keywords): Use "cl--" prefix.
* lisp/edmacro.el (edmacro-mismatch): Simplify to remove dependence on
CL's internals.
2012-06-11 11:52:50 -04:00
|
|
|
(if (cl--check-test cl-old (elt cl-seq cl-end))
|
1993-07-30 20:15:09 +00:00
|
|
|
(progn
|
2014-04-21 23:18:15 -04:00
|
|
|
(setf (elt cl-seq cl-end) cl-new)
|
1993-07-30 20:15:09 +00:00
|
|
|
(setq cl-count (1- cl-count)))))
|
|
|
|
(while (and (< cl-start cl-end) (> cl-count 0))
|
Use lexical-binding for all of CL, and clean up its namespace.
* lisp/emacs-lisp/cl-lib.el: Use lexical-binding.
(cl-map-extents, cl-maclisp-member): Remove.
(cl--set-elt, cl--set-nthcdr, cl--set-buffer-substring)
(cl--set-substring, cl--block-wrapper, cl--block-throw)
(cl--compiling-file, cl--mapcar-many, cl--do-subst): Use "cl--" prefix.
* lisp/emacs-lisp/cl-extra.el: Use lexical-binding.
(cl--mapcar-many, cl--map-keymap-recursively, cl--map-intervals)
(cl--map-overlays, cl--set-frame-visible-p, cl--progv-save)
(cl--progv-before, cl--progv-after, cl--finite-do, cl--set-getf)
(cl--do-remf, cl--do-prettyprint): Use "cl--" prefix.
* lisp/emacs-lisp/cl-seq.el: Use lexical-binding.
(cl--parsing-keywords, cl--check-key, cl--check-test-nokey)
(cl--check-test, cl--check-match): Use "cl--" prefix and backquotes.
(cl--alist, cl--sublis-rec, cl--nsublis-rec, cl--tree-equal-rec):
* lisp/emacs-lisp/cl-macs.el (cl--lambda-list-keywords): Use "cl--" prefix.
* lisp/edmacro.el (edmacro-mismatch): Simplify to remove dependence on
CL's internals.
2012-06-11 11:52:50 -04:00
|
|
|
(if (cl--check-test cl-old (aref cl-seq cl-start))
|
1993-07-30 20:15:09 +00:00
|
|
|
(progn
|
|
|
|
(aset cl-seq cl-start cl-new)
|
|
|
|
(setq cl-count (1- cl-count))))
|
2024-05-08 12:13:48 +02:00
|
|
|
(setq cl-start (1+ cl-start))))))
|
|
|
|
(if (stringp seq) (concat cl-seq) cl-seq))))
|
1993-07-30 20:15:09 +00:00
|
|
|
|
2007-06-27 18:59:03 +00:00
|
|
|
;;;###autoload
|
2012-06-03 21:05:17 -04:00
|
|
|
(defun cl-nsubstitute-if (cl-new cl-pred cl-list &rest cl-keys)
|
1993-07-30 20:15:09 +00:00
|
|
|
"Substitute NEW for all items satisfying PREDICATE in SEQ.
|
|
|
|
This is a destructive function; it reuses the storage of SEQ whenever possible.
|
(reduce, fill, replace, remove*, remove-if, remove-if-not, delete*, delete-if,
delete-if-not, remove-duplicates, delete-duplicates, substitute, substitute-if,
substitute-if-not, nsubstitute, nsubstitute-if, nsubstitute-if-not, find,
find-if, find-if-not, position, position-if, position-if-not, count, count-if,
count-if-not, mismatch, search, sort*, stable-sort, merge, member*, member-if,
member-if-not, assoc*, assoc-if, assoc-if-not, rassoc*, rassoc-if,
rassoc-if-not, union, nunion, intersection, nintersection, set-difference,
nset-difference, set-exclusive-or, nset-exclusive-or, subsetp, subst-if,
subst-if-not, nsubst, nsubst-if, nsubst-if-not, sublis, nsublis, tree-equal):
Improve argument/docstring consistency.
2005-05-20 14:30:34 +00:00
|
|
|
\nKeywords supported: :key :count :start :end :from-end
|
|
|
|
\n(fn NEW PREDICATE SEQ [KEYWORD VALUE]...)"
|
Inline important-return-value declarations in cl-lib.el
These declarations are now properly added to 'cl-lib.el' itself, or to
'cl-loaddefs.el'. This means that they will now correctly show up
immediately when loading 'cl-lib.el', instead of only after 'cl-macs.el'
is pulled in by an autoload. C.f. Bug#76247.
I did not considered worth reproducing everywhere the list saying which
functions among the below belong to these two categories:
1. Functions that are side-effect-free except for the behavior of
functions passed as argument.
2. Functions that mutate and return a list.
AFAIU, this is not actionable with our current byte-compiler, i.e. we
can't add any extra declarations based on it. However, if the list
should be needed at some point, for example due to improvements in the
compiler, this commit will be where to find it. In the worst case, and
with more work, it's also deducible from the source code itself.
* lisp/emacs-lisp/cl-macs.el: Move important-return-value declarations
from here...
* lisp/emacs-lisp/cl-extra.el (cl-map, cl-maplist, cl-mapcan)
(cl-mapcon, cl-some, cl-every, cl-notany, cl-notevery, cl-nreconc):
* lisp/emacs-lisp/cl-lib.el (cl-mapcar, cl-adjoin, cl-subst):
* lisp/emacs-lisp/cl-seq.el (cl-reduce, cl-remove, cl-remove-if)
(cl-remove-if-not, cl-delete, cl-delete-if, cl-delete-if-not)
(cl-remove-duplicates, cl-delete-duplicates, cl-substitute)
(cl-substitute-if, cl-substitute-if-not, cl-nsubstitute)
(cl-nsubstitute-if, cl-nsubstitute-if-not, cl-find, cl-find-if)
(cl-find-if-not, cl-position, cl-position-if, cl-position-if-not)
(cl-count, cl-count-if, cl-count-if-not, cl-mismatch, cl-search)
(cl-sort, cl-stable-sort, cl-merge, cl-member, cl-member-if)
(cl-member-if-not, cl-assoc, cl-assoc-if, cl-assoc-if-not, cl-rassoc)
(cl-rassoc-if, cl-rassoc-if-not, cl-union, cl-nunion, cl-intersection)
(cl-nintersection, cl-set-difference, cl-nset-difference)
(cl-set-exclusive-or, cl-nset-exclusive-or, cl-subsetp, cl-subst-if)
(cl-subst-if-not, cl-nsubst, cl-nsubst-if, cl-nsubst-if-not, cl-sublis)
(cl-nsublis, cl-tree-equal): ...to have them inline here.
2025-02-14 22:46:07 +01:00
|
|
|
(declare (important-return-value t))
|
2012-06-03 21:05:17 -04:00
|
|
|
(apply 'cl-nsubstitute cl-new nil cl-list :if cl-pred cl-keys))
|
1993-07-30 20:15:09 +00:00
|
|
|
|
2007-06-27 18:59:03 +00:00
|
|
|
;;;###autoload
|
2012-06-03 21:05:17 -04:00
|
|
|
(defun cl-nsubstitute-if-not (cl-new cl-pred cl-list &rest cl-keys)
|
1993-07-30 20:15:09 +00:00
|
|
|
"Substitute NEW for all items not satisfying PREDICATE in SEQ.
|
|
|
|
This is a destructive function; it reuses the storage of SEQ whenever possible.
|
(reduce, fill, replace, remove*, remove-if, remove-if-not, delete*, delete-if,
delete-if-not, remove-duplicates, delete-duplicates, substitute, substitute-if,
substitute-if-not, nsubstitute, nsubstitute-if, nsubstitute-if-not, find,
find-if, find-if-not, position, position-if, position-if-not, count, count-if,
count-if-not, mismatch, search, sort*, stable-sort, merge, member*, member-if,
member-if-not, assoc*, assoc-if, assoc-if-not, rassoc*, rassoc-if,
rassoc-if-not, union, nunion, intersection, nintersection, set-difference,
nset-difference, set-exclusive-or, nset-exclusive-or, subsetp, subst-if,
subst-if-not, nsubst, nsubst-if, nsubst-if-not, sublis, nsublis, tree-equal):
Improve argument/docstring consistency.
2005-05-20 14:30:34 +00:00
|
|
|
\nKeywords supported: :key :count :start :end :from-end
|
|
|
|
\n(fn NEW PREDICATE SEQ [KEYWORD VALUE]...)"
|
Inline important-return-value declarations in cl-lib.el
These declarations are now properly added to 'cl-lib.el' itself, or to
'cl-loaddefs.el'. This means that they will now correctly show up
immediately when loading 'cl-lib.el', instead of only after 'cl-macs.el'
is pulled in by an autoload. C.f. Bug#76247.
I did not considered worth reproducing everywhere the list saying which
functions among the below belong to these two categories:
1. Functions that are side-effect-free except for the behavior of
functions passed as argument.
2. Functions that mutate and return a list.
AFAIU, this is not actionable with our current byte-compiler, i.e. we
can't add any extra declarations based on it. However, if the list
should be needed at some point, for example due to improvements in the
compiler, this commit will be where to find it. In the worst case, and
with more work, it's also deducible from the source code itself.
* lisp/emacs-lisp/cl-macs.el: Move important-return-value declarations
from here...
* lisp/emacs-lisp/cl-extra.el (cl-map, cl-maplist, cl-mapcan)
(cl-mapcon, cl-some, cl-every, cl-notany, cl-notevery, cl-nreconc):
* lisp/emacs-lisp/cl-lib.el (cl-mapcar, cl-adjoin, cl-subst):
* lisp/emacs-lisp/cl-seq.el (cl-reduce, cl-remove, cl-remove-if)
(cl-remove-if-not, cl-delete, cl-delete-if, cl-delete-if-not)
(cl-remove-duplicates, cl-delete-duplicates, cl-substitute)
(cl-substitute-if, cl-substitute-if-not, cl-nsubstitute)
(cl-nsubstitute-if, cl-nsubstitute-if-not, cl-find, cl-find-if)
(cl-find-if-not, cl-position, cl-position-if, cl-position-if-not)
(cl-count, cl-count-if, cl-count-if-not, cl-mismatch, cl-search)
(cl-sort, cl-stable-sort, cl-merge, cl-member, cl-member-if)
(cl-member-if-not, cl-assoc, cl-assoc-if, cl-assoc-if-not, cl-rassoc)
(cl-rassoc-if, cl-rassoc-if-not, cl-union, cl-nunion, cl-intersection)
(cl-nintersection, cl-set-difference, cl-nset-difference)
(cl-set-exclusive-or, cl-nset-exclusive-or, cl-subsetp, cl-subst-if)
(cl-subst-if-not, cl-nsubst, cl-nsubst-if, cl-nsubst-if-not, cl-sublis)
(cl-nsublis, cl-tree-equal): ...to have them inline here.
2025-02-14 22:46:07 +01:00
|
|
|
(declare (important-return-value t))
|
2012-06-03 21:05:17 -04:00
|
|
|
(apply 'cl-nsubstitute cl-new nil cl-list :if-not cl-pred cl-keys))
|
1993-07-30 20:15:09 +00:00
|
|
|
|
2007-06-27 18:59:03 +00:00
|
|
|
;;;###autoload
|
2012-06-03 21:05:17 -04:00
|
|
|
(defun cl-find (cl-item cl-seq &rest cl-keys)
|
(reduce, fill, replace, remove*, remove-if, remove-if-not, delete*, delete-if,
delete-if-not, remove-duplicates, delete-duplicates, substitute, substitute-if,
substitute-if-not, nsubstitute, nsubstitute-if, nsubstitute-if-not, find,
find-if, find-if-not, position, position-if, position-if-not, count, count-if,
count-if-not, mismatch, search, sort*, stable-sort, merge, member*, member-if,
member-if-not, assoc*, assoc-if, assoc-if-not, rassoc*, rassoc-if,
rassoc-if-not, union, nunion, intersection, nintersection, set-difference,
nset-difference, set-exclusive-or, nset-exclusive-or, subsetp, subst-if,
subst-if-not, nsubst, nsubst-if, nsubst-if-not, sublis, nsublis, tree-equal):
Improve argument/docstring consistency.
2005-05-20 14:30:34 +00:00
|
|
|
"Find the first occurrence of ITEM in SEQ.
|
1993-07-30 20:15:09 +00:00
|
|
|
Return the matching ITEM, or nil if not found.
|
(reduce, fill, replace, remove*, remove-if, remove-if-not, delete*, delete-if,
delete-if-not, remove-duplicates, delete-duplicates, substitute, substitute-if,
substitute-if-not, nsubstitute, nsubstitute-if, nsubstitute-if-not, find,
find-if, find-if-not, position, position-if, position-if-not, count, count-if,
count-if-not, mismatch, search, sort*, stable-sort, merge, member*, member-if,
member-if-not, assoc*, assoc-if, assoc-if-not, rassoc*, rassoc-if,
rassoc-if-not, union, nunion, intersection, nintersection, set-difference,
nset-difference, set-exclusive-or, nset-exclusive-or, subsetp, subst-if,
subst-if-not, nsubst, nsubst-if, nsubst-if-not, sublis, nsublis, tree-equal):
Improve argument/docstring consistency.
2005-05-20 14:30:34 +00:00
|
|
|
\nKeywords supported: :test :test-not :key :start :end :from-end
|
|
|
|
\n(fn ITEM SEQ [KEYWORD VALUE]...)"
|
Inline important-return-value declarations in cl-lib.el
These declarations are now properly added to 'cl-lib.el' itself, or to
'cl-loaddefs.el'. This means that they will now correctly show up
immediately when loading 'cl-lib.el', instead of only after 'cl-macs.el'
is pulled in by an autoload. C.f. Bug#76247.
I did not considered worth reproducing everywhere the list saying which
functions among the below belong to these two categories:
1. Functions that are side-effect-free except for the behavior of
functions passed as argument.
2. Functions that mutate and return a list.
AFAIU, this is not actionable with our current byte-compiler, i.e. we
can't add any extra declarations based on it. However, if the list
should be needed at some point, for example due to improvements in the
compiler, this commit will be where to find it. In the worst case, and
with more work, it's also deducible from the source code itself.
* lisp/emacs-lisp/cl-macs.el: Move important-return-value declarations
from here...
* lisp/emacs-lisp/cl-extra.el (cl-map, cl-maplist, cl-mapcan)
(cl-mapcon, cl-some, cl-every, cl-notany, cl-notevery, cl-nreconc):
* lisp/emacs-lisp/cl-lib.el (cl-mapcar, cl-adjoin, cl-subst):
* lisp/emacs-lisp/cl-seq.el (cl-reduce, cl-remove, cl-remove-if)
(cl-remove-if-not, cl-delete, cl-delete-if, cl-delete-if-not)
(cl-remove-duplicates, cl-delete-duplicates, cl-substitute)
(cl-substitute-if, cl-substitute-if-not, cl-nsubstitute)
(cl-nsubstitute-if, cl-nsubstitute-if-not, cl-find, cl-find-if)
(cl-find-if-not, cl-position, cl-position-if, cl-position-if-not)
(cl-count, cl-count-if, cl-count-if-not, cl-mismatch, cl-search)
(cl-sort, cl-stable-sort, cl-merge, cl-member, cl-member-if)
(cl-member-if-not, cl-assoc, cl-assoc-if, cl-assoc-if-not, cl-rassoc)
(cl-rassoc-if, cl-rassoc-if-not, cl-union, cl-nunion, cl-intersection)
(cl-nintersection, cl-set-difference, cl-nset-difference)
(cl-set-exclusive-or, cl-nset-exclusive-or, cl-subsetp, cl-subst-if)
(cl-subst-if-not, cl-nsubst, cl-nsubst-if, cl-nsubst-if-not, cl-sublis)
(cl-nsublis, cl-tree-equal): ...to have them inline here.
2025-02-14 22:46:07 +01:00
|
|
|
(declare (important-return-value t))
|
2012-06-03 21:05:17 -04:00
|
|
|
(let ((cl-pos (apply 'cl-position cl-item cl-seq cl-keys)))
|
1993-07-30 20:15:09 +00:00
|
|
|
(and cl-pos (elt cl-seq cl-pos))))
|
|
|
|
|
2007-06-27 18:59:03 +00:00
|
|
|
;;;###autoload
|
2012-06-03 21:05:17 -04:00
|
|
|
(defun cl-find-if (cl-pred cl-list &rest cl-keys)
|
(reduce, fill, replace, remove*, remove-if, remove-if-not, delete*, delete-if,
delete-if-not, remove-duplicates, delete-duplicates, substitute, substitute-if,
substitute-if-not, nsubstitute, nsubstitute-if, nsubstitute-if-not, find,
find-if, find-if-not, position, position-if, position-if-not, count, count-if,
count-if-not, mismatch, search, sort*, stable-sort, merge, member*, member-if,
member-if-not, assoc*, assoc-if, assoc-if-not, rassoc*, rassoc-if,
rassoc-if-not, union, nunion, intersection, nintersection, set-difference,
nset-difference, set-exclusive-or, nset-exclusive-or, subsetp, subst-if,
subst-if-not, nsubst, nsubst-if, nsubst-if-not, sublis, nsublis, tree-equal):
Improve argument/docstring consistency.
2005-05-20 14:30:34 +00:00
|
|
|
"Find the first item satisfying PREDICATE in SEQ.
|
|
|
|
Return the matching item, or nil if not found.
|
|
|
|
\nKeywords supported: :key :start :end :from-end
|
|
|
|
\n(fn PREDICATE SEQ [KEYWORD VALUE]...)"
|
Inline important-return-value declarations in cl-lib.el
These declarations are now properly added to 'cl-lib.el' itself, or to
'cl-loaddefs.el'. This means that they will now correctly show up
immediately when loading 'cl-lib.el', instead of only after 'cl-macs.el'
is pulled in by an autoload. C.f. Bug#76247.
I did not considered worth reproducing everywhere the list saying which
functions among the below belong to these two categories:
1. Functions that are side-effect-free except for the behavior of
functions passed as argument.
2. Functions that mutate and return a list.
AFAIU, this is not actionable with our current byte-compiler, i.e. we
can't add any extra declarations based on it. However, if the list
should be needed at some point, for example due to improvements in the
compiler, this commit will be where to find it. In the worst case, and
with more work, it's also deducible from the source code itself.
* lisp/emacs-lisp/cl-macs.el: Move important-return-value declarations
from here...
* lisp/emacs-lisp/cl-extra.el (cl-map, cl-maplist, cl-mapcan)
(cl-mapcon, cl-some, cl-every, cl-notany, cl-notevery, cl-nreconc):
* lisp/emacs-lisp/cl-lib.el (cl-mapcar, cl-adjoin, cl-subst):
* lisp/emacs-lisp/cl-seq.el (cl-reduce, cl-remove, cl-remove-if)
(cl-remove-if-not, cl-delete, cl-delete-if, cl-delete-if-not)
(cl-remove-duplicates, cl-delete-duplicates, cl-substitute)
(cl-substitute-if, cl-substitute-if-not, cl-nsubstitute)
(cl-nsubstitute-if, cl-nsubstitute-if-not, cl-find, cl-find-if)
(cl-find-if-not, cl-position, cl-position-if, cl-position-if-not)
(cl-count, cl-count-if, cl-count-if-not, cl-mismatch, cl-search)
(cl-sort, cl-stable-sort, cl-merge, cl-member, cl-member-if)
(cl-member-if-not, cl-assoc, cl-assoc-if, cl-assoc-if-not, cl-rassoc)
(cl-rassoc-if, cl-rassoc-if-not, cl-union, cl-nunion, cl-intersection)
(cl-nintersection, cl-set-difference, cl-nset-difference)
(cl-set-exclusive-or, cl-nset-exclusive-or, cl-subsetp, cl-subst-if)
(cl-subst-if-not, cl-nsubst, cl-nsubst-if, cl-nsubst-if-not, cl-sublis)
(cl-nsublis, cl-tree-equal): ...to have them inline here.
2025-02-14 22:46:07 +01:00
|
|
|
(declare (important-return-value t))
|
2012-06-03 21:05:17 -04:00
|
|
|
(apply 'cl-find nil cl-list :if cl-pred cl-keys))
|
1993-07-30 20:15:09 +00:00
|
|
|
|
2007-06-27 18:59:03 +00:00
|
|
|
;;;###autoload
|
2012-06-03 21:05:17 -04:00
|
|
|
(defun cl-find-if-not (cl-pred cl-list &rest cl-keys)
|
(reduce, fill, replace, remove*, remove-if, remove-if-not, delete*, delete-if,
delete-if-not, remove-duplicates, delete-duplicates, substitute, substitute-if,
substitute-if-not, nsubstitute, nsubstitute-if, nsubstitute-if-not, find,
find-if, find-if-not, position, position-if, position-if-not, count, count-if,
count-if-not, mismatch, search, sort*, stable-sort, merge, member*, member-if,
member-if-not, assoc*, assoc-if, assoc-if-not, rassoc*, rassoc-if,
rassoc-if-not, union, nunion, intersection, nintersection, set-difference,
nset-difference, set-exclusive-or, nset-exclusive-or, subsetp, subst-if,
subst-if-not, nsubst, nsubst-if, nsubst-if-not, sublis, nsublis, tree-equal):
Improve argument/docstring consistency.
2005-05-20 14:30:34 +00:00
|
|
|
"Find the first item not satisfying PREDICATE in SEQ.
|
|
|
|
Return the matching item, or nil if not found.
|
|
|
|
\nKeywords supported: :key :start :end :from-end
|
|
|
|
\n(fn PREDICATE SEQ [KEYWORD VALUE]...)"
|
Inline important-return-value declarations in cl-lib.el
These declarations are now properly added to 'cl-lib.el' itself, or to
'cl-loaddefs.el'. This means that they will now correctly show up
immediately when loading 'cl-lib.el', instead of only after 'cl-macs.el'
is pulled in by an autoload. C.f. Bug#76247.
I did not considered worth reproducing everywhere the list saying which
functions among the below belong to these two categories:
1. Functions that are side-effect-free except for the behavior of
functions passed as argument.
2. Functions that mutate and return a list.
AFAIU, this is not actionable with our current byte-compiler, i.e. we
can't add any extra declarations based on it. However, if the list
should be needed at some point, for example due to improvements in the
compiler, this commit will be where to find it. In the worst case, and
with more work, it's also deducible from the source code itself.
* lisp/emacs-lisp/cl-macs.el: Move important-return-value declarations
from here...
* lisp/emacs-lisp/cl-extra.el (cl-map, cl-maplist, cl-mapcan)
(cl-mapcon, cl-some, cl-every, cl-notany, cl-notevery, cl-nreconc):
* lisp/emacs-lisp/cl-lib.el (cl-mapcar, cl-adjoin, cl-subst):
* lisp/emacs-lisp/cl-seq.el (cl-reduce, cl-remove, cl-remove-if)
(cl-remove-if-not, cl-delete, cl-delete-if, cl-delete-if-not)
(cl-remove-duplicates, cl-delete-duplicates, cl-substitute)
(cl-substitute-if, cl-substitute-if-not, cl-nsubstitute)
(cl-nsubstitute-if, cl-nsubstitute-if-not, cl-find, cl-find-if)
(cl-find-if-not, cl-position, cl-position-if, cl-position-if-not)
(cl-count, cl-count-if, cl-count-if-not, cl-mismatch, cl-search)
(cl-sort, cl-stable-sort, cl-merge, cl-member, cl-member-if)
(cl-member-if-not, cl-assoc, cl-assoc-if, cl-assoc-if-not, cl-rassoc)
(cl-rassoc-if, cl-rassoc-if-not, cl-union, cl-nunion, cl-intersection)
(cl-nintersection, cl-set-difference, cl-nset-difference)
(cl-set-exclusive-or, cl-nset-exclusive-or, cl-subsetp, cl-subst-if)
(cl-subst-if-not, cl-nsubst, cl-nsubst-if, cl-nsubst-if-not, cl-sublis)
(cl-nsublis, cl-tree-equal): ...to have them inline here.
2025-02-14 22:46:07 +01:00
|
|
|
(declare (important-return-value t))
|
2012-06-03 21:05:17 -04:00
|
|
|
(apply 'cl-find nil cl-list :if-not cl-pred cl-keys))
|
1993-07-30 20:15:09 +00:00
|
|
|
|
2007-06-27 18:59:03 +00:00
|
|
|
;;;###autoload
|
2012-06-03 21:05:17 -04:00
|
|
|
(defun cl-position (cl-item cl-seq &rest cl-keys)
|
(reduce, fill, replace, remove*, remove-if, remove-if-not, delete*, delete-if,
delete-if-not, remove-duplicates, delete-duplicates, substitute, substitute-if,
substitute-if-not, nsubstitute, nsubstitute-if, nsubstitute-if-not, find,
find-if, find-if-not, position, position-if, position-if-not, count, count-if,
count-if-not, mismatch, search, sort*, stable-sort, merge, member*, member-if,
member-if-not, assoc*, assoc-if, assoc-if-not, rassoc*, rassoc-if,
rassoc-if-not, union, nunion, intersection, nintersection, set-difference,
nset-difference, set-exclusive-or, nset-exclusive-or, subsetp, subst-if,
subst-if-not, nsubst, nsubst-if, nsubst-if-not, sublis, nsublis, tree-equal):
Improve argument/docstring consistency.
2005-05-20 14:30:34 +00:00
|
|
|
"Find the first occurrence of ITEM in SEQ.
|
1993-07-30 20:15:09 +00:00
|
|
|
Return the index of the matching item, or nil if not found.
|
(reduce, fill, replace, remove*, remove-if, remove-if-not, delete*, delete-if,
delete-if-not, remove-duplicates, delete-duplicates, substitute, substitute-if,
substitute-if-not, nsubstitute, nsubstitute-if, nsubstitute-if-not, find,
find-if, find-if-not, position, position-if, position-if-not, count, count-if,
count-if-not, mismatch, search, sort*, stable-sort, merge, member*, member-if,
member-if-not, assoc*, assoc-if, assoc-if-not, rassoc*, rassoc-if,
rassoc-if-not, union, nunion, intersection, nintersection, set-difference,
nset-difference, set-exclusive-or, nset-exclusive-or, subsetp, subst-if,
subst-if-not, nsubst, nsubst-if, nsubst-if-not, sublis, nsublis, tree-equal):
Improve argument/docstring consistency.
2005-05-20 14:30:34 +00:00
|
|
|
\nKeywords supported: :test :test-not :key :start :end :from-end
|
|
|
|
\n(fn ITEM SEQ [KEYWORD VALUE]...)"
|
Inline important-return-value declarations in cl-lib.el
These declarations are now properly added to 'cl-lib.el' itself, or to
'cl-loaddefs.el'. This means that they will now correctly show up
immediately when loading 'cl-lib.el', instead of only after 'cl-macs.el'
is pulled in by an autoload. C.f. Bug#76247.
I did not considered worth reproducing everywhere the list saying which
functions among the below belong to these two categories:
1. Functions that are side-effect-free except for the behavior of
functions passed as argument.
2. Functions that mutate and return a list.
AFAIU, this is not actionable with our current byte-compiler, i.e. we
can't add any extra declarations based on it. However, if the list
should be needed at some point, for example due to improvements in the
compiler, this commit will be where to find it. In the worst case, and
with more work, it's also deducible from the source code itself.
* lisp/emacs-lisp/cl-macs.el: Move important-return-value declarations
from here...
* lisp/emacs-lisp/cl-extra.el (cl-map, cl-maplist, cl-mapcan)
(cl-mapcon, cl-some, cl-every, cl-notany, cl-notevery, cl-nreconc):
* lisp/emacs-lisp/cl-lib.el (cl-mapcar, cl-adjoin, cl-subst):
* lisp/emacs-lisp/cl-seq.el (cl-reduce, cl-remove, cl-remove-if)
(cl-remove-if-not, cl-delete, cl-delete-if, cl-delete-if-not)
(cl-remove-duplicates, cl-delete-duplicates, cl-substitute)
(cl-substitute-if, cl-substitute-if-not, cl-nsubstitute)
(cl-nsubstitute-if, cl-nsubstitute-if-not, cl-find, cl-find-if)
(cl-find-if-not, cl-position, cl-position-if, cl-position-if-not)
(cl-count, cl-count-if, cl-count-if-not, cl-mismatch, cl-search)
(cl-sort, cl-stable-sort, cl-merge, cl-member, cl-member-if)
(cl-member-if-not, cl-assoc, cl-assoc-if, cl-assoc-if-not, cl-rassoc)
(cl-rassoc-if, cl-rassoc-if-not, cl-union, cl-nunion, cl-intersection)
(cl-nintersection, cl-set-difference, cl-nset-difference)
(cl-set-exclusive-or, cl-nset-exclusive-or, cl-subsetp, cl-subst-if)
(cl-subst-if-not, cl-nsubst, cl-nsubst-if, cl-nsubst-if-not, cl-sublis)
(cl-nsublis, cl-tree-equal): ...to have them inline here.
2025-02-14 22:46:07 +01:00
|
|
|
(declare (important-return-value t))
|
Use lexical-binding for all of CL, and clean up its namespace.
* lisp/emacs-lisp/cl-lib.el: Use lexical-binding.
(cl-map-extents, cl-maclisp-member): Remove.
(cl--set-elt, cl--set-nthcdr, cl--set-buffer-substring)
(cl--set-substring, cl--block-wrapper, cl--block-throw)
(cl--compiling-file, cl--mapcar-many, cl--do-subst): Use "cl--" prefix.
* lisp/emacs-lisp/cl-extra.el: Use lexical-binding.
(cl--mapcar-many, cl--map-keymap-recursively, cl--map-intervals)
(cl--map-overlays, cl--set-frame-visible-p, cl--progv-save)
(cl--progv-before, cl--progv-after, cl--finite-do, cl--set-getf)
(cl--do-remf, cl--do-prettyprint): Use "cl--" prefix.
* lisp/emacs-lisp/cl-seq.el: Use lexical-binding.
(cl--parsing-keywords, cl--check-key, cl--check-test-nokey)
(cl--check-test, cl--check-match): Use "cl--" prefix and backquotes.
(cl--alist, cl--sublis-rec, cl--nsublis-rec, cl--tree-equal-rec):
* lisp/emacs-lisp/cl-macs.el (cl--lambda-list-keywords): Use "cl--" prefix.
* lisp/edmacro.el (edmacro-mismatch): Simplify to remove dependence on
CL's internals.
2012-06-11 11:52:50 -04:00
|
|
|
(cl--parsing-keywords (:test :test-not :key :if :if-not
|
1993-07-30 20:15:09 +00:00
|
|
|
(:start 0) :end :from-end) ()
|
2012-05-17 16:04:56 -04:00
|
|
|
(cl--position cl-item cl-seq cl-start cl-end cl-from-end)))
|
1993-07-30 20:15:09 +00:00
|
|
|
|
2012-05-17 16:04:56 -04:00
|
|
|
(defun cl--position (cl-item cl-seq cl-start &optional cl-end cl-from-end)
|
1993-07-30 20:15:09 +00:00
|
|
|
(if (listp cl-seq)
|
2016-10-20 19:51:55 +09:00
|
|
|
(let ((cl-p (nthcdr cl-start cl-seq))
|
|
|
|
cl-res)
|
|
|
|
(while (and cl-p (or (null cl-end) (< cl-start cl-end)) (or (null cl-res) cl-from-end))
|
Use lexical-binding for all of CL, and clean up its namespace.
* lisp/emacs-lisp/cl-lib.el: Use lexical-binding.
(cl-map-extents, cl-maclisp-member): Remove.
(cl--set-elt, cl--set-nthcdr, cl--set-buffer-substring)
(cl--set-substring, cl--block-wrapper, cl--block-throw)
(cl--compiling-file, cl--mapcar-many, cl--do-subst): Use "cl--" prefix.
* lisp/emacs-lisp/cl-extra.el: Use lexical-binding.
(cl--mapcar-many, cl--map-keymap-recursively, cl--map-intervals)
(cl--map-overlays, cl--set-frame-visible-p, cl--progv-save)
(cl--progv-before, cl--progv-after, cl--finite-do, cl--set-getf)
(cl--do-remf, cl--do-prettyprint): Use "cl--" prefix.
* lisp/emacs-lisp/cl-seq.el: Use lexical-binding.
(cl--parsing-keywords, cl--check-key, cl--check-test-nokey)
(cl--check-test, cl--check-match): Use "cl--" prefix and backquotes.
(cl--alist, cl--sublis-rec, cl--nsublis-rec, cl--tree-equal-rec):
* lisp/emacs-lisp/cl-macs.el (cl--lambda-list-keywords): Use "cl--" prefix.
* lisp/edmacro.el (edmacro-mismatch): Simplify to remove dependence on
CL's internals.
2012-06-11 11:52:50 -04:00
|
|
|
(if (cl--check-test cl-item (car cl-p))
|
1993-07-30 20:15:09 +00:00
|
|
|
(setq cl-res cl-start))
|
|
|
|
(setq cl-p (cdr cl-p) cl-start (1+ cl-start)))
|
2016-10-20 19:51:55 +09:00
|
|
|
cl-res)
|
1993-07-30 20:15:09 +00:00
|
|
|
(or cl-end (setq cl-end (length cl-seq)))
|
|
|
|
(if cl-from-end
|
|
|
|
(progn
|
|
|
|
(while (and (>= (setq cl-end (1- cl-end)) cl-start)
|
Use lexical-binding for all of CL, and clean up its namespace.
* lisp/emacs-lisp/cl-lib.el: Use lexical-binding.
(cl-map-extents, cl-maclisp-member): Remove.
(cl--set-elt, cl--set-nthcdr, cl--set-buffer-substring)
(cl--set-substring, cl--block-wrapper, cl--block-throw)
(cl--compiling-file, cl--mapcar-many, cl--do-subst): Use "cl--" prefix.
* lisp/emacs-lisp/cl-extra.el: Use lexical-binding.
(cl--mapcar-many, cl--map-keymap-recursively, cl--map-intervals)
(cl--map-overlays, cl--set-frame-visible-p, cl--progv-save)
(cl--progv-before, cl--progv-after, cl--finite-do, cl--set-getf)
(cl--do-remf, cl--do-prettyprint): Use "cl--" prefix.
* lisp/emacs-lisp/cl-seq.el: Use lexical-binding.
(cl--parsing-keywords, cl--check-key, cl--check-test-nokey)
(cl--check-test, cl--check-match): Use "cl--" prefix and backquotes.
(cl--alist, cl--sublis-rec, cl--nsublis-rec, cl--tree-equal-rec):
* lisp/emacs-lisp/cl-macs.el (cl--lambda-list-keywords): Use "cl--" prefix.
* lisp/edmacro.el (edmacro-mismatch): Simplify to remove dependence on
CL's internals.
2012-06-11 11:52:50 -04:00
|
|
|
(not (cl--check-test cl-item (aref cl-seq cl-end)))))
|
1993-07-30 20:15:09 +00:00
|
|
|
(and (>= cl-end cl-start) cl-end))
|
|
|
|
(while (and (< cl-start cl-end)
|
Use lexical-binding for all of CL, and clean up its namespace.
* lisp/emacs-lisp/cl-lib.el: Use lexical-binding.
(cl-map-extents, cl-maclisp-member): Remove.
(cl--set-elt, cl--set-nthcdr, cl--set-buffer-substring)
(cl--set-substring, cl--block-wrapper, cl--block-throw)
(cl--compiling-file, cl--mapcar-many, cl--do-subst): Use "cl--" prefix.
* lisp/emacs-lisp/cl-extra.el: Use lexical-binding.
(cl--mapcar-many, cl--map-keymap-recursively, cl--map-intervals)
(cl--map-overlays, cl--set-frame-visible-p, cl--progv-save)
(cl--progv-before, cl--progv-after, cl--finite-do, cl--set-getf)
(cl--do-remf, cl--do-prettyprint): Use "cl--" prefix.
* lisp/emacs-lisp/cl-seq.el: Use lexical-binding.
(cl--parsing-keywords, cl--check-key, cl--check-test-nokey)
(cl--check-test, cl--check-match): Use "cl--" prefix and backquotes.
(cl--alist, cl--sublis-rec, cl--nsublis-rec, cl--tree-equal-rec):
* lisp/emacs-lisp/cl-macs.el (cl--lambda-list-keywords): Use "cl--" prefix.
* lisp/edmacro.el (edmacro-mismatch): Simplify to remove dependence on
CL's internals.
2012-06-11 11:52:50 -04:00
|
|
|
(not (cl--check-test cl-item (aref cl-seq cl-start))))
|
1993-07-30 20:15:09 +00:00
|
|
|
(setq cl-start (1+ cl-start)))
|
|
|
|
(and (< cl-start cl-end) cl-start))))
|
|
|
|
|
2007-06-27 18:59:03 +00:00
|
|
|
;;;###autoload
|
2012-06-03 21:05:17 -04:00
|
|
|
(defun cl-position-if (cl-pred cl-list &rest cl-keys)
|
(reduce, fill, replace, remove*, remove-if, remove-if-not, delete*, delete-if,
delete-if-not, remove-duplicates, delete-duplicates, substitute, substitute-if,
substitute-if-not, nsubstitute, nsubstitute-if, nsubstitute-if-not, find,
find-if, find-if-not, position, position-if, position-if-not, count, count-if,
count-if-not, mismatch, search, sort*, stable-sort, merge, member*, member-if,
member-if-not, assoc*, assoc-if, assoc-if-not, rassoc*, rassoc-if,
rassoc-if-not, union, nunion, intersection, nintersection, set-difference,
nset-difference, set-exclusive-or, nset-exclusive-or, subsetp, subst-if,
subst-if-not, nsubst, nsubst-if, nsubst-if-not, sublis, nsublis, tree-equal):
Improve argument/docstring consistency.
2005-05-20 14:30:34 +00:00
|
|
|
"Find the first item satisfying PREDICATE in SEQ.
|
1993-07-30 20:15:09 +00:00
|
|
|
Return the index of the matching item, or nil if not found.
|
(reduce, fill, replace, remove*, remove-if, remove-if-not, delete*, delete-if,
delete-if-not, remove-duplicates, delete-duplicates, substitute, substitute-if,
substitute-if-not, nsubstitute, nsubstitute-if, nsubstitute-if-not, find,
find-if, find-if-not, position, position-if, position-if-not, count, count-if,
count-if-not, mismatch, search, sort*, stable-sort, merge, member*, member-if,
member-if-not, assoc*, assoc-if, assoc-if-not, rassoc*, rassoc-if,
rassoc-if-not, union, nunion, intersection, nintersection, set-difference,
nset-difference, set-exclusive-or, nset-exclusive-or, subsetp, subst-if,
subst-if-not, nsubst, nsubst-if, nsubst-if-not, sublis, nsublis, tree-equal):
Improve argument/docstring consistency.
2005-05-20 14:30:34 +00:00
|
|
|
\nKeywords supported: :key :start :end :from-end
|
|
|
|
\n(fn PREDICATE SEQ [KEYWORD VALUE]...)"
|
Inline important-return-value declarations in cl-lib.el
These declarations are now properly added to 'cl-lib.el' itself, or to
'cl-loaddefs.el'. This means that they will now correctly show up
immediately when loading 'cl-lib.el', instead of only after 'cl-macs.el'
is pulled in by an autoload. C.f. Bug#76247.
I did not considered worth reproducing everywhere the list saying which
functions among the below belong to these two categories:
1. Functions that are side-effect-free except for the behavior of
functions passed as argument.
2. Functions that mutate and return a list.
AFAIU, this is not actionable with our current byte-compiler, i.e. we
can't add any extra declarations based on it. However, if the list
should be needed at some point, for example due to improvements in the
compiler, this commit will be where to find it. In the worst case, and
with more work, it's also deducible from the source code itself.
* lisp/emacs-lisp/cl-macs.el: Move important-return-value declarations
from here...
* lisp/emacs-lisp/cl-extra.el (cl-map, cl-maplist, cl-mapcan)
(cl-mapcon, cl-some, cl-every, cl-notany, cl-notevery, cl-nreconc):
* lisp/emacs-lisp/cl-lib.el (cl-mapcar, cl-adjoin, cl-subst):
* lisp/emacs-lisp/cl-seq.el (cl-reduce, cl-remove, cl-remove-if)
(cl-remove-if-not, cl-delete, cl-delete-if, cl-delete-if-not)
(cl-remove-duplicates, cl-delete-duplicates, cl-substitute)
(cl-substitute-if, cl-substitute-if-not, cl-nsubstitute)
(cl-nsubstitute-if, cl-nsubstitute-if-not, cl-find, cl-find-if)
(cl-find-if-not, cl-position, cl-position-if, cl-position-if-not)
(cl-count, cl-count-if, cl-count-if-not, cl-mismatch, cl-search)
(cl-sort, cl-stable-sort, cl-merge, cl-member, cl-member-if)
(cl-member-if-not, cl-assoc, cl-assoc-if, cl-assoc-if-not, cl-rassoc)
(cl-rassoc-if, cl-rassoc-if-not, cl-union, cl-nunion, cl-intersection)
(cl-nintersection, cl-set-difference, cl-nset-difference)
(cl-set-exclusive-or, cl-nset-exclusive-or, cl-subsetp, cl-subst-if)
(cl-subst-if-not, cl-nsubst, cl-nsubst-if, cl-nsubst-if-not, cl-sublis)
(cl-nsublis, cl-tree-equal): ...to have them inline here.
2025-02-14 22:46:07 +01:00
|
|
|
(declare (important-return-value t))
|
2012-06-03 21:05:17 -04:00
|
|
|
(apply 'cl-position nil cl-list :if cl-pred cl-keys))
|
1993-07-30 20:15:09 +00:00
|
|
|
|
2007-06-27 18:59:03 +00:00
|
|
|
;;;###autoload
|
2012-06-03 21:05:17 -04:00
|
|
|
(defun cl-position-if-not (cl-pred cl-list &rest cl-keys)
|
(reduce, fill, replace, remove*, remove-if, remove-if-not, delete*, delete-if,
delete-if-not, remove-duplicates, delete-duplicates, substitute, substitute-if,
substitute-if-not, nsubstitute, nsubstitute-if, nsubstitute-if-not, find,
find-if, find-if-not, position, position-if, position-if-not, count, count-if,
count-if-not, mismatch, search, sort*, stable-sort, merge, member*, member-if,
member-if-not, assoc*, assoc-if, assoc-if-not, rassoc*, rassoc-if,
rassoc-if-not, union, nunion, intersection, nintersection, set-difference,
nset-difference, set-exclusive-or, nset-exclusive-or, subsetp, subst-if,
subst-if-not, nsubst, nsubst-if, nsubst-if-not, sublis, nsublis, tree-equal):
Improve argument/docstring consistency.
2005-05-20 14:30:34 +00:00
|
|
|
"Find the first item not satisfying PREDICATE in SEQ.
|
1993-07-30 20:15:09 +00:00
|
|
|
Return the index of the matching item, or nil if not found.
|
(reduce, fill, replace, remove*, remove-if, remove-if-not, delete*, delete-if,
delete-if-not, remove-duplicates, delete-duplicates, substitute, substitute-if,
substitute-if-not, nsubstitute, nsubstitute-if, nsubstitute-if-not, find,
find-if, find-if-not, position, position-if, position-if-not, count, count-if,
count-if-not, mismatch, search, sort*, stable-sort, merge, member*, member-if,
member-if-not, assoc*, assoc-if, assoc-if-not, rassoc*, rassoc-if,
rassoc-if-not, union, nunion, intersection, nintersection, set-difference,
nset-difference, set-exclusive-or, nset-exclusive-or, subsetp, subst-if,
subst-if-not, nsubst, nsubst-if, nsubst-if-not, sublis, nsublis, tree-equal):
Improve argument/docstring consistency.
2005-05-20 14:30:34 +00:00
|
|
|
\nKeywords supported: :key :start :end :from-end
|
|
|
|
\n(fn PREDICATE SEQ [KEYWORD VALUE]...)"
|
Inline important-return-value declarations in cl-lib.el
These declarations are now properly added to 'cl-lib.el' itself, or to
'cl-loaddefs.el'. This means that they will now correctly show up
immediately when loading 'cl-lib.el', instead of only after 'cl-macs.el'
is pulled in by an autoload. C.f. Bug#76247.
I did not considered worth reproducing everywhere the list saying which
functions among the below belong to these two categories:
1. Functions that are side-effect-free except for the behavior of
functions passed as argument.
2. Functions that mutate and return a list.
AFAIU, this is not actionable with our current byte-compiler, i.e. we
can't add any extra declarations based on it. However, if the list
should be needed at some point, for example due to improvements in the
compiler, this commit will be where to find it. In the worst case, and
with more work, it's also deducible from the source code itself.
* lisp/emacs-lisp/cl-macs.el: Move important-return-value declarations
from here...
* lisp/emacs-lisp/cl-extra.el (cl-map, cl-maplist, cl-mapcan)
(cl-mapcon, cl-some, cl-every, cl-notany, cl-notevery, cl-nreconc):
* lisp/emacs-lisp/cl-lib.el (cl-mapcar, cl-adjoin, cl-subst):
* lisp/emacs-lisp/cl-seq.el (cl-reduce, cl-remove, cl-remove-if)
(cl-remove-if-not, cl-delete, cl-delete-if, cl-delete-if-not)
(cl-remove-duplicates, cl-delete-duplicates, cl-substitute)
(cl-substitute-if, cl-substitute-if-not, cl-nsubstitute)
(cl-nsubstitute-if, cl-nsubstitute-if-not, cl-find, cl-find-if)
(cl-find-if-not, cl-position, cl-position-if, cl-position-if-not)
(cl-count, cl-count-if, cl-count-if-not, cl-mismatch, cl-search)
(cl-sort, cl-stable-sort, cl-merge, cl-member, cl-member-if)
(cl-member-if-not, cl-assoc, cl-assoc-if, cl-assoc-if-not, cl-rassoc)
(cl-rassoc-if, cl-rassoc-if-not, cl-union, cl-nunion, cl-intersection)
(cl-nintersection, cl-set-difference, cl-nset-difference)
(cl-set-exclusive-or, cl-nset-exclusive-or, cl-subsetp, cl-subst-if)
(cl-subst-if-not, cl-nsubst, cl-nsubst-if, cl-nsubst-if-not, cl-sublis)
(cl-nsublis, cl-tree-equal): ...to have them inline here.
2025-02-14 22:46:07 +01:00
|
|
|
(declare (important-return-value t))
|
2012-06-03 21:05:17 -04:00
|
|
|
(apply 'cl-position nil cl-list :if-not cl-pred cl-keys))
|
1993-07-30 20:15:09 +00:00
|
|
|
|
2007-06-27 18:59:03 +00:00
|
|
|
;;;###autoload
|
2012-06-03 21:05:17 -04:00
|
|
|
(defun cl-count (cl-item cl-seq &rest cl-keys)
|
(reduce, fill, replace, remove*, remove-if, remove-if-not, delete*, delete-if,
delete-if-not, remove-duplicates, delete-duplicates, substitute, substitute-if,
substitute-if-not, nsubstitute, nsubstitute-if, nsubstitute-if-not, find,
find-if, find-if-not, position, position-if, position-if-not, count, count-if,
count-if-not, mismatch, search, sort*, stable-sort, merge, member*, member-if,
member-if-not, assoc*, assoc-if, assoc-if-not, rassoc*, rassoc-if,
rassoc-if-not, union, nunion, intersection, nintersection, set-difference,
nset-difference, set-exclusive-or, nset-exclusive-or, subsetp, subst-if,
subst-if-not, nsubst, nsubst-if, nsubst-if-not, sublis, nsublis, tree-equal):
Improve argument/docstring consistency.
2005-05-20 14:30:34 +00:00
|
|
|
"Count the number of occurrences of ITEM in SEQ.
|
|
|
|
\nKeywords supported: :test :test-not :key :start :end
|
|
|
|
\n(fn ITEM SEQ [KEYWORD VALUE]...)"
|
Inline important-return-value declarations in cl-lib.el
These declarations are now properly added to 'cl-lib.el' itself, or to
'cl-loaddefs.el'. This means that they will now correctly show up
immediately when loading 'cl-lib.el', instead of only after 'cl-macs.el'
is pulled in by an autoload. C.f. Bug#76247.
I did not considered worth reproducing everywhere the list saying which
functions among the below belong to these two categories:
1. Functions that are side-effect-free except for the behavior of
functions passed as argument.
2. Functions that mutate and return a list.
AFAIU, this is not actionable with our current byte-compiler, i.e. we
can't add any extra declarations based on it. However, if the list
should be needed at some point, for example due to improvements in the
compiler, this commit will be where to find it. In the worst case, and
with more work, it's also deducible from the source code itself.
* lisp/emacs-lisp/cl-macs.el: Move important-return-value declarations
from here...
* lisp/emacs-lisp/cl-extra.el (cl-map, cl-maplist, cl-mapcan)
(cl-mapcon, cl-some, cl-every, cl-notany, cl-notevery, cl-nreconc):
* lisp/emacs-lisp/cl-lib.el (cl-mapcar, cl-adjoin, cl-subst):
* lisp/emacs-lisp/cl-seq.el (cl-reduce, cl-remove, cl-remove-if)
(cl-remove-if-not, cl-delete, cl-delete-if, cl-delete-if-not)
(cl-remove-duplicates, cl-delete-duplicates, cl-substitute)
(cl-substitute-if, cl-substitute-if-not, cl-nsubstitute)
(cl-nsubstitute-if, cl-nsubstitute-if-not, cl-find, cl-find-if)
(cl-find-if-not, cl-position, cl-position-if, cl-position-if-not)
(cl-count, cl-count-if, cl-count-if-not, cl-mismatch, cl-search)
(cl-sort, cl-stable-sort, cl-merge, cl-member, cl-member-if)
(cl-member-if-not, cl-assoc, cl-assoc-if, cl-assoc-if-not, cl-rassoc)
(cl-rassoc-if, cl-rassoc-if-not, cl-union, cl-nunion, cl-intersection)
(cl-nintersection, cl-set-difference, cl-nset-difference)
(cl-set-exclusive-or, cl-nset-exclusive-or, cl-subsetp, cl-subst-if)
(cl-subst-if-not, cl-nsubst, cl-nsubst-if, cl-nsubst-if-not, cl-sublis)
(cl-nsublis, cl-tree-equal): ...to have them inline here.
2025-02-14 22:46:07 +01:00
|
|
|
(declare (important-return-value t))
|
Use lexical-binding for all of CL, and clean up its namespace.
* lisp/emacs-lisp/cl-lib.el: Use lexical-binding.
(cl-map-extents, cl-maclisp-member): Remove.
(cl--set-elt, cl--set-nthcdr, cl--set-buffer-substring)
(cl--set-substring, cl--block-wrapper, cl--block-throw)
(cl--compiling-file, cl--mapcar-many, cl--do-subst): Use "cl--" prefix.
* lisp/emacs-lisp/cl-extra.el: Use lexical-binding.
(cl--mapcar-many, cl--map-keymap-recursively, cl--map-intervals)
(cl--map-overlays, cl--set-frame-visible-p, cl--progv-save)
(cl--progv-before, cl--progv-after, cl--finite-do, cl--set-getf)
(cl--do-remf, cl--do-prettyprint): Use "cl--" prefix.
* lisp/emacs-lisp/cl-seq.el: Use lexical-binding.
(cl--parsing-keywords, cl--check-key, cl--check-test-nokey)
(cl--check-test, cl--check-match): Use "cl--" prefix and backquotes.
(cl--alist, cl--sublis-rec, cl--nsublis-rec, cl--tree-equal-rec):
* lisp/emacs-lisp/cl-macs.el (cl--lambda-list-keywords): Use "cl--" prefix.
* lisp/edmacro.el (edmacro-mismatch): Simplify to remove dependence on
CL's internals.
2012-06-11 11:52:50 -04:00
|
|
|
(cl--parsing-keywords (:test :test-not :key :if :if-not (:start 0) :end) ()
|
1993-07-30 20:15:09 +00:00
|
|
|
(let ((cl-count 0) cl-x)
|
|
|
|
(or cl-end (setq cl-end (length cl-seq)))
|
|
|
|
(if (consp cl-seq) (setq cl-seq (nthcdr cl-start cl-seq)))
|
|
|
|
(while (< cl-start cl-end)
|
2002-09-27 22:19:22 +00:00
|
|
|
(setq cl-x (if (consp cl-seq) (pop cl-seq) (aref cl-seq cl-start)))
|
Use lexical-binding for all of CL, and clean up its namespace.
* lisp/emacs-lisp/cl-lib.el: Use lexical-binding.
(cl-map-extents, cl-maclisp-member): Remove.
(cl--set-elt, cl--set-nthcdr, cl--set-buffer-substring)
(cl--set-substring, cl--block-wrapper, cl--block-throw)
(cl--compiling-file, cl--mapcar-many, cl--do-subst): Use "cl--" prefix.
* lisp/emacs-lisp/cl-extra.el: Use lexical-binding.
(cl--mapcar-many, cl--map-keymap-recursively, cl--map-intervals)
(cl--map-overlays, cl--set-frame-visible-p, cl--progv-save)
(cl--progv-before, cl--progv-after, cl--finite-do, cl--set-getf)
(cl--do-remf, cl--do-prettyprint): Use "cl--" prefix.
* lisp/emacs-lisp/cl-seq.el: Use lexical-binding.
(cl--parsing-keywords, cl--check-key, cl--check-test-nokey)
(cl--check-test, cl--check-match): Use "cl--" prefix and backquotes.
(cl--alist, cl--sublis-rec, cl--nsublis-rec, cl--tree-equal-rec):
* lisp/emacs-lisp/cl-macs.el (cl--lambda-list-keywords): Use "cl--" prefix.
* lisp/edmacro.el (edmacro-mismatch): Simplify to remove dependence on
CL's internals.
2012-06-11 11:52:50 -04:00
|
|
|
(if (cl--check-test cl-item cl-x) (setq cl-count (1+ cl-count)))
|
1993-07-30 20:15:09 +00:00
|
|
|
(setq cl-start (1+ cl-start)))
|
|
|
|
cl-count)))
|
|
|
|
|
2007-06-27 18:59:03 +00:00
|
|
|
;;;###autoload
|
2012-06-03 21:05:17 -04:00
|
|
|
(defun cl-count-if (cl-pred cl-list &rest cl-keys)
|
(reduce, fill, replace, remove*, remove-if, remove-if-not, delete*, delete-if,
delete-if-not, remove-duplicates, delete-duplicates, substitute, substitute-if,
substitute-if-not, nsubstitute, nsubstitute-if, nsubstitute-if-not, find,
find-if, find-if-not, position, position-if, position-if-not, count, count-if,
count-if-not, mismatch, search, sort*, stable-sort, merge, member*, member-if,
member-if-not, assoc*, assoc-if, assoc-if-not, rassoc*, rassoc-if,
rassoc-if-not, union, nunion, intersection, nintersection, set-difference,
nset-difference, set-exclusive-or, nset-exclusive-or, subsetp, subst-if,
subst-if-not, nsubst, nsubst-if, nsubst-if-not, sublis, nsublis, tree-equal):
Improve argument/docstring consistency.
2005-05-20 14:30:34 +00:00
|
|
|
"Count the number of items satisfying PREDICATE in SEQ.
|
|
|
|
\nKeywords supported: :key :start :end
|
|
|
|
\n(fn PREDICATE SEQ [KEYWORD VALUE]...)"
|
Inline important-return-value declarations in cl-lib.el
These declarations are now properly added to 'cl-lib.el' itself, or to
'cl-loaddefs.el'. This means that they will now correctly show up
immediately when loading 'cl-lib.el', instead of only after 'cl-macs.el'
is pulled in by an autoload. C.f. Bug#76247.
I did not considered worth reproducing everywhere the list saying which
functions among the below belong to these two categories:
1. Functions that are side-effect-free except for the behavior of
functions passed as argument.
2. Functions that mutate and return a list.
AFAIU, this is not actionable with our current byte-compiler, i.e. we
can't add any extra declarations based on it. However, if the list
should be needed at some point, for example due to improvements in the
compiler, this commit will be where to find it. In the worst case, and
with more work, it's also deducible from the source code itself.
* lisp/emacs-lisp/cl-macs.el: Move important-return-value declarations
from here...
* lisp/emacs-lisp/cl-extra.el (cl-map, cl-maplist, cl-mapcan)
(cl-mapcon, cl-some, cl-every, cl-notany, cl-notevery, cl-nreconc):
* lisp/emacs-lisp/cl-lib.el (cl-mapcar, cl-adjoin, cl-subst):
* lisp/emacs-lisp/cl-seq.el (cl-reduce, cl-remove, cl-remove-if)
(cl-remove-if-not, cl-delete, cl-delete-if, cl-delete-if-not)
(cl-remove-duplicates, cl-delete-duplicates, cl-substitute)
(cl-substitute-if, cl-substitute-if-not, cl-nsubstitute)
(cl-nsubstitute-if, cl-nsubstitute-if-not, cl-find, cl-find-if)
(cl-find-if-not, cl-position, cl-position-if, cl-position-if-not)
(cl-count, cl-count-if, cl-count-if-not, cl-mismatch, cl-search)
(cl-sort, cl-stable-sort, cl-merge, cl-member, cl-member-if)
(cl-member-if-not, cl-assoc, cl-assoc-if, cl-assoc-if-not, cl-rassoc)
(cl-rassoc-if, cl-rassoc-if-not, cl-union, cl-nunion, cl-intersection)
(cl-nintersection, cl-set-difference, cl-nset-difference)
(cl-set-exclusive-or, cl-nset-exclusive-or, cl-subsetp, cl-subst-if)
(cl-subst-if-not, cl-nsubst, cl-nsubst-if, cl-nsubst-if-not, cl-sublis)
(cl-nsublis, cl-tree-equal): ...to have them inline here.
2025-02-14 22:46:07 +01:00
|
|
|
(declare (important-return-value t))
|
2012-06-03 21:05:17 -04:00
|
|
|
(apply 'cl-count nil cl-list :if cl-pred cl-keys))
|
1993-07-30 20:15:09 +00:00
|
|
|
|
2007-06-27 18:59:03 +00:00
|
|
|
;;;###autoload
|
2012-06-03 21:05:17 -04:00
|
|
|
(defun cl-count-if-not (cl-pred cl-list &rest cl-keys)
|
(reduce, fill, replace, remove*, remove-if, remove-if-not, delete*, delete-if,
delete-if-not, remove-duplicates, delete-duplicates, substitute, substitute-if,
substitute-if-not, nsubstitute, nsubstitute-if, nsubstitute-if-not, find,
find-if, find-if-not, position, position-if, position-if-not, count, count-if,
count-if-not, mismatch, search, sort*, stable-sort, merge, member*, member-if,
member-if-not, assoc*, assoc-if, assoc-if-not, rassoc*, rassoc-if,
rassoc-if-not, union, nunion, intersection, nintersection, set-difference,
nset-difference, set-exclusive-or, nset-exclusive-or, subsetp, subst-if,
subst-if-not, nsubst, nsubst-if, nsubst-if-not, sublis, nsublis, tree-equal):
Improve argument/docstring consistency.
2005-05-20 14:30:34 +00:00
|
|
|
"Count the number of items not satisfying PREDICATE in SEQ.
|
|
|
|
\nKeywords supported: :key :start :end
|
|
|
|
\n(fn PREDICATE SEQ [KEYWORD VALUE]...)"
|
Inline important-return-value declarations in cl-lib.el
These declarations are now properly added to 'cl-lib.el' itself, or to
'cl-loaddefs.el'. This means that they will now correctly show up
immediately when loading 'cl-lib.el', instead of only after 'cl-macs.el'
is pulled in by an autoload. C.f. Bug#76247.
I did not considered worth reproducing everywhere the list saying which
functions among the below belong to these two categories:
1. Functions that are side-effect-free except for the behavior of
functions passed as argument.
2. Functions that mutate and return a list.
AFAIU, this is not actionable with our current byte-compiler, i.e. we
can't add any extra declarations based on it. However, if the list
should be needed at some point, for example due to improvements in the
compiler, this commit will be where to find it. In the worst case, and
with more work, it's also deducible from the source code itself.
* lisp/emacs-lisp/cl-macs.el: Move important-return-value declarations
from here...
* lisp/emacs-lisp/cl-extra.el (cl-map, cl-maplist, cl-mapcan)
(cl-mapcon, cl-some, cl-every, cl-notany, cl-notevery, cl-nreconc):
* lisp/emacs-lisp/cl-lib.el (cl-mapcar, cl-adjoin, cl-subst):
* lisp/emacs-lisp/cl-seq.el (cl-reduce, cl-remove, cl-remove-if)
(cl-remove-if-not, cl-delete, cl-delete-if, cl-delete-if-not)
(cl-remove-duplicates, cl-delete-duplicates, cl-substitute)
(cl-substitute-if, cl-substitute-if-not, cl-nsubstitute)
(cl-nsubstitute-if, cl-nsubstitute-if-not, cl-find, cl-find-if)
(cl-find-if-not, cl-position, cl-position-if, cl-position-if-not)
(cl-count, cl-count-if, cl-count-if-not, cl-mismatch, cl-search)
(cl-sort, cl-stable-sort, cl-merge, cl-member, cl-member-if)
(cl-member-if-not, cl-assoc, cl-assoc-if, cl-assoc-if-not, cl-rassoc)
(cl-rassoc-if, cl-rassoc-if-not, cl-union, cl-nunion, cl-intersection)
(cl-nintersection, cl-set-difference, cl-nset-difference)
(cl-set-exclusive-or, cl-nset-exclusive-or, cl-subsetp, cl-subst-if)
(cl-subst-if-not, cl-nsubst, cl-nsubst-if, cl-nsubst-if-not, cl-sublis)
(cl-nsublis, cl-tree-equal): ...to have them inline here.
2025-02-14 22:46:07 +01:00
|
|
|
(declare (important-return-value t))
|
2012-06-03 21:05:17 -04:00
|
|
|
(apply 'cl-count nil cl-list :if-not cl-pred cl-keys))
|
1993-07-30 20:15:09 +00:00
|
|
|
|
2007-06-27 18:59:03 +00:00
|
|
|
;;;###autoload
|
2012-06-03 21:05:17 -04:00
|
|
|
(defun cl-mismatch (cl-seq1 cl-seq2 &rest cl-keys)
|
1993-07-30 20:15:09 +00:00
|
|
|
"Compare SEQ1 with SEQ2, return index of first mismatching element.
|
|
|
|
Return nil if the sequences match. If one sequence is a prefix of the
|
2002-01-25 18:47:33 +00:00
|
|
|
other, the return value indicates the end of the shorter sequence.
|
(reduce, fill, replace, remove*, remove-if, remove-if-not, delete*, delete-if,
delete-if-not, remove-duplicates, delete-duplicates, substitute, substitute-if,
substitute-if-not, nsubstitute, nsubstitute-if, nsubstitute-if-not, find,
find-if, find-if-not, position, position-if, position-if-not, count, count-if,
count-if-not, mismatch, search, sort*, stable-sort, merge, member*, member-if,
member-if-not, assoc*, assoc-if, assoc-if-not, rassoc*, rassoc-if,
rassoc-if-not, union, nunion, intersection, nintersection, set-difference,
nset-difference, set-exclusive-or, nset-exclusive-or, subsetp, subst-if,
subst-if-not, nsubst, nsubst-if, nsubst-if-not, sublis, nsublis, tree-equal):
Improve argument/docstring consistency.
2005-05-20 14:30:34 +00:00
|
|
|
\nKeywords supported: :test :test-not :key :start1 :end1 :start2 :end2 :from-end
|
|
|
|
\n(fn SEQ1 SEQ2 [KEYWORD VALUE]...)"
|
Inline important-return-value declarations in cl-lib.el
These declarations are now properly added to 'cl-lib.el' itself, or to
'cl-loaddefs.el'. This means that they will now correctly show up
immediately when loading 'cl-lib.el', instead of only after 'cl-macs.el'
is pulled in by an autoload. C.f. Bug#76247.
I did not considered worth reproducing everywhere the list saying which
functions among the below belong to these two categories:
1. Functions that are side-effect-free except for the behavior of
functions passed as argument.
2. Functions that mutate and return a list.
AFAIU, this is not actionable with our current byte-compiler, i.e. we
can't add any extra declarations based on it. However, if the list
should be needed at some point, for example due to improvements in the
compiler, this commit will be where to find it. In the worst case, and
with more work, it's also deducible from the source code itself.
* lisp/emacs-lisp/cl-macs.el: Move important-return-value declarations
from here...
* lisp/emacs-lisp/cl-extra.el (cl-map, cl-maplist, cl-mapcan)
(cl-mapcon, cl-some, cl-every, cl-notany, cl-notevery, cl-nreconc):
* lisp/emacs-lisp/cl-lib.el (cl-mapcar, cl-adjoin, cl-subst):
* lisp/emacs-lisp/cl-seq.el (cl-reduce, cl-remove, cl-remove-if)
(cl-remove-if-not, cl-delete, cl-delete-if, cl-delete-if-not)
(cl-remove-duplicates, cl-delete-duplicates, cl-substitute)
(cl-substitute-if, cl-substitute-if-not, cl-nsubstitute)
(cl-nsubstitute-if, cl-nsubstitute-if-not, cl-find, cl-find-if)
(cl-find-if-not, cl-position, cl-position-if, cl-position-if-not)
(cl-count, cl-count-if, cl-count-if-not, cl-mismatch, cl-search)
(cl-sort, cl-stable-sort, cl-merge, cl-member, cl-member-if)
(cl-member-if-not, cl-assoc, cl-assoc-if, cl-assoc-if-not, cl-rassoc)
(cl-rassoc-if, cl-rassoc-if-not, cl-union, cl-nunion, cl-intersection)
(cl-nintersection, cl-set-difference, cl-nset-difference)
(cl-set-exclusive-or, cl-nset-exclusive-or, cl-subsetp, cl-subst-if)
(cl-subst-if-not, cl-nsubst, cl-nsubst-if, cl-nsubst-if-not, cl-sublis)
(cl-nsublis, cl-tree-equal): ...to have them inline here.
2025-02-14 22:46:07 +01:00
|
|
|
(declare (important-return-value t))
|
Use lexical-binding for all of CL, and clean up its namespace.
* lisp/emacs-lisp/cl-lib.el: Use lexical-binding.
(cl-map-extents, cl-maclisp-member): Remove.
(cl--set-elt, cl--set-nthcdr, cl--set-buffer-substring)
(cl--set-substring, cl--block-wrapper, cl--block-throw)
(cl--compiling-file, cl--mapcar-many, cl--do-subst): Use "cl--" prefix.
* lisp/emacs-lisp/cl-extra.el: Use lexical-binding.
(cl--mapcar-many, cl--map-keymap-recursively, cl--map-intervals)
(cl--map-overlays, cl--set-frame-visible-p, cl--progv-save)
(cl--progv-before, cl--progv-after, cl--finite-do, cl--set-getf)
(cl--do-remf, cl--do-prettyprint): Use "cl--" prefix.
* lisp/emacs-lisp/cl-seq.el: Use lexical-binding.
(cl--parsing-keywords, cl--check-key, cl--check-test-nokey)
(cl--check-test, cl--check-match): Use "cl--" prefix and backquotes.
(cl--alist, cl--sublis-rec, cl--nsublis-rec, cl--tree-equal-rec):
* lisp/emacs-lisp/cl-macs.el (cl--lambda-list-keywords): Use "cl--" prefix.
* lisp/edmacro.el (edmacro-mismatch): Simplify to remove dependence on
CL's internals.
2012-06-11 11:52:50 -04:00
|
|
|
(cl--parsing-keywords (:test :test-not :key :from-end
|
1993-07-30 20:15:09 +00:00
|
|
|
(:start1 0) :end1 (:start2 0) :end2) ()
|
|
|
|
(or cl-end1 (setq cl-end1 (length cl-seq1)))
|
|
|
|
(or cl-end2 (setq cl-end2 (length cl-seq2)))
|
|
|
|
(if cl-from-end
|
|
|
|
(progn
|
|
|
|
(while (and (< cl-start1 cl-end1) (< cl-start2 cl-end2)
|
Use lexical-binding for all of CL, and clean up its namespace.
* lisp/emacs-lisp/cl-lib.el: Use lexical-binding.
(cl-map-extents, cl-maclisp-member): Remove.
(cl--set-elt, cl--set-nthcdr, cl--set-buffer-substring)
(cl--set-substring, cl--block-wrapper, cl--block-throw)
(cl--compiling-file, cl--mapcar-many, cl--do-subst): Use "cl--" prefix.
* lisp/emacs-lisp/cl-extra.el: Use lexical-binding.
(cl--mapcar-many, cl--map-keymap-recursively, cl--map-intervals)
(cl--map-overlays, cl--set-frame-visible-p, cl--progv-save)
(cl--progv-before, cl--progv-after, cl--finite-do, cl--set-getf)
(cl--do-remf, cl--do-prettyprint): Use "cl--" prefix.
* lisp/emacs-lisp/cl-seq.el: Use lexical-binding.
(cl--parsing-keywords, cl--check-key, cl--check-test-nokey)
(cl--check-test, cl--check-match): Use "cl--" prefix and backquotes.
(cl--alist, cl--sublis-rec, cl--nsublis-rec, cl--tree-equal-rec):
* lisp/emacs-lisp/cl-macs.el (cl--lambda-list-keywords): Use "cl--" prefix.
* lisp/edmacro.el (edmacro-mismatch): Simplify to remove dependence on
CL's internals.
2012-06-11 11:52:50 -04:00
|
|
|
(cl--check-match (elt cl-seq1 (1- cl-end1))
|
1993-07-30 20:15:09 +00:00
|
|
|
(elt cl-seq2 (1- cl-end2))))
|
|
|
|
(setq cl-end1 (1- cl-end1) cl-end2 (1- cl-end2)))
|
|
|
|
(and (or (< cl-start1 cl-end1) (< cl-start2 cl-end2))
|
|
|
|
(1- cl-end1)))
|
|
|
|
(let ((cl-p1 (and (listp cl-seq1) (nthcdr cl-start1 cl-seq1)))
|
|
|
|
(cl-p2 (and (listp cl-seq2) (nthcdr cl-start2 cl-seq2))))
|
|
|
|
(while (and (< cl-start1 cl-end1) (< cl-start2 cl-end2)
|
Use lexical-binding for all of CL, and clean up its namespace.
* lisp/emacs-lisp/cl-lib.el: Use lexical-binding.
(cl-map-extents, cl-maclisp-member): Remove.
(cl--set-elt, cl--set-nthcdr, cl--set-buffer-substring)
(cl--set-substring, cl--block-wrapper, cl--block-throw)
(cl--compiling-file, cl--mapcar-many, cl--do-subst): Use "cl--" prefix.
* lisp/emacs-lisp/cl-extra.el: Use lexical-binding.
(cl--mapcar-many, cl--map-keymap-recursively, cl--map-intervals)
(cl--map-overlays, cl--set-frame-visible-p, cl--progv-save)
(cl--progv-before, cl--progv-after, cl--finite-do, cl--set-getf)
(cl--do-remf, cl--do-prettyprint): Use "cl--" prefix.
* lisp/emacs-lisp/cl-seq.el: Use lexical-binding.
(cl--parsing-keywords, cl--check-key, cl--check-test-nokey)
(cl--check-test, cl--check-match): Use "cl--" prefix and backquotes.
(cl--alist, cl--sublis-rec, cl--nsublis-rec, cl--tree-equal-rec):
* lisp/emacs-lisp/cl-macs.el (cl--lambda-list-keywords): Use "cl--" prefix.
* lisp/edmacro.el (edmacro-mismatch): Simplify to remove dependence on
CL's internals.
2012-06-11 11:52:50 -04:00
|
|
|
(cl--check-match (if cl-p1 (car cl-p1)
|
1993-07-30 20:15:09 +00:00
|
|
|
(aref cl-seq1 cl-start1))
|
|
|
|
(if cl-p2 (car cl-p2)
|
|
|
|
(aref cl-seq2 cl-start2))))
|
|
|
|
(setq cl-p1 (cdr cl-p1) cl-p2 (cdr cl-p2)
|
|
|
|
cl-start1 (1+ cl-start1) cl-start2 (1+ cl-start2)))
|
|
|
|
(and (or (< cl-start1 cl-end1) (< cl-start2 cl-end2))
|
|
|
|
cl-start1)))))
|
|
|
|
|
2007-06-27 18:59:03 +00:00
|
|
|
;;;###autoload
|
2012-06-03 21:05:17 -04:00
|
|
|
(defun cl-search (cl-seq1 cl-seq2 &rest cl-keys)
|
1993-07-30 20:15:09 +00:00
|
|
|
"Search for SEQ1 as a subsequence of SEQ2.
|
|
|
|
Return the index of the leftmost element of the first match found;
|
|
|
|
return nil if there are no matches.
|
(reduce, fill, replace, remove*, remove-if, remove-if-not, delete*, delete-if,
delete-if-not, remove-duplicates, delete-duplicates, substitute, substitute-if,
substitute-if-not, nsubstitute, nsubstitute-if, nsubstitute-if-not, find,
find-if, find-if-not, position, position-if, position-if-not, count, count-if,
count-if-not, mismatch, search, sort*, stable-sort, merge, member*, member-if,
member-if-not, assoc*, assoc-if, assoc-if-not, rassoc*, rassoc-if,
rassoc-if-not, union, nunion, intersection, nintersection, set-difference,
nset-difference, set-exclusive-or, nset-exclusive-or, subsetp, subst-if,
subst-if-not, nsubst, nsubst-if, nsubst-if-not, sublis, nsublis, tree-equal):
Improve argument/docstring consistency.
2005-05-20 14:30:34 +00:00
|
|
|
\nKeywords supported: :test :test-not :key :start1 :end1 :start2 :end2 :from-end
|
|
|
|
\n(fn SEQ1 SEQ2 [KEYWORD VALUE]...)"
|
Inline important-return-value declarations in cl-lib.el
These declarations are now properly added to 'cl-lib.el' itself, or to
'cl-loaddefs.el'. This means that they will now correctly show up
immediately when loading 'cl-lib.el', instead of only after 'cl-macs.el'
is pulled in by an autoload. C.f. Bug#76247.
I did not considered worth reproducing everywhere the list saying which
functions among the below belong to these two categories:
1. Functions that are side-effect-free except for the behavior of
functions passed as argument.
2. Functions that mutate and return a list.
AFAIU, this is not actionable with our current byte-compiler, i.e. we
can't add any extra declarations based on it. However, if the list
should be needed at some point, for example due to improvements in the
compiler, this commit will be where to find it. In the worst case, and
with more work, it's also deducible from the source code itself.
* lisp/emacs-lisp/cl-macs.el: Move important-return-value declarations
from here...
* lisp/emacs-lisp/cl-extra.el (cl-map, cl-maplist, cl-mapcan)
(cl-mapcon, cl-some, cl-every, cl-notany, cl-notevery, cl-nreconc):
* lisp/emacs-lisp/cl-lib.el (cl-mapcar, cl-adjoin, cl-subst):
* lisp/emacs-lisp/cl-seq.el (cl-reduce, cl-remove, cl-remove-if)
(cl-remove-if-not, cl-delete, cl-delete-if, cl-delete-if-not)
(cl-remove-duplicates, cl-delete-duplicates, cl-substitute)
(cl-substitute-if, cl-substitute-if-not, cl-nsubstitute)
(cl-nsubstitute-if, cl-nsubstitute-if-not, cl-find, cl-find-if)
(cl-find-if-not, cl-position, cl-position-if, cl-position-if-not)
(cl-count, cl-count-if, cl-count-if-not, cl-mismatch, cl-search)
(cl-sort, cl-stable-sort, cl-merge, cl-member, cl-member-if)
(cl-member-if-not, cl-assoc, cl-assoc-if, cl-assoc-if-not, cl-rassoc)
(cl-rassoc-if, cl-rassoc-if-not, cl-union, cl-nunion, cl-intersection)
(cl-nintersection, cl-set-difference, cl-nset-difference)
(cl-set-exclusive-or, cl-nset-exclusive-or, cl-subsetp, cl-subst-if)
(cl-subst-if-not, cl-nsubst, cl-nsubst-if, cl-nsubst-if-not, cl-sublis)
(cl-nsublis, cl-tree-equal): ...to have them inline here.
2025-02-14 22:46:07 +01:00
|
|
|
(declare (important-return-value t))
|
Use lexical-binding for all of CL, and clean up its namespace.
* lisp/emacs-lisp/cl-lib.el: Use lexical-binding.
(cl-map-extents, cl-maclisp-member): Remove.
(cl--set-elt, cl--set-nthcdr, cl--set-buffer-substring)
(cl--set-substring, cl--block-wrapper, cl--block-throw)
(cl--compiling-file, cl--mapcar-many, cl--do-subst): Use "cl--" prefix.
* lisp/emacs-lisp/cl-extra.el: Use lexical-binding.
(cl--mapcar-many, cl--map-keymap-recursively, cl--map-intervals)
(cl--map-overlays, cl--set-frame-visible-p, cl--progv-save)
(cl--progv-before, cl--progv-after, cl--finite-do, cl--set-getf)
(cl--do-remf, cl--do-prettyprint): Use "cl--" prefix.
* lisp/emacs-lisp/cl-seq.el: Use lexical-binding.
(cl--parsing-keywords, cl--check-key, cl--check-test-nokey)
(cl--check-test, cl--check-match): Use "cl--" prefix and backquotes.
(cl--alist, cl--sublis-rec, cl--nsublis-rec, cl--tree-equal-rec):
* lisp/emacs-lisp/cl-macs.el (cl--lambda-list-keywords): Use "cl--" prefix.
* lisp/edmacro.el (edmacro-mismatch): Simplify to remove dependence on
CL's internals.
2012-06-11 11:52:50 -04:00
|
|
|
(cl--parsing-keywords (:test :test-not :key :from-end
|
1993-07-30 20:15:09 +00:00
|
|
|
(:start1 0) :end1 (:start2 0) :end2) ()
|
|
|
|
(or cl-end1 (setq cl-end1 (length cl-seq1)))
|
|
|
|
(or cl-end2 (setq cl-end2 (length cl-seq2)))
|
|
|
|
(if (>= cl-start1 cl-end1)
|
|
|
|
(if cl-from-end cl-end2 cl-start2)
|
|
|
|
(let* ((cl-len (- cl-end1 cl-start1))
|
Use lexical-binding for all of CL, and clean up its namespace.
* lisp/emacs-lisp/cl-lib.el: Use lexical-binding.
(cl-map-extents, cl-maclisp-member): Remove.
(cl--set-elt, cl--set-nthcdr, cl--set-buffer-substring)
(cl--set-substring, cl--block-wrapper, cl--block-throw)
(cl--compiling-file, cl--mapcar-many, cl--do-subst): Use "cl--" prefix.
* lisp/emacs-lisp/cl-extra.el: Use lexical-binding.
(cl--mapcar-many, cl--map-keymap-recursively, cl--map-intervals)
(cl--map-overlays, cl--set-frame-visible-p, cl--progv-save)
(cl--progv-before, cl--progv-after, cl--finite-do, cl--set-getf)
(cl--do-remf, cl--do-prettyprint): Use "cl--" prefix.
* lisp/emacs-lisp/cl-seq.el: Use lexical-binding.
(cl--parsing-keywords, cl--check-key, cl--check-test-nokey)
(cl--check-test, cl--check-match): Use "cl--" prefix and backquotes.
(cl--alist, cl--sublis-rec, cl--nsublis-rec, cl--tree-equal-rec):
* lisp/emacs-lisp/cl-macs.el (cl--lambda-list-keywords): Use "cl--" prefix.
* lisp/edmacro.el (edmacro-mismatch): Simplify to remove dependence on
CL's internals.
2012-06-11 11:52:50 -04:00
|
|
|
(cl-first (cl--check-key (elt cl-seq1 cl-start1)))
|
1993-07-30 20:15:09 +00:00
|
|
|
(cl-if nil) cl-pos)
|
|
|
|
(setq cl-end2 (- cl-end2 (1- cl-len)))
|
|
|
|
(while (and (< cl-start2 cl-end2)
|
2012-05-17 16:04:56 -04:00
|
|
|
(setq cl-pos (cl--position cl-first cl-seq2
|
|
|
|
cl-start2 cl-end2 cl-from-end))
|
2012-06-03 21:05:17 -04:00
|
|
|
(apply 'cl-mismatch cl-seq1 cl-seq2
|
2000-05-05 20:01:01 +00:00
|
|
|
:start1 (1+ cl-start1) :end1 cl-end1
|
|
|
|
:start2 (1+ cl-pos) :end2 (+ cl-pos cl-len)
|
|
|
|
:from-end nil cl-keys))
|
1993-07-30 20:15:09 +00:00
|
|
|
(if cl-from-end (setq cl-end2 cl-pos) (setq cl-start2 (1+ cl-pos))))
|
|
|
|
(and (< cl-start2 cl-end2) cl-pos)))))
|
|
|
|
|
2007-06-27 18:59:03 +00:00
|
|
|
;;;###autoload
|
2012-06-03 21:05:17 -04:00
|
|
|
(defun cl-sort (cl-seq cl-pred &rest cl-keys)
|
(reduce, fill, replace, remove*, remove-if, remove-if-not, delete*, delete-if,
delete-if-not, remove-duplicates, delete-duplicates, substitute, substitute-if,
substitute-if-not, nsubstitute, nsubstitute-if, nsubstitute-if-not, find,
find-if, find-if-not, position, position-if, position-if-not, count, count-if,
count-if-not, mismatch, search, sort*, stable-sort, merge, member*, member-if,
member-if-not, assoc*, assoc-if, assoc-if-not, rassoc*, rassoc-if,
rassoc-if-not, union, nunion, intersection, nintersection, set-difference,
nset-difference, set-exclusive-or, nset-exclusive-or, subsetp, subst-if,
subst-if-not, nsubst, nsubst-if, nsubst-if-not, sublis, nsublis, tree-equal):
Improve argument/docstring consistency.
2005-05-20 14:30:34 +00:00
|
|
|
"Sort the argument SEQ according to PREDICATE.
|
|
|
|
This is a destructive function; it reuses the storage of SEQ if possible.
|
|
|
|
\nKeywords supported: :key
|
|
|
|
\n(fn SEQ PREDICATE [KEYWORD VALUE]...)"
|
Inline important-return-value declarations in cl-lib.el
These declarations are now properly added to 'cl-lib.el' itself, or to
'cl-loaddefs.el'. This means that they will now correctly show up
immediately when loading 'cl-lib.el', instead of only after 'cl-macs.el'
is pulled in by an autoload. C.f. Bug#76247.
I did not considered worth reproducing everywhere the list saying which
functions among the below belong to these two categories:
1. Functions that are side-effect-free except for the behavior of
functions passed as argument.
2. Functions that mutate and return a list.
AFAIU, this is not actionable with our current byte-compiler, i.e. we
can't add any extra declarations based on it. However, if the list
should be needed at some point, for example due to improvements in the
compiler, this commit will be where to find it. In the worst case, and
with more work, it's also deducible from the source code itself.
* lisp/emacs-lisp/cl-macs.el: Move important-return-value declarations
from here...
* lisp/emacs-lisp/cl-extra.el (cl-map, cl-maplist, cl-mapcan)
(cl-mapcon, cl-some, cl-every, cl-notany, cl-notevery, cl-nreconc):
* lisp/emacs-lisp/cl-lib.el (cl-mapcar, cl-adjoin, cl-subst):
* lisp/emacs-lisp/cl-seq.el (cl-reduce, cl-remove, cl-remove-if)
(cl-remove-if-not, cl-delete, cl-delete-if, cl-delete-if-not)
(cl-remove-duplicates, cl-delete-duplicates, cl-substitute)
(cl-substitute-if, cl-substitute-if-not, cl-nsubstitute)
(cl-nsubstitute-if, cl-nsubstitute-if-not, cl-find, cl-find-if)
(cl-find-if-not, cl-position, cl-position-if, cl-position-if-not)
(cl-count, cl-count-if, cl-count-if-not, cl-mismatch, cl-search)
(cl-sort, cl-stable-sort, cl-merge, cl-member, cl-member-if)
(cl-member-if-not, cl-assoc, cl-assoc-if, cl-assoc-if-not, cl-rassoc)
(cl-rassoc-if, cl-rassoc-if-not, cl-union, cl-nunion, cl-intersection)
(cl-nintersection, cl-set-difference, cl-nset-difference)
(cl-set-exclusive-or, cl-nset-exclusive-or, cl-subsetp, cl-subst-if)
(cl-subst-if-not, cl-nsubst, cl-nsubst-if, cl-nsubst-if-not, cl-sublis)
(cl-nsublis, cl-tree-equal): ...to have them inline here.
2025-02-14 22:46:07 +01:00
|
|
|
;; It's safe to ignore the return value when used on arrays,
|
|
|
|
;; but most calls pass lists.
|
|
|
|
(declare (important-return-value t))
|
1993-07-30 20:15:09 +00:00
|
|
|
(if (nlistp cl-seq)
|
2024-05-12 11:22:23 +02:00
|
|
|
(if (stringp cl-seq)
|
|
|
|
(concat (apply #'cl-sort (vconcat cl-seq) cl-pred cl-keys))
|
|
|
|
(cl-replace cl-seq
|
|
|
|
(apply #'cl-sort (append cl-seq nil) cl-pred cl-keys)))
|
Use lexical-binding for all of CL, and clean up its namespace.
* lisp/emacs-lisp/cl-lib.el: Use lexical-binding.
(cl-map-extents, cl-maclisp-member): Remove.
(cl--set-elt, cl--set-nthcdr, cl--set-buffer-substring)
(cl--set-substring, cl--block-wrapper, cl--block-throw)
(cl--compiling-file, cl--mapcar-many, cl--do-subst): Use "cl--" prefix.
* lisp/emacs-lisp/cl-extra.el: Use lexical-binding.
(cl--mapcar-many, cl--map-keymap-recursively, cl--map-intervals)
(cl--map-overlays, cl--set-frame-visible-p, cl--progv-save)
(cl--progv-before, cl--progv-after, cl--finite-do, cl--set-getf)
(cl--do-remf, cl--do-prettyprint): Use "cl--" prefix.
* lisp/emacs-lisp/cl-seq.el: Use lexical-binding.
(cl--parsing-keywords, cl--check-key, cl--check-test-nokey)
(cl--check-test, cl--check-match): Use "cl--" prefix and backquotes.
(cl--alist, cl--sublis-rec, cl--nsublis-rec, cl--tree-equal-rec):
* lisp/emacs-lisp/cl-macs.el (cl--lambda-list-keywords): Use "cl--" prefix.
* lisp/edmacro.el (edmacro-mismatch): Simplify to remove dependence on
CL's internals.
2012-06-11 11:52:50 -04:00
|
|
|
(cl--parsing-keywords (:key) ()
|
1993-07-30 20:15:09 +00:00
|
|
|
(if (memq cl-key '(nil identity))
|
|
|
|
(sort cl-seq cl-pred)
|
2020-11-16 17:03:45 +01:00
|
|
|
(sort cl-seq (lambda (cl-x cl-y)
|
|
|
|
(funcall cl-pred (funcall cl-key cl-x)
|
|
|
|
(funcall cl-key cl-y))))))))
|
1993-07-30 20:15:09 +00:00
|
|
|
|
2007-06-27 18:59:03 +00:00
|
|
|
;;;###autoload
|
2012-06-03 21:05:17 -04:00
|
|
|
(defun cl-stable-sort (cl-seq cl-pred &rest cl-keys)
|
(reduce, fill, replace, remove*, remove-if, remove-if-not, delete*, delete-if,
delete-if-not, remove-duplicates, delete-duplicates, substitute, substitute-if,
substitute-if-not, nsubstitute, nsubstitute-if, nsubstitute-if-not, find,
find-if, find-if-not, position, position-if, position-if-not, count, count-if,
count-if-not, mismatch, search, sort*, stable-sort, merge, member*, member-if,
member-if-not, assoc*, assoc-if, assoc-if-not, rassoc*, rassoc-if,
rassoc-if-not, union, nunion, intersection, nintersection, set-difference,
nset-difference, set-exclusive-or, nset-exclusive-or, subsetp, subst-if,
subst-if-not, nsubst, nsubst-if, nsubst-if-not, sublis, nsublis, tree-equal):
Improve argument/docstring consistency.
2005-05-20 14:30:34 +00:00
|
|
|
"Sort the argument SEQ stably according to PREDICATE.
|
|
|
|
This is a destructive function; it reuses the storage of SEQ if possible.
|
|
|
|
\nKeywords supported: :key
|
|
|
|
\n(fn SEQ PREDICATE [KEYWORD VALUE]...)"
|
Inline important-return-value declarations in cl-lib.el
These declarations are now properly added to 'cl-lib.el' itself, or to
'cl-loaddefs.el'. This means that they will now correctly show up
immediately when loading 'cl-lib.el', instead of only after 'cl-macs.el'
is pulled in by an autoload. C.f. Bug#76247.
I did not considered worth reproducing everywhere the list saying which
functions among the below belong to these two categories:
1. Functions that are side-effect-free except for the behavior of
functions passed as argument.
2. Functions that mutate and return a list.
AFAIU, this is not actionable with our current byte-compiler, i.e. we
can't add any extra declarations based on it. However, if the list
should be needed at some point, for example due to improvements in the
compiler, this commit will be where to find it. In the worst case, and
with more work, it's also deducible from the source code itself.
* lisp/emacs-lisp/cl-macs.el: Move important-return-value declarations
from here...
* lisp/emacs-lisp/cl-extra.el (cl-map, cl-maplist, cl-mapcan)
(cl-mapcon, cl-some, cl-every, cl-notany, cl-notevery, cl-nreconc):
* lisp/emacs-lisp/cl-lib.el (cl-mapcar, cl-adjoin, cl-subst):
* lisp/emacs-lisp/cl-seq.el (cl-reduce, cl-remove, cl-remove-if)
(cl-remove-if-not, cl-delete, cl-delete-if, cl-delete-if-not)
(cl-remove-duplicates, cl-delete-duplicates, cl-substitute)
(cl-substitute-if, cl-substitute-if-not, cl-nsubstitute)
(cl-nsubstitute-if, cl-nsubstitute-if-not, cl-find, cl-find-if)
(cl-find-if-not, cl-position, cl-position-if, cl-position-if-not)
(cl-count, cl-count-if, cl-count-if-not, cl-mismatch, cl-search)
(cl-sort, cl-stable-sort, cl-merge, cl-member, cl-member-if)
(cl-member-if-not, cl-assoc, cl-assoc-if, cl-assoc-if-not, cl-rassoc)
(cl-rassoc-if, cl-rassoc-if-not, cl-union, cl-nunion, cl-intersection)
(cl-nintersection, cl-set-difference, cl-nset-difference)
(cl-set-exclusive-or, cl-nset-exclusive-or, cl-subsetp, cl-subst-if)
(cl-subst-if-not, cl-nsubst, cl-nsubst-if, cl-nsubst-if-not, cl-sublis)
(cl-nsublis, cl-tree-equal): ...to have them inline here.
2025-02-14 22:46:07 +01:00
|
|
|
;; It's safe to ignore the return value when used on arrays,
|
|
|
|
;; but most calls pass lists.
|
|
|
|
(declare (important-return-value t))
|
2012-06-03 21:05:17 -04:00
|
|
|
(apply 'cl-sort cl-seq cl-pred cl-keys))
|
1993-07-30 20:15:09 +00:00
|
|
|
|
2007-06-27 18:59:03 +00:00
|
|
|
;;;###autoload
|
2012-06-03 21:05:17 -04:00
|
|
|
(defun cl-merge (cl-type cl-seq1 cl-seq2 cl-pred &rest cl-keys)
|
1993-07-30 20:15:09 +00:00
|
|
|
"Destructively merge the two sequences to produce a new sequence.
|
(reduce, fill, replace, remove*, remove-if, remove-if-not, delete*, delete-if,
delete-if-not, remove-duplicates, delete-duplicates, substitute, substitute-if,
substitute-if-not, nsubstitute, nsubstitute-if, nsubstitute-if-not, find,
find-if, find-if-not, position, position-if, position-if-not, count, count-if,
count-if-not, mismatch, search, sort*, stable-sort, merge, member*, member-if,
member-if-not, assoc*, assoc-if, assoc-if-not, rassoc*, rassoc-if,
rassoc-if-not, union, nunion, intersection, nintersection, set-difference,
nset-difference, set-exclusive-or, nset-exclusive-or, subsetp, subst-if,
subst-if-not, nsubst, nsubst-if, nsubst-if-not, sublis, nsublis, tree-equal):
Improve argument/docstring consistency.
2005-05-20 14:30:34 +00:00
|
|
|
TYPE is the sequence type to return, SEQ1 and SEQ2 are the two argument
|
|
|
|
sequences, and PREDICATE is a `less-than' predicate on the elements.
|
|
|
|
\nKeywords supported: :key
|
|
|
|
\n(fn TYPE SEQ1 SEQ2 PREDICATE [KEYWORD VALUE]...)"
|
Inline important-return-value declarations in cl-lib.el
These declarations are now properly added to 'cl-lib.el' itself, or to
'cl-loaddefs.el'. This means that they will now correctly show up
immediately when loading 'cl-lib.el', instead of only after 'cl-macs.el'
is pulled in by an autoload. C.f. Bug#76247.
I did not considered worth reproducing everywhere the list saying which
functions among the below belong to these two categories:
1. Functions that are side-effect-free except for the behavior of
functions passed as argument.
2. Functions that mutate and return a list.
AFAIU, this is not actionable with our current byte-compiler, i.e. we
can't add any extra declarations based on it. However, if the list
should be needed at some point, for example due to improvements in the
compiler, this commit will be where to find it. In the worst case, and
with more work, it's also deducible from the source code itself.
* lisp/emacs-lisp/cl-macs.el: Move important-return-value declarations
from here...
* lisp/emacs-lisp/cl-extra.el (cl-map, cl-maplist, cl-mapcan)
(cl-mapcon, cl-some, cl-every, cl-notany, cl-notevery, cl-nreconc):
* lisp/emacs-lisp/cl-lib.el (cl-mapcar, cl-adjoin, cl-subst):
* lisp/emacs-lisp/cl-seq.el (cl-reduce, cl-remove, cl-remove-if)
(cl-remove-if-not, cl-delete, cl-delete-if, cl-delete-if-not)
(cl-remove-duplicates, cl-delete-duplicates, cl-substitute)
(cl-substitute-if, cl-substitute-if-not, cl-nsubstitute)
(cl-nsubstitute-if, cl-nsubstitute-if-not, cl-find, cl-find-if)
(cl-find-if-not, cl-position, cl-position-if, cl-position-if-not)
(cl-count, cl-count-if, cl-count-if-not, cl-mismatch, cl-search)
(cl-sort, cl-stable-sort, cl-merge, cl-member, cl-member-if)
(cl-member-if-not, cl-assoc, cl-assoc-if, cl-assoc-if-not, cl-rassoc)
(cl-rassoc-if, cl-rassoc-if-not, cl-union, cl-nunion, cl-intersection)
(cl-nintersection, cl-set-difference, cl-nset-difference)
(cl-set-exclusive-or, cl-nset-exclusive-or, cl-subsetp, cl-subst-if)
(cl-subst-if-not, cl-nsubst, cl-nsubst-if, cl-nsubst-if-not, cl-sublis)
(cl-nsublis, cl-tree-equal): ...to have them inline here.
2025-02-14 22:46:07 +01:00
|
|
|
(declare (important-return-value t))
|
1993-07-30 20:15:09 +00:00
|
|
|
(or (listp cl-seq1) (setq cl-seq1 (append cl-seq1 nil)))
|
|
|
|
(or (listp cl-seq2) (setq cl-seq2 (append cl-seq2 nil)))
|
Use lexical-binding for all of CL, and clean up its namespace.
* lisp/emacs-lisp/cl-lib.el: Use lexical-binding.
(cl-map-extents, cl-maclisp-member): Remove.
(cl--set-elt, cl--set-nthcdr, cl--set-buffer-substring)
(cl--set-substring, cl--block-wrapper, cl--block-throw)
(cl--compiling-file, cl--mapcar-many, cl--do-subst): Use "cl--" prefix.
* lisp/emacs-lisp/cl-extra.el: Use lexical-binding.
(cl--mapcar-many, cl--map-keymap-recursively, cl--map-intervals)
(cl--map-overlays, cl--set-frame-visible-p, cl--progv-save)
(cl--progv-before, cl--progv-after, cl--finite-do, cl--set-getf)
(cl--do-remf, cl--do-prettyprint): Use "cl--" prefix.
* lisp/emacs-lisp/cl-seq.el: Use lexical-binding.
(cl--parsing-keywords, cl--check-key, cl--check-test-nokey)
(cl--check-test, cl--check-match): Use "cl--" prefix and backquotes.
(cl--alist, cl--sublis-rec, cl--nsublis-rec, cl--tree-equal-rec):
* lisp/emacs-lisp/cl-macs.el (cl--lambda-list-keywords): Use "cl--" prefix.
* lisp/edmacro.el (edmacro-mismatch): Simplify to remove dependence on
CL's internals.
2012-06-11 11:52:50 -04:00
|
|
|
(cl--parsing-keywords (:key) ()
|
1993-07-30 20:15:09 +00:00
|
|
|
(let ((cl-res nil))
|
|
|
|
(while (and cl-seq1 cl-seq2)
|
Use lexical-binding for all of CL, and clean up its namespace.
* lisp/emacs-lisp/cl-lib.el: Use lexical-binding.
(cl-map-extents, cl-maclisp-member): Remove.
(cl--set-elt, cl--set-nthcdr, cl--set-buffer-substring)
(cl--set-substring, cl--block-wrapper, cl--block-throw)
(cl--compiling-file, cl--mapcar-many, cl--do-subst): Use "cl--" prefix.
* lisp/emacs-lisp/cl-extra.el: Use lexical-binding.
(cl--mapcar-many, cl--map-keymap-recursively, cl--map-intervals)
(cl--map-overlays, cl--set-frame-visible-p, cl--progv-save)
(cl--progv-before, cl--progv-after, cl--finite-do, cl--set-getf)
(cl--do-remf, cl--do-prettyprint): Use "cl--" prefix.
* lisp/emacs-lisp/cl-seq.el: Use lexical-binding.
(cl--parsing-keywords, cl--check-key, cl--check-test-nokey)
(cl--check-test, cl--check-match): Use "cl--" prefix and backquotes.
(cl--alist, cl--sublis-rec, cl--nsublis-rec, cl--tree-equal-rec):
* lisp/emacs-lisp/cl-macs.el (cl--lambda-list-keywords): Use "cl--" prefix.
* lisp/edmacro.el (edmacro-mismatch): Simplify to remove dependence on
CL's internals.
2012-06-11 11:52:50 -04:00
|
|
|
(if (funcall cl-pred (cl--check-key (car cl-seq2))
|
|
|
|
(cl--check-key (car cl-seq1)))
|
2002-09-27 22:19:22 +00:00
|
|
|
(push (pop cl-seq2) cl-res)
|
|
|
|
(push (pop cl-seq1) cl-res)))
|
2012-06-03 21:05:17 -04:00
|
|
|
(cl-coerce (nconc (nreverse cl-res) cl-seq1 cl-seq2) cl-type))))
|
1993-07-30 20:15:09 +00:00
|
|
|
|
2007-06-27 18:59:03 +00:00
|
|
|
;;;###autoload
|
2012-06-03 21:05:17 -04:00
|
|
|
(defun cl-member (cl-item cl-list &rest cl-keys)
|
1993-07-30 20:15:09 +00:00
|
|
|
"Find the first occurrence of ITEM in LIST.
|
|
|
|
Return the sublist of LIST whose car is ITEM.
|
(reduce, fill, replace, remove*, remove-if, remove-if-not, delete*, delete-if,
delete-if-not, remove-duplicates, delete-duplicates, substitute, substitute-if,
substitute-if-not, nsubstitute, nsubstitute-if, nsubstitute-if-not, find,
find-if, find-if-not, position, position-if, position-if-not, count, count-if,
count-if-not, mismatch, search, sort*, stable-sort, merge, member*, member-if,
member-if-not, assoc*, assoc-if, assoc-if-not, rassoc*, rassoc-if,
rassoc-if-not, union, nunion, intersection, nintersection, set-difference,
nset-difference, set-exclusive-or, nset-exclusive-or, subsetp, subst-if,
subst-if-not, nsubst, nsubst-if, nsubst-if-not, sublis, nsublis, tree-equal):
Improve argument/docstring consistency.
2005-05-20 14:30:34 +00:00
|
|
|
\nKeywords supported: :test :test-not :key
|
|
|
|
\n(fn ITEM LIST [KEYWORD VALUE]...)"
|
Inline important-return-value declarations in cl-lib.el
These declarations are now properly added to 'cl-lib.el' itself, or to
'cl-loaddefs.el'. This means that they will now correctly show up
immediately when loading 'cl-lib.el', instead of only after 'cl-macs.el'
is pulled in by an autoload. C.f. Bug#76247.
I did not considered worth reproducing everywhere the list saying which
functions among the below belong to these two categories:
1. Functions that are side-effect-free except for the behavior of
functions passed as argument.
2. Functions that mutate and return a list.
AFAIU, this is not actionable with our current byte-compiler, i.e. we
can't add any extra declarations based on it. However, if the list
should be needed at some point, for example due to improvements in the
compiler, this commit will be where to find it. In the worst case, and
with more work, it's also deducible from the source code itself.
* lisp/emacs-lisp/cl-macs.el: Move important-return-value declarations
from here...
* lisp/emacs-lisp/cl-extra.el (cl-map, cl-maplist, cl-mapcan)
(cl-mapcon, cl-some, cl-every, cl-notany, cl-notevery, cl-nreconc):
* lisp/emacs-lisp/cl-lib.el (cl-mapcar, cl-adjoin, cl-subst):
* lisp/emacs-lisp/cl-seq.el (cl-reduce, cl-remove, cl-remove-if)
(cl-remove-if-not, cl-delete, cl-delete-if, cl-delete-if-not)
(cl-remove-duplicates, cl-delete-duplicates, cl-substitute)
(cl-substitute-if, cl-substitute-if-not, cl-nsubstitute)
(cl-nsubstitute-if, cl-nsubstitute-if-not, cl-find, cl-find-if)
(cl-find-if-not, cl-position, cl-position-if, cl-position-if-not)
(cl-count, cl-count-if, cl-count-if-not, cl-mismatch, cl-search)
(cl-sort, cl-stable-sort, cl-merge, cl-member, cl-member-if)
(cl-member-if-not, cl-assoc, cl-assoc-if, cl-assoc-if-not, cl-rassoc)
(cl-rassoc-if, cl-rassoc-if-not, cl-union, cl-nunion, cl-intersection)
(cl-nintersection, cl-set-difference, cl-nset-difference)
(cl-set-exclusive-or, cl-nset-exclusive-or, cl-subsetp, cl-subst-if)
(cl-subst-if-not, cl-nsubst, cl-nsubst-if, cl-nsubst-if-not, cl-sublis)
(cl-nsublis, cl-tree-equal): ...to have them inline here.
2025-02-14 22:46:07 +01:00
|
|
|
(declare (important-return-value t)
|
|
|
|
(compiler-macro cl--compiler-macro-member))
|
1993-07-30 20:15:09 +00:00
|
|
|
(if cl-keys
|
Use lexical-binding for all of CL, and clean up its namespace.
* lisp/emacs-lisp/cl-lib.el: Use lexical-binding.
(cl-map-extents, cl-maclisp-member): Remove.
(cl--set-elt, cl--set-nthcdr, cl--set-buffer-substring)
(cl--set-substring, cl--block-wrapper, cl--block-throw)
(cl--compiling-file, cl--mapcar-many, cl--do-subst): Use "cl--" prefix.
* lisp/emacs-lisp/cl-extra.el: Use lexical-binding.
(cl--mapcar-many, cl--map-keymap-recursively, cl--map-intervals)
(cl--map-overlays, cl--set-frame-visible-p, cl--progv-save)
(cl--progv-before, cl--progv-after, cl--finite-do, cl--set-getf)
(cl--do-remf, cl--do-prettyprint): Use "cl--" prefix.
* lisp/emacs-lisp/cl-seq.el: Use lexical-binding.
(cl--parsing-keywords, cl--check-key, cl--check-test-nokey)
(cl--check-test, cl--check-match): Use "cl--" prefix and backquotes.
(cl--alist, cl--sublis-rec, cl--nsublis-rec, cl--tree-equal-rec):
* lisp/emacs-lisp/cl-macs.el (cl--lambda-list-keywords): Use "cl--" prefix.
* lisp/edmacro.el (edmacro-mismatch): Simplify to remove dependence on
CL's internals.
2012-06-11 11:52:50 -04:00
|
|
|
(cl--parsing-keywords (:test :test-not :key :if :if-not) ()
|
|
|
|
(while (and cl-list (not (cl--check-test cl-item (car cl-list))))
|
1993-07-30 20:15:09 +00:00
|
|
|
(setq cl-list (cdr cl-list)))
|
|
|
|
cl-list)
|
2019-06-01 17:57:51 -07:00
|
|
|
(memql cl-item cl-list)))
|
2012-06-08 22:26:47 -04:00
|
|
|
(autoload 'cl--compiler-macro-member "cl-macs")
|
1993-07-30 20:15:09 +00:00
|
|
|
|
2007-06-27 18:59:03 +00:00
|
|
|
;;;###autoload
|
2012-06-03 21:05:17 -04:00
|
|
|
(defun cl-member-if (cl-pred cl-list &rest cl-keys)
|
1993-07-30 20:15:09 +00:00
|
|
|
"Find the first item satisfying PREDICATE in LIST.
|
|
|
|
Return the sublist of LIST whose car matches.
|
(reduce, fill, replace, remove*, remove-if, remove-if-not, delete*, delete-if,
delete-if-not, remove-duplicates, delete-duplicates, substitute, substitute-if,
substitute-if-not, nsubstitute, nsubstitute-if, nsubstitute-if-not, find,
find-if, find-if-not, position, position-if, position-if-not, count, count-if,
count-if-not, mismatch, search, sort*, stable-sort, merge, member*, member-if,
member-if-not, assoc*, assoc-if, assoc-if-not, rassoc*, rassoc-if,
rassoc-if-not, union, nunion, intersection, nintersection, set-difference,
nset-difference, set-exclusive-or, nset-exclusive-or, subsetp, subst-if,
subst-if-not, nsubst, nsubst-if, nsubst-if-not, sublis, nsublis, tree-equal):
Improve argument/docstring consistency.
2005-05-20 14:30:34 +00:00
|
|
|
\nKeywords supported: :key
|
|
|
|
\n(fn PREDICATE LIST [KEYWORD VALUE]...)"
|
Inline important-return-value declarations in cl-lib.el
These declarations are now properly added to 'cl-lib.el' itself, or to
'cl-loaddefs.el'. This means that they will now correctly show up
immediately when loading 'cl-lib.el', instead of only after 'cl-macs.el'
is pulled in by an autoload. C.f. Bug#76247.
I did not considered worth reproducing everywhere the list saying which
functions among the below belong to these two categories:
1. Functions that are side-effect-free except for the behavior of
functions passed as argument.
2. Functions that mutate and return a list.
AFAIU, this is not actionable with our current byte-compiler, i.e. we
can't add any extra declarations based on it. However, if the list
should be needed at some point, for example due to improvements in the
compiler, this commit will be where to find it. In the worst case, and
with more work, it's also deducible from the source code itself.
* lisp/emacs-lisp/cl-macs.el: Move important-return-value declarations
from here...
* lisp/emacs-lisp/cl-extra.el (cl-map, cl-maplist, cl-mapcan)
(cl-mapcon, cl-some, cl-every, cl-notany, cl-notevery, cl-nreconc):
* lisp/emacs-lisp/cl-lib.el (cl-mapcar, cl-adjoin, cl-subst):
* lisp/emacs-lisp/cl-seq.el (cl-reduce, cl-remove, cl-remove-if)
(cl-remove-if-not, cl-delete, cl-delete-if, cl-delete-if-not)
(cl-remove-duplicates, cl-delete-duplicates, cl-substitute)
(cl-substitute-if, cl-substitute-if-not, cl-nsubstitute)
(cl-nsubstitute-if, cl-nsubstitute-if-not, cl-find, cl-find-if)
(cl-find-if-not, cl-position, cl-position-if, cl-position-if-not)
(cl-count, cl-count-if, cl-count-if-not, cl-mismatch, cl-search)
(cl-sort, cl-stable-sort, cl-merge, cl-member, cl-member-if)
(cl-member-if-not, cl-assoc, cl-assoc-if, cl-assoc-if-not, cl-rassoc)
(cl-rassoc-if, cl-rassoc-if-not, cl-union, cl-nunion, cl-intersection)
(cl-nintersection, cl-set-difference, cl-nset-difference)
(cl-set-exclusive-or, cl-nset-exclusive-or, cl-subsetp, cl-subst-if)
(cl-subst-if-not, cl-nsubst, cl-nsubst-if, cl-nsubst-if-not, cl-sublis)
(cl-nsublis, cl-tree-equal): ...to have them inline here.
2025-02-14 22:46:07 +01:00
|
|
|
(declare (important-return-value t))
|
2012-06-03 21:05:17 -04:00
|
|
|
(apply 'cl-member nil cl-list :if cl-pred cl-keys))
|
1993-07-30 20:15:09 +00:00
|
|
|
|
2007-06-27 18:59:03 +00:00
|
|
|
;;;###autoload
|
2012-06-03 21:05:17 -04:00
|
|
|
(defun cl-member-if-not (cl-pred cl-list &rest cl-keys)
|
1993-07-30 20:15:09 +00:00
|
|
|
"Find the first item not satisfying PREDICATE in LIST.
|
|
|
|
Return the sublist of LIST whose car matches.
|
(reduce, fill, replace, remove*, remove-if, remove-if-not, delete*, delete-if,
delete-if-not, remove-duplicates, delete-duplicates, substitute, substitute-if,
substitute-if-not, nsubstitute, nsubstitute-if, nsubstitute-if-not, find,
find-if, find-if-not, position, position-if, position-if-not, count, count-if,
count-if-not, mismatch, search, sort*, stable-sort, merge, member*, member-if,
member-if-not, assoc*, assoc-if, assoc-if-not, rassoc*, rassoc-if,
rassoc-if-not, union, nunion, intersection, nintersection, set-difference,
nset-difference, set-exclusive-or, nset-exclusive-or, subsetp, subst-if,
subst-if-not, nsubst, nsubst-if, nsubst-if-not, sublis, nsublis, tree-equal):
Improve argument/docstring consistency.
2005-05-20 14:30:34 +00:00
|
|
|
\nKeywords supported: :key
|
|
|
|
\n(fn PREDICATE LIST [KEYWORD VALUE]...)"
|
Inline important-return-value declarations in cl-lib.el
These declarations are now properly added to 'cl-lib.el' itself, or to
'cl-loaddefs.el'. This means that they will now correctly show up
immediately when loading 'cl-lib.el', instead of only after 'cl-macs.el'
is pulled in by an autoload. C.f. Bug#76247.
I did not considered worth reproducing everywhere the list saying which
functions among the below belong to these two categories:
1. Functions that are side-effect-free except for the behavior of
functions passed as argument.
2. Functions that mutate and return a list.
AFAIU, this is not actionable with our current byte-compiler, i.e. we
can't add any extra declarations based on it. However, if the list
should be needed at some point, for example due to improvements in the
compiler, this commit will be where to find it. In the worst case, and
with more work, it's also deducible from the source code itself.
* lisp/emacs-lisp/cl-macs.el: Move important-return-value declarations
from here...
* lisp/emacs-lisp/cl-extra.el (cl-map, cl-maplist, cl-mapcan)
(cl-mapcon, cl-some, cl-every, cl-notany, cl-notevery, cl-nreconc):
* lisp/emacs-lisp/cl-lib.el (cl-mapcar, cl-adjoin, cl-subst):
* lisp/emacs-lisp/cl-seq.el (cl-reduce, cl-remove, cl-remove-if)
(cl-remove-if-not, cl-delete, cl-delete-if, cl-delete-if-not)
(cl-remove-duplicates, cl-delete-duplicates, cl-substitute)
(cl-substitute-if, cl-substitute-if-not, cl-nsubstitute)
(cl-nsubstitute-if, cl-nsubstitute-if-not, cl-find, cl-find-if)
(cl-find-if-not, cl-position, cl-position-if, cl-position-if-not)
(cl-count, cl-count-if, cl-count-if-not, cl-mismatch, cl-search)
(cl-sort, cl-stable-sort, cl-merge, cl-member, cl-member-if)
(cl-member-if-not, cl-assoc, cl-assoc-if, cl-assoc-if-not, cl-rassoc)
(cl-rassoc-if, cl-rassoc-if-not, cl-union, cl-nunion, cl-intersection)
(cl-nintersection, cl-set-difference, cl-nset-difference)
(cl-set-exclusive-or, cl-nset-exclusive-or, cl-subsetp, cl-subst-if)
(cl-subst-if-not, cl-nsubst, cl-nsubst-if, cl-nsubst-if-not, cl-sublis)
(cl-nsublis, cl-tree-equal): ...to have them inline here.
2025-02-14 22:46:07 +01:00
|
|
|
(declare (important-return-value t))
|
2012-06-03 21:05:17 -04:00
|
|
|
(apply 'cl-member nil cl-list :if-not cl-pred cl-keys))
|
1993-07-30 20:15:09 +00:00
|
|
|
|
2007-06-27 18:59:03 +00:00
|
|
|
;;;###autoload
|
2012-05-17 16:04:56 -04:00
|
|
|
(defun cl--adjoin (cl-item cl-list &rest cl-keys)
|
Use lexical-binding for all of CL, and clean up its namespace.
* lisp/emacs-lisp/cl-lib.el: Use lexical-binding.
(cl-map-extents, cl-maclisp-member): Remove.
(cl--set-elt, cl--set-nthcdr, cl--set-buffer-substring)
(cl--set-substring, cl--block-wrapper, cl--block-throw)
(cl--compiling-file, cl--mapcar-many, cl--do-subst): Use "cl--" prefix.
* lisp/emacs-lisp/cl-extra.el: Use lexical-binding.
(cl--mapcar-many, cl--map-keymap-recursively, cl--map-intervals)
(cl--map-overlays, cl--set-frame-visible-p, cl--progv-save)
(cl--progv-before, cl--progv-after, cl--finite-do, cl--set-getf)
(cl--do-remf, cl--do-prettyprint): Use "cl--" prefix.
* lisp/emacs-lisp/cl-seq.el: Use lexical-binding.
(cl--parsing-keywords, cl--check-key, cl--check-test-nokey)
(cl--check-test, cl--check-match): Use "cl--" prefix and backquotes.
(cl--alist, cl--sublis-rec, cl--nsublis-rec, cl--tree-equal-rec):
* lisp/emacs-lisp/cl-macs.el (cl--lambda-list-keywords): Use "cl--" prefix.
* lisp/edmacro.el (edmacro-mismatch): Simplify to remove dependence on
CL's internals.
2012-06-11 11:52:50 -04:00
|
|
|
(if (cl--parsing-keywords (:key) t
|
|
|
|
(apply 'cl-member (cl--check-key cl-item) cl-list cl-keys))
|
1993-07-30 20:15:09 +00:00
|
|
|
cl-list
|
|
|
|
(cons cl-item cl-list)))
|
|
|
|
|
2007-06-27 18:59:03 +00:00
|
|
|
;;;###autoload
|
2012-06-03 21:05:17 -04:00
|
|
|
(defun cl-assoc (cl-item cl-alist &rest cl-keys)
|
1993-07-30 20:15:09 +00:00
|
|
|
"Find the first item whose car matches ITEM in LIST.
|
(reduce, fill, replace, remove*, remove-if, remove-if-not, delete*, delete-if,
delete-if-not, remove-duplicates, delete-duplicates, substitute, substitute-if,
substitute-if-not, nsubstitute, nsubstitute-if, nsubstitute-if-not, find,
find-if, find-if-not, position, position-if, position-if-not, count, count-if,
count-if-not, mismatch, search, sort*, stable-sort, merge, member*, member-if,
member-if-not, assoc*, assoc-if, assoc-if-not, rassoc*, rassoc-if,
rassoc-if-not, union, nunion, intersection, nintersection, set-difference,
nset-difference, set-exclusive-or, nset-exclusive-or, subsetp, subst-if,
subst-if-not, nsubst, nsubst-if, nsubst-if-not, sublis, nsublis, tree-equal):
Improve argument/docstring consistency.
2005-05-20 14:30:34 +00:00
|
|
|
\nKeywords supported: :test :test-not :key
|
|
|
|
\n(fn ITEM LIST [KEYWORD VALUE]...)"
|
Inline important-return-value declarations in cl-lib.el
These declarations are now properly added to 'cl-lib.el' itself, or to
'cl-loaddefs.el'. This means that they will now correctly show up
immediately when loading 'cl-lib.el', instead of only after 'cl-macs.el'
is pulled in by an autoload. C.f. Bug#76247.
I did not considered worth reproducing everywhere the list saying which
functions among the below belong to these two categories:
1. Functions that are side-effect-free except for the behavior of
functions passed as argument.
2. Functions that mutate and return a list.
AFAIU, this is not actionable with our current byte-compiler, i.e. we
can't add any extra declarations based on it. However, if the list
should be needed at some point, for example due to improvements in the
compiler, this commit will be where to find it. In the worst case, and
with more work, it's also deducible from the source code itself.
* lisp/emacs-lisp/cl-macs.el: Move important-return-value declarations
from here...
* lisp/emacs-lisp/cl-extra.el (cl-map, cl-maplist, cl-mapcan)
(cl-mapcon, cl-some, cl-every, cl-notany, cl-notevery, cl-nreconc):
* lisp/emacs-lisp/cl-lib.el (cl-mapcar, cl-adjoin, cl-subst):
* lisp/emacs-lisp/cl-seq.el (cl-reduce, cl-remove, cl-remove-if)
(cl-remove-if-not, cl-delete, cl-delete-if, cl-delete-if-not)
(cl-remove-duplicates, cl-delete-duplicates, cl-substitute)
(cl-substitute-if, cl-substitute-if-not, cl-nsubstitute)
(cl-nsubstitute-if, cl-nsubstitute-if-not, cl-find, cl-find-if)
(cl-find-if-not, cl-position, cl-position-if, cl-position-if-not)
(cl-count, cl-count-if, cl-count-if-not, cl-mismatch, cl-search)
(cl-sort, cl-stable-sort, cl-merge, cl-member, cl-member-if)
(cl-member-if-not, cl-assoc, cl-assoc-if, cl-assoc-if-not, cl-rassoc)
(cl-rassoc-if, cl-rassoc-if-not, cl-union, cl-nunion, cl-intersection)
(cl-nintersection, cl-set-difference, cl-nset-difference)
(cl-set-exclusive-or, cl-nset-exclusive-or, cl-subsetp, cl-subst-if)
(cl-subst-if-not, cl-nsubst, cl-nsubst-if, cl-nsubst-if-not, cl-sublis)
(cl-nsublis, cl-tree-equal): ...to have them inline here.
2025-02-14 22:46:07 +01:00
|
|
|
(declare (important-return-value t)
|
|
|
|
(compiler-macro cl--compiler-macro-assoc))
|
1993-07-30 20:15:09 +00:00
|
|
|
(if cl-keys
|
Use lexical-binding for all of CL, and clean up its namespace.
* lisp/emacs-lisp/cl-lib.el: Use lexical-binding.
(cl-map-extents, cl-maclisp-member): Remove.
(cl--set-elt, cl--set-nthcdr, cl--set-buffer-substring)
(cl--set-substring, cl--block-wrapper, cl--block-throw)
(cl--compiling-file, cl--mapcar-many, cl--do-subst): Use "cl--" prefix.
* lisp/emacs-lisp/cl-extra.el: Use lexical-binding.
(cl--mapcar-many, cl--map-keymap-recursively, cl--map-intervals)
(cl--map-overlays, cl--set-frame-visible-p, cl--progv-save)
(cl--progv-before, cl--progv-after, cl--finite-do, cl--set-getf)
(cl--do-remf, cl--do-prettyprint): Use "cl--" prefix.
* lisp/emacs-lisp/cl-seq.el: Use lexical-binding.
(cl--parsing-keywords, cl--check-key, cl--check-test-nokey)
(cl--check-test, cl--check-match): Use "cl--" prefix and backquotes.
(cl--alist, cl--sublis-rec, cl--nsublis-rec, cl--tree-equal-rec):
* lisp/emacs-lisp/cl-macs.el (cl--lambda-list-keywords): Use "cl--" prefix.
* lisp/edmacro.el (edmacro-mismatch): Simplify to remove dependence on
CL's internals.
2012-06-11 11:52:50 -04:00
|
|
|
(cl--parsing-keywords (:test :test-not :key :if :if-not) ()
|
1993-07-30 20:15:09 +00:00
|
|
|
(while (and cl-alist
|
|
|
|
(or (not (consp (car cl-alist)))
|
Use lexical-binding for all of CL, and clean up its namespace.
* lisp/emacs-lisp/cl-lib.el: Use lexical-binding.
(cl-map-extents, cl-maclisp-member): Remove.
(cl--set-elt, cl--set-nthcdr, cl--set-buffer-substring)
(cl--set-substring, cl--block-wrapper, cl--block-throw)
(cl--compiling-file, cl--mapcar-many, cl--do-subst): Use "cl--" prefix.
* lisp/emacs-lisp/cl-extra.el: Use lexical-binding.
(cl--mapcar-many, cl--map-keymap-recursively, cl--map-intervals)
(cl--map-overlays, cl--set-frame-visible-p, cl--progv-save)
(cl--progv-before, cl--progv-after, cl--finite-do, cl--set-getf)
(cl--do-remf, cl--do-prettyprint): Use "cl--" prefix.
* lisp/emacs-lisp/cl-seq.el: Use lexical-binding.
(cl--parsing-keywords, cl--check-key, cl--check-test-nokey)
(cl--check-test, cl--check-match): Use "cl--" prefix and backquotes.
(cl--alist, cl--sublis-rec, cl--nsublis-rec, cl--tree-equal-rec):
* lisp/emacs-lisp/cl-macs.el (cl--lambda-list-keywords): Use "cl--" prefix.
* lisp/edmacro.el (edmacro-mismatch): Simplify to remove dependence on
CL's internals.
2012-06-11 11:52:50 -04:00
|
|
|
(not (cl--check-test cl-item (car (car cl-alist))))))
|
1993-07-30 20:15:09 +00:00
|
|
|
(setq cl-alist (cdr cl-alist)))
|
|
|
|
(and cl-alist (car cl-alist)))
|
2019-06-01 18:12:31 -07:00
|
|
|
(if (and (numberp cl-item) (not (fixnump cl-item)))
|
1993-07-30 20:15:09 +00:00
|
|
|
(assoc cl-item cl-alist)
|
|
|
|
(assq cl-item cl-alist))))
|
2012-06-08 22:26:47 -04:00
|
|
|
(autoload 'cl--compiler-macro-assoc "cl-macs")
|
1993-07-30 20:15:09 +00:00
|
|
|
|
2007-06-27 18:59:03 +00:00
|
|
|
;;;###autoload
|
2012-06-03 21:05:17 -04:00
|
|
|
(defun cl-assoc-if (cl-pred cl-list &rest cl-keys)
|
1993-07-30 20:15:09 +00:00
|
|
|
"Find the first item whose car satisfies PREDICATE in LIST.
|
(reduce, fill, replace, remove*, remove-if, remove-if-not, delete*, delete-if,
delete-if-not, remove-duplicates, delete-duplicates, substitute, substitute-if,
substitute-if-not, nsubstitute, nsubstitute-if, nsubstitute-if-not, find,
find-if, find-if-not, position, position-if, position-if-not, count, count-if,
count-if-not, mismatch, search, sort*, stable-sort, merge, member*, member-if,
member-if-not, assoc*, assoc-if, assoc-if-not, rassoc*, rassoc-if,
rassoc-if-not, union, nunion, intersection, nintersection, set-difference,
nset-difference, set-exclusive-or, nset-exclusive-or, subsetp, subst-if,
subst-if-not, nsubst, nsubst-if, nsubst-if-not, sublis, nsublis, tree-equal):
Improve argument/docstring consistency.
2005-05-20 14:30:34 +00:00
|
|
|
\nKeywords supported: :key
|
|
|
|
\n(fn PREDICATE LIST [KEYWORD VALUE]...)"
|
Inline important-return-value declarations in cl-lib.el
These declarations are now properly added to 'cl-lib.el' itself, or to
'cl-loaddefs.el'. This means that they will now correctly show up
immediately when loading 'cl-lib.el', instead of only after 'cl-macs.el'
is pulled in by an autoload. C.f. Bug#76247.
I did not considered worth reproducing everywhere the list saying which
functions among the below belong to these two categories:
1. Functions that are side-effect-free except for the behavior of
functions passed as argument.
2. Functions that mutate and return a list.
AFAIU, this is not actionable with our current byte-compiler, i.e. we
can't add any extra declarations based on it. However, if the list
should be needed at some point, for example due to improvements in the
compiler, this commit will be where to find it. In the worst case, and
with more work, it's also deducible from the source code itself.
* lisp/emacs-lisp/cl-macs.el: Move important-return-value declarations
from here...
* lisp/emacs-lisp/cl-extra.el (cl-map, cl-maplist, cl-mapcan)
(cl-mapcon, cl-some, cl-every, cl-notany, cl-notevery, cl-nreconc):
* lisp/emacs-lisp/cl-lib.el (cl-mapcar, cl-adjoin, cl-subst):
* lisp/emacs-lisp/cl-seq.el (cl-reduce, cl-remove, cl-remove-if)
(cl-remove-if-not, cl-delete, cl-delete-if, cl-delete-if-not)
(cl-remove-duplicates, cl-delete-duplicates, cl-substitute)
(cl-substitute-if, cl-substitute-if-not, cl-nsubstitute)
(cl-nsubstitute-if, cl-nsubstitute-if-not, cl-find, cl-find-if)
(cl-find-if-not, cl-position, cl-position-if, cl-position-if-not)
(cl-count, cl-count-if, cl-count-if-not, cl-mismatch, cl-search)
(cl-sort, cl-stable-sort, cl-merge, cl-member, cl-member-if)
(cl-member-if-not, cl-assoc, cl-assoc-if, cl-assoc-if-not, cl-rassoc)
(cl-rassoc-if, cl-rassoc-if-not, cl-union, cl-nunion, cl-intersection)
(cl-nintersection, cl-set-difference, cl-nset-difference)
(cl-set-exclusive-or, cl-nset-exclusive-or, cl-subsetp, cl-subst-if)
(cl-subst-if-not, cl-nsubst, cl-nsubst-if, cl-nsubst-if-not, cl-sublis)
(cl-nsublis, cl-tree-equal): ...to have them inline here.
2025-02-14 22:46:07 +01:00
|
|
|
(declare (important-return-value t))
|
2012-06-03 21:05:17 -04:00
|
|
|
(apply 'cl-assoc nil cl-list :if cl-pred cl-keys))
|
1993-07-30 20:15:09 +00:00
|
|
|
|
2007-06-27 18:59:03 +00:00
|
|
|
;;;###autoload
|
2012-06-03 21:05:17 -04:00
|
|
|
(defun cl-assoc-if-not (cl-pred cl-list &rest cl-keys)
|
1993-07-30 20:15:09 +00:00
|
|
|
"Find the first item whose car does not satisfy PREDICATE in LIST.
|
(reduce, fill, replace, remove*, remove-if, remove-if-not, delete*, delete-if,
delete-if-not, remove-duplicates, delete-duplicates, substitute, substitute-if,
substitute-if-not, nsubstitute, nsubstitute-if, nsubstitute-if-not, find,
find-if, find-if-not, position, position-if, position-if-not, count, count-if,
count-if-not, mismatch, search, sort*, stable-sort, merge, member*, member-if,
member-if-not, assoc*, assoc-if, assoc-if-not, rassoc*, rassoc-if,
rassoc-if-not, union, nunion, intersection, nintersection, set-difference,
nset-difference, set-exclusive-or, nset-exclusive-or, subsetp, subst-if,
subst-if-not, nsubst, nsubst-if, nsubst-if-not, sublis, nsublis, tree-equal):
Improve argument/docstring consistency.
2005-05-20 14:30:34 +00:00
|
|
|
\nKeywords supported: :key
|
|
|
|
\n(fn PREDICATE LIST [KEYWORD VALUE]...)"
|
Inline important-return-value declarations in cl-lib.el
These declarations are now properly added to 'cl-lib.el' itself, or to
'cl-loaddefs.el'. This means that they will now correctly show up
immediately when loading 'cl-lib.el', instead of only after 'cl-macs.el'
is pulled in by an autoload. C.f. Bug#76247.
I did not considered worth reproducing everywhere the list saying which
functions among the below belong to these two categories:
1. Functions that are side-effect-free except for the behavior of
functions passed as argument.
2. Functions that mutate and return a list.
AFAIU, this is not actionable with our current byte-compiler, i.e. we
can't add any extra declarations based on it. However, if the list
should be needed at some point, for example due to improvements in the
compiler, this commit will be where to find it. In the worst case, and
with more work, it's also deducible from the source code itself.
* lisp/emacs-lisp/cl-macs.el: Move important-return-value declarations
from here...
* lisp/emacs-lisp/cl-extra.el (cl-map, cl-maplist, cl-mapcan)
(cl-mapcon, cl-some, cl-every, cl-notany, cl-notevery, cl-nreconc):
* lisp/emacs-lisp/cl-lib.el (cl-mapcar, cl-adjoin, cl-subst):
* lisp/emacs-lisp/cl-seq.el (cl-reduce, cl-remove, cl-remove-if)
(cl-remove-if-not, cl-delete, cl-delete-if, cl-delete-if-not)
(cl-remove-duplicates, cl-delete-duplicates, cl-substitute)
(cl-substitute-if, cl-substitute-if-not, cl-nsubstitute)
(cl-nsubstitute-if, cl-nsubstitute-if-not, cl-find, cl-find-if)
(cl-find-if-not, cl-position, cl-position-if, cl-position-if-not)
(cl-count, cl-count-if, cl-count-if-not, cl-mismatch, cl-search)
(cl-sort, cl-stable-sort, cl-merge, cl-member, cl-member-if)
(cl-member-if-not, cl-assoc, cl-assoc-if, cl-assoc-if-not, cl-rassoc)
(cl-rassoc-if, cl-rassoc-if-not, cl-union, cl-nunion, cl-intersection)
(cl-nintersection, cl-set-difference, cl-nset-difference)
(cl-set-exclusive-or, cl-nset-exclusive-or, cl-subsetp, cl-subst-if)
(cl-subst-if-not, cl-nsubst, cl-nsubst-if, cl-nsubst-if-not, cl-sublis)
(cl-nsublis, cl-tree-equal): ...to have them inline here.
2025-02-14 22:46:07 +01:00
|
|
|
(declare (important-return-value t))
|
2012-06-03 21:05:17 -04:00
|
|
|
(apply 'cl-assoc nil cl-list :if-not cl-pred cl-keys))
|
1993-07-30 20:15:09 +00:00
|
|
|
|
2007-06-27 18:59:03 +00:00
|
|
|
;;;###autoload
|
2012-06-03 21:05:17 -04:00
|
|
|
(defun cl-rassoc (cl-item cl-alist &rest cl-keys)
|
1993-07-30 20:15:09 +00:00
|
|
|
"Find the first item whose cdr matches ITEM in LIST.
|
(reduce, fill, replace, remove*, remove-if, remove-if-not, delete*, delete-if,
delete-if-not, remove-duplicates, delete-duplicates, substitute, substitute-if,
substitute-if-not, nsubstitute, nsubstitute-if, nsubstitute-if-not, find,
find-if, find-if-not, position, position-if, position-if-not, count, count-if,
count-if-not, mismatch, search, sort*, stable-sort, merge, member*, member-if,
member-if-not, assoc*, assoc-if, assoc-if-not, rassoc*, rassoc-if,
rassoc-if-not, union, nunion, intersection, nintersection, set-difference,
nset-difference, set-exclusive-or, nset-exclusive-or, subsetp, subst-if,
subst-if-not, nsubst, nsubst-if, nsubst-if-not, sublis, nsublis, tree-equal):
Improve argument/docstring consistency.
2005-05-20 14:30:34 +00:00
|
|
|
\nKeywords supported: :test :test-not :key
|
|
|
|
\n(fn ITEM LIST [KEYWORD VALUE]...)"
|
Inline important-return-value declarations in cl-lib.el
These declarations are now properly added to 'cl-lib.el' itself, or to
'cl-loaddefs.el'. This means that they will now correctly show up
immediately when loading 'cl-lib.el', instead of only after 'cl-macs.el'
is pulled in by an autoload. C.f. Bug#76247.
I did not considered worth reproducing everywhere the list saying which
functions among the below belong to these two categories:
1. Functions that are side-effect-free except for the behavior of
functions passed as argument.
2. Functions that mutate and return a list.
AFAIU, this is not actionable with our current byte-compiler, i.e. we
can't add any extra declarations based on it. However, if the list
should be needed at some point, for example due to improvements in the
compiler, this commit will be where to find it. In the worst case, and
with more work, it's also deducible from the source code itself.
* lisp/emacs-lisp/cl-macs.el: Move important-return-value declarations
from here...
* lisp/emacs-lisp/cl-extra.el (cl-map, cl-maplist, cl-mapcan)
(cl-mapcon, cl-some, cl-every, cl-notany, cl-notevery, cl-nreconc):
* lisp/emacs-lisp/cl-lib.el (cl-mapcar, cl-adjoin, cl-subst):
* lisp/emacs-lisp/cl-seq.el (cl-reduce, cl-remove, cl-remove-if)
(cl-remove-if-not, cl-delete, cl-delete-if, cl-delete-if-not)
(cl-remove-duplicates, cl-delete-duplicates, cl-substitute)
(cl-substitute-if, cl-substitute-if-not, cl-nsubstitute)
(cl-nsubstitute-if, cl-nsubstitute-if-not, cl-find, cl-find-if)
(cl-find-if-not, cl-position, cl-position-if, cl-position-if-not)
(cl-count, cl-count-if, cl-count-if-not, cl-mismatch, cl-search)
(cl-sort, cl-stable-sort, cl-merge, cl-member, cl-member-if)
(cl-member-if-not, cl-assoc, cl-assoc-if, cl-assoc-if-not, cl-rassoc)
(cl-rassoc-if, cl-rassoc-if-not, cl-union, cl-nunion, cl-intersection)
(cl-nintersection, cl-set-difference, cl-nset-difference)
(cl-set-exclusive-or, cl-nset-exclusive-or, cl-subsetp, cl-subst-if)
(cl-subst-if-not, cl-nsubst, cl-nsubst-if, cl-nsubst-if-not, cl-sublis)
(cl-nsublis, cl-tree-equal): ...to have them inline here.
2025-02-14 22:46:07 +01:00
|
|
|
(declare (important-return-value t))
|
1993-07-30 20:15:09 +00:00
|
|
|
(if (or cl-keys (numberp cl-item))
|
Use lexical-binding for all of CL, and clean up its namespace.
* lisp/emacs-lisp/cl-lib.el: Use lexical-binding.
(cl-map-extents, cl-maclisp-member): Remove.
(cl--set-elt, cl--set-nthcdr, cl--set-buffer-substring)
(cl--set-substring, cl--block-wrapper, cl--block-throw)
(cl--compiling-file, cl--mapcar-many, cl--do-subst): Use "cl--" prefix.
* lisp/emacs-lisp/cl-extra.el: Use lexical-binding.
(cl--mapcar-many, cl--map-keymap-recursively, cl--map-intervals)
(cl--map-overlays, cl--set-frame-visible-p, cl--progv-save)
(cl--progv-before, cl--progv-after, cl--finite-do, cl--set-getf)
(cl--do-remf, cl--do-prettyprint): Use "cl--" prefix.
* lisp/emacs-lisp/cl-seq.el: Use lexical-binding.
(cl--parsing-keywords, cl--check-key, cl--check-test-nokey)
(cl--check-test, cl--check-match): Use "cl--" prefix and backquotes.
(cl--alist, cl--sublis-rec, cl--nsublis-rec, cl--tree-equal-rec):
* lisp/emacs-lisp/cl-macs.el (cl--lambda-list-keywords): Use "cl--" prefix.
* lisp/edmacro.el (edmacro-mismatch): Simplify to remove dependence on
CL's internals.
2012-06-11 11:52:50 -04:00
|
|
|
(cl--parsing-keywords (:test :test-not :key :if :if-not) ()
|
1993-07-30 20:15:09 +00:00
|
|
|
(while (and cl-alist
|
|
|
|
(or (not (consp (car cl-alist)))
|
Use lexical-binding for all of CL, and clean up its namespace.
* lisp/emacs-lisp/cl-lib.el: Use lexical-binding.
(cl-map-extents, cl-maclisp-member): Remove.
(cl--set-elt, cl--set-nthcdr, cl--set-buffer-substring)
(cl--set-substring, cl--block-wrapper, cl--block-throw)
(cl--compiling-file, cl--mapcar-many, cl--do-subst): Use "cl--" prefix.
* lisp/emacs-lisp/cl-extra.el: Use lexical-binding.
(cl--mapcar-many, cl--map-keymap-recursively, cl--map-intervals)
(cl--map-overlays, cl--set-frame-visible-p, cl--progv-save)
(cl--progv-before, cl--progv-after, cl--finite-do, cl--set-getf)
(cl--do-remf, cl--do-prettyprint): Use "cl--" prefix.
* lisp/emacs-lisp/cl-seq.el: Use lexical-binding.
(cl--parsing-keywords, cl--check-key, cl--check-test-nokey)
(cl--check-test, cl--check-match): Use "cl--" prefix and backquotes.
(cl--alist, cl--sublis-rec, cl--nsublis-rec, cl--tree-equal-rec):
* lisp/emacs-lisp/cl-macs.el (cl--lambda-list-keywords): Use "cl--" prefix.
* lisp/edmacro.el (edmacro-mismatch): Simplify to remove dependence on
CL's internals.
2012-06-11 11:52:50 -04:00
|
|
|
(not (cl--check-test cl-item (cdr (car cl-alist))))))
|
1993-07-30 20:15:09 +00:00
|
|
|
(setq cl-alist (cdr cl-alist)))
|
|
|
|
(and cl-alist (car cl-alist)))
|
|
|
|
(rassq cl-item cl-alist)))
|
|
|
|
|
2007-06-27 18:59:03 +00:00
|
|
|
;;;###autoload
|
2012-06-03 21:05:17 -04:00
|
|
|
(defun cl-rassoc-if (cl-pred cl-list &rest cl-keys)
|
1993-07-30 20:15:09 +00:00
|
|
|
"Find the first item whose cdr satisfies PREDICATE in LIST.
|
(reduce, fill, replace, remove*, remove-if, remove-if-not, delete*, delete-if,
delete-if-not, remove-duplicates, delete-duplicates, substitute, substitute-if,
substitute-if-not, nsubstitute, nsubstitute-if, nsubstitute-if-not, find,
find-if, find-if-not, position, position-if, position-if-not, count, count-if,
count-if-not, mismatch, search, sort*, stable-sort, merge, member*, member-if,
member-if-not, assoc*, assoc-if, assoc-if-not, rassoc*, rassoc-if,
rassoc-if-not, union, nunion, intersection, nintersection, set-difference,
nset-difference, set-exclusive-or, nset-exclusive-or, subsetp, subst-if,
subst-if-not, nsubst, nsubst-if, nsubst-if-not, sublis, nsublis, tree-equal):
Improve argument/docstring consistency.
2005-05-20 14:30:34 +00:00
|
|
|
\nKeywords supported: :key
|
|
|
|
\n(fn PREDICATE LIST [KEYWORD VALUE]...)"
|
Inline important-return-value declarations in cl-lib.el
These declarations are now properly added to 'cl-lib.el' itself, or to
'cl-loaddefs.el'. This means that they will now correctly show up
immediately when loading 'cl-lib.el', instead of only after 'cl-macs.el'
is pulled in by an autoload. C.f. Bug#76247.
I did not considered worth reproducing everywhere the list saying which
functions among the below belong to these two categories:
1. Functions that are side-effect-free except for the behavior of
functions passed as argument.
2. Functions that mutate and return a list.
AFAIU, this is not actionable with our current byte-compiler, i.e. we
can't add any extra declarations based on it. However, if the list
should be needed at some point, for example due to improvements in the
compiler, this commit will be where to find it. In the worst case, and
with more work, it's also deducible from the source code itself.
* lisp/emacs-lisp/cl-macs.el: Move important-return-value declarations
from here...
* lisp/emacs-lisp/cl-extra.el (cl-map, cl-maplist, cl-mapcan)
(cl-mapcon, cl-some, cl-every, cl-notany, cl-notevery, cl-nreconc):
* lisp/emacs-lisp/cl-lib.el (cl-mapcar, cl-adjoin, cl-subst):
* lisp/emacs-lisp/cl-seq.el (cl-reduce, cl-remove, cl-remove-if)
(cl-remove-if-not, cl-delete, cl-delete-if, cl-delete-if-not)
(cl-remove-duplicates, cl-delete-duplicates, cl-substitute)
(cl-substitute-if, cl-substitute-if-not, cl-nsubstitute)
(cl-nsubstitute-if, cl-nsubstitute-if-not, cl-find, cl-find-if)
(cl-find-if-not, cl-position, cl-position-if, cl-position-if-not)
(cl-count, cl-count-if, cl-count-if-not, cl-mismatch, cl-search)
(cl-sort, cl-stable-sort, cl-merge, cl-member, cl-member-if)
(cl-member-if-not, cl-assoc, cl-assoc-if, cl-assoc-if-not, cl-rassoc)
(cl-rassoc-if, cl-rassoc-if-not, cl-union, cl-nunion, cl-intersection)
(cl-nintersection, cl-set-difference, cl-nset-difference)
(cl-set-exclusive-or, cl-nset-exclusive-or, cl-subsetp, cl-subst-if)
(cl-subst-if-not, cl-nsubst, cl-nsubst-if, cl-nsubst-if-not, cl-sublis)
(cl-nsublis, cl-tree-equal): ...to have them inline here.
2025-02-14 22:46:07 +01:00
|
|
|
(declare (important-return-value t))
|
2012-06-03 21:05:17 -04:00
|
|
|
(apply 'cl-rassoc nil cl-list :if cl-pred cl-keys))
|
1993-07-30 20:15:09 +00:00
|
|
|
|
2007-06-27 18:59:03 +00:00
|
|
|
;;;###autoload
|
2012-06-03 21:05:17 -04:00
|
|
|
(defun cl-rassoc-if-not (cl-pred cl-list &rest cl-keys)
|
1993-07-30 20:15:09 +00:00
|
|
|
"Find the first item whose cdr does not satisfy PREDICATE in LIST.
|
(reduce, fill, replace, remove*, remove-if, remove-if-not, delete*, delete-if,
delete-if-not, remove-duplicates, delete-duplicates, substitute, substitute-if,
substitute-if-not, nsubstitute, nsubstitute-if, nsubstitute-if-not, find,
find-if, find-if-not, position, position-if, position-if-not, count, count-if,
count-if-not, mismatch, search, sort*, stable-sort, merge, member*, member-if,
member-if-not, assoc*, assoc-if, assoc-if-not, rassoc*, rassoc-if,
rassoc-if-not, union, nunion, intersection, nintersection, set-difference,
nset-difference, set-exclusive-or, nset-exclusive-or, subsetp, subst-if,
subst-if-not, nsubst, nsubst-if, nsubst-if-not, sublis, nsublis, tree-equal):
Improve argument/docstring consistency.
2005-05-20 14:30:34 +00:00
|
|
|
\nKeywords supported: :key
|
|
|
|
\n(fn PREDICATE LIST [KEYWORD VALUE]...)"
|
Inline important-return-value declarations in cl-lib.el
These declarations are now properly added to 'cl-lib.el' itself, or to
'cl-loaddefs.el'. This means that they will now correctly show up
immediately when loading 'cl-lib.el', instead of only after 'cl-macs.el'
is pulled in by an autoload. C.f. Bug#76247.
I did not considered worth reproducing everywhere the list saying which
functions among the below belong to these two categories:
1. Functions that are side-effect-free except for the behavior of
functions passed as argument.
2. Functions that mutate and return a list.
AFAIU, this is not actionable with our current byte-compiler, i.e. we
can't add any extra declarations based on it. However, if the list
should be needed at some point, for example due to improvements in the
compiler, this commit will be where to find it. In the worst case, and
with more work, it's also deducible from the source code itself.
* lisp/emacs-lisp/cl-macs.el: Move important-return-value declarations
from here...
* lisp/emacs-lisp/cl-extra.el (cl-map, cl-maplist, cl-mapcan)
(cl-mapcon, cl-some, cl-every, cl-notany, cl-notevery, cl-nreconc):
* lisp/emacs-lisp/cl-lib.el (cl-mapcar, cl-adjoin, cl-subst):
* lisp/emacs-lisp/cl-seq.el (cl-reduce, cl-remove, cl-remove-if)
(cl-remove-if-not, cl-delete, cl-delete-if, cl-delete-if-not)
(cl-remove-duplicates, cl-delete-duplicates, cl-substitute)
(cl-substitute-if, cl-substitute-if-not, cl-nsubstitute)
(cl-nsubstitute-if, cl-nsubstitute-if-not, cl-find, cl-find-if)
(cl-find-if-not, cl-position, cl-position-if, cl-position-if-not)
(cl-count, cl-count-if, cl-count-if-not, cl-mismatch, cl-search)
(cl-sort, cl-stable-sort, cl-merge, cl-member, cl-member-if)
(cl-member-if-not, cl-assoc, cl-assoc-if, cl-assoc-if-not, cl-rassoc)
(cl-rassoc-if, cl-rassoc-if-not, cl-union, cl-nunion, cl-intersection)
(cl-nintersection, cl-set-difference, cl-nset-difference)
(cl-set-exclusive-or, cl-nset-exclusive-or, cl-subsetp, cl-subst-if)
(cl-subst-if-not, cl-nsubst, cl-nsubst-if, cl-nsubst-if-not, cl-sublis)
(cl-nsublis, cl-tree-equal): ...to have them inline here.
2025-02-14 22:46:07 +01:00
|
|
|
(declare (important-return-value t))
|
2012-06-03 21:05:17 -04:00
|
|
|
(apply 'cl-rassoc nil cl-list :if-not cl-pred cl-keys))
|
1993-07-30 20:15:09 +00:00
|
|
|
|
2007-06-27 18:59:03 +00:00
|
|
|
;;;###autoload
|
2012-06-03 21:05:17 -04:00
|
|
|
(defun cl-union (cl-list1 cl-list2 &rest cl-keys)
|
1993-07-30 20:15:09 +00:00
|
|
|
"Combine LIST1 and LIST2 using a set-union operation.
|
2011-02-09 21:07:32 -08:00
|
|
|
The resulting list contains all items that appear in either LIST1 or LIST2.
|
1993-07-30 20:15:09 +00:00
|
|
|
This is a non-destructive function; it makes a copy of the data if necessary
|
|
|
|
to avoid corrupting the original LIST1 and LIST2.
|
(reduce, fill, replace, remove*, remove-if, remove-if-not, delete*, delete-if,
delete-if-not, remove-duplicates, delete-duplicates, substitute, substitute-if,
substitute-if-not, nsubstitute, nsubstitute-if, nsubstitute-if-not, find,
find-if, find-if-not, position, position-if, position-if-not, count, count-if,
count-if-not, mismatch, search, sort*, stable-sort, merge, member*, member-if,
member-if-not, assoc*, assoc-if, assoc-if-not, rassoc*, rassoc-if,
rassoc-if-not, union, nunion, intersection, nintersection, set-difference,
nset-difference, set-exclusive-or, nset-exclusive-or, subsetp, subst-if,
subst-if-not, nsubst, nsubst-if, nsubst-if-not, sublis, nsublis, tree-equal):
Improve argument/docstring consistency.
2005-05-20 14:30:34 +00:00
|
|
|
\nKeywords supported: :test :test-not :key
|
|
|
|
\n(fn LIST1 LIST2 [KEYWORD VALUE]...)"
|
Inline important-return-value declarations in cl-lib.el
These declarations are now properly added to 'cl-lib.el' itself, or to
'cl-loaddefs.el'. This means that they will now correctly show up
immediately when loading 'cl-lib.el', instead of only after 'cl-macs.el'
is pulled in by an autoload. C.f. Bug#76247.
I did not considered worth reproducing everywhere the list saying which
functions among the below belong to these two categories:
1. Functions that are side-effect-free except for the behavior of
functions passed as argument.
2. Functions that mutate and return a list.
AFAIU, this is not actionable with our current byte-compiler, i.e. we
can't add any extra declarations based on it. However, if the list
should be needed at some point, for example due to improvements in the
compiler, this commit will be where to find it. In the worst case, and
with more work, it's also deducible from the source code itself.
* lisp/emacs-lisp/cl-macs.el: Move important-return-value declarations
from here...
* lisp/emacs-lisp/cl-extra.el (cl-map, cl-maplist, cl-mapcan)
(cl-mapcon, cl-some, cl-every, cl-notany, cl-notevery, cl-nreconc):
* lisp/emacs-lisp/cl-lib.el (cl-mapcar, cl-adjoin, cl-subst):
* lisp/emacs-lisp/cl-seq.el (cl-reduce, cl-remove, cl-remove-if)
(cl-remove-if-not, cl-delete, cl-delete-if, cl-delete-if-not)
(cl-remove-duplicates, cl-delete-duplicates, cl-substitute)
(cl-substitute-if, cl-substitute-if-not, cl-nsubstitute)
(cl-nsubstitute-if, cl-nsubstitute-if-not, cl-find, cl-find-if)
(cl-find-if-not, cl-position, cl-position-if, cl-position-if-not)
(cl-count, cl-count-if, cl-count-if-not, cl-mismatch, cl-search)
(cl-sort, cl-stable-sort, cl-merge, cl-member, cl-member-if)
(cl-member-if-not, cl-assoc, cl-assoc-if, cl-assoc-if-not, cl-rassoc)
(cl-rassoc-if, cl-rassoc-if-not, cl-union, cl-nunion, cl-intersection)
(cl-nintersection, cl-set-difference, cl-nset-difference)
(cl-set-exclusive-or, cl-nset-exclusive-or, cl-subsetp, cl-subst-if)
(cl-subst-if-not, cl-nsubst, cl-nsubst-if, cl-nsubst-if-not, cl-sublis)
(cl-nsublis, cl-tree-equal): ...to have them inline here.
2025-02-14 22:46:07 +01:00
|
|
|
(declare (important-return-value t))
|
1993-07-30 20:15:09 +00:00
|
|
|
(cond ((null cl-list1) cl-list2) ((null cl-list2) cl-list1)
|
2016-02-23 14:38:30 +11:00
|
|
|
((and (not cl-keys) (equal cl-list1 cl-list2)) cl-list1)
|
1993-07-30 20:15:09 +00:00
|
|
|
(t
|
|
|
|
(or (>= (length cl-list1) (length cl-list2))
|
|
|
|
(setq cl-list1 (prog1 cl-list2 (setq cl-list2 cl-list1))))
|
|
|
|
(while cl-list2
|
|
|
|
(if (or cl-keys (numberp (car cl-list2)))
|
2012-12-06 16:29:29 -05:00
|
|
|
(setq cl-list1
|
|
|
|
(apply 'cl-adjoin (car cl-list2) cl-list1 cl-keys))
|
1993-07-30 20:15:09 +00:00
|
|
|
(or (memq (car cl-list2) cl-list1)
|
2002-09-27 22:19:22 +00:00
|
|
|
(push (car cl-list2) cl-list1)))
|
|
|
|
(pop cl-list2))
|
1993-07-30 20:15:09 +00:00
|
|
|
cl-list1)))
|
|
|
|
|
2007-06-27 18:59:03 +00:00
|
|
|
;;;###autoload
|
2012-06-03 21:05:17 -04:00
|
|
|
(defun cl-nunion (cl-list1 cl-list2 &rest cl-keys)
|
1993-07-30 20:15:09 +00:00
|
|
|
"Combine LIST1 and LIST2 using a set-union operation.
|
2011-02-09 21:07:32 -08:00
|
|
|
The resulting list contains all items that appear in either LIST1 or LIST2.
|
1993-07-30 20:15:09 +00:00
|
|
|
This is a destructive function; it reuses the storage of LIST1 and LIST2
|
|
|
|
whenever possible.
|
(reduce, fill, replace, remove*, remove-if, remove-if-not, delete*, delete-if,
delete-if-not, remove-duplicates, delete-duplicates, substitute, substitute-if,
substitute-if-not, nsubstitute, nsubstitute-if, nsubstitute-if-not, find,
find-if, find-if-not, position, position-if, position-if-not, count, count-if,
count-if-not, mismatch, search, sort*, stable-sort, merge, member*, member-if,
member-if-not, assoc*, assoc-if, assoc-if-not, rassoc*, rassoc-if,
rassoc-if-not, union, nunion, intersection, nintersection, set-difference,
nset-difference, set-exclusive-or, nset-exclusive-or, subsetp, subst-if,
subst-if-not, nsubst, nsubst-if, nsubst-if-not, sublis, nsublis, tree-equal):
Improve argument/docstring consistency.
2005-05-20 14:30:34 +00:00
|
|
|
\nKeywords supported: :test :test-not :key
|
|
|
|
\n(fn LIST1 LIST2 [KEYWORD VALUE]...)"
|
Inline important-return-value declarations in cl-lib.el
These declarations are now properly added to 'cl-lib.el' itself, or to
'cl-loaddefs.el'. This means that they will now correctly show up
immediately when loading 'cl-lib.el', instead of only after 'cl-macs.el'
is pulled in by an autoload. C.f. Bug#76247.
I did not considered worth reproducing everywhere the list saying which
functions among the below belong to these two categories:
1. Functions that are side-effect-free except for the behavior of
functions passed as argument.
2. Functions that mutate and return a list.
AFAIU, this is not actionable with our current byte-compiler, i.e. we
can't add any extra declarations based on it. However, if the list
should be needed at some point, for example due to improvements in the
compiler, this commit will be where to find it. In the worst case, and
with more work, it's also deducible from the source code itself.
* lisp/emacs-lisp/cl-macs.el: Move important-return-value declarations
from here...
* lisp/emacs-lisp/cl-extra.el (cl-map, cl-maplist, cl-mapcan)
(cl-mapcon, cl-some, cl-every, cl-notany, cl-notevery, cl-nreconc):
* lisp/emacs-lisp/cl-lib.el (cl-mapcar, cl-adjoin, cl-subst):
* lisp/emacs-lisp/cl-seq.el (cl-reduce, cl-remove, cl-remove-if)
(cl-remove-if-not, cl-delete, cl-delete-if, cl-delete-if-not)
(cl-remove-duplicates, cl-delete-duplicates, cl-substitute)
(cl-substitute-if, cl-substitute-if-not, cl-nsubstitute)
(cl-nsubstitute-if, cl-nsubstitute-if-not, cl-find, cl-find-if)
(cl-find-if-not, cl-position, cl-position-if, cl-position-if-not)
(cl-count, cl-count-if, cl-count-if-not, cl-mismatch, cl-search)
(cl-sort, cl-stable-sort, cl-merge, cl-member, cl-member-if)
(cl-member-if-not, cl-assoc, cl-assoc-if, cl-assoc-if-not, cl-rassoc)
(cl-rassoc-if, cl-rassoc-if-not, cl-union, cl-nunion, cl-intersection)
(cl-nintersection, cl-set-difference, cl-nset-difference)
(cl-set-exclusive-or, cl-nset-exclusive-or, cl-subsetp, cl-subst-if)
(cl-subst-if-not, cl-nsubst, cl-nsubst-if, cl-nsubst-if-not, cl-sublis)
(cl-nsublis, cl-tree-equal): ...to have them inline here.
2025-02-14 22:46:07 +01:00
|
|
|
(declare (important-return-value t))
|
1993-07-30 20:15:09 +00:00
|
|
|
(cond ((null cl-list1) cl-list2) ((null cl-list2) cl-list1)
|
2012-06-03 21:05:17 -04:00
|
|
|
(t (apply 'cl-union cl-list1 cl-list2 cl-keys))))
|
1993-07-30 20:15:09 +00:00
|
|
|
|
2007-06-27 18:59:03 +00:00
|
|
|
;;;###autoload
|
2012-06-03 21:05:17 -04:00
|
|
|
(defun cl-intersection (cl-list1 cl-list2 &rest cl-keys)
|
1993-07-30 20:15:09 +00:00
|
|
|
"Combine LIST1 and LIST2 using a set-intersection operation.
|
2011-02-09 21:07:32 -08:00
|
|
|
The resulting list contains all items that appear in both LIST1 and LIST2.
|
1993-07-30 20:15:09 +00:00
|
|
|
This is a non-destructive function; it makes a copy of the data if necessary
|
|
|
|
to avoid corrupting the original LIST1 and LIST2.
|
(reduce, fill, replace, remove*, remove-if, remove-if-not, delete*, delete-if,
delete-if-not, remove-duplicates, delete-duplicates, substitute, substitute-if,
substitute-if-not, nsubstitute, nsubstitute-if, nsubstitute-if-not, find,
find-if, find-if-not, position, position-if, position-if-not, count, count-if,
count-if-not, mismatch, search, sort*, stable-sort, merge, member*, member-if,
member-if-not, assoc*, assoc-if, assoc-if-not, rassoc*, rassoc-if,
rassoc-if-not, union, nunion, intersection, nintersection, set-difference,
nset-difference, set-exclusive-or, nset-exclusive-or, subsetp, subst-if,
subst-if-not, nsubst, nsubst-if, nsubst-if-not, sublis, nsublis, tree-equal):
Improve argument/docstring consistency.
2005-05-20 14:30:34 +00:00
|
|
|
\nKeywords supported: :test :test-not :key
|
|
|
|
\n(fn LIST1 LIST2 [KEYWORD VALUE]...)"
|
Inline important-return-value declarations in cl-lib.el
These declarations are now properly added to 'cl-lib.el' itself, or to
'cl-loaddefs.el'. This means that they will now correctly show up
immediately when loading 'cl-lib.el', instead of only after 'cl-macs.el'
is pulled in by an autoload. C.f. Bug#76247.
I did not considered worth reproducing everywhere the list saying which
functions among the below belong to these two categories:
1. Functions that are side-effect-free except for the behavior of
functions passed as argument.
2. Functions that mutate and return a list.
AFAIU, this is not actionable with our current byte-compiler, i.e. we
can't add any extra declarations based on it. However, if the list
should be needed at some point, for example due to improvements in the
compiler, this commit will be where to find it. In the worst case, and
with more work, it's also deducible from the source code itself.
* lisp/emacs-lisp/cl-macs.el: Move important-return-value declarations
from here...
* lisp/emacs-lisp/cl-extra.el (cl-map, cl-maplist, cl-mapcan)
(cl-mapcon, cl-some, cl-every, cl-notany, cl-notevery, cl-nreconc):
* lisp/emacs-lisp/cl-lib.el (cl-mapcar, cl-adjoin, cl-subst):
* lisp/emacs-lisp/cl-seq.el (cl-reduce, cl-remove, cl-remove-if)
(cl-remove-if-not, cl-delete, cl-delete-if, cl-delete-if-not)
(cl-remove-duplicates, cl-delete-duplicates, cl-substitute)
(cl-substitute-if, cl-substitute-if-not, cl-nsubstitute)
(cl-nsubstitute-if, cl-nsubstitute-if-not, cl-find, cl-find-if)
(cl-find-if-not, cl-position, cl-position-if, cl-position-if-not)
(cl-count, cl-count-if, cl-count-if-not, cl-mismatch, cl-search)
(cl-sort, cl-stable-sort, cl-merge, cl-member, cl-member-if)
(cl-member-if-not, cl-assoc, cl-assoc-if, cl-assoc-if-not, cl-rassoc)
(cl-rassoc-if, cl-rassoc-if-not, cl-union, cl-nunion, cl-intersection)
(cl-nintersection, cl-set-difference, cl-nset-difference)
(cl-set-exclusive-or, cl-nset-exclusive-or, cl-subsetp, cl-subst-if)
(cl-subst-if-not, cl-nsubst, cl-nsubst-if, cl-nsubst-if-not, cl-sublis)
(cl-nsublis, cl-tree-equal): ...to have them inline here.
2025-02-14 22:46:07 +01:00
|
|
|
(declare (important-return-value t))
|
1993-07-30 20:15:09 +00:00
|
|
|
(and cl-list1 cl-list2
|
|
|
|
(if (equal cl-list1 cl-list2) cl-list1
|
Use lexical-binding for all of CL, and clean up its namespace.
* lisp/emacs-lisp/cl-lib.el: Use lexical-binding.
(cl-map-extents, cl-maclisp-member): Remove.
(cl--set-elt, cl--set-nthcdr, cl--set-buffer-substring)
(cl--set-substring, cl--block-wrapper, cl--block-throw)
(cl--compiling-file, cl--mapcar-many, cl--do-subst): Use "cl--" prefix.
* lisp/emacs-lisp/cl-extra.el: Use lexical-binding.
(cl--mapcar-many, cl--map-keymap-recursively, cl--map-intervals)
(cl--map-overlays, cl--set-frame-visible-p, cl--progv-save)
(cl--progv-before, cl--progv-after, cl--finite-do, cl--set-getf)
(cl--do-remf, cl--do-prettyprint): Use "cl--" prefix.
* lisp/emacs-lisp/cl-seq.el: Use lexical-binding.
(cl--parsing-keywords, cl--check-key, cl--check-test-nokey)
(cl--check-test, cl--check-match): Use "cl--" prefix and backquotes.
(cl--alist, cl--sublis-rec, cl--nsublis-rec, cl--tree-equal-rec):
* lisp/emacs-lisp/cl-macs.el (cl--lambda-list-keywords): Use "cl--" prefix.
* lisp/edmacro.el (edmacro-mismatch): Simplify to remove dependence on
CL's internals.
2012-06-11 11:52:50 -04:00
|
|
|
(cl--parsing-keywords (:key) (:test :test-not)
|
1993-07-30 20:15:09 +00:00
|
|
|
(let ((cl-res nil))
|
|
|
|
(or (>= (length cl-list1) (length cl-list2))
|
|
|
|
(setq cl-list1 (prog1 cl-list2 (setq cl-list2 cl-list1))))
|
|
|
|
(while cl-list2
|
|
|
|
(if (if (or cl-keys (numberp (car cl-list2)))
|
Use lexical-binding for all of CL, and clean up its namespace.
* lisp/emacs-lisp/cl-lib.el: Use lexical-binding.
(cl-map-extents, cl-maclisp-member): Remove.
(cl--set-elt, cl--set-nthcdr, cl--set-buffer-substring)
(cl--set-substring, cl--block-wrapper, cl--block-throw)
(cl--compiling-file, cl--mapcar-many, cl--do-subst): Use "cl--" prefix.
* lisp/emacs-lisp/cl-extra.el: Use lexical-binding.
(cl--mapcar-many, cl--map-keymap-recursively, cl--map-intervals)
(cl--map-overlays, cl--set-frame-visible-p, cl--progv-save)
(cl--progv-before, cl--progv-after, cl--finite-do, cl--set-getf)
(cl--do-remf, cl--do-prettyprint): Use "cl--" prefix.
* lisp/emacs-lisp/cl-seq.el: Use lexical-binding.
(cl--parsing-keywords, cl--check-key, cl--check-test-nokey)
(cl--check-test, cl--check-match): Use "cl--" prefix and backquotes.
(cl--alist, cl--sublis-rec, cl--nsublis-rec, cl--tree-equal-rec):
* lisp/emacs-lisp/cl-macs.el (cl--lambda-list-keywords): Use "cl--" prefix.
* lisp/edmacro.el (edmacro-mismatch): Simplify to remove dependence on
CL's internals.
2012-06-11 11:52:50 -04:00
|
|
|
(apply 'cl-member (cl--check-key (car cl-list2))
|
1993-07-30 20:15:09 +00:00
|
|
|
cl-list1 cl-keys)
|
|
|
|
(memq (car cl-list2) cl-list1))
|
2002-09-27 22:19:22 +00:00
|
|
|
(push (car cl-list2) cl-res))
|
|
|
|
(pop cl-list2))
|
1993-07-30 20:15:09 +00:00
|
|
|
cl-res)))))
|
|
|
|
|
2007-06-27 18:59:03 +00:00
|
|
|
;;;###autoload
|
2012-06-03 21:05:17 -04:00
|
|
|
(defun cl-nintersection (cl-list1 cl-list2 &rest cl-keys)
|
1993-07-30 20:15:09 +00:00
|
|
|
"Combine LIST1 and LIST2 using a set-intersection operation.
|
2011-02-09 21:07:32 -08:00
|
|
|
The resulting list contains all items that appear in both LIST1 and LIST2.
|
2025-02-02 18:05:57 +01:00
|
|
|
This is a destructive function; it reuses the storage of LIST1 (but not
|
|
|
|
LIST2) whenever possible.
|
(reduce, fill, replace, remove*, remove-if, remove-if-not, delete*, delete-if,
delete-if-not, remove-duplicates, delete-duplicates, substitute, substitute-if,
substitute-if-not, nsubstitute, nsubstitute-if, nsubstitute-if-not, find,
find-if, find-if-not, position, position-if, position-if-not, count, count-if,
count-if-not, mismatch, search, sort*, stable-sort, merge, member*, member-if,
member-if-not, assoc*, assoc-if, assoc-if-not, rassoc*, rassoc-if,
rassoc-if-not, union, nunion, intersection, nintersection, set-difference,
nset-difference, set-exclusive-or, nset-exclusive-or, subsetp, subst-if,
subst-if-not, nsubst, nsubst-if, nsubst-if-not, sublis, nsublis, tree-equal):
Improve argument/docstring consistency.
2005-05-20 14:30:34 +00:00
|
|
|
\nKeywords supported: :test :test-not :key
|
|
|
|
\n(fn LIST1 LIST2 [KEYWORD VALUE]...)"
|
Inline important-return-value declarations in cl-lib.el
These declarations are now properly added to 'cl-lib.el' itself, or to
'cl-loaddefs.el'. This means that they will now correctly show up
immediately when loading 'cl-lib.el', instead of only after 'cl-macs.el'
is pulled in by an autoload. C.f. Bug#76247.
I did not considered worth reproducing everywhere the list saying which
functions among the below belong to these two categories:
1. Functions that are side-effect-free except for the behavior of
functions passed as argument.
2. Functions that mutate and return a list.
AFAIU, this is not actionable with our current byte-compiler, i.e. we
can't add any extra declarations based on it. However, if the list
should be needed at some point, for example due to improvements in the
compiler, this commit will be where to find it. In the worst case, and
with more work, it's also deducible from the source code itself.
* lisp/emacs-lisp/cl-macs.el: Move important-return-value declarations
from here...
* lisp/emacs-lisp/cl-extra.el (cl-map, cl-maplist, cl-mapcan)
(cl-mapcon, cl-some, cl-every, cl-notany, cl-notevery, cl-nreconc):
* lisp/emacs-lisp/cl-lib.el (cl-mapcar, cl-adjoin, cl-subst):
* lisp/emacs-lisp/cl-seq.el (cl-reduce, cl-remove, cl-remove-if)
(cl-remove-if-not, cl-delete, cl-delete-if, cl-delete-if-not)
(cl-remove-duplicates, cl-delete-duplicates, cl-substitute)
(cl-substitute-if, cl-substitute-if-not, cl-nsubstitute)
(cl-nsubstitute-if, cl-nsubstitute-if-not, cl-find, cl-find-if)
(cl-find-if-not, cl-position, cl-position-if, cl-position-if-not)
(cl-count, cl-count-if, cl-count-if-not, cl-mismatch, cl-search)
(cl-sort, cl-stable-sort, cl-merge, cl-member, cl-member-if)
(cl-member-if-not, cl-assoc, cl-assoc-if, cl-assoc-if-not, cl-rassoc)
(cl-rassoc-if, cl-rassoc-if-not, cl-union, cl-nunion, cl-intersection)
(cl-nintersection, cl-set-difference, cl-nset-difference)
(cl-set-exclusive-or, cl-nset-exclusive-or, cl-subsetp, cl-subst-if)
(cl-subst-if-not, cl-nsubst, cl-nsubst-if, cl-nsubst-if-not, cl-sublis)
(cl-nsublis, cl-tree-equal): ...to have them inline here.
2025-02-14 22:46:07 +01:00
|
|
|
(declare (important-return-value t))
|
2012-06-03 21:05:17 -04:00
|
|
|
(and cl-list1 cl-list2 (apply 'cl-intersection cl-list1 cl-list2 cl-keys)))
|
1993-07-30 20:15:09 +00:00
|
|
|
|
2007-06-27 18:59:03 +00:00
|
|
|
;;;###autoload
|
2012-06-03 21:05:17 -04:00
|
|
|
(defun cl-set-difference (cl-list1 cl-list2 &rest cl-keys)
|
1993-07-30 20:15:09 +00:00
|
|
|
"Combine LIST1 and LIST2 using a set-difference operation.
|
2011-02-09 21:07:32 -08:00
|
|
|
The resulting list contains all items that appear in LIST1 but not LIST2.
|
1993-07-30 20:15:09 +00:00
|
|
|
This is a non-destructive function; it makes a copy of the data if necessary
|
|
|
|
to avoid corrupting the original LIST1 and LIST2.
|
(reduce, fill, replace, remove*, remove-if, remove-if-not, delete*, delete-if,
delete-if-not, remove-duplicates, delete-duplicates, substitute, substitute-if,
substitute-if-not, nsubstitute, nsubstitute-if, nsubstitute-if-not, find,
find-if, find-if-not, position, position-if, position-if-not, count, count-if,
count-if-not, mismatch, search, sort*, stable-sort, merge, member*, member-if,
member-if-not, assoc*, assoc-if, assoc-if-not, rassoc*, rassoc-if,
rassoc-if-not, union, nunion, intersection, nintersection, set-difference,
nset-difference, set-exclusive-or, nset-exclusive-or, subsetp, subst-if,
subst-if-not, nsubst, nsubst-if, nsubst-if-not, sublis, nsublis, tree-equal):
Improve argument/docstring consistency.
2005-05-20 14:30:34 +00:00
|
|
|
\nKeywords supported: :test :test-not :key
|
|
|
|
\n(fn LIST1 LIST2 [KEYWORD VALUE]...)"
|
Inline important-return-value declarations in cl-lib.el
These declarations are now properly added to 'cl-lib.el' itself, or to
'cl-loaddefs.el'. This means that they will now correctly show up
immediately when loading 'cl-lib.el', instead of only after 'cl-macs.el'
is pulled in by an autoload. C.f. Bug#76247.
I did not considered worth reproducing everywhere the list saying which
functions among the below belong to these two categories:
1. Functions that are side-effect-free except for the behavior of
functions passed as argument.
2. Functions that mutate and return a list.
AFAIU, this is not actionable with our current byte-compiler, i.e. we
can't add any extra declarations based on it. However, if the list
should be needed at some point, for example due to improvements in the
compiler, this commit will be where to find it. In the worst case, and
with more work, it's also deducible from the source code itself.
* lisp/emacs-lisp/cl-macs.el: Move important-return-value declarations
from here...
* lisp/emacs-lisp/cl-extra.el (cl-map, cl-maplist, cl-mapcan)
(cl-mapcon, cl-some, cl-every, cl-notany, cl-notevery, cl-nreconc):
* lisp/emacs-lisp/cl-lib.el (cl-mapcar, cl-adjoin, cl-subst):
* lisp/emacs-lisp/cl-seq.el (cl-reduce, cl-remove, cl-remove-if)
(cl-remove-if-not, cl-delete, cl-delete-if, cl-delete-if-not)
(cl-remove-duplicates, cl-delete-duplicates, cl-substitute)
(cl-substitute-if, cl-substitute-if-not, cl-nsubstitute)
(cl-nsubstitute-if, cl-nsubstitute-if-not, cl-find, cl-find-if)
(cl-find-if-not, cl-position, cl-position-if, cl-position-if-not)
(cl-count, cl-count-if, cl-count-if-not, cl-mismatch, cl-search)
(cl-sort, cl-stable-sort, cl-merge, cl-member, cl-member-if)
(cl-member-if-not, cl-assoc, cl-assoc-if, cl-assoc-if-not, cl-rassoc)
(cl-rassoc-if, cl-rassoc-if-not, cl-union, cl-nunion, cl-intersection)
(cl-nintersection, cl-set-difference, cl-nset-difference)
(cl-set-exclusive-or, cl-nset-exclusive-or, cl-subsetp, cl-subst-if)
(cl-subst-if-not, cl-nsubst, cl-nsubst-if, cl-nsubst-if-not, cl-sublis)
(cl-nsublis, cl-tree-equal): ...to have them inline here.
2025-02-14 22:46:07 +01:00
|
|
|
(declare (important-return-value t))
|
1993-07-30 20:15:09 +00:00
|
|
|
(if (or (null cl-list1) (null cl-list2)) cl-list1
|
Use lexical-binding for all of CL, and clean up its namespace.
* lisp/emacs-lisp/cl-lib.el: Use lexical-binding.
(cl-map-extents, cl-maclisp-member): Remove.
(cl--set-elt, cl--set-nthcdr, cl--set-buffer-substring)
(cl--set-substring, cl--block-wrapper, cl--block-throw)
(cl--compiling-file, cl--mapcar-many, cl--do-subst): Use "cl--" prefix.
* lisp/emacs-lisp/cl-extra.el: Use lexical-binding.
(cl--mapcar-many, cl--map-keymap-recursively, cl--map-intervals)
(cl--map-overlays, cl--set-frame-visible-p, cl--progv-save)
(cl--progv-before, cl--progv-after, cl--finite-do, cl--set-getf)
(cl--do-remf, cl--do-prettyprint): Use "cl--" prefix.
* lisp/emacs-lisp/cl-seq.el: Use lexical-binding.
(cl--parsing-keywords, cl--check-key, cl--check-test-nokey)
(cl--check-test, cl--check-match): Use "cl--" prefix and backquotes.
(cl--alist, cl--sublis-rec, cl--nsublis-rec, cl--tree-equal-rec):
* lisp/emacs-lisp/cl-macs.el (cl--lambda-list-keywords): Use "cl--" prefix.
* lisp/edmacro.el (edmacro-mismatch): Simplify to remove dependence on
CL's internals.
2012-06-11 11:52:50 -04:00
|
|
|
(cl--parsing-keywords (:key) (:test :test-not)
|
1993-07-30 20:15:09 +00:00
|
|
|
(let ((cl-res nil))
|
|
|
|
(while cl-list1
|
|
|
|
(or (if (or cl-keys (numberp (car cl-list1)))
|
Use lexical-binding for all of CL, and clean up its namespace.
* lisp/emacs-lisp/cl-lib.el: Use lexical-binding.
(cl-map-extents, cl-maclisp-member): Remove.
(cl--set-elt, cl--set-nthcdr, cl--set-buffer-substring)
(cl--set-substring, cl--block-wrapper, cl--block-throw)
(cl--compiling-file, cl--mapcar-many, cl--do-subst): Use "cl--" prefix.
* lisp/emacs-lisp/cl-extra.el: Use lexical-binding.
(cl--mapcar-many, cl--map-keymap-recursively, cl--map-intervals)
(cl--map-overlays, cl--set-frame-visible-p, cl--progv-save)
(cl--progv-before, cl--progv-after, cl--finite-do, cl--set-getf)
(cl--do-remf, cl--do-prettyprint): Use "cl--" prefix.
* lisp/emacs-lisp/cl-seq.el: Use lexical-binding.
(cl--parsing-keywords, cl--check-key, cl--check-test-nokey)
(cl--check-test, cl--check-match): Use "cl--" prefix and backquotes.
(cl--alist, cl--sublis-rec, cl--nsublis-rec, cl--tree-equal-rec):
* lisp/emacs-lisp/cl-macs.el (cl--lambda-list-keywords): Use "cl--" prefix.
* lisp/edmacro.el (edmacro-mismatch): Simplify to remove dependence on
CL's internals.
2012-06-11 11:52:50 -04:00
|
|
|
(apply 'cl-member (cl--check-key (car cl-list1))
|
1993-07-30 20:15:09 +00:00
|
|
|
cl-list2 cl-keys)
|
|
|
|
(memq (car cl-list1) cl-list2))
|
2002-09-27 22:19:22 +00:00
|
|
|
(push (car cl-list1) cl-res))
|
|
|
|
(pop cl-list1))
|
2015-11-03 02:11:45 +02:00
|
|
|
(nreverse cl-res)))))
|
1993-07-30 20:15:09 +00:00
|
|
|
|
2007-06-27 18:59:03 +00:00
|
|
|
;;;###autoload
|
2012-06-03 21:05:17 -04:00
|
|
|
(defun cl-nset-difference (cl-list1 cl-list2 &rest cl-keys)
|
1993-07-30 20:15:09 +00:00
|
|
|
"Combine LIST1 and LIST2 using a set-difference operation.
|
2011-02-09 21:07:32 -08:00
|
|
|
The resulting list contains all items that appear in LIST1 but not LIST2.
|
2025-02-02 18:05:57 +01:00
|
|
|
This is a destructive function; it reuses the storage of LIST1 (but not
|
|
|
|
LIST2) whenever possible.
|
(reduce, fill, replace, remove*, remove-if, remove-if-not, delete*, delete-if,
delete-if-not, remove-duplicates, delete-duplicates, substitute, substitute-if,
substitute-if-not, nsubstitute, nsubstitute-if, nsubstitute-if-not, find,
find-if, find-if-not, position, position-if, position-if-not, count, count-if,
count-if-not, mismatch, search, sort*, stable-sort, merge, member*, member-if,
member-if-not, assoc*, assoc-if, assoc-if-not, rassoc*, rassoc-if,
rassoc-if-not, union, nunion, intersection, nintersection, set-difference,
nset-difference, set-exclusive-or, nset-exclusive-or, subsetp, subst-if,
subst-if-not, nsubst, nsubst-if, nsubst-if-not, sublis, nsublis, tree-equal):
Improve argument/docstring consistency.
2005-05-20 14:30:34 +00:00
|
|
|
\nKeywords supported: :test :test-not :key
|
|
|
|
\n(fn LIST1 LIST2 [KEYWORD VALUE]...)"
|
Inline important-return-value declarations in cl-lib.el
These declarations are now properly added to 'cl-lib.el' itself, or to
'cl-loaddefs.el'. This means that they will now correctly show up
immediately when loading 'cl-lib.el', instead of only after 'cl-macs.el'
is pulled in by an autoload. C.f. Bug#76247.
I did not considered worth reproducing everywhere the list saying which
functions among the below belong to these two categories:
1. Functions that are side-effect-free except for the behavior of
functions passed as argument.
2. Functions that mutate and return a list.
AFAIU, this is not actionable with our current byte-compiler, i.e. we
can't add any extra declarations based on it. However, if the list
should be needed at some point, for example due to improvements in the
compiler, this commit will be where to find it. In the worst case, and
with more work, it's also deducible from the source code itself.
* lisp/emacs-lisp/cl-macs.el: Move important-return-value declarations
from here...
* lisp/emacs-lisp/cl-extra.el (cl-map, cl-maplist, cl-mapcan)
(cl-mapcon, cl-some, cl-every, cl-notany, cl-notevery, cl-nreconc):
* lisp/emacs-lisp/cl-lib.el (cl-mapcar, cl-adjoin, cl-subst):
* lisp/emacs-lisp/cl-seq.el (cl-reduce, cl-remove, cl-remove-if)
(cl-remove-if-not, cl-delete, cl-delete-if, cl-delete-if-not)
(cl-remove-duplicates, cl-delete-duplicates, cl-substitute)
(cl-substitute-if, cl-substitute-if-not, cl-nsubstitute)
(cl-nsubstitute-if, cl-nsubstitute-if-not, cl-find, cl-find-if)
(cl-find-if-not, cl-position, cl-position-if, cl-position-if-not)
(cl-count, cl-count-if, cl-count-if-not, cl-mismatch, cl-search)
(cl-sort, cl-stable-sort, cl-merge, cl-member, cl-member-if)
(cl-member-if-not, cl-assoc, cl-assoc-if, cl-assoc-if-not, cl-rassoc)
(cl-rassoc-if, cl-rassoc-if-not, cl-union, cl-nunion, cl-intersection)
(cl-nintersection, cl-set-difference, cl-nset-difference)
(cl-set-exclusive-or, cl-nset-exclusive-or, cl-subsetp, cl-subst-if)
(cl-subst-if-not, cl-nsubst, cl-nsubst-if, cl-nsubst-if-not, cl-sublis)
(cl-nsublis, cl-tree-equal): ...to have them inline here.
2025-02-14 22:46:07 +01:00
|
|
|
(declare (important-return-value t))
|
1993-07-30 20:15:09 +00:00
|
|
|
(if (or (null cl-list1) (null cl-list2)) cl-list1
|
2012-06-03 21:05:17 -04:00
|
|
|
(apply 'cl-set-difference cl-list1 cl-list2 cl-keys)))
|
1993-07-30 20:15:09 +00:00
|
|
|
|
2007-06-27 18:59:03 +00:00
|
|
|
;;;###autoload
|
2012-06-03 21:05:17 -04:00
|
|
|
(defun cl-set-exclusive-or (cl-list1 cl-list2 &rest cl-keys)
|
1993-07-30 20:15:09 +00:00
|
|
|
"Combine LIST1 and LIST2 using a set-exclusive-or operation.
|
2011-02-09 21:07:32 -08:00
|
|
|
The resulting list contains all items appearing in exactly one of LIST1, LIST2.
|
1993-07-30 20:15:09 +00:00
|
|
|
This is a non-destructive function; it makes a copy of the data if necessary
|
|
|
|
to avoid corrupting the original LIST1 and LIST2.
|
(reduce, fill, replace, remove*, remove-if, remove-if-not, delete*, delete-if,
delete-if-not, remove-duplicates, delete-duplicates, substitute, substitute-if,
substitute-if-not, nsubstitute, nsubstitute-if, nsubstitute-if-not, find,
find-if, find-if-not, position, position-if, position-if-not, count, count-if,
count-if-not, mismatch, search, sort*, stable-sort, merge, member*, member-if,
member-if-not, assoc*, assoc-if, assoc-if-not, rassoc*, rassoc-if,
rassoc-if-not, union, nunion, intersection, nintersection, set-difference,
nset-difference, set-exclusive-or, nset-exclusive-or, subsetp, subst-if,
subst-if-not, nsubst, nsubst-if, nsubst-if-not, sublis, nsublis, tree-equal):
Improve argument/docstring consistency.
2005-05-20 14:30:34 +00:00
|
|
|
\nKeywords supported: :test :test-not :key
|
|
|
|
\n(fn LIST1 LIST2 [KEYWORD VALUE]...)"
|
Inline important-return-value declarations in cl-lib.el
These declarations are now properly added to 'cl-lib.el' itself, or to
'cl-loaddefs.el'. This means that they will now correctly show up
immediately when loading 'cl-lib.el', instead of only after 'cl-macs.el'
is pulled in by an autoload. C.f. Bug#76247.
I did not considered worth reproducing everywhere the list saying which
functions among the below belong to these two categories:
1. Functions that are side-effect-free except for the behavior of
functions passed as argument.
2. Functions that mutate and return a list.
AFAIU, this is not actionable with our current byte-compiler, i.e. we
can't add any extra declarations based on it. However, if the list
should be needed at some point, for example due to improvements in the
compiler, this commit will be where to find it. In the worst case, and
with more work, it's also deducible from the source code itself.
* lisp/emacs-lisp/cl-macs.el: Move important-return-value declarations
from here...
* lisp/emacs-lisp/cl-extra.el (cl-map, cl-maplist, cl-mapcan)
(cl-mapcon, cl-some, cl-every, cl-notany, cl-notevery, cl-nreconc):
* lisp/emacs-lisp/cl-lib.el (cl-mapcar, cl-adjoin, cl-subst):
* lisp/emacs-lisp/cl-seq.el (cl-reduce, cl-remove, cl-remove-if)
(cl-remove-if-not, cl-delete, cl-delete-if, cl-delete-if-not)
(cl-remove-duplicates, cl-delete-duplicates, cl-substitute)
(cl-substitute-if, cl-substitute-if-not, cl-nsubstitute)
(cl-nsubstitute-if, cl-nsubstitute-if-not, cl-find, cl-find-if)
(cl-find-if-not, cl-position, cl-position-if, cl-position-if-not)
(cl-count, cl-count-if, cl-count-if-not, cl-mismatch, cl-search)
(cl-sort, cl-stable-sort, cl-merge, cl-member, cl-member-if)
(cl-member-if-not, cl-assoc, cl-assoc-if, cl-assoc-if-not, cl-rassoc)
(cl-rassoc-if, cl-rassoc-if-not, cl-union, cl-nunion, cl-intersection)
(cl-nintersection, cl-set-difference, cl-nset-difference)
(cl-set-exclusive-or, cl-nset-exclusive-or, cl-subsetp, cl-subst-if)
(cl-subst-if-not, cl-nsubst, cl-nsubst-if, cl-nsubst-if-not, cl-sublis)
(cl-nsublis, cl-tree-equal): ...to have them inline here.
2025-02-14 22:46:07 +01:00
|
|
|
(declare (important-return-value t))
|
1993-07-30 20:15:09 +00:00
|
|
|
(cond ((null cl-list1) cl-list2) ((null cl-list2) cl-list1)
|
|
|
|
((equal cl-list1 cl-list2) nil)
|
2012-06-03 21:05:17 -04:00
|
|
|
(t (append (apply 'cl-set-difference cl-list1 cl-list2 cl-keys)
|
|
|
|
(apply 'cl-set-difference cl-list2 cl-list1 cl-keys)))))
|
1993-07-30 20:15:09 +00:00
|
|
|
|
2007-06-27 18:59:03 +00:00
|
|
|
;;;###autoload
|
2012-06-03 21:05:17 -04:00
|
|
|
(defun cl-nset-exclusive-or (cl-list1 cl-list2 &rest cl-keys)
|
1993-07-30 20:15:09 +00:00
|
|
|
"Combine LIST1 and LIST2 using a set-exclusive-or operation.
|
2011-02-09 21:07:32 -08:00
|
|
|
The resulting list contains all items appearing in exactly one of LIST1, LIST2.
|
1993-07-30 20:15:09 +00:00
|
|
|
This is a destructive function; it reuses the storage of LIST1 and LIST2
|
|
|
|
whenever possible.
|
(reduce, fill, replace, remove*, remove-if, remove-if-not, delete*, delete-if,
delete-if-not, remove-duplicates, delete-duplicates, substitute, substitute-if,
substitute-if-not, nsubstitute, nsubstitute-if, nsubstitute-if-not, find,
find-if, find-if-not, position, position-if, position-if-not, count, count-if,
count-if-not, mismatch, search, sort*, stable-sort, merge, member*, member-if,
member-if-not, assoc*, assoc-if, assoc-if-not, rassoc*, rassoc-if,
rassoc-if-not, union, nunion, intersection, nintersection, set-difference,
nset-difference, set-exclusive-or, nset-exclusive-or, subsetp, subst-if,
subst-if-not, nsubst, nsubst-if, nsubst-if-not, sublis, nsublis, tree-equal):
Improve argument/docstring consistency.
2005-05-20 14:30:34 +00:00
|
|
|
\nKeywords supported: :test :test-not :key
|
|
|
|
\n(fn LIST1 LIST2 [KEYWORD VALUE]...)"
|
Inline important-return-value declarations in cl-lib.el
These declarations are now properly added to 'cl-lib.el' itself, or to
'cl-loaddefs.el'. This means that they will now correctly show up
immediately when loading 'cl-lib.el', instead of only after 'cl-macs.el'
is pulled in by an autoload. C.f. Bug#76247.
I did not considered worth reproducing everywhere the list saying which
functions among the below belong to these two categories:
1. Functions that are side-effect-free except for the behavior of
functions passed as argument.
2. Functions that mutate and return a list.
AFAIU, this is not actionable with our current byte-compiler, i.e. we
can't add any extra declarations based on it. However, if the list
should be needed at some point, for example due to improvements in the
compiler, this commit will be where to find it. In the worst case, and
with more work, it's also deducible from the source code itself.
* lisp/emacs-lisp/cl-macs.el: Move important-return-value declarations
from here...
* lisp/emacs-lisp/cl-extra.el (cl-map, cl-maplist, cl-mapcan)
(cl-mapcon, cl-some, cl-every, cl-notany, cl-notevery, cl-nreconc):
* lisp/emacs-lisp/cl-lib.el (cl-mapcar, cl-adjoin, cl-subst):
* lisp/emacs-lisp/cl-seq.el (cl-reduce, cl-remove, cl-remove-if)
(cl-remove-if-not, cl-delete, cl-delete-if, cl-delete-if-not)
(cl-remove-duplicates, cl-delete-duplicates, cl-substitute)
(cl-substitute-if, cl-substitute-if-not, cl-nsubstitute)
(cl-nsubstitute-if, cl-nsubstitute-if-not, cl-find, cl-find-if)
(cl-find-if-not, cl-position, cl-position-if, cl-position-if-not)
(cl-count, cl-count-if, cl-count-if-not, cl-mismatch, cl-search)
(cl-sort, cl-stable-sort, cl-merge, cl-member, cl-member-if)
(cl-member-if-not, cl-assoc, cl-assoc-if, cl-assoc-if-not, cl-rassoc)
(cl-rassoc-if, cl-rassoc-if-not, cl-union, cl-nunion, cl-intersection)
(cl-nintersection, cl-set-difference, cl-nset-difference)
(cl-set-exclusive-or, cl-nset-exclusive-or, cl-subsetp, cl-subst-if)
(cl-subst-if-not, cl-nsubst, cl-nsubst-if, cl-nsubst-if-not, cl-sublis)
(cl-nsublis, cl-tree-equal): ...to have them inline here.
2025-02-14 22:46:07 +01:00
|
|
|
(declare (important-return-value t))
|
1993-07-30 20:15:09 +00:00
|
|
|
(cond ((null cl-list1) cl-list2) ((null cl-list2) cl-list1)
|
|
|
|
((equal cl-list1 cl-list2) nil)
|
2012-06-03 21:05:17 -04:00
|
|
|
(t (nconc (apply 'cl-nset-difference cl-list1 cl-list2 cl-keys)
|
|
|
|
(apply 'cl-nset-difference cl-list2 cl-list1 cl-keys)))))
|
1993-07-30 20:15:09 +00:00
|
|
|
|
2007-06-27 18:59:03 +00:00
|
|
|
;;;###autoload
|
2012-06-03 21:05:17 -04:00
|
|
|
(defun cl-subsetp (cl-list1 cl-list2 &rest cl-keys)
|
2005-05-17 00:28:50 +00:00
|
|
|
"Return true if LIST1 is a subset of LIST2.
|
1993-07-30 20:15:09 +00:00
|
|
|
I.e., if every element of LIST1 also appears in LIST2.
|
(reduce, fill, replace, remove*, remove-if, remove-if-not, delete*, delete-if,
delete-if-not, remove-duplicates, delete-duplicates, substitute, substitute-if,
substitute-if-not, nsubstitute, nsubstitute-if, nsubstitute-if-not, find,
find-if, find-if-not, position, position-if, position-if-not, count, count-if,
count-if-not, mismatch, search, sort*, stable-sort, merge, member*, member-if,
member-if-not, assoc*, assoc-if, assoc-if-not, rassoc*, rassoc-if,
rassoc-if-not, union, nunion, intersection, nintersection, set-difference,
nset-difference, set-exclusive-or, nset-exclusive-or, subsetp, subst-if,
subst-if-not, nsubst, nsubst-if, nsubst-if-not, sublis, nsublis, tree-equal):
Improve argument/docstring consistency.
2005-05-20 14:30:34 +00:00
|
|
|
\nKeywords supported: :test :test-not :key
|
|
|
|
\n(fn LIST1 LIST2 [KEYWORD VALUE]...)"
|
Inline important-return-value declarations in cl-lib.el
These declarations are now properly added to 'cl-lib.el' itself, or to
'cl-loaddefs.el'. This means that they will now correctly show up
immediately when loading 'cl-lib.el', instead of only after 'cl-macs.el'
is pulled in by an autoload. C.f. Bug#76247.
I did not considered worth reproducing everywhere the list saying which
functions among the below belong to these two categories:
1. Functions that are side-effect-free except for the behavior of
functions passed as argument.
2. Functions that mutate and return a list.
AFAIU, this is not actionable with our current byte-compiler, i.e. we
can't add any extra declarations based on it. However, if the list
should be needed at some point, for example due to improvements in the
compiler, this commit will be where to find it. In the worst case, and
with more work, it's also deducible from the source code itself.
* lisp/emacs-lisp/cl-macs.el: Move important-return-value declarations
from here...
* lisp/emacs-lisp/cl-extra.el (cl-map, cl-maplist, cl-mapcan)
(cl-mapcon, cl-some, cl-every, cl-notany, cl-notevery, cl-nreconc):
* lisp/emacs-lisp/cl-lib.el (cl-mapcar, cl-adjoin, cl-subst):
* lisp/emacs-lisp/cl-seq.el (cl-reduce, cl-remove, cl-remove-if)
(cl-remove-if-not, cl-delete, cl-delete-if, cl-delete-if-not)
(cl-remove-duplicates, cl-delete-duplicates, cl-substitute)
(cl-substitute-if, cl-substitute-if-not, cl-nsubstitute)
(cl-nsubstitute-if, cl-nsubstitute-if-not, cl-find, cl-find-if)
(cl-find-if-not, cl-position, cl-position-if, cl-position-if-not)
(cl-count, cl-count-if, cl-count-if-not, cl-mismatch, cl-search)
(cl-sort, cl-stable-sort, cl-merge, cl-member, cl-member-if)
(cl-member-if-not, cl-assoc, cl-assoc-if, cl-assoc-if-not, cl-rassoc)
(cl-rassoc-if, cl-rassoc-if-not, cl-union, cl-nunion, cl-intersection)
(cl-nintersection, cl-set-difference, cl-nset-difference)
(cl-set-exclusive-or, cl-nset-exclusive-or, cl-subsetp, cl-subst-if)
(cl-subst-if-not, cl-nsubst, cl-nsubst-if, cl-nsubst-if-not, cl-sublis)
(cl-nsublis, cl-tree-equal): ...to have them inline here.
2025-02-14 22:46:07 +01:00
|
|
|
(declare (important-return-value t))
|
1993-07-30 20:15:09 +00:00
|
|
|
(cond ((null cl-list1) t) ((null cl-list2) nil)
|
|
|
|
((equal cl-list1 cl-list2) t)
|
Use lexical-binding for all of CL, and clean up its namespace.
* lisp/emacs-lisp/cl-lib.el: Use lexical-binding.
(cl-map-extents, cl-maclisp-member): Remove.
(cl--set-elt, cl--set-nthcdr, cl--set-buffer-substring)
(cl--set-substring, cl--block-wrapper, cl--block-throw)
(cl--compiling-file, cl--mapcar-many, cl--do-subst): Use "cl--" prefix.
* lisp/emacs-lisp/cl-extra.el: Use lexical-binding.
(cl--mapcar-many, cl--map-keymap-recursively, cl--map-intervals)
(cl--map-overlays, cl--set-frame-visible-p, cl--progv-save)
(cl--progv-before, cl--progv-after, cl--finite-do, cl--set-getf)
(cl--do-remf, cl--do-prettyprint): Use "cl--" prefix.
* lisp/emacs-lisp/cl-seq.el: Use lexical-binding.
(cl--parsing-keywords, cl--check-key, cl--check-test-nokey)
(cl--check-test, cl--check-match): Use "cl--" prefix and backquotes.
(cl--alist, cl--sublis-rec, cl--nsublis-rec, cl--tree-equal-rec):
* lisp/emacs-lisp/cl-macs.el (cl--lambda-list-keywords): Use "cl--" prefix.
* lisp/edmacro.el (edmacro-mismatch): Simplify to remove dependence on
CL's internals.
2012-06-11 11:52:50 -04:00
|
|
|
(t (cl--parsing-keywords (:key) (:test :test-not)
|
1993-07-30 20:15:09 +00:00
|
|
|
(while (and cl-list1
|
Use lexical-binding for all of CL, and clean up its namespace.
* lisp/emacs-lisp/cl-lib.el: Use lexical-binding.
(cl-map-extents, cl-maclisp-member): Remove.
(cl--set-elt, cl--set-nthcdr, cl--set-buffer-substring)
(cl--set-substring, cl--block-wrapper, cl--block-throw)
(cl--compiling-file, cl--mapcar-many, cl--do-subst): Use "cl--" prefix.
* lisp/emacs-lisp/cl-extra.el: Use lexical-binding.
(cl--mapcar-many, cl--map-keymap-recursively, cl--map-intervals)
(cl--map-overlays, cl--set-frame-visible-p, cl--progv-save)
(cl--progv-before, cl--progv-after, cl--finite-do, cl--set-getf)
(cl--do-remf, cl--do-prettyprint): Use "cl--" prefix.
* lisp/emacs-lisp/cl-seq.el: Use lexical-binding.
(cl--parsing-keywords, cl--check-key, cl--check-test-nokey)
(cl--check-test, cl--check-match): Use "cl--" prefix and backquotes.
(cl--alist, cl--sublis-rec, cl--nsublis-rec, cl--tree-equal-rec):
* lisp/emacs-lisp/cl-macs.el (cl--lambda-list-keywords): Use "cl--" prefix.
* lisp/edmacro.el (edmacro-mismatch): Simplify to remove dependence on
CL's internals.
2012-06-11 11:52:50 -04:00
|
|
|
(apply 'cl-member (cl--check-key (car cl-list1))
|
1993-07-30 20:15:09 +00:00
|
|
|
cl-list2 cl-keys))
|
2002-09-27 22:19:22 +00:00
|
|
|
(pop cl-list1))
|
1993-07-30 20:15:09 +00:00
|
|
|
(null cl-list1)))))
|
|
|
|
|
2007-06-27 18:59:03 +00:00
|
|
|
;;;###autoload
|
2012-06-03 21:05:17 -04:00
|
|
|
(defun cl-subst-if (cl-new cl-pred cl-tree &rest cl-keys)
|
1993-07-30 20:15:09 +00:00
|
|
|
"Substitute NEW for elements matching PREDICATE in TREE (non-destructively).
|
|
|
|
Return a copy of TREE with all matching elements replaced by NEW.
|
(reduce, fill, replace, remove*, remove-if, remove-if-not, delete*, delete-if,
delete-if-not, remove-duplicates, delete-duplicates, substitute, substitute-if,
substitute-if-not, nsubstitute, nsubstitute-if, nsubstitute-if-not, find,
find-if, find-if-not, position, position-if, position-if-not, count, count-if,
count-if-not, mismatch, search, sort*, stable-sort, merge, member*, member-if,
member-if-not, assoc*, assoc-if, assoc-if-not, rassoc*, rassoc-if,
rassoc-if-not, union, nunion, intersection, nintersection, set-difference,
nset-difference, set-exclusive-or, nset-exclusive-or, subsetp, subst-if,
subst-if-not, nsubst, nsubst-if, nsubst-if-not, sublis, nsublis, tree-equal):
Improve argument/docstring consistency.
2005-05-20 14:30:34 +00:00
|
|
|
\nKeywords supported: :key
|
|
|
|
\n(fn NEW PREDICATE TREE [KEYWORD VALUE]...)"
|
Inline important-return-value declarations in cl-lib.el
These declarations are now properly added to 'cl-lib.el' itself, or to
'cl-loaddefs.el'. This means that they will now correctly show up
immediately when loading 'cl-lib.el', instead of only after 'cl-macs.el'
is pulled in by an autoload. C.f. Bug#76247.
I did not considered worth reproducing everywhere the list saying which
functions among the below belong to these two categories:
1. Functions that are side-effect-free except for the behavior of
functions passed as argument.
2. Functions that mutate and return a list.
AFAIU, this is not actionable with our current byte-compiler, i.e. we
can't add any extra declarations based on it. However, if the list
should be needed at some point, for example due to improvements in the
compiler, this commit will be where to find it. In the worst case, and
with more work, it's also deducible from the source code itself.
* lisp/emacs-lisp/cl-macs.el: Move important-return-value declarations
from here...
* lisp/emacs-lisp/cl-extra.el (cl-map, cl-maplist, cl-mapcan)
(cl-mapcon, cl-some, cl-every, cl-notany, cl-notevery, cl-nreconc):
* lisp/emacs-lisp/cl-lib.el (cl-mapcar, cl-adjoin, cl-subst):
* lisp/emacs-lisp/cl-seq.el (cl-reduce, cl-remove, cl-remove-if)
(cl-remove-if-not, cl-delete, cl-delete-if, cl-delete-if-not)
(cl-remove-duplicates, cl-delete-duplicates, cl-substitute)
(cl-substitute-if, cl-substitute-if-not, cl-nsubstitute)
(cl-nsubstitute-if, cl-nsubstitute-if-not, cl-find, cl-find-if)
(cl-find-if-not, cl-position, cl-position-if, cl-position-if-not)
(cl-count, cl-count-if, cl-count-if-not, cl-mismatch, cl-search)
(cl-sort, cl-stable-sort, cl-merge, cl-member, cl-member-if)
(cl-member-if-not, cl-assoc, cl-assoc-if, cl-assoc-if-not, cl-rassoc)
(cl-rassoc-if, cl-rassoc-if-not, cl-union, cl-nunion, cl-intersection)
(cl-nintersection, cl-set-difference, cl-nset-difference)
(cl-set-exclusive-or, cl-nset-exclusive-or, cl-subsetp, cl-subst-if)
(cl-subst-if-not, cl-nsubst, cl-nsubst-if, cl-nsubst-if-not, cl-sublis)
(cl-nsublis, cl-tree-equal): ...to have them inline here.
2025-02-14 22:46:07 +01:00
|
|
|
(declare (important-return-value t))
|
2012-06-03 21:05:17 -04:00
|
|
|
(apply 'cl-sublis (list (cons nil cl-new)) cl-tree :if cl-pred cl-keys))
|
1993-07-30 20:15:09 +00:00
|
|
|
|
2007-06-27 18:59:03 +00:00
|
|
|
;;;###autoload
|
2012-06-03 21:05:17 -04:00
|
|
|
(defun cl-subst-if-not (cl-new cl-pred cl-tree &rest cl-keys)
|
1993-07-30 20:15:09 +00:00
|
|
|
"Substitute NEW for elts not matching PREDICATE in TREE (non-destructively).
|
|
|
|
Return a copy of TREE with all non-matching elements replaced by NEW.
|
(reduce, fill, replace, remove*, remove-if, remove-if-not, delete*, delete-if,
delete-if-not, remove-duplicates, delete-duplicates, substitute, substitute-if,
substitute-if-not, nsubstitute, nsubstitute-if, nsubstitute-if-not, find,
find-if, find-if-not, position, position-if, position-if-not, count, count-if,
count-if-not, mismatch, search, sort*, stable-sort, merge, member*, member-if,
member-if-not, assoc*, assoc-if, assoc-if-not, rassoc*, rassoc-if,
rassoc-if-not, union, nunion, intersection, nintersection, set-difference,
nset-difference, set-exclusive-or, nset-exclusive-or, subsetp, subst-if,
subst-if-not, nsubst, nsubst-if, nsubst-if-not, sublis, nsublis, tree-equal):
Improve argument/docstring consistency.
2005-05-20 14:30:34 +00:00
|
|
|
\nKeywords supported: :key
|
|
|
|
\n(fn NEW PREDICATE TREE [KEYWORD VALUE]...)"
|
Inline important-return-value declarations in cl-lib.el
These declarations are now properly added to 'cl-lib.el' itself, or to
'cl-loaddefs.el'. This means that they will now correctly show up
immediately when loading 'cl-lib.el', instead of only after 'cl-macs.el'
is pulled in by an autoload. C.f. Bug#76247.
I did not considered worth reproducing everywhere the list saying which
functions among the below belong to these two categories:
1. Functions that are side-effect-free except for the behavior of
functions passed as argument.
2. Functions that mutate and return a list.
AFAIU, this is not actionable with our current byte-compiler, i.e. we
can't add any extra declarations based on it. However, if the list
should be needed at some point, for example due to improvements in the
compiler, this commit will be where to find it. In the worst case, and
with more work, it's also deducible from the source code itself.
* lisp/emacs-lisp/cl-macs.el: Move important-return-value declarations
from here...
* lisp/emacs-lisp/cl-extra.el (cl-map, cl-maplist, cl-mapcan)
(cl-mapcon, cl-some, cl-every, cl-notany, cl-notevery, cl-nreconc):
* lisp/emacs-lisp/cl-lib.el (cl-mapcar, cl-adjoin, cl-subst):
* lisp/emacs-lisp/cl-seq.el (cl-reduce, cl-remove, cl-remove-if)
(cl-remove-if-not, cl-delete, cl-delete-if, cl-delete-if-not)
(cl-remove-duplicates, cl-delete-duplicates, cl-substitute)
(cl-substitute-if, cl-substitute-if-not, cl-nsubstitute)
(cl-nsubstitute-if, cl-nsubstitute-if-not, cl-find, cl-find-if)
(cl-find-if-not, cl-position, cl-position-if, cl-position-if-not)
(cl-count, cl-count-if, cl-count-if-not, cl-mismatch, cl-search)
(cl-sort, cl-stable-sort, cl-merge, cl-member, cl-member-if)
(cl-member-if-not, cl-assoc, cl-assoc-if, cl-assoc-if-not, cl-rassoc)
(cl-rassoc-if, cl-rassoc-if-not, cl-union, cl-nunion, cl-intersection)
(cl-nintersection, cl-set-difference, cl-nset-difference)
(cl-set-exclusive-or, cl-nset-exclusive-or, cl-subsetp, cl-subst-if)
(cl-subst-if-not, cl-nsubst, cl-nsubst-if, cl-nsubst-if-not, cl-sublis)
(cl-nsublis, cl-tree-equal): ...to have them inline here.
2025-02-14 22:46:07 +01:00
|
|
|
(declare (important-return-value t))
|
2012-06-03 21:05:17 -04:00
|
|
|
(apply 'cl-sublis (list (cons nil cl-new)) cl-tree :if-not cl-pred cl-keys))
|
1993-07-30 20:15:09 +00:00
|
|
|
|
2007-06-27 18:59:03 +00:00
|
|
|
;;;###autoload
|
2012-06-03 21:05:17 -04:00
|
|
|
(defun cl-nsubst (cl-new cl-old cl-tree &rest cl-keys)
|
1993-07-30 20:15:09 +00:00
|
|
|
"Substitute NEW for OLD everywhere in TREE (destructively).
|
|
|
|
Any element of TREE which is `eql' to OLD is changed to NEW (via a call
|
|
|
|
to `setcar').
|
(reduce, fill, replace, remove*, remove-if, remove-if-not, delete*, delete-if,
delete-if-not, remove-duplicates, delete-duplicates, substitute, substitute-if,
substitute-if-not, nsubstitute, nsubstitute-if, nsubstitute-if-not, find,
find-if, find-if-not, position, position-if, position-if-not, count, count-if,
count-if-not, mismatch, search, sort*, stable-sort, merge, member*, member-if,
member-if-not, assoc*, assoc-if, assoc-if-not, rassoc*, rassoc-if,
rassoc-if-not, union, nunion, intersection, nintersection, set-difference,
nset-difference, set-exclusive-or, nset-exclusive-or, subsetp, subst-if,
subst-if-not, nsubst, nsubst-if, nsubst-if-not, sublis, nsublis, tree-equal):
Improve argument/docstring consistency.
2005-05-20 14:30:34 +00:00
|
|
|
\nKeywords supported: :test :test-not :key
|
|
|
|
\n(fn NEW OLD TREE [KEYWORD VALUE]...)"
|
Inline important-return-value declarations in cl-lib.el
These declarations are now properly added to 'cl-lib.el' itself, or to
'cl-loaddefs.el'. This means that they will now correctly show up
immediately when loading 'cl-lib.el', instead of only after 'cl-macs.el'
is pulled in by an autoload. C.f. Bug#76247.
I did not considered worth reproducing everywhere the list saying which
functions among the below belong to these two categories:
1. Functions that are side-effect-free except for the behavior of
functions passed as argument.
2. Functions that mutate and return a list.
AFAIU, this is not actionable with our current byte-compiler, i.e. we
can't add any extra declarations based on it. However, if the list
should be needed at some point, for example due to improvements in the
compiler, this commit will be where to find it. In the worst case, and
with more work, it's also deducible from the source code itself.
* lisp/emacs-lisp/cl-macs.el: Move important-return-value declarations
from here...
* lisp/emacs-lisp/cl-extra.el (cl-map, cl-maplist, cl-mapcan)
(cl-mapcon, cl-some, cl-every, cl-notany, cl-notevery, cl-nreconc):
* lisp/emacs-lisp/cl-lib.el (cl-mapcar, cl-adjoin, cl-subst):
* lisp/emacs-lisp/cl-seq.el (cl-reduce, cl-remove, cl-remove-if)
(cl-remove-if-not, cl-delete, cl-delete-if, cl-delete-if-not)
(cl-remove-duplicates, cl-delete-duplicates, cl-substitute)
(cl-substitute-if, cl-substitute-if-not, cl-nsubstitute)
(cl-nsubstitute-if, cl-nsubstitute-if-not, cl-find, cl-find-if)
(cl-find-if-not, cl-position, cl-position-if, cl-position-if-not)
(cl-count, cl-count-if, cl-count-if-not, cl-mismatch, cl-search)
(cl-sort, cl-stable-sort, cl-merge, cl-member, cl-member-if)
(cl-member-if-not, cl-assoc, cl-assoc-if, cl-assoc-if-not, cl-rassoc)
(cl-rassoc-if, cl-rassoc-if-not, cl-union, cl-nunion, cl-intersection)
(cl-nintersection, cl-set-difference, cl-nset-difference)
(cl-set-exclusive-or, cl-nset-exclusive-or, cl-subsetp, cl-subst-if)
(cl-subst-if-not, cl-nsubst, cl-nsubst-if, cl-nsubst-if-not, cl-sublis)
(cl-nsublis, cl-tree-equal): ...to have them inline here.
2025-02-14 22:46:07 +01:00
|
|
|
(declare (important-return-value t))
|
2012-06-03 21:05:17 -04:00
|
|
|
(apply 'cl-nsublis (list (cons cl-old cl-new)) cl-tree cl-keys))
|
1993-07-30 20:15:09 +00:00
|
|
|
|
2007-06-27 18:59:03 +00:00
|
|
|
;;;###autoload
|
2012-06-03 21:05:17 -04:00
|
|
|
(defun cl-nsubst-if (cl-new cl-pred cl-tree &rest cl-keys)
|
1993-07-30 20:15:09 +00:00
|
|
|
"Substitute NEW for elements matching PREDICATE in TREE (destructively).
|
|
|
|
Any element of TREE which matches is changed to NEW (via a call to `setcar').
|
(reduce, fill, replace, remove*, remove-if, remove-if-not, delete*, delete-if,
delete-if-not, remove-duplicates, delete-duplicates, substitute, substitute-if,
substitute-if-not, nsubstitute, nsubstitute-if, nsubstitute-if-not, find,
find-if, find-if-not, position, position-if, position-if-not, count, count-if,
count-if-not, mismatch, search, sort*, stable-sort, merge, member*, member-if,
member-if-not, assoc*, assoc-if, assoc-if-not, rassoc*, rassoc-if,
rassoc-if-not, union, nunion, intersection, nintersection, set-difference,
nset-difference, set-exclusive-or, nset-exclusive-or, subsetp, subst-if,
subst-if-not, nsubst, nsubst-if, nsubst-if-not, sublis, nsublis, tree-equal):
Improve argument/docstring consistency.
2005-05-20 14:30:34 +00:00
|
|
|
\nKeywords supported: :key
|
|
|
|
\n(fn NEW PREDICATE TREE [KEYWORD VALUE]...)"
|
Inline important-return-value declarations in cl-lib.el
These declarations are now properly added to 'cl-lib.el' itself, or to
'cl-loaddefs.el'. This means that they will now correctly show up
immediately when loading 'cl-lib.el', instead of only after 'cl-macs.el'
is pulled in by an autoload. C.f. Bug#76247.
I did not considered worth reproducing everywhere the list saying which
functions among the below belong to these two categories:
1. Functions that are side-effect-free except for the behavior of
functions passed as argument.
2. Functions that mutate and return a list.
AFAIU, this is not actionable with our current byte-compiler, i.e. we
can't add any extra declarations based on it. However, if the list
should be needed at some point, for example due to improvements in the
compiler, this commit will be where to find it. In the worst case, and
with more work, it's also deducible from the source code itself.
* lisp/emacs-lisp/cl-macs.el: Move important-return-value declarations
from here...
* lisp/emacs-lisp/cl-extra.el (cl-map, cl-maplist, cl-mapcan)
(cl-mapcon, cl-some, cl-every, cl-notany, cl-notevery, cl-nreconc):
* lisp/emacs-lisp/cl-lib.el (cl-mapcar, cl-adjoin, cl-subst):
* lisp/emacs-lisp/cl-seq.el (cl-reduce, cl-remove, cl-remove-if)
(cl-remove-if-not, cl-delete, cl-delete-if, cl-delete-if-not)
(cl-remove-duplicates, cl-delete-duplicates, cl-substitute)
(cl-substitute-if, cl-substitute-if-not, cl-nsubstitute)
(cl-nsubstitute-if, cl-nsubstitute-if-not, cl-find, cl-find-if)
(cl-find-if-not, cl-position, cl-position-if, cl-position-if-not)
(cl-count, cl-count-if, cl-count-if-not, cl-mismatch, cl-search)
(cl-sort, cl-stable-sort, cl-merge, cl-member, cl-member-if)
(cl-member-if-not, cl-assoc, cl-assoc-if, cl-assoc-if-not, cl-rassoc)
(cl-rassoc-if, cl-rassoc-if-not, cl-union, cl-nunion, cl-intersection)
(cl-nintersection, cl-set-difference, cl-nset-difference)
(cl-set-exclusive-or, cl-nset-exclusive-or, cl-subsetp, cl-subst-if)
(cl-subst-if-not, cl-nsubst, cl-nsubst-if, cl-nsubst-if-not, cl-sublis)
(cl-nsublis, cl-tree-equal): ...to have them inline here.
2025-02-14 22:46:07 +01:00
|
|
|
(declare (important-return-value t))
|
2012-06-03 21:05:17 -04:00
|
|
|
(apply 'cl-nsublis (list (cons nil cl-new)) cl-tree :if cl-pred cl-keys))
|
1993-07-30 20:15:09 +00:00
|
|
|
|
2007-06-27 18:59:03 +00:00
|
|
|
;;;###autoload
|
2012-06-03 21:05:17 -04:00
|
|
|
(defun cl-nsubst-if-not (cl-new cl-pred cl-tree &rest cl-keys)
|
1993-07-30 20:15:09 +00:00
|
|
|
"Substitute NEW for elements not matching PREDICATE in TREE (destructively).
|
|
|
|
Any element of TREE which matches is changed to NEW (via a call to `setcar').
|
(reduce, fill, replace, remove*, remove-if, remove-if-not, delete*, delete-if,
delete-if-not, remove-duplicates, delete-duplicates, substitute, substitute-if,
substitute-if-not, nsubstitute, nsubstitute-if, nsubstitute-if-not, find,
find-if, find-if-not, position, position-if, position-if-not, count, count-if,
count-if-not, mismatch, search, sort*, stable-sort, merge, member*, member-if,
member-if-not, assoc*, assoc-if, assoc-if-not, rassoc*, rassoc-if,
rassoc-if-not, union, nunion, intersection, nintersection, set-difference,
nset-difference, set-exclusive-or, nset-exclusive-or, subsetp, subst-if,
subst-if-not, nsubst, nsubst-if, nsubst-if-not, sublis, nsublis, tree-equal):
Improve argument/docstring consistency.
2005-05-20 14:30:34 +00:00
|
|
|
\nKeywords supported: :key
|
|
|
|
\n(fn NEW PREDICATE TREE [KEYWORD VALUE]...)"
|
Inline important-return-value declarations in cl-lib.el
These declarations are now properly added to 'cl-lib.el' itself, or to
'cl-loaddefs.el'. This means that they will now correctly show up
immediately when loading 'cl-lib.el', instead of only after 'cl-macs.el'
is pulled in by an autoload. C.f. Bug#76247.
I did not considered worth reproducing everywhere the list saying which
functions among the below belong to these two categories:
1. Functions that are side-effect-free except for the behavior of
functions passed as argument.
2. Functions that mutate and return a list.
AFAIU, this is not actionable with our current byte-compiler, i.e. we
can't add any extra declarations based on it. However, if the list
should be needed at some point, for example due to improvements in the
compiler, this commit will be where to find it. In the worst case, and
with more work, it's also deducible from the source code itself.
* lisp/emacs-lisp/cl-macs.el: Move important-return-value declarations
from here...
* lisp/emacs-lisp/cl-extra.el (cl-map, cl-maplist, cl-mapcan)
(cl-mapcon, cl-some, cl-every, cl-notany, cl-notevery, cl-nreconc):
* lisp/emacs-lisp/cl-lib.el (cl-mapcar, cl-adjoin, cl-subst):
* lisp/emacs-lisp/cl-seq.el (cl-reduce, cl-remove, cl-remove-if)
(cl-remove-if-not, cl-delete, cl-delete-if, cl-delete-if-not)
(cl-remove-duplicates, cl-delete-duplicates, cl-substitute)
(cl-substitute-if, cl-substitute-if-not, cl-nsubstitute)
(cl-nsubstitute-if, cl-nsubstitute-if-not, cl-find, cl-find-if)
(cl-find-if-not, cl-position, cl-position-if, cl-position-if-not)
(cl-count, cl-count-if, cl-count-if-not, cl-mismatch, cl-search)
(cl-sort, cl-stable-sort, cl-merge, cl-member, cl-member-if)
(cl-member-if-not, cl-assoc, cl-assoc-if, cl-assoc-if-not, cl-rassoc)
(cl-rassoc-if, cl-rassoc-if-not, cl-union, cl-nunion, cl-intersection)
(cl-nintersection, cl-set-difference, cl-nset-difference)
(cl-set-exclusive-or, cl-nset-exclusive-or, cl-subsetp, cl-subst-if)
(cl-subst-if-not, cl-nsubst, cl-nsubst-if, cl-nsubst-if-not, cl-sublis)
(cl-nsublis, cl-tree-equal): ...to have them inline here.
2025-02-14 22:46:07 +01:00
|
|
|
(declare (important-return-value t))
|
2012-06-03 21:05:17 -04:00
|
|
|
(apply 'cl-nsublis (list (cons nil cl-new)) cl-tree :if-not cl-pred cl-keys))
|
1993-07-30 20:15:09 +00:00
|
|
|
|
Use lexical-binding for all of CL, and clean up its namespace.
* lisp/emacs-lisp/cl-lib.el: Use lexical-binding.
(cl-map-extents, cl-maclisp-member): Remove.
(cl--set-elt, cl--set-nthcdr, cl--set-buffer-substring)
(cl--set-substring, cl--block-wrapper, cl--block-throw)
(cl--compiling-file, cl--mapcar-many, cl--do-subst): Use "cl--" prefix.
* lisp/emacs-lisp/cl-extra.el: Use lexical-binding.
(cl--mapcar-many, cl--map-keymap-recursively, cl--map-intervals)
(cl--map-overlays, cl--set-frame-visible-p, cl--progv-save)
(cl--progv-before, cl--progv-after, cl--finite-do, cl--set-getf)
(cl--do-remf, cl--do-prettyprint): Use "cl--" prefix.
* lisp/emacs-lisp/cl-seq.el: Use lexical-binding.
(cl--parsing-keywords, cl--check-key, cl--check-test-nokey)
(cl--check-test, cl--check-match): Use "cl--" prefix and backquotes.
(cl--alist, cl--sublis-rec, cl--nsublis-rec, cl--tree-equal-rec):
* lisp/emacs-lisp/cl-macs.el (cl--lambda-list-keywords): Use "cl--" prefix.
* lisp/edmacro.el (edmacro-mismatch): Simplify to remove dependence on
CL's internals.
2012-06-11 11:52:50 -04:00
|
|
|
(defvar cl--alist)
|
|
|
|
|
2007-06-27 18:59:03 +00:00
|
|
|
;;;###autoload
|
2012-06-03 21:05:17 -04:00
|
|
|
(defun cl-sublis (cl-alist cl-tree &rest cl-keys)
|
1993-07-30 20:15:09 +00:00
|
|
|
"Perform substitutions indicated by ALIST in TREE (non-destructively).
|
|
|
|
Return a copy of TREE with all matching elements replaced.
|
(reduce, fill, replace, remove*, remove-if, remove-if-not, delete*, delete-if,
delete-if-not, remove-duplicates, delete-duplicates, substitute, substitute-if,
substitute-if-not, nsubstitute, nsubstitute-if, nsubstitute-if-not, find,
find-if, find-if-not, position, position-if, position-if-not, count, count-if,
count-if-not, mismatch, search, sort*, stable-sort, merge, member*, member-if,
member-if-not, assoc*, assoc-if, assoc-if-not, rassoc*, rassoc-if,
rassoc-if-not, union, nunion, intersection, nintersection, set-difference,
nset-difference, set-exclusive-or, nset-exclusive-or, subsetp, subst-if,
subst-if-not, nsubst, nsubst-if, nsubst-if-not, sublis, nsublis, tree-equal):
Improve argument/docstring consistency.
2005-05-20 14:30:34 +00:00
|
|
|
\nKeywords supported: :test :test-not :key
|
|
|
|
\n(fn ALIST TREE [KEYWORD VALUE]...)"
|
Inline important-return-value declarations in cl-lib.el
These declarations are now properly added to 'cl-lib.el' itself, or to
'cl-loaddefs.el'. This means that they will now correctly show up
immediately when loading 'cl-lib.el', instead of only after 'cl-macs.el'
is pulled in by an autoload. C.f. Bug#76247.
I did not considered worth reproducing everywhere the list saying which
functions among the below belong to these two categories:
1. Functions that are side-effect-free except for the behavior of
functions passed as argument.
2. Functions that mutate and return a list.
AFAIU, this is not actionable with our current byte-compiler, i.e. we
can't add any extra declarations based on it. However, if the list
should be needed at some point, for example due to improvements in the
compiler, this commit will be where to find it. In the worst case, and
with more work, it's also deducible from the source code itself.
* lisp/emacs-lisp/cl-macs.el: Move important-return-value declarations
from here...
* lisp/emacs-lisp/cl-extra.el (cl-map, cl-maplist, cl-mapcan)
(cl-mapcon, cl-some, cl-every, cl-notany, cl-notevery, cl-nreconc):
* lisp/emacs-lisp/cl-lib.el (cl-mapcar, cl-adjoin, cl-subst):
* lisp/emacs-lisp/cl-seq.el (cl-reduce, cl-remove, cl-remove-if)
(cl-remove-if-not, cl-delete, cl-delete-if, cl-delete-if-not)
(cl-remove-duplicates, cl-delete-duplicates, cl-substitute)
(cl-substitute-if, cl-substitute-if-not, cl-nsubstitute)
(cl-nsubstitute-if, cl-nsubstitute-if-not, cl-find, cl-find-if)
(cl-find-if-not, cl-position, cl-position-if, cl-position-if-not)
(cl-count, cl-count-if, cl-count-if-not, cl-mismatch, cl-search)
(cl-sort, cl-stable-sort, cl-merge, cl-member, cl-member-if)
(cl-member-if-not, cl-assoc, cl-assoc-if, cl-assoc-if-not, cl-rassoc)
(cl-rassoc-if, cl-rassoc-if-not, cl-union, cl-nunion, cl-intersection)
(cl-nintersection, cl-set-difference, cl-nset-difference)
(cl-set-exclusive-or, cl-nset-exclusive-or, cl-subsetp, cl-subst-if)
(cl-subst-if-not, cl-nsubst, cl-nsubst-if, cl-nsubst-if-not, cl-sublis)
(cl-nsublis, cl-tree-equal): ...to have them inline here.
2025-02-14 22:46:07 +01:00
|
|
|
(declare (important-return-value t))
|
Use lexical-binding for all of CL, and clean up its namespace.
* lisp/emacs-lisp/cl-lib.el: Use lexical-binding.
(cl-map-extents, cl-maclisp-member): Remove.
(cl--set-elt, cl--set-nthcdr, cl--set-buffer-substring)
(cl--set-substring, cl--block-wrapper, cl--block-throw)
(cl--compiling-file, cl--mapcar-many, cl--do-subst): Use "cl--" prefix.
* lisp/emacs-lisp/cl-extra.el: Use lexical-binding.
(cl--mapcar-many, cl--map-keymap-recursively, cl--map-intervals)
(cl--map-overlays, cl--set-frame-visible-p, cl--progv-save)
(cl--progv-before, cl--progv-after, cl--finite-do, cl--set-getf)
(cl--do-remf, cl--do-prettyprint): Use "cl--" prefix.
* lisp/emacs-lisp/cl-seq.el: Use lexical-binding.
(cl--parsing-keywords, cl--check-key, cl--check-test-nokey)
(cl--check-test, cl--check-match): Use "cl--" prefix and backquotes.
(cl--alist, cl--sublis-rec, cl--nsublis-rec, cl--tree-equal-rec):
* lisp/emacs-lisp/cl-macs.el (cl--lambda-list-keywords): Use "cl--" prefix.
* lisp/edmacro.el (edmacro-mismatch): Simplify to remove dependence on
CL's internals.
2012-06-11 11:52:50 -04:00
|
|
|
(cl--parsing-keywords (:test :test-not :key :if :if-not) ()
|
|
|
|
(let ((cl--alist cl-alist))
|
|
|
|
(cl--sublis-rec cl-tree))))
|
1993-07-30 20:15:09 +00:00
|
|
|
|
Use lexical-binding for all of CL, and clean up its namespace.
* lisp/emacs-lisp/cl-lib.el: Use lexical-binding.
(cl-map-extents, cl-maclisp-member): Remove.
(cl--set-elt, cl--set-nthcdr, cl--set-buffer-substring)
(cl--set-substring, cl--block-wrapper, cl--block-throw)
(cl--compiling-file, cl--mapcar-many, cl--do-subst): Use "cl--" prefix.
* lisp/emacs-lisp/cl-extra.el: Use lexical-binding.
(cl--mapcar-many, cl--map-keymap-recursively, cl--map-intervals)
(cl--map-overlays, cl--set-frame-visible-p, cl--progv-save)
(cl--progv-before, cl--progv-after, cl--finite-do, cl--set-getf)
(cl--do-remf, cl--do-prettyprint): Use "cl--" prefix.
* lisp/emacs-lisp/cl-seq.el: Use lexical-binding.
(cl--parsing-keywords, cl--check-key, cl--check-test-nokey)
(cl--check-test, cl--check-match): Use "cl--" prefix and backquotes.
(cl--alist, cl--sublis-rec, cl--nsublis-rec, cl--tree-equal-rec):
* lisp/emacs-lisp/cl-macs.el (cl--lambda-list-keywords): Use "cl--" prefix.
* lisp/edmacro.el (edmacro-mismatch): Simplify to remove dependence on
CL's internals.
2012-06-11 11:52:50 -04:00
|
|
|
(defun cl--sublis-rec (cl-tree) ;Uses cl--alist cl-key/test*/if*.
|
|
|
|
(let ((cl-temp (cl--check-key cl-tree)) (cl-p cl--alist))
|
|
|
|
(while (and cl-p (not (cl--check-test-nokey (car (car cl-p)) cl-temp)))
|
1993-07-30 20:15:09 +00:00
|
|
|
(setq cl-p (cdr cl-p)))
|
|
|
|
(if cl-p (cdr (car cl-p))
|
|
|
|
(if (consp cl-tree)
|
Use lexical-binding for all of CL, and clean up its namespace.
* lisp/emacs-lisp/cl-lib.el: Use lexical-binding.
(cl-map-extents, cl-maclisp-member): Remove.
(cl--set-elt, cl--set-nthcdr, cl--set-buffer-substring)
(cl--set-substring, cl--block-wrapper, cl--block-throw)
(cl--compiling-file, cl--mapcar-many, cl--do-subst): Use "cl--" prefix.
* lisp/emacs-lisp/cl-extra.el: Use lexical-binding.
(cl--mapcar-many, cl--map-keymap-recursively, cl--map-intervals)
(cl--map-overlays, cl--set-frame-visible-p, cl--progv-save)
(cl--progv-before, cl--progv-after, cl--finite-do, cl--set-getf)
(cl--do-remf, cl--do-prettyprint): Use "cl--" prefix.
* lisp/emacs-lisp/cl-seq.el: Use lexical-binding.
(cl--parsing-keywords, cl--check-key, cl--check-test-nokey)
(cl--check-test, cl--check-match): Use "cl--" prefix and backquotes.
(cl--alist, cl--sublis-rec, cl--nsublis-rec, cl--tree-equal-rec):
* lisp/emacs-lisp/cl-macs.el (cl--lambda-list-keywords): Use "cl--" prefix.
* lisp/edmacro.el (edmacro-mismatch): Simplify to remove dependence on
CL's internals.
2012-06-11 11:52:50 -04:00
|
|
|
(let ((cl-a (cl--sublis-rec (car cl-tree)))
|
|
|
|
(cl-d (cl--sublis-rec (cdr cl-tree))))
|
1993-07-30 20:15:09 +00:00
|
|
|
(if (and (eq cl-a (car cl-tree)) (eq cl-d (cdr cl-tree)))
|
|
|
|
cl-tree
|
|
|
|
(cons cl-a cl-d)))
|
|
|
|
cl-tree))))
|
|
|
|
|
2007-06-27 18:59:03 +00:00
|
|
|
;;;###autoload
|
2012-06-03 21:05:17 -04:00
|
|
|
(defun cl-nsublis (cl-alist cl-tree &rest cl-keys)
|
1993-07-30 20:15:09 +00:00
|
|
|
"Perform substitutions indicated by ALIST in TREE (destructively).
|
|
|
|
Any matching element of TREE is changed via a call to `setcar'.
|
(reduce, fill, replace, remove*, remove-if, remove-if-not, delete*, delete-if,
delete-if-not, remove-duplicates, delete-duplicates, substitute, substitute-if,
substitute-if-not, nsubstitute, nsubstitute-if, nsubstitute-if-not, find,
find-if, find-if-not, position, position-if, position-if-not, count, count-if,
count-if-not, mismatch, search, sort*, stable-sort, merge, member*, member-if,
member-if-not, assoc*, assoc-if, assoc-if-not, rassoc*, rassoc-if,
rassoc-if-not, union, nunion, intersection, nintersection, set-difference,
nset-difference, set-exclusive-or, nset-exclusive-or, subsetp, subst-if,
subst-if-not, nsubst, nsubst-if, nsubst-if-not, sublis, nsublis, tree-equal):
Improve argument/docstring consistency.
2005-05-20 14:30:34 +00:00
|
|
|
\nKeywords supported: :test :test-not :key
|
|
|
|
\n(fn ALIST TREE [KEYWORD VALUE]...)"
|
Inline important-return-value declarations in cl-lib.el
These declarations are now properly added to 'cl-lib.el' itself, or to
'cl-loaddefs.el'. This means that they will now correctly show up
immediately when loading 'cl-lib.el', instead of only after 'cl-macs.el'
is pulled in by an autoload. C.f. Bug#76247.
I did not considered worth reproducing everywhere the list saying which
functions among the below belong to these two categories:
1. Functions that are side-effect-free except for the behavior of
functions passed as argument.
2. Functions that mutate and return a list.
AFAIU, this is not actionable with our current byte-compiler, i.e. we
can't add any extra declarations based on it. However, if the list
should be needed at some point, for example due to improvements in the
compiler, this commit will be where to find it. In the worst case, and
with more work, it's also deducible from the source code itself.
* lisp/emacs-lisp/cl-macs.el: Move important-return-value declarations
from here...
* lisp/emacs-lisp/cl-extra.el (cl-map, cl-maplist, cl-mapcan)
(cl-mapcon, cl-some, cl-every, cl-notany, cl-notevery, cl-nreconc):
* lisp/emacs-lisp/cl-lib.el (cl-mapcar, cl-adjoin, cl-subst):
* lisp/emacs-lisp/cl-seq.el (cl-reduce, cl-remove, cl-remove-if)
(cl-remove-if-not, cl-delete, cl-delete-if, cl-delete-if-not)
(cl-remove-duplicates, cl-delete-duplicates, cl-substitute)
(cl-substitute-if, cl-substitute-if-not, cl-nsubstitute)
(cl-nsubstitute-if, cl-nsubstitute-if-not, cl-find, cl-find-if)
(cl-find-if-not, cl-position, cl-position-if, cl-position-if-not)
(cl-count, cl-count-if, cl-count-if-not, cl-mismatch, cl-search)
(cl-sort, cl-stable-sort, cl-merge, cl-member, cl-member-if)
(cl-member-if-not, cl-assoc, cl-assoc-if, cl-assoc-if-not, cl-rassoc)
(cl-rassoc-if, cl-rassoc-if-not, cl-union, cl-nunion, cl-intersection)
(cl-nintersection, cl-set-difference, cl-nset-difference)
(cl-set-exclusive-or, cl-nset-exclusive-or, cl-subsetp, cl-subst-if)
(cl-subst-if-not, cl-nsubst, cl-nsubst-if, cl-nsubst-if-not, cl-sublis)
(cl-nsublis, cl-tree-equal): ...to have them inline here.
2025-02-14 22:46:07 +01:00
|
|
|
(declare (important-return-value t))
|
Use lexical-binding for all of CL, and clean up its namespace.
* lisp/emacs-lisp/cl-lib.el: Use lexical-binding.
(cl-map-extents, cl-maclisp-member): Remove.
(cl--set-elt, cl--set-nthcdr, cl--set-buffer-substring)
(cl--set-substring, cl--block-wrapper, cl--block-throw)
(cl--compiling-file, cl--mapcar-many, cl--do-subst): Use "cl--" prefix.
* lisp/emacs-lisp/cl-extra.el: Use lexical-binding.
(cl--mapcar-many, cl--map-keymap-recursively, cl--map-intervals)
(cl--map-overlays, cl--set-frame-visible-p, cl--progv-save)
(cl--progv-before, cl--progv-after, cl--finite-do, cl--set-getf)
(cl--do-remf, cl--do-prettyprint): Use "cl--" prefix.
* lisp/emacs-lisp/cl-seq.el: Use lexical-binding.
(cl--parsing-keywords, cl--check-key, cl--check-test-nokey)
(cl--check-test, cl--check-match): Use "cl--" prefix and backquotes.
(cl--alist, cl--sublis-rec, cl--nsublis-rec, cl--tree-equal-rec):
* lisp/emacs-lisp/cl-macs.el (cl--lambda-list-keywords): Use "cl--" prefix.
* lisp/edmacro.el (edmacro-mismatch): Simplify to remove dependence on
CL's internals.
2012-06-11 11:52:50 -04:00
|
|
|
(cl--parsing-keywords (:test :test-not :key :if :if-not) ()
|
|
|
|
(let ((cl-hold (list cl-tree))
|
|
|
|
(cl--alist cl-alist))
|
|
|
|
(cl--nsublis-rec cl-hold)
|
1993-07-30 20:15:09 +00:00
|
|
|
(car cl-hold))))
|
|
|
|
|
Use lexical-binding for all of CL, and clean up its namespace.
* lisp/emacs-lisp/cl-lib.el: Use lexical-binding.
(cl-map-extents, cl-maclisp-member): Remove.
(cl--set-elt, cl--set-nthcdr, cl--set-buffer-substring)
(cl--set-substring, cl--block-wrapper, cl--block-throw)
(cl--compiling-file, cl--mapcar-many, cl--do-subst): Use "cl--" prefix.
* lisp/emacs-lisp/cl-extra.el: Use lexical-binding.
(cl--mapcar-many, cl--map-keymap-recursively, cl--map-intervals)
(cl--map-overlays, cl--set-frame-visible-p, cl--progv-save)
(cl--progv-before, cl--progv-after, cl--finite-do, cl--set-getf)
(cl--do-remf, cl--do-prettyprint): Use "cl--" prefix.
* lisp/emacs-lisp/cl-seq.el: Use lexical-binding.
(cl--parsing-keywords, cl--check-key, cl--check-test-nokey)
(cl--check-test, cl--check-match): Use "cl--" prefix and backquotes.
(cl--alist, cl--sublis-rec, cl--nsublis-rec, cl--tree-equal-rec):
* lisp/emacs-lisp/cl-macs.el (cl--lambda-list-keywords): Use "cl--" prefix.
* lisp/edmacro.el (edmacro-mismatch): Simplify to remove dependence on
CL's internals.
2012-06-11 11:52:50 -04:00
|
|
|
(defun cl--nsublis-rec (cl-tree) ;Uses cl--alist cl-key/test*/if*.
|
1993-07-30 20:15:09 +00:00
|
|
|
(while (consp cl-tree)
|
Use lexical-binding for all of CL, and clean up its namespace.
* lisp/emacs-lisp/cl-lib.el: Use lexical-binding.
(cl-map-extents, cl-maclisp-member): Remove.
(cl--set-elt, cl--set-nthcdr, cl--set-buffer-substring)
(cl--set-substring, cl--block-wrapper, cl--block-throw)
(cl--compiling-file, cl--mapcar-many, cl--do-subst): Use "cl--" prefix.
* lisp/emacs-lisp/cl-extra.el: Use lexical-binding.
(cl--mapcar-many, cl--map-keymap-recursively, cl--map-intervals)
(cl--map-overlays, cl--set-frame-visible-p, cl--progv-save)
(cl--progv-before, cl--progv-after, cl--finite-do, cl--set-getf)
(cl--do-remf, cl--do-prettyprint): Use "cl--" prefix.
* lisp/emacs-lisp/cl-seq.el: Use lexical-binding.
(cl--parsing-keywords, cl--check-key, cl--check-test-nokey)
(cl--check-test, cl--check-match): Use "cl--" prefix and backquotes.
(cl--alist, cl--sublis-rec, cl--nsublis-rec, cl--tree-equal-rec):
* lisp/emacs-lisp/cl-macs.el (cl--lambda-list-keywords): Use "cl--" prefix.
* lisp/edmacro.el (edmacro-mismatch): Simplify to remove dependence on
CL's internals.
2012-06-11 11:52:50 -04:00
|
|
|
(let ((cl-temp (cl--check-key (car cl-tree))) (cl-p cl--alist))
|
|
|
|
(while (and cl-p (not (cl--check-test-nokey (car (car cl-p)) cl-temp)))
|
1993-07-30 20:15:09 +00:00
|
|
|
(setq cl-p (cdr cl-p)))
|
|
|
|
(if cl-p (setcar cl-tree (cdr (car cl-p)))
|
Use lexical-binding for all of CL, and clean up its namespace.
* lisp/emacs-lisp/cl-lib.el: Use lexical-binding.
(cl-map-extents, cl-maclisp-member): Remove.
(cl--set-elt, cl--set-nthcdr, cl--set-buffer-substring)
(cl--set-substring, cl--block-wrapper, cl--block-throw)
(cl--compiling-file, cl--mapcar-many, cl--do-subst): Use "cl--" prefix.
* lisp/emacs-lisp/cl-extra.el: Use lexical-binding.
(cl--mapcar-many, cl--map-keymap-recursively, cl--map-intervals)
(cl--map-overlays, cl--set-frame-visible-p, cl--progv-save)
(cl--progv-before, cl--progv-after, cl--finite-do, cl--set-getf)
(cl--do-remf, cl--do-prettyprint): Use "cl--" prefix.
* lisp/emacs-lisp/cl-seq.el: Use lexical-binding.
(cl--parsing-keywords, cl--check-key, cl--check-test-nokey)
(cl--check-test, cl--check-match): Use "cl--" prefix and backquotes.
(cl--alist, cl--sublis-rec, cl--nsublis-rec, cl--tree-equal-rec):
* lisp/emacs-lisp/cl-macs.el (cl--lambda-list-keywords): Use "cl--" prefix.
* lisp/edmacro.el (edmacro-mismatch): Simplify to remove dependence on
CL's internals.
2012-06-11 11:52:50 -04:00
|
|
|
(if (consp (car cl-tree)) (cl--nsublis-rec (car cl-tree))))
|
|
|
|
(setq cl-temp (cl--check-key (cdr cl-tree)) cl-p cl--alist)
|
|
|
|
(while (and cl-p (not (cl--check-test-nokey (car (car cl-p)) cl-temp)))
|
1993-07-30 20:15:09 +00:00
|
|
|
(setq cl-p (cdr cl-p)))
|
|
|
|
(if cl-p
|
|
|
|
(progn (setcdr cl-tree (cdr (car cl-p))) (setq cl-tree nil))
|
|
|
|
(setq cl-tree (cdr cl-tree))))))
|
|
|
|
|
2007-06-27 18:59:03 +00:00
|
|
|
;;;###autoload
|
2012-06-03 21:05:17 -04:00
|
|
|
(defun cl-tree-equal (cl-x cl-y &rest cl-keys)
|
(reduce, fill, replace, remove*, remove-if, remove-if-not, delete*, delete-if,
delete-if-not, remove-duplicates, delete-duplicates, substitute, substitute-if,
substitute-if-not, nsubstitute, nsubstitute-if, nsubstitute-if-not, find,
find-if, find-if-not, position, position-if, position-if-not, count, count-if,
count-if-not, mismatch, search, sort*, stable-sort, merge, member*, member-if,
member-if-not, assoc*, assoc-if, assoc-if-not, rassoc*, rassoc-if,
rassoc-if-not, union, nunion, intersection, nintersection, set-difference,
nset-difference, set-exclusive-or, nset-exclusive-or, subsetp, subst-if,
subst-if-not, nsubst, nsubst-if, nsubst-if-not, sublis, nsublis, tree-equal):
Improve argument/docstring consistency.
2005-05-20 14:30:34 +00:00
|
|
|
"Return t if trees TREE1 and TREE2 have `eql' leaves.
|
1993-07-30 20:15:09 +00:00
|
|
|
Atoms are compared by `eql'; cons cells are compared recursively.
|
(reduce, fill, replace, remove*, remove-if, remove-if-not, delete*, delete-if,
delete-if-not, remove-duplicates, delete-duplicates, substitute, substitute-if,
substitute-if-not, nsubstitute, nsubstitute-if, nsubstitute-if-not, find,
find-if, find-if-not, position, position-if, position-if-not, count, count-if,
count-if-not, mismatch, search, sort*, stable-sort, merge, member*, member-if,
member-if-not, assoc*, assoc-if, assoc-if-not, rassoc*, rassoc-if,
rassoc-if-not, union, nunion, intersection, nintersection, set-difference,
nset-difference, set-exclusive-or, nset-exclusive-or, subsetp, subst-if,
subst-if-not, nsubst, nsubst-if, nsubst-if-not, sublis, nsublis, tree-equal):
Improve argument/docstring consistency.
2005-05-20 14:30:34 +00:00
|
|
|
\nKeywords supported: :test :test-not :key
|
|
|
|
\n(fn TREE1 TREE2 [KEYWORD VALUE]...)"
|
Inline important-return-value declarations in cl-lib.el
These declarations are now properly added to 'cl-lib.el' itself, or to
'cl-loaddefs.el'. This means that they will now correctly show up
immediately when loading 'cl-lib.el', instead of only after 'cl-macs.el'
is pulled in by an autoload. C.f. Bug#76247.
I did not considered worth reproducing everywhere the list saying which
functions among the below belong to these two categories:
1. Functions that are side-effect-free except for the behavior of
functions passed as argument.
2. Functions that mutate and return a list.
AFAIU, this is not actionable with our current byte-compiler, i.e. we
can't add any extra declarations based on it. However, if the list
should be needed at some point, for example due to improvements in the
compiler, this commit will be where to find it. In the worst case, and
with more work, it's also deducible from the source code itself.
* lisp/emacs-lisp/cl-macs.el: Move important-return-value declarations
from here...
* lisp/emacs-lisp/cl-extra.el (cl-map, cl-maplist, cl-mapcan)
(cl-mapcon, cl-some, cl-every, cl-notany, cl-notevery, cl-nreconc):
* lisp/emacs-lisp/cl-lib.el (cl-mapcar, cl-adjoin, cl-subst):
* lisp/emacs-lisp/cl-seq.el (cl-reduce, cl-remove, cl-remove-if)
(cl-remove-if-not, cl-delete, cl-delete-if, cl-delete-if-not)
(cl-remove-duplicates, cl-delete-duplicates, cl-substitute)
(cl-substitute-if, cl-substitute-if-not, cl-nsubstitute)
(cl-nsubstitute-if, cl-nsubstitute-if-not, cl-find, cl-find-if)
(cl-find-if-not, cl-position, cl-position-if, cl-position-if-not)
(cl-count, cl-count-if, cl-count-if-not, cl-mismatch, cl-search)
(cl-sort, cl-stable-sort, cl-merge, cl-member, cl-member-if)
(cl-member-if-not, cl-assoc, cl-assoc-if, cl-assoc-if-not, cl-rassoc)
(cl-rassoc-if, cl-rassoc-if-not, cl-union, cl-nunion, cl-intersection)
(cl-nintersection, cl-set-difference, cl-nset-difference)
(cl-set-exclusive-or, cl-nset-exclusive-or, cl-subsetp, cl-subst-if)
(cl-subst-if-not, cl-nsubst, cl-nsubst-if, cl-nsubst-if-not, cl-sublis)
(cl-nsublis, cl-tree-equal): ...to have them inline here.
2025-02-14 22:46:07 +01:00
|
|
|
(declare (important-return-value t))
|
Use lexical-binding for all of CL, and clean up its namespace.
* lisp/emacs-lisp/cl-lib.el: Use lexical-binding.
(cl-map-extents, cl-maclisp-member): Remove.
(cl--set-elt, cl--set-nthcdr, cl--set-buffer-substring)
(cl--set-substring, cl--block-wrapper, cl--block-throw)
(cl--compiling-file, cl--mapcar-many, cl--do-subst): Use "cl--" prefix.
* lisp/emacs-lisp/cl-extra.el: Use lexical-binding.
(cl--mapcar-many, cl--map-keymap-recursively, cl--map-intervals)
(cl--map-overlays, cl--set-frame-visible-p, cl--progv-save)
(cl--progv-before, cl--progv-after, cl--finite-do, cl--set-getf)
(cl--do-remf, cl--do-prettyprint): Use "cl--" prefix.
* lisp/emacs-lisp/cl-seq.el: Use lexical-binding.
(cl--parsing-keywords, cl--check-key, cl--check-test-nokey)
(cl--check-test, cl--check-match): Use "cl--" prefix and backquotes.
(cl--alist, cl--sublis-rec, cl--nsublis-rec, cl--tree-equal-rec):
* lisp/emacs-lisp/cl-macs.el (cl--lambda-list-keywords): Use "cl--" prefix.
* lisp/edmacro.el (edmacro-mismatch): Simplify to remove dependence on
CL's internals.
2012-06-11 11:52:50 -04:00
|
|
|
(cl--parsing-keywords (:test :test-not :key) ()
|
|
|
|
(cl--tree-equal-rec cl-x cl-y)))
|
1993-07-30 20:15:09 +00:00
|
|
|
|
Use lexical-binding for all of CL, and clean up its namespace.
* lisp/emacs-lisp/cl-lib.el: Use lexical-binding.
(cl-map-extents, cl-maclisp-member): Remove.
(cl--set-elt, cl--set-nthcdr, cl--set-buffer-substring)
(cl--set-substring, cl--block-wrapper, cl--block-throw)
(cl--compiling-file, cl--mapcar-many, cl--do-subst): Use "cl--" prefix.
* lisp/emacs-lisp/cl-extra.el: Use lexical-binding.
(cl--mapcar-many, cl--map-keymap-recursively, cl--map-intervals)
(cl--map-overlays, cl--set-frame-visible-p, cl--progv-save)
(cl--progv-before, cl--progv-after, cl--finite-do, cl--set-getf)
(cl--do-remf, cl--do-prettyprint): Use "cl--" prefix.
* lisp/emacs-lisp/cl-seq.el: Use lexical-binding.
(cl--parsing-keywords, cl--check-key, cl--check-test-nokey)
(cl--check-test, cl--check-match): Use "cl--" prefix and backquotes.
(cl--alist, cl--sublis-rec, cl--nsublis-rec, cl--tree-equal-rec):
* lisp/emacs-lisp/cl-macs.el (cl--lambda-list-keywords): Use "cl--" prefix.
* lisp/edmacro.el (edmacro-mismatch): Simplify to remove dependence on
CL's internals.
2012-06-11 11:52:50 -04:00
|
|
|
(defun cl--tree-equal-rec (cl-x cl-y) ;Uses cl-key/test*.
|
1993-07-30 20:15:09 +00:00
|
|
|
(while (and (consp cl-x) (consp cl-y)
|
Use lexical-binding for all of CL, and clean up its namespace.
* lisp/emacs-lisp/cl-lib.el: Use lexical-binding.
(cl-map-extents, cl-maclisp-member): Remove.
(cl--set-elt, cl--set-nthcdr, cl--set-buffer-substring)
(cl--set-substring, cl--block-wrapper, cl--block-throw)
(cl--compiling-file, cl--mapcar-many, cl--do-subst): Use "cl--" prefix.
* lisp/emacs-lisp/cl-extra.el: Use lexical-binding.
(cl--mapcar-many, cl--map-keymap-recursively, cl--map-intervals)
(cl--map-overlays, cl--set-frame-visible-p, cl--progv-save)
(cl--progv-before, cl--progv-after, cl--finite-do, cl--set-getf)
(cl--do-remf, cl--do-prettyprint): Use "cl--" prefix.
* lisp/emacs-lisp/cl-seq.el: Use lexical-binding.
(cl--parsing-keywords, cl--check-key, cl--check-test-nokey)
(cl--check-test, cl--check-match): Use "cl--" prefix and backquotes.
(cl--alist, cl--sublis-rec, cl--nsublis-rec, cl--tree-equal-rec):
* lisp/emacs-lisp/cl-macs.el (cl--lambda-list-keywords): Use "cl--" prefix.
* lisp/edmacro.el (edmacro-mismatch): Simplify to remove dependence on
CL's internals.
2012-06-11 11:52:50 -04:00
|
|
|
(cl--tree-equal-rec (car cl-x) (car cl-y)))
|
1993-07-30 20:15:09 +00:00
|
|
|
(setq cl-x (cdr cl-x) cl-y (cdr cl-y)))
|
Use lexical-binding for all of CL, and clean up its namespace.
* lisp/emacs-lisp/cl-lib.el: Use lexical-binding.
(cl-map-extents, cl-maclisp-member): Remove.
(cl--set-elt, cl--set-nthcdr, cl--set-buffer-substring)
(cl--set-substring, cl--block-wrapper, cl--block-throw)
(cl--compiling-file, cl--mapcar-many, cl--do-subst): Use "cl--" prefix.
* lisp/emacs-lisp/cl-extra.el: Use lexical-binding.
(cl--mapcar-many, cl--map-keymap-recursively, cl--map-intervals)
(cl--map-overlays, cl--set-frame-visible-p, cl--progv-save)
(cl--progv-before, cl--progv-after, cl--finite-do, cl--set-getf)
(cl--do-remf, cl--do-prettyprint): Use "cl--" prefix.
* lisp/emacs-lisp/cl-seq.el: Use lexical-binding.
(cl--parsing-keywords, cl--check-key, cl--check-test-nokey)
(cl--check-test, cl--check-match): Use "cl--" prefix and backquotes.
(cl--alist, cl--sublis-rec, cl--nsublis-rec, cl--tree-equal-rec):
* lisp/emacs-lisp/cl-macs.el (cl--lambda-list-keywords): Use "cl--" prefix.
* lisp/edmacro.el (edmacro-mismatch): Simplify to remove dependence on
CL's internals.
2012-06-11 11:52:50 -04:00
|
|
|
(and (not (consp cl-x)) (not (consp cl-y)) (cl--check-match cl-x cl-y)))
|
1993-07-30 20:15:09 +00:00
|
|
|
|
|
|
|
|
2020-10-20 19:10:51 +02:00
|
|
|
(make-obsolete-variable 'cl-seq-load-hook
|
|
|
|
"use `with-eval-after-load' instead." "28.1")
|
1993-07-30 20:15:09 +00:00
|
|
|
(run-hooks 'cl-seq-load-hook)
|
|
|
|
|
2007-06-27 18:59:03 +00:00
|
|
|
;; Local variables:
|
|
|
|
;; generated-autoload-file: "cl-loaddefs.el"
|
|
|
|
;; End:
|
|
|
|
|
2015-05-13 19:02:31 -04:00
|
|
|
(provide 'cl-seq)
|
|
|
|
|
1993-07-30 20:15:09 +00:00
|
|
|
;;; cl-seq.el ends here
|