branch: master
commit 6284038761ba2ca3ed33f57abc585cf866825863
Author: Nicolas Petton <nico...@petton.fr>
Commit: Nicolas Petton <nico...@petton.fr>
Update seq.el to version 1.2
* package/seq/seq.el: Update to version 1.2
* packages/seq/tests/seq-tests.el: Update to version 1.2
---
packages/seq/seq.el | 28 +++++++++++++++++++++++-----
packages/seq/tests/seq-tests.el | 11 +++++++++--
2 files changed, 32 insertions(+), 7 deletions(-)
diff --git a/packages/seq/seq.el b/packages/seq/seq.el
index bc0344d..5366fd2 100644
--- a/packages/seq/seq.el
+++ b/packages/seq/seq.el
@@ -4,7 +4,7 @@
;; Author: Nicolas Petton <nico...@petton.fr>
;; Keywords: sequences
-;; Version: 1.1.1
+;; Version: 1.2
;; Package: seq
;; Maintainer: emacs-de...@gnu.org
@@ -172,9 +172,7 @@ The result is a sequence of the same type as SEQ."
(if (listp seq)
(sort (seq-copy seq) pred)
(let ((result (seq-sort pred (append seq nil))))
- (cond ((stringp seq) (concat result))
- ((vectorp seq) (vconcat result))
- (t (error "Unsupported sequence: %s" seq))))))
+ (seq--into result (type-of seq)))))
(defun seq-contains-p (seq elt &optional testfn)
"Return the first element in SEQ that equals to ELT.
@@ -257,6 +255,27 @@ keys. Keys are compared using `equal'."
(seq-reverse seq)
nil))
+(defalias 'seq-reverse
+ (if (ignore-errors (reverse [1 2]))
+ #'reverse
+ (lambda (seq)
+ "Return the reversed copy of list, vector, or string SEQ.
+See also the function `nreverse', which is used more often."
+ (let ((result '()))
+ (seq-map (lambda (elt) (push elt result))
+ seq)
+ (if (listp seq)
+ result
+ (seq--into result (type-of seq)))))))
+
+(defun seq--into (seq type)
+ "Convert the sequence SEQ into a sequence of type TYPE."
+ (pcase type
+ (`vector (vconcat seq))
+ (`string (concat seq))
+ (`list (append seq nil))
+ (t (error "Not a sequence type name: %s" type))))
+
(defun seq--drop-list (list n)
"Return a list from LIST without its first N elements.
This is an optimization for lists in `seq-drop'."
@@ -300,7 +319,6 @@ This is an optimization for lists in `seq-take-while'."
(defalias 'seq-copy #'copy-sequence)
(defalias 'seq-elt #'elt)
-(defalias 'seq-reverse #'reverse)
(defalias 'seq-length #'length)
(defalias 'seq-do #'mapc)
(defalias 'seq-each #'seq-do)
diff --git a/packages/seq/tests/seq-tests.el b/packages/seq/tests/seq-tests.el
index b92a15c..badb326 100644
--- a/packages/seq/tests/seq-tests.el
+++ b/packages/seq/tests/seq-tests.el
@@ -216,10 +216,17 @@ Evaluate BODY for each created sequence.
(should (equal (seq-partition '(1 2 3) -1) '())))
(ert-deftest test-seq-group-by ()
- (should (equal (seq-group-by #'test-sequences-oddp '(1 2 3 4))
- '((t 1 3) (nil 2 4))))
+ (with-test-sequences (seq '(1 2 3 4))
+ (should (equal (seq-group-by #'test-sequences-oddp seq)
+ '((t 1 3) (nil 2 4)))))
(should (equal (seq-group-by #'car '((a 1) (b 3) (c 4) (a 2)))
'((b (b 3)) (c (c 4)) (a (a 1) (a 2))))))
+(ert-deftest test-seq-reverse ()
+ (with-test-sequences (seq '(1 2 3 4))
+ (should (same-contents-p (seq-reverse seq) '(4 3 2 1)))
+ (should (equal (type-of (seq-reverse seq))
+ (type-of seq)))))
+
(provide 'seq-tests)
;;; seq-tests.el ends here
