Created
January 12, 2016 09:38
-
-
Save Wilfred/cf11078b064ed694e13e to your computer and use it in GitHub Desktop.
Marking python.el as emacs core
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
commit baa81b1c8666676b9be6f39ff0020e82e7ee791d | |
Author: Stefan Monnier <[email protected]> | |
Date: Sun Nov 29 20:28:28 2015 -0500 | |
* externals-list: Add seq and python as :core packages | |
* .gitignore: Add packages/{seq,python}. | |
* packages/seq: Remove. | |
diff --git a/.gitignore b/.gitignore | |
index 1e8522c..4c17086 100644 | |
--- a/.gitignore | |
+++ b/.gitignore | |
@@ -18,7 +18,9 @@ packages/exwm | |
packages/ntlm | |
packages/omn-mode/ | |
packages/pabbrev | |
+packages/python | |
packages/rudel | |
+packages/seq | |
packages/soap-client | |
packages/w3 | |
packages/xelb | |
diff --git a/externals-list b/externals-list | |
index bf99d91..446ed58 100644 | |
--- a/externals-list | |
+++ b/externals-list | |
@@ -64,9 +64,11 @@ | |
("on-screen" :subtree "https://github.com/michael-heerdegen/on-screen.el.git") | |
("pabbrev" :external "https://github.com/phillord/pabbrev.git") | |
("pinentry" :subtree "https://github.com/ueno/pinentry-el.git") | |
+ ("python" :core "lisp/progmodes/python.el") | |
;;FIXME:("org" :external ??) ;; Need to introduce snapshots!! | |
("rich-minority" :subtree "https://github.com/Malabarba/rich-minority") | |
("rudel" :external nil) ;; Was bzr::bzr://rudel.bzr.sourceforge.net/bzrroot/rudel/trunk | |
+ ("seq" :core "lisp/emacs-lisp/seq.el") | |
("soap-client" :core ("lisp/net/soap-client.el" "lisp/net/soap-inspect.el")) | |
("sotlisp" :subtree "https://github.com/Malabarba/speed-of-thought-lisp") | |
("spinner" :subtree "https://github.com/Malabarba/spinner.el") | |
diff --git a/packages/seq/seq.el b/packages/seq/seq.el | |
deleted file mode 100644 | |
index 58f6903..0000000 | |
--- a/packages/seq/seq.el | |
+++ /dev/null | |
@@ -1,483 +0,0 @@ | |
-;;; seq.el --- Sequence manipulation functions -*- lexical-binding: t -*- | |
- | |
-;; Copyright (C) 2014-2015 Free Software Foundation, Inc. | |
- | |
-;; Author: Nicolas Petton <[email protected]> | |
-;; Keywords: sequences | |
-;; Version: 1.11 | |
-;; Package: seq | |
- | |
-;; Maintainer: [email protected] | |
- | |
-;; This file is part of GNU Emacs. | |
- | |
-;; GNU Emacs is free software: you can redistribute it and/or modify | |
-;; it under the terms of the GNU General Public License as published by | |
-;; the Free Software Foundation, either version 3 of the License, or | |
-;; (at your option) any later version. | |
- | |
-;; GNU Emacs is distributed in the hope that it will be useful, | |
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of | |
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
-;; GNU General Public License for more details. | |
- | |
-;; You should have received a copy of the GNU General Public License | |
-;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. | |
- | |
-;;; Commentary: | |
- | |
-;; Sequence-manipulation functions that complement basic functions | |
-;; provided by subr.el. | |
-;; | |
-;; All functions are prefixed with "seq-". | |
-;; | |
-;; All provided functions work on lists, strings and vectors. | |
-;; | |
-;; Functions taking a predicate or iterating over a sequence using a | |
-;; function as argument take the function as their first argument and | |
-;; the sequence as their second argument. All other functions take | |
-;; the sequence as their first argument. | |
-;; | |
-;; All functions are tested in test/automated/seq-tests.el | |
- | |
-;;; Code: | |
- | |
-(defmacro seq-doseq (spec &rest body) | |
- "Loop over a sequence. | |
-Similar to `dolist' but can be applied to lists, strings, and vectors. | |
- | |
-Evaluate BODY with VAR bound to each element of SEQ, in turn. | |
- | |
-\(fn (VAR SEQ) BODY...)" | |
- (declare (indent 1) (debug ((symbolp form &optional form) body))) | |
- (let ((length (make-symbol "length")) | |
- (seq (make-symbol "seq")) | |
- (index (make-symbol "index"))) | |
- `(let* ((,seq ,(cadr spec)) | |
- (,length (if (listp ,seq) nil (seq-length ,seq))) | |
- (,index (if ,length 0 ,seq))) | |
- (while (if ,length | |
- (< ,index ,length) | |
- (consp ,index)) | |
- (let ((,(car spec) (if ,length | |
- (prog1 (seq-elt ,seq ,index) | |
- (setq ,index (+ ,index 1))) | |
- (pop ,index)))) | |
- ,@body))))) | |
- | |
-(if (fboundp 'pcase-defmacro) | |
- ;; Implementation of `seq-let' based on a `pcase' | |
- ;; pattern. Requires Emacs>=25.1. | |
- (progn | |
- (pcase-defmacro seq (&rest args) | |
- "pcase pattern matching sequence elements. | |
-Matches if the object is a sequence (list, string or vector), and | |
-binds each element of ARGS to the corresponding element of the | |
-sequence." | |
- `(and (pred seq-p) | |
- ,@(seq--make-pcase-bindings args))) | |
- | |
- (defmacro seq-let (args seq &rest body) | |
- "Bind the variables in ARGS to the elements of SEQ then evaluate BODY. | |
- | |
-ARGS can also include the `&rest' marker followed by a variable | |
-name to be bound to the rest of SEQ." | |
- (declare (indent 2) (debug t)) | |
- `(pcase-let ((,(seq--make-pcase-patterns args) ,seq)) | |
- ,@body))) | |
- | |
- ;; Implementation of `seq-let' compatible with Emacs<25.1. | |
- (defmacro seq-let (args seq &rest body) | |
- "Bind the variables in ARGS to the elements of SEQ then evaluate BODY. | |
- | |
-ARGS can also include the `&rest' marker followed by a variable | |
-name to be bound to the rest of SEQ." | |
- (declare (indent 2) (debug t)) | |
- (let ((seq-var (make-symbol "seq"))) | |
- `(let* ((,seq-var ,seq) | |
- ,@(seq--make-bindings args seq-var)) | |
- ,@body)))) | |
- | |
-(defun seq-drop (seq n) | |
- "Return a subsequence of SEQ without its first N elements. | |
-The result is a sequence of the same type as SEQ. | |
- | |
-If N is a negative integer or zero, SEQ is returned." | |
- (if (<= n 0) | |
- seq | |
- (if (listp seq) | |
- (seq--drop-list seq n) | |
- (let ((length (seq-length seq))) | |
- (seq-subseq seq (min n length) length))))) | |
- | |
-(defun seq-take (seq n) | |
- "Return a subsequence of SEQ with its first N elements. | |
-The result is a sequence of the same type as SEQ. | |
- | |
-If N is a negative integer or zero, an empty sequence is | |
-returned." | |
- (if (listp seq) | |
- (seq--take-list seq n) | |
- (seq-subseq seq 0 (min (max n 0) (seq-length seq))))) | |
- | |
-(defun seq-drop-while (pred seq) | |
- "Return a sequence from the first element for which (PRED element) is nil in SEQ. | |
-The result is a sequence of the same type as SEQ." | |
- (if (listp seq) | |
- (seq--drop-while-list pred seq) | |
- (seq-drop seq (seq--count-successive pred seq)))) | |
- | |
-(defun seq-take-while (pred seq) | |
- "Return the successive elements for which (PRED element) is non-nil in SEQ. | |
-The result is a sequence of the same type as SEQ." | |
- (if (listp seq) | |
- (seq--take-while-list pred seq) | |
- (seq-take seq (seq--count-successive pred seq)))) | |
- | |
-(defun seq-filter (pred seq) | |
- "Return a list of all the elements for which (PRED element) is non-nil in SEQ." | |
- (let ((exclude (make-symbol "exclude"))) | |
- (delq exclude (seq-map (lambda (elt) | |
- (if (funcall pred elt) | |
- elt | |
- exclude)) | |
- seq)))) | |
- | |
-(defun seq-remove (pred seq) | |
- "Return a list of all the elements for which (PRED element) is nil in SEQ." | |
- (seq-filter (lambda (elt) (not (funcall pred elt))) | |
- seq)) | |
- | |
-(defun seq-reduce (function seq initial-value) | |
- "Reduce the function FUNCTION across SEQ, starting with INITIAL-VALUE. | |
- | |
-Return the result of calling FUNCTION with INITIAL-VALUE and the | |
-first element of SEQ, then calling FUNCTION with that result and | |
-the second element of SEQ, then with that result and the third | |
-element of SEQ, etc. | |
- | |
-If SEQ is empty, return INITIAL-VALUE and FUNCTION is not called." | |
- (if (seq-empty-p seq) | |
- initial-value | |
- (let ((acc initial-value)) | |
- (seq-doseq (elt seq) | |
- (setq acc (funcall function acc elt))) | |
- acc))) | |
- | |
-(defun seq-some (pred seq) | |
- "Return the first value for which if (PRED element) is non-nil for in SEQ." | |
- (catch 'seq--break | |
- (seq-doseq (elt seq) | |
- (let ((result (funcall pred elt))) | |
- (when result | |
- (throw 'seq--break result)))) | |
- nil)) | |
- | |
-(defun seq-find (pred seq &optional default) | |
- "Return the first element for which (PRED element) is non-nil in SEQ. | |
-If no element is found, return DEFAULT. | |
- | |
-Note that `seq-find' has an ambiguity if the found element is | |
-identical to DEFAULT, as it cannot be known if an element was | |
-found or not." | |
- (catch 'seq--break | |
- (seq-doseq (elt seq) | |
- (when (funcall pred elt) | |
- (throw 'seq--break elt))) | |
- default)) | |
- | |
-(defun seq-every-p (pred seq) | |
- "Return non-nil if (PRED element) is non-nil for all elements of the sequence SEQ." | |
- (catch 'seq--break | |
- (seq-doseq (elt seq) | |
- (or (funcall pred elt) | |
- (throw 'seq--break nil))) | |
- t)) | |
- | |
-(defun seq-count (pred seq) | |
- "Return the number of elements for which (PRED element) is non-nil in SEQ." | |
- (let ((count 0)) | |
- (seq-doseq (elt seq) | |
- (when (funcall pred elt) | |
- (setq count (+ 1 count)))) | |
- count)) | |
- | |
-(defun seq-empty-p (seq) | |
- "Return non-nil if the sequence SEQ is empty, nil otherwise." | |
- (if (listp seq) | |
- (null seq) | |
- (= 0 (seq-length seq)))) | |
- | |
-(defun seq-sort (pred seq) | |
- "Return a sorted sequence comparing using PRED the elements of SEQ. | |
-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))))) | |
- | |
-(defun seq-contains (seq elt &optional testfn) | |
- "Return the first element in SEQ that equals to ELT. | |
-Equality is defined by TESTFN if non-nil or by `equal' if nil." | |
- (seq-some (lambda (e) | |
- (funcall (or testfn #'equal) elt e)) | |
- seq)) | |
- | |
-(defun seq-position (seq elt &optional testfn) | |
- "Return the index of the first element in SEQ that is equal to ELT. | |
-Equality is defined by TESTFN if non-nil or by `equal' if nil." | |
- (let ((index 0)) | |
- (catch 'seq--break | |
- (seq-doseq (e seq) | |
- (when (funcall (or testfn #'equal) e elt) | |
- (throw 'seq--break index)) | |
- (setq index (1+ index))) | |
- nil))) | |
- | |
-(defun seq-uniq (seq &optional testfn) | |
- "Return a list of the elements of SEQ with duplicates removed. | |
-TESTFN is used to compare elements, or `equal' if TESTFN is nil." | |
- (let ((result '())) | |
- (seq-doseq (elt seq) | |
- (unless (seq-contains result elt testfn) | |
- (setq result (cons elt result)))) | |
- (nreverse result))) | |
- | |
-(defun seq-subseq (seq start &optional end) | |
- "Return the subsequence of SEQ from START to END. | |
-If END is omitted, it defaults to the length of the sequence. | |
-If START or END is negative, it counts from the end." | |
- (cond ((or (stringp seq) (vectorp seq)) (substring seq start end)) | |
- ((listp seq) | |
- (let (len (errtext (format "Bad bounding indices: %s, %s" start end))) | |
- (and end (< end 0) (setq end (+ end (setq len (seq-length seq))))) | |
- (if (< start 0) (setq start (+ start (or len (setq len (seq-length seq)))))) | |
- (when (> start 0) | |
- (setq seq (nthcdr (1- start) seq)) | |
- (or seq (error "%s" errtext)) | |
- (setq seq (cdr seq))) | |
- (if end | |
- (let ((res nil)) | |
- (while (and (>= (setq end (1- end)) start) seq) | |
- (push (pop seq) res)) | |
- (or (= (1+ end) start) (error "%s" errtext)) | |
- (nreverse res)) | |
- (seq-copy seq)))) | |
- (t (error "Unsupported sequence: %s" seq)))) | |
- | |
-(defun seq-concatenate (type &rest seqs) | |
- "Concatenate, into a sequence of type TYPE, the sequences SEQS. | |
-TYPE must be one of following symbols: vector, string or list. | |
- | |
-\n(fn TYPE SEQUENCE...)" | |
- (pcase type | |
- (`vector (apply #'vconcat seqs)) | |
- (`string (apply #'concat seqs)) | |
- (`list (apply #'append (append seqs '(nil)))) | |
- (t (error "Not a sequence type name: %S" type)))) | |
- | |
-(defun seq-mapcat (function seq &optional type) | |
- "Concatenate the result of applying FUNCTION to each element of SEQ. | |
-The result is a sequence of type TYPE, or a list if TYPE is nil." | |
- (apply #'seq-concatenate (or type 'list) | |
- (seq-map function seq))) | |
- | |
-(defun seq-partition (seq n) | |
- "Return a list of the elements of SEQ grouped into sub-sequences of length N. | |
-The last sequence may contain less than N elements. If N is a | |
-negative integer or 0, nil is returned." | |
- (unless (< n 1) | |
- (let ((result '())) | |
- (while (not (seq-empty-p seq)) | |
- (push (seq-take seq n) result) | |
- (setq seq (seq-drop seq n))) | |
- (nreverse result)))) | |
- | |
-(defun seq-intersection (seq1 seq2 &optional testfn) | |
- "Return a list of the elements that appear in both SEQ1 and SEQ2. | |
-Equality is defined by TESTFN if non-nil or by `equal' if nil." | |
- (seq-reduce (lambda (acc elt) | |
- (if (seq-contains seq2 elt testfn) | |
- (cons elt acc) | |
- acc)) | |
- (seq-reverse seq1) | |
- '())) | |
- | |
-(defun seq-difference (seq1 seq2 &optional testfn) | |
- "Return a list of the elements that appear in SEQ1 but not in SEQ2. | |
-Equality is defined by TESTFN if non-nil or by `equal' if nil." | |
- (seq-reduce (lambda (acc elt) | |
- (if (not (seq-contains seq2 elt testfn)) | |
- (cons elt acc) | |
- acc)) | |
- (seq-reverse seq1) | |
- '())) | |
- | |
-(defun seq-group-by (function seq) | |
- "Apply FUNCTION to each element of SEQ. | |
-Separate the elements of SEQ into an alist using the results as | |
-keys. Keys are compared using `equal'." | |
- (seq-reduce | |
- (lambda (acc elt) | |
- (let* ((key (funcall function elt)) | |
- (cell (assoc key acc))) | |
- (if cell | |
- (setcdr cell (push elt (cdr cell))) | |
- (push (list key elt) acc)) | |
- acc)) | |
- (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. | |
-TYPE can be one of the following symbols: vector, string or list." | |
- (pcase type | |
- (`vector (vconcat seq)) | |
- (`string (concat seq)) | |
- (`list (append seq nil)) | |
- (t (error "Not a sequence type name: %S" type)))) | |
- | |
-(defun seq-min (seq) | |
- "Return the smallest element of SEQ. | |
-SEQ must be a sequence of numbers or markers." | |
- (apply #'min (seq-into seq 'list))) | |
- | |
-(defun seq-max (seq) | |
- "Return the largest element of SEQ. | |
-SEQ must be a sequence of numbers or markers." | |
- (apply #'max (seq-into seq 'list))) | |
- | |
-(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'." | |
- (while (and list (> n 0)) | |
- (setq list (cdr list) | |
- n (1- n))) | |
- list) | |
- | |
-(defun seq--take-list (list n) | |
- "Return a list from LIST made of its first N elements. | |
-This is an optimization for lists in `seq-take'." | |
- (let ((result '())) | |
- (while (and list (> n 0)) | |
- (setq n (1- n)) | |
- (push (pop list) result)) | |
- (nreverse result))) | |
- | |
-(defun seq--drop-while-list (pred list) | |
- "Return a list from the first element for which (PRED element) is nil in LIST. | |
-This is an optimization for lists in `seq-drop-while'." | |
- (while (and list (funcall pred (car list))) | |
- (setq list (cdr list))) | |
- list) | |
- | |
-(defun seq--take-while-list (pred list) | |
- "Return the successive elements for which (PRED element) is non-nil in LIST. | |
-This is an optimization for lists in `seq-take-while'." | |
- (let ((result '())) | |
- (while (and list (funcall pred (car list))) | |
- (push (pop list) result)) | |
- (nreverse result))) | |
- | |
-(defun seq--count-successive (pred seq) | |
- "Return the number of successive elements for which (PRED element) is non-nil in SEQ." | |
- (let ((n 0) | |
- (len (seq-length seq))) | |
- (while (and (< n len) | |
- (funcall pred (seq-elt seq n))) | |
- (setq n (+ 1 n))) | |
- n)) | |
- | |
-(defun seq--make-pcase-bindings (args) | |
- "Return a list of bindings of the variables in ARGS to the elements of a sequence." | |
- (let ((bindings '()) | |
- (index 0) | |
- (rest-marker nil)) | |
- (seq-doseq (name args) | |
- (unless rest-marker | |
- (pcase name | |
- (`&rest | |
- (progn (push `(app (pcase--flip seq-drop ,index) | |
- ,(seq--elt-safe args (1+ index))) | |
- bindings) | |
- (setq rest-marker t))) | |
- (t | |
- (push `(app (pcase--flip seq--elt-safe ,index) ,name) bindings)))) | |
- (setq index (1+ index))) | |
- bindings)) | |
- | |
-(defun seq--make-pcase-patterns (args) | |
- "Return a list of `(seq ...)' pcase patterns from the argument list ARGS." | |
- (cons 'seq | |
- (seq-map (lambda (elt) | |
- (if (seq-p elt) | |
- (seq--make-pcase-patterns elt) | |
- elt)) | |
- args))) | |
- | |
-;; Helper function for the Backward-compatible version of `seq-let' | |
-;; for Emacs<25.1. | |
-(defun seq--make-bindings (args seq &optional bindings) | |
- "Return a list of bindings of the variables in ARGS to the elements of a sequence. | |
-if BINDINGS is non-nil, append new bindings to it, and return | |
-BINDINGS." | |
- (let ((index 0) | |
- (rest-marker nil)) | |
- (seq-doseq (name args) | |
- (unless rest-marker | |
- (pcase name | |
- ((pred seq-p) | |
- (setq bindings (seq--make-bindings (seq--elt-safe args index) | |
- `(seq--elt-safe ,seq ,index) | |
- bindings))) | |
- (`&rest | |
- (progn (push `(,(seq--elt-safe args (1+ index)) | |
- (seq-drop ,seq ,index)) | |
- bindings) | |
- (setq rest-marker t))) | |
- (t | |
- (push `(,name (seq--elt-safe ,seq ,index)) bindings)))) | |
- (setq index (1+ index))) | |
- bindings)) | |
- | |
-(defun seq--elt-safe (seq n) | |
- "Return element of SEQ at the index N. | |
-If no element is found, return nil." | |
- (when (or (listp seq) | |
- (and (sequencep seq) | |
- (> (seq-length seq) n))) | |
- (seq-elt seq n))) | |
- | |
-(defun seq--activate-font-lock-keywords () | |
- "Activate font-lock keywords for some symbols defined in seq." | |
- (font-lock-add-keywords 'emacs-lisp-mode | |
- '("\\<seq-doseq\\>" "\\<seq-let\\>"))) | |
- | |
-(defalias 'seq-copy #'copy-sequence) | |
-(defalias 'seq-elt #'elt) | |
-(defalias 'seq-length #'length) | |
-(defalias 'seq-do #'mapc) | |
-(defalias 'seq-each #'seq-do) | |
-(defalias 'seq-map #'mapcar) | |
-(defalias 'seq-p #'sequencep) | |
- | |
-(unless (fboundp 'elisp--font-lock-flush-elisp-buffers) | |
- ;; In Emacs≥25, (via elisp--font-lock-flush-elisp-buffers and a few others) | |
- ;; we automatically highlight macros. | |
- (add-hook 'emacs-lisp-mode-hook #'seq--activate-font-lock-keywords)) | |
- | |
-(provide 'seq) | |
-;;; seq.el ends here | |
diff --git a/packages/seq/tests/seq-tests.el b/packages/seq/tests/seq-tests.el | |
deleted file mode 100644 | |
index 8f2dfbb..0000000 | |
--- a/packages/seq/tests/seq-tests.el | |
+++ /dev/null | |
@@ -1,326 +0,0 @@ | |
-;;; seq-tests.el --- Tests for sequences.el | |
- | |
-;; Copyright (C) 2014-2015 Free Software Foundation, Inc. | |
- | |
-;; Author: Nicolas Petton <[email protected]> | |
-;; Maintainer: [email protected] | |
- | |
-;; This file is part of GNU Emacs. | |
- | |
-;; GNU Emacs is free software: you can redistribute it and/or modify | |
-;; it under the terms of the GNU General Public License as published by | |
-;; the Free Software Foundation, either version 3 of the License, or | |
-;; (at your option) any later version. | |
- | |
-;; GNU Emacs is distributed in the hope that it will be useful, | |
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of | |
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
-;; GNU General Public License for more details. | |
- | |
-;; You should have received a copy of the GNU General Public License | |
-;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. | |
- | |
-;;; Commentary: | |
- | |
-;; Tests for sequences.el | |
- | |
-;;; Code: | |
- | |
-(require 'ert) | |
-(require 'seq) | |
- | |
-(defmacro with-test-sequences (spec &rest body) | |
- "Successively bind VAR to a list, vector, and string built from SEQ. | |
-Evaluate BODY for each created sequence. | |
- | |
-\(fn (var seq) body)" | |
- (declare (indent 1) (debug ((symbolp form) body))) | |
- (let ((initial-seq (make-symbol "initial-seq"))) | |
- `(let ((,initial-seq ,(cadr spec))) | |
- ,@(mapcar (lambda (s) | |
- `(let ((,(car spec) (apply (function ,s) ,initial-seq))) | |
- ,@body)) | |
- '(list vector string))))) | |
- | |
-(defun same-contents-p (seq1 seq2) | |
- "Return t if SEQ1 and SEQ2 have the same contents, nil otherwise." | |
- (equal (append seq1 '()) (append seq2 '()))) | |
- | |
-(defun test-sequences-evenp (integer) | |
- "Return t if INTEGER is even." | |
- (eq (logand integer 1) 0)) | |
- | |
-(defun test-sequences-oddp (integer) | |
- "Return t if INTEGER is odd." | |
- (not (test-sequences-evenp integer))) | |
- | |
-(ert-deftest test-seq-drop () | |
- (with-test-sequences (seq '(1 2 3 4)) | |
- (should (equal (seq-drop seq 0) seq)) | |
- (should (equal (seq-drop seq 1) (seq-subseq seq 1))) | |
- (should (equal (seq-drop seq 2) (seq-subseq seq 2))) | |
- (should (seq-empty-p (seq-drop seq 4))) | |
- (should (seq-empty-p (seq-drop seq 10)))) | |
- (with-test-sequences (seq '()) | |
- (should (seq-empty-p (seq-drop seq 0))) | |
- (should (seq-empty-p (seq-drop seq 1))))) | |
- | |
-(ert-deftest test-seq-take () | |
- (with-test-sequences (seq '(2 3 4 5)) | |
- (should (seq-empty-p (seq-take seq 0))) | |
- (should (= (seq-length (seq-take seq 1)) 1)) | |
- (should (= (seq-elt (seq-take seq 1) 0) 2)) | |
- (should (same-contents-p (seq-take seq 3) '(2 3 4))) | |
- (should (equal (seq-take seq 10) seq)))) | |
- | |
-(ert-deftest test-seq-drop-while () | |
- (with-test-sequences (seq '(1 3 2 4)) | |
- (should (equal (seq-drop-while #'test-sequences-oddp seq) | |
- (seq-drop seq 2))) | |
- (should (equal (seq-drop-while #'test-sequences-evenp seq) | |
- seq)) | |
- (should (seq-empty-p (seq-drop-while #'numberp seq)))) | |
- (with-test-sequences (seq '()) | |
- (should (seq-empty-p (seq-drop-while #'test-sequences-oddp seq))))) | |
- | |
-(ert-deftest test-seq-take-while () | |
- (with-test-sequences (seq '(1 3 2 4)) | |
- (should (equal (seq-take-while #'test-sequences-oddp seq) | |
- (seq-take seq 2))) | |
- (should (seq-empty-p (seq-take-while #'test-sequences-evenp seq))) | |
- (should (equal (seq-take-while #'numberp seq) seq))) | |
- (with-test-sequences (seq '()) | |
- (should (seq-empty-p (seq-take-while #'test-sequences-oddp seq))))) | |
- | |
-(ert-deftest test-seq-filter () | |
- (with-test-sequences (seq '(6 7 8 9 10)) | |
- (should (equal (seq-filter #'test-sequences-evenp seq) '(6 8 10))) | |
- (should (equal (seq-filter #'test-sequences-oddp seq) '(7 9))) | |
- (should (equal (seq-filter (lambda (elt) nil) seq) '()))) | |
- (with-test-sequences (seq '()) | |
- (should (equal (seq-filter #'test-sequences-evenp seq) '())))) | |
- | |
-(ert-deftest test-seq-remove () | |
- (with-test-sequences (seq '(6 7 8 9 10)) | |
- (should (equal (seq-remove #'test-sequences-evenp seq) '(7 9))) | |
- (should (equal (seq-remove #'test-sequences-oddp seq) '(6 8 10))) | |
- (should (same-contents-p (seq-remove (lambda (elt) nil) seq) seq))) | |
- (with-test-sequences (seq '()) | |
- (should (equal (seq-remove #'test-sequences-evenp seq) '())))) | |
- | |
-(ert-deftest test-seq-count () | |
- (with-test-sequences (seq '(6 7 8 9 10)) | |
- (should (equal (seq-count #'test-sequences-evenp seq) 3)) | |
- (should (equal (seq-count #'test-sequences-oddp seq) 2)) | |
- (should (equal (seq-count (lambda (elt) nil) seq) 0))) | |
- (with-test-sequences (seq '()) | |
- (should (equal (seq-count #'test-sequences-evenp seq) 0)))) | |
- | |
-(ert-deftest test-seq-reduce () | |
- (with-test-sequences (seq '(1 2 3 4)) | |
- (should (= (seq-reduce #'+ seq 0) 10)) | |
- (should (= (seq-reduce #'+ seq 5) 15))) | |
- (with-test-sequences (seq '()) | |
- (should (eq (seq-reduce #'+ seq 0) 0)) | |
- (should (eq (seq-reduce #'+ seq 7) 7)))) | |
- | |
-(ert-deftest test-seq-some () | |
- (with-test-sequences (seq '(4 3 2 1)) | |
- (should (seq-some #'test-sequences-evenp seq)) | |
- (should (seq-some #'test-sequences-oddp seq)) | |
- (should-not (seq-some (lambda (elt) (> elt 10)) seq))) | |
- (with-test-sequences (seq '()) | |
- (should-not (seq-some #'test-sequences-oddp seq))) | |
- (should (seq-some #'null '(1 nil 2)))) | |
- | |
-(ert-deftest test-seq-find () | |
- (with-test-sequences (seq '(4 3 2 1)) | |
- (should (= 4 (seq-find #'test-sequences-evenp seq))) | |
- (should (= 3 (seq-find #'test-sequences-oddp seq))) | |
- (should-not (seq-find (lambda (elt) (> elt 10)) seq))) | |
- (should-not (seq-find #'null '(1 nil 2))) | |
- (should-not (seq-find #'null '(1 nil 2) t)) | |
- (should-not (seq-find #'null '(1 2 3))) | |
- (should (seq-find #'null '(1 2 3) 'sentinel))) | |
- | |
-(ert-deftest test-seq-contains () | |
- (with-test-sequences (seq '(3 4 5 6)) | |
- (should (seq-contains seq 3)) | |
- (should-not (seq-contains seq 7))) | |
- (with-test-sequences (seq '()) | |
- (should-not (seq-contains seq 3)) | |
- (should-not (seq-contains seq nil)))) | |
- | |
-(ert-deftest test-seq-every-p () | |
- (with-test-sequences (seq '(43 54 22 1)) | |
- (should (seq-every-p (lambda (elt) t) seq)) | |
- (should-not (seq-every-p #'test-sequences-oddp seq)) | |
- (should-not (seq-every-p #'test-sequences-evenp seq))) | |
- (with-test-sequences (seq '(42 54 22 2)) | |
- (should (seq-every-p #'test-sequences-evenp seq)) | |
- (should-not (seq-every-p #'test-sequences-oddp seq))) | |
- (with-test-sequences (seq '()) | |
- (should (seq-every-p #'identity seq)) | |
- (should (seq-every-p #'test-sequences-evenp seq)))) | |
- | |
-(ert-deftest test-seq-empty-p () | |
- (with-test-sequences (seq '(0)) | |
- (should-not (seq-empty-p seq))) | |
- (with-test-sequences (seq '(0 1 2)) | |
- (should-not (seq-empty-p seq))) | |
- (with-test-sequences (seq '()) | |
- (should (seq-empty-p seq)))) | |
- | |
-(ert-deftest test-seq-sort () | |
- (should (equal (seq-sort #'< "cbaf") "abcf")) | |
- (should (equal (seq-sort #'< '(2 1 9 4)) '(1 2 4 9))) | |
- (should (equal (seq-sort #'< [2 1 9 4]) [1 2 4 9])) | |
- (should (equal (seq-sort #'< "") ""))) | |
- | |
-(ert-deftest test-seq-uniq () | |
- (with-test-sequences (seq '(2 4 6 8 6 4 3)) | |
- (should (equal (seq-uniq seq) '(2 4 6 8 3)))) | |
- (with-test-sequences (seq '(3 3 3 3 3)) | |
- (should (equal (seq-uniq seq) '(3)))) | |
- (with-test-sequences (seq '()) | |
- (should (equal (seq-uniq seq) '())))) | |
- | |
-(ert-deftest test-seq-subseq () | |
- (with-test-sequences (seq '(2 3 4 5)) | |
- (should (equal (seq-subseq seq 0 4) seq)) | |
- (should (same-contents-p (seq-subseq seq 2 4) '(4 5))) | |
- (should (same-contents-p (seq-subseq seq 1 3) '(3 4))) | |
- (should (same-contents-p (seq-subseq seq 1 -1) '(3 4)))) | |
- (should (vectorp (seq-subseq [2 3 4 5] 2))) | |
- (should (stringp (seq-subseq "foo" 2 3))) | |
- (should (listp (seq-subseq '(2 3 4 4) 2 3))) | |
- (should-error (seq-subseq '(1 2 3) 4)) | |
- (should-not (seq-subseq '(1 2 3) 3)) | |
- (should (seq-subseq '(1 2 3) -3)) | |
- (should-error (seq-subseq '(1 2 3) 1 4)) | |
- (should (seq-subseq '(1 2 3) 1 3))) | |
- | |
-(ert-deftest test-seq-concatenate () | |
- (with-test-sequences (seq '(2 4 6)) | |
- (should (equal (seq-concatenate 'string seq [8]) (string 2 4 6 8))) | |
- (should (equal (seq-concatenate 'list seq '(8 10)) '(2 4 6 8 10))) | |
- (should (equal (seq-concatenate 'vector seq '(8 10)) [2 4 6 8 10])) | |
- (should (equal (seq-concatenate 'vector nil '(8 10)) [8 10])) | |
- (should (equal (seq-concatenate 'vector seq nil) [2 4 6])))) | |
- | |
-(ert-deftest test-seq-mapcat () | |
- (should (equal (seq-mapcat #'seq-reverse '((3 2 1) (6 5 4))) | |
- '(1 2 3 4 5 6))) | |
- (should (equal (seq-mapcat #'seq-reverse '[(3 2 1) (6 5 4)]) | |
- '(1 2 3 4 5 6))) | |
- (should (equal (seq-mapcat #'seq-reverse '((3 2 1) (6 5 4)) 'vector) | |
- '[1 2 3 4 5 6]))) | |
- | |
-(ert-deftest test-seq-partition () | |
- (should (same-contents-p (seq-partition '(0 1 2 3 4 5 6 7) 3) | |
- '((0 1 2) (3 4 5) (6 7)))) | |
- (should (same-contents-p (seq-partition '[0 1 2 3 4 5 6 7] 3) | |
- '([0 1 2] [3 4 5] [6 7]))) | |
- (should (same-contents-p (seq-partition "Hello world" 2) | |
- '("He" "ll" "o " "wo" "rl" "d"))) | |
- (should (equal (seq-partition '() 2) '())) | |
- (should (equal (seq-partition '(1 2 3) -1) '()))) | |
- | |
-(ert-deftest test-seq-group-by () | |
- (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))))) | |
- | |
-(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)))) | |
- | |
-(ert-deftest test-seq-intersection () | |
- (let ((v1 [2 3 4 5]) | |
- (v2 [1 3 5 6 7])) | |
- (should (same-contents-p (seq-intersection v1 v2) | |
- '(3 5)))) | |
- (let ((l1 '(2 3 4 5)) | |
- (l2 '(1 3 5 6 7))) | |
- (should (same-contents-p (seq-intersection l1 l2) | |
- '(3 5)))) | |
- (let ((v1 [2 4 6]) | |
- (v2 [1 3 5])) | |
- (should (seq-empty-p (seq-intersection v1 v2))))) | |
- | |
-(ert-deftest test-seq-difference () | |
- (let ((v1 [2 3 4 5]) | |
- (v2 [1 3 5 6 7])) | |
- (should (same-contents-p (seq-difference v1 v2) | |
- '(2 4)))) | |
- (let ((l1 '(2 3 4 5)) | |
- (l2 '(1 3 5 6 7))) | |
- (should (same-contents-p (seq-difference l1 l2) | |
- '(2 4)))) | |
- (let ((v1 [2 4 6]) | |
- (v2 [2 4 6])) | |
- (should (seq-empty-p (seq-difference v1 v2))))) | |
- | |
-(ert-deftest test-seq-let () | |
- (with-test-sequences (seq '(1 2 3 4)) | |
- (seq-let (a b c d e) seq | |
- (should (= a 1)) | |
- (should (= b 2)) | |
- (should (= c 3)) | |
- (should (= d 4)) | |
- (should (null e))) | |
- (seq-let (a b &rest others) seq | |
- (should (= a 1)) | |
- (should (= b 2)) | |
- (should (same-contents-p others (seq-drop seq 2))))) | |
- (let ((seq '(1 (2 (3 (4)))))) | |
- (seq-let (_ (_ (_ (a)))) seq | |
- (should (= a 4)))) | |
- (let (seq) | |
- (seq-let (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)) | |
- (should (= (seq-max seq) 5)))) | |
- | |
-(ert-deftest test-seq-position () | |
- (with-test-sequences (seq '(2 4 6)) | |
- (should (null (seq-position seq 1))) | |
- (should (= (seq-position seq 4) 1))) | |
- (let ((seq '(a b c))) | |
- (should (null (seq-position seq 'd #'eq))) | |
- (should (= (seq-position seq 'a #'eq) 0)) | |
- (should (null (seq-position seq (make-symbol "a") #'eq))))) | |
- | |
-(provide 'seq-tests) | |
-;;; seq-tests.el ends here |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment