From c58f8dda2b2282302cf47ef3e7df6523bde606f5 Mon Sep 17 00:00:00 2001 From: Earl Hyatt Date: Sat, 14 Aug 2021 14:17:12 +0200 Subject: Add macro `seq-setq`. * doc/lispref/sequences.texi (seq-setq): Document this macro. * lisp/emacs-lisp/seq.el (seq-setq): New macro. * test/lisp/emacs-lisp/seq-tests.el (test-seq-setq): Test this macro (bug#50053). --- test/lisp/emacs-lisp/seq-tests.el | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'test/lisp/emacs-lisp/seq-tests.el') diff --git a/test/lisp/emacs-lisp/seq-tests.el b/test/lisp/emacs-lisp/seq-tests.el index 05c7fbe781e..44e855e2cfa 100644 --- a/test/lisp/emacs-lisp/seq-tests.el +++ b/test/lisp/emacs-lisp/seq-tests.el @@ -383,6 +383,30 @@ Evaluate BODY for each created sequence. (should (null b)) (should (null c))))) +(ert-deftest test-seq-setq () + (with-test-sequences (seq '(1 2 3 4)) + (let (a b c d e) + (seq-setq (a b c d e) seq) + (should (= a 1)) + (should (= b 2)) + (should (= c 3)) + (should (= d 4)) + (should (null e))) + (let (a b others) + (seq-setq (a b &rest others) seq) + (should (= a 1)) + (should (= b 2)) + (should (same-contents-p others (seq-drop seq 2))))) + (let ((a) + (seq '(1 (2 (3 (4)))))) + (seq-setq (_ (_ (_ (a)))) seq) + (should (= a 4))) + (let (seq a b c) + (seq-setq (a b c) seq) + (should (null a)) + (should (null b)) + (should (null c)))) + (ert-deftest test-seq-min-max () (with-test-sequences (seq '(4 5 3 2 0 4)) (should (= (seq-min seq) 0)) -- cgit v1.2.3 From a8a3fd8f8e27089ac46bf98e534529ff03f679a5 Mon Sep 17 00:00:00 2001 From: Earl Hyatt Date: Sat, 14 Aug 2021 14:17:55 +0200 Subject: Add macro `seq-setq`. * doc/lispref/sequences.texi (seq-setq): Document this macro. * test/lisp/emacs-lisp/seq-tests.el (test-seq-setq): Test this macro (bug#50053). --- doc/lispref/sequences.texi | 17 +++++++++++++++++ test/lisp/emacs-lisp/seq-tests.el | 24 ++++++++++++++++++++++++ 2 files changed, 41 insertions(+) (limited to 'test/lisp/emacs-lisp/seq-tests.el') diff --git a/doc/lispref/sequences.texi b/doc/lispref/sequences.texi index 20816ce8ca2..257f5d162ea 100644 --- a/doc/lispref/sequences.texi +++ b/doc/lispref/sequences.texi @@ -1128,6 +1128,23 @@ assigned to variables as if by @code{setq} instead of as in a @end example @end defmac +@defmac seq-setq var-sequence val-sequence +@cindex sequence destructuring + This macro works similarly to @code{seq-let}, except that values are +assigned to variables as if by @code{setq} instead of as in a +@code{let} binding. + +@example +@group +(let ((a nil) + (b nil)) + (seq-setq (_ a _ b) '(1 2 3 4)) + (list a b)) +@result{} (2 4) +@end group +@end example +@end defmac + @defun seq-random-elt sequence This function returns an element of @var{sequence} taken at random. diff --git a/test/lisp/emacs-lisp/seq-tests.el b/test/lisp/emacs-lisp/seq-tests.el index 44e855e2cfa..5217921d3d7 100644 --- a/test/lisp/emacs-lisp/seq-tests.el +++ b/test/lisp/emacs-lisp/seq-tests.el @@ -407,6 +407,30 @@ Evaluate BODY for each created sequence. (should (null b)) (should (null c)))) +(ert-deftest test-seq-setq () + (with-test-sequences (seq '(1 2 3 4)) + (let (a b c d e) + (seq-setq (a b c d e) seq) + (should (= a 1)) + (should (= b 2)) + (should (= c 3)) + (should (= d 4)) + (should (null e))) + (let (a b others) + (seq-setq (a b &rest others) seq) + (should (= a 1)) + (should (= b 2)) + (should (same-contents-p others (seq-drop seq 2))))) + (let ((a) + (seq '(1 (2 (3 (4)))))) + (seq-setq (_ (_ (_ (a)))) seq) + (should (= a 4))) + (let (seq a b c) + (seq-setq (a b c) seq) + (should (null a)) + (should (null b)) + (should (null c)))) + (ert-deftest test-seq-min-max () (with-test-sequences (seq '(4 5 3 2 0 4)) (should (= (seq-min seq) 0)) -- cgit v1.2.3 From 3fd0cc85a58775e0a09efb88649bea9dd28c5491 Mon Sep 17 00:00:00 2001 From: Lars Ingebrigtsen Date: Sat, 14 Aug 2021 15:30:17 +0200 Subject: Revert "Add macro `seq-setq`." This reverts commit a8a3fd8f8e27089ac46bf98e534529ff03f679a5. The same patch was applied twice. Remove the second instance. --- doc/lispref/sequences.texi | 17 ----------------- test/lisp/emacs-lisp/seq-tests.el | 24 ------------------------ 2 files changed, 41 deletions(-) (limited to 'test/lisp/emacs-lisp/seq-tests.el') diff --git a/doc/lispref/sequences.texi b/doc/lispref/sequences.texi index 257f5d162ea..20816ce8ca2 100644 --- a/doc/lispref/sequences.texi +++ b/doc/lispref/sequences.texi @@ -1128,23 +1128,6 @@ assigned to variables as if by @code{setq} instead of as in a @end example @end defmac -@defmac seq-setq var-sequence val-sequence -@cindex sequence destructuring - This macro works similarly to @code{seq-let}, except that values are -assigned to variables as if by @code{setq} instead of as in a -@code{let} binding. - -@example -@group -(let ((a nil) - (b nil)) - (seq-setq (_ a _ b) '(1 2 3 4)) - (list a b)) -@result{} (2 4) -@end group -@end example -@end defmac - @defun seq-random-elt sequence This function returns an element of @var{sequence} taken at random. diff --git a/test/lisp/emacs-lisp/seq-tests.el b/test/lisp/emacs-lisp/seq-tests.el index 5217921d3d7..44e855e2cfa 100644 --- a/test/lisp/emacs-lisp/seq-tests.el +++ b/test/lisp/emacs-lisp/seq-tests.el @@ -407,30 +407,6 @@ Evaluate BODY for each created sequence. (should (null b)) (should (null c)))) -(ert-deftest test-seq-setq () - (with-test-sequences (seq '(1 2 3 4)) - (let (a b c d e) - (seq-setq (a b c d e) seq) - (should (= a 1)) - (should (= b 2)) - (should (= c 3)) - (should (= d 4)) - (should (null e))) - (let (a b others) - (seq-setq (a b &rest others) seq) - (should (= a 1)) - (should (= b 2)) - (should (same-contents-p others (seq-drop seq 2))))) - (let ((a) - (seq '(1 (2 (3 (4)))))) - (seq-setq (_ (_ (_ (a)))) seq) - (should (= a 4))) - (let (seq a b c) - (seq-setq (a b c) seq) - (should (null a)) - (should (null b)) - (should (null c)))) - (ert-deftest test-seq-min-max () (with-test-sequences (seq '(4 5 3 2 0 4)) (should (= (seq-min seq) 0)) -- cgit v1.2.3