summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Petton <nicolas@petton.fr>2015-03-09 12:46:29 +0100
committerNicolas Petton <nicolas@petton.fr>2015-03-09 12:50:24 +0100
commitb7ed48c3ce8e77acc08d4948684333bef3238d2d (patch)
treef391b49af05d99cdde85b933bdaeb1e6598d146c
parent8854b9cf5283cac3e4a5a3726325a82b88c1fcb5 (diff)
downloademacs-b7ed48c3ce8e77acc08d4948684333bef3238d2d.tar.gz
Add seq-into as a public function
* lisp/emacs-lisp/seq.el: Make seq-into a public function (replacing seq--into) * test/automated/seq-tests.el: Add tests for seq-into * doc/lispref/sequences.texi: Add documentation for seq-into
-rw-r--r--doc/lispref/ChangeLog5
-rw-r--r--doc/lispref/sequences.texi22
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/emacs-lisp/seq.el12
-rw-r--r--test/ChangeLog4
-rw-r--r--test/automated/seq-tests.el22
6 files changed, 65 insertions, 5 deletions
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 42bff7c865a..260656c6cf7 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,8 @@
+2015-03-09 Nicolas Petton <nicolas@petton.fr>
+
+ * sequences.texi (seq-into): Add documentation for the new
+ seq-into function.
+
2015-03-03 Eli Zaretskii <eliz@gnu.org>
* processes.texi (Synchronous Processes): Update documentation of
diff --git a/doc/lispref/sequences.texi b/doc/lispref/sequences.texi
index 04404f886e0..1af353590cf 100644
--- a/doc/lispref/sequences.texi
+++ b/doc/lispref/sequences.texi
@@ -740,6 +740,28 @@ of @var{sequence}. Keys are compared using @code{equal}.
@end example
@end defun
+@defun seq-into sequence type
+ This function converts the sequence @var{sequence} into a sequence
+of type @var{type}. @var{type} can be one of the following symbols:
+@code{vector}, @code{string} or @code{list}.
+
+@example
+@group
+(seq-into [1 2 3] 'list)
+@result{} (1 2 3)
+@end group
+@group
+(seq-into nil 'vector)
+@result{} []
+@end group
+@group
+(seq-into "hello" 'vector)
+@result{} [104 101 108 108 111]
+@end group
+@end example
+@end defun
+
+
@defmac seq-doseq (var sequence [result]) body@dots{}
@cindex sequence iteration
This macro is like @code{dolist}, except that @var{sequence} can be a list,
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b284ef16eaf..d8330a46c89 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2015-03-09 Nicolas Petton <nicolas@petton.fr>
+
+ * emacs-lisp/seq.el (seq-into): New function.
+ Bump seq.el version to 1.3.
+
2015-03-09 Dmitry Gutov <dgutov@yandex.ru>
* progmodes/ruby-mode.el (ruby-font-lock-keywords): Don't consider
diff --git a/lisp/emacs-lisp/seq.el b/lisp/emacs-lisp/seq.el
index ad4c3536b44..59b91408d09 100644
--- a/lisp/emacs-lisp/seq.el
+++ b/lisp/emacs-lisp/seq.el
@@ -4,7 +4,8 @@
;; Author: Nicolas Petton <nicolas@petton.fr>
;; Keywords: sequences
-;; Version: 1.2
+;; Version: 1.3
+;; Package: seq
;; Maintainer: emacs-devel@gnu.org
@@ -171,7 +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))))
- (seq--into result (type-of 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.
@@ -265,10 +266,11 @@ See also the function `nreverse', which is used more often."
seq)
(if (listp seq)
result
- (seq--into result (type-of seq)))))))
+ (seq-into result (type-of seq)))))))
-(defun seq--into (seq type)
- "Convert the sequence SEQ into a sequence of type TYPE."
+(defun seq-into (seq type)
+ "Convert the sequence SEQ into a sequence of type TYPE.
+TYPE can be one of the following symbols: vector, string or list."
(pcase type
(`vector (vconcat seq))
(`string (concat seq))
diff --git a/test/ChangeLog b/test/ChangeLog
index 301cc4046e5..876b9462611 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,7 @@
+2015-03-09 Nicolas Petton <nicolas@petton.fr>
+
+ * automated/seq-tests.el (test-seq-into): Add a test for seq-into.
+
2015-03-08 Dmitry Gutov <dgutov@yandex.ru>
* indent/ruby.rb: Add an example for bug#20026.
diff --git a/test/automated/seq-tests.el b/test/automated/seq-tests.el
index badb3267f43..d3536b6f9a6 100644
--- a/test/automated/seq-tests.el
+++ b/test/automated/seq-tests.el
@@ -228,5 +228,27 @@ Evaluate BODY for each created sequence.
(should (equal (type-of (seq-reverse seq))
(type-of seq)))))
+(ert-deftest test-seq-into ()
+ (let* ((vector [1 2 3])
+ (list (seq-into vector 'list)))
+ (should (same-contents-p vector list))
+ (should (listp list)))
+ (let* ((list '(hello world))
+ (vector (seq-into list 'vector)))
+ (should (same-contents-p vector list))
+ (should (vectorp vector)))
+ (let* ((string "hello")
+ (list (seq-into string 'list)))
+ (should (same-contents-p string list))
+ (should (stringp string)))
+ (let* ((string "hello")
+ (vector (seq-into string 'vector)))
+ (should (same-contents-p string vector))
+ (should (stringp string)))
+ (let* ((list nil)
+ (vector (seq-into list 'vector)))
+ (should (same-contents-p list vector))
+ (should (vectorp vector))))
+
(provide 'seq-tests)
;;; seq-tests.el ends here