Rename seq-p and map-p to seqp and mapp
* lisp/emacs-lisp/seq.el (seqp): New name. * lisp/emacs-lisp/map.el (mapp): New name. * doc/lispref/sequences.texi: Update the documentation for seqp. * test/automated/map-tests.el: Update the tests for mapp.
This commit is contained in:
parent
23036bac7d
commit
51d840a8a1
4 changed files with 21 additions and 21 deletions
|
@ -467,18 +467,18 @@ built-in sequence types, @code{seq-length} behaves like @code{length}.
|
|||
@xref{Definition of length}.
|
||||
@end defun
|
||||
|
||||
@defun seq-p sequence
|
||||
@defun seqp sequence
|
||||
This function returns non-@code{nil} if @var{sequence} is a sequence
|
||||
(a list or array), or any additional type of sequence defined via
|
||||
@file{seq.el} generic functions.
|
||||
|
||||
@example
|
||||
@group
|
||||
(seq-p [1 2])
|
||||
(seqp [1 2])
|
||||
@result{} t
|
||||
@end group
|
||||
@group
|
||||
(seq-p 2)
|
||||
(seqp 2)
|
||||
@result{} nil
|
||||
@end group
|
||||
@end example
|
||||
|
|
|
@ -58,7 +58,7 @@ unquoted form.
|
|||
|
||||
ARGS can also be a list of symbols, which stands for ('SYMBOL
|
||||
SYMBOL)."
|
||||
`(and (pred map-p)
|
||||
`(and (pred mapp)
|
||||
,@(map--make-pcase-bindings args)))
|
||||
|
||||
(defmacro map-let (keys map &rest body)
|
||||
|
@ -155,7 +155,7 @@ MAP can be a list, hash-table or array."
|
|||
|
||||
Map can be a nested map composed of alists, hash-tables and arrays."
|
||||
(or (seq-reduce (lambda (acc key)
|
||||
(when (map-p acc)
|
||||
(when (mapp acc)
|
||||
(map-elt acc key)))
|
||||
keys
|
||||
map)
|
||||
|
@ -239,7 +239,7 @@ MAP can be a list, hash-table or array."
|
|||
(map-filter (lambda (key val) (not (funcall pred key val)))
|
||||
map))
|
||||
|
||||
(defun map-p (map)
|
||||
(defun mapp (map)
|
||||
"Return non-nil if MAP is a map (list, hash-table or array)."
|
||||
(or (listp map)
|
||||
(hash-table-p map)
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
|
||||
;; Author: Nicolas Petton <nicolas@petton.fr>
|
||||
;; Keywords: sequences
|
||||
;; Version: 2.2
|
||||
;; Version: 2.3
|
||||
;; Package: seq
|
||||
|
||||
;; Maintainer: emacs-devel@gnu.org
|
||||
|
@ -46,7 +46,7 @@
|
|||
;; - `seq-elt'
|
||||
;; - `seq-length'
|
||||
;; - `seq-do'
|
||||
;; - `seq-p'
|
||||
;; - `seqp'
|
||||
;; - `seq-subseq'
|
||||
;; - `seq-into-sequence'
|
||||
;; - `seq-copy'
|
||||
|
@ -79,7 +79,7 @@ corresponding element of SEQUENCE.
|
|||
|
||||
Extra elements of the sequence are ignored if fewer PATTERNS are
|
||||
given, and the match does not fail."
|
||||
`(and (pred seq-p)
|
||||
`(and (pred seqp)
|
||||
,@(seq--make-pcase-bindings patterns)))
|
||||
|
||||
(defmacro seq-let (args sequence &rest body)
|
||||
|
@ -117,7 +117,7 @@ Return SEQUENCE."
|
|||
|
||||
(defalias 'seq-each #'seq-do)
|
||||
|
||||
(cl-defgeneric seq-p (sequence)
|
||||
(cl-defgeneric seqp (sequence)
|
||||
"Return non-nil if SEQUENCE is a sequence, nil otherwise."
|
||||
(sequencep sequence))
|
||||
|
||||
|
@ -433,7 +433,7 @@ SEQUENCE must be a sequence of numbers or markers."
|
|||
"Return a list of `(seq ...)' pcase patterns from the argument list ARGS."
|
||||
(cons 'seq
|
||||
(seq-map (lambda (elt)
|
||||
(if (seq-p elt)
|
||||
(if (seqp elt)
|
||||
(seq--make-pcase-patterns elt)
|
||||
elt))
|
||||
args)))
|
||||
|
|
|
@ -126,16 +126,16 @@ Evaluate BODY for each created map.
|
|||
(should (null (map-nested-elt vec '(2 1 1))))
|
||||
(should (= 4 (map-nested-elt vec '(2 1 1) 4)))))
|
||||
|
||||
(ert-deftest test-map-p ()
|
||||
(should (map-p nil))
|
||||
(should (map-p '((a . b) (c . d))))
|
||||
(should (map-p '(a b c d)))
|
||||
(should (map-p []))
|
||||
(should (map-p [1 2 3]))
|
||||
(should (map-p (make-hash-table)))
|
||||
(should (map-p "hello"))
|
||||
(should (not (map-p 1)))
|
||||
(should (not (map-p 'hello))))
|
||||
(ert-deftest test-mapp ()
|
||||
(should (mapp nil))
|
||||
(should (mapp '((a . b) (c . d))))
|
||||
(should (mapp '(a b c d)))
|
||||
(should (mapp []))
|
||||
(should (mapp [1 2 3]))
|
||||
(should (mapp (make-hash-table)))
|
||||
(should (mapp "hello"))
|
||||
(should (not (mapp 1)))
|
||||
(should (not (mapp 'hello))))
|
||||
|
||||
(ert-deftest test-map-keys ()
|
||||
(with-maps-do map
|
||||
|
|
Loading…
Add table
Reference in a new issue