[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master a1535f9 3/4: Rename map-contains-key-p and map-some
From: |
Nicolas Petton |
Subject: |
[Emacs-diffs] master a1535f9 3/4: Rename map-contains-key-p and map-some-p |
Date: |
Sat, 05 Sep 2015 22:56:05 +0000 |
branch: master
commit a1535f938181ea137037d0233924a2c9d9e08f76
Author: Nicolas Petton <address@hidden>
Commit: Nicolas Petton <address@hidden>
Rename map-contains-key-p and map-some-p
Remove the "-p" suffix from both function names.
* lisp/emacs-lisp/map.el (map-contains-key, map-some): Rename the functions.
* test/automated/map-tests.el (test-map-contains-key, test-map-some):
Update both test functions.
---
lisp/emacs-lisp/map.el | 8 ++++----
test/automated/map-tests.el | 26 +++++++++++++-------------
2 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/lisp/emacs-lisp/map.el b/lisp/emacs-lisp/map.el
index 5014571..4e7d3b9 100644
--- a/lisp/emacs-lisp/map.el
+++ b/lisp/emacs-lisp/map.el
@@ -249,15 +249,15 @@ MAP can be a list, hash-table or array."
:array (seq-empty-p map)
:hash-table (zerop (hash-table-count map))))
-(defun map-contains-key-p (map key &optional testfn)
+(defun map-contains-key (map key &optional testfn)
"Return non-nil if MAP contain the key KEY, nil otherwise.
Equality is defined by TESTFN if non-nil or by `equal' if nil.
MAP can be a list, hash-table or array."
- (seq-contains-p (map-keys map) key testfn))
+ (seq-contains (map-keys map) key testfn))
-(defun map-some-p (pred map)
- "Return a key/value pair for which (PRED key val) is non-nil in MAP.
+(defun map-some (pred map)
+ "Return a non-nil if (PRED key val) is non-nil for any key/value pair in MAP.
MAP can be a list, hash-table or array."
(catch 'map--break
diff --git a/test/automated/map-tests.el b/test/automated/map-tests.el
index 1f3a07e..ca68004 100644
--- a/test/automated/map-tests.el
+++ b/test/automated/map-tests.el
@@ -252,29 +252,29 @@ Evaluate BODY for each created map.
(should (not (map-empty-p "hello")))
(should (map-empty-p "")))
-(ert-deftest test-map-contains-key-p ()
- (should (map-contains-key-p '((a . 1) (b . 2)) 'a))
- (should (not (map-contains-key-p '((a . 1) (b . 2)) 'c)))
- (should (map-contains-key-p '(("a" . 1)) "a"))
- (should (not (map-contains-key-p '(("a" . 1)) "a" #'eq)))
- (should (map-contains-key-p [a b c] 2))
- (should (not (map-contains-key-p [a b c] 3))))
-
-(ert-deftest test-map-some-p ()
+(ert-deftest test-map-contains-key ()
+ (should (map-contains-key '((a . 1) (b . 2)) 'a))
+ (should (not (map-contains-key '((a . 1) (b . 2)) 'c)))
+ (should (map-contains-key '(("a" . 1)) "a"))
+ (should (not (map-contains-key '(("a" . 1)) "a" #'eq)))
+ (should (map-contains-key [a b c] 2))
+ (should (not (map-contains-key [a b c] 3))))
+
+(ert-deftest test-map-some ()
(with-maps-do map
- (should (equal (map-some-p (lambda (k _v)
+ (should (equal (map-some (lambda (k _v)
(eq 1 k))
map)
(cons 1 4)))
- (should (not (map-some-p (lambda (k _v)
+ (should (not (map-some (lambda (k _v)
(eq 'd k))
map))))
(let ((vec [a b c]))
- (should (equal (map-some-p (lambda (k _v)
+ (should (equal (map-some (lambda (k _v)
(> k 1))
vec)
(cons 2 'c)))
- (should (not (map-some-p (lambda (k _v)
+ (should (not (map-some (lambda (k _v)
(> k 3))
vec)))))