From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Damien Cassou Newsgroups: gmane.emacs.bugs Subject: bug#26540: 25.2; [PATCH] Add cl-set-equal to test for set equality Date: Wed, 19 Apr 2017 13:39:11 +0200 Message-ID: <87tw5k8w4g.fsf@cassou.me> References: <87bmrve6n9.fsf@cassou.me> <87vaq0hh3f.fsf@petton.fr> <87wpag8yog.fsf@cassou.me> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Trace: blaine.gmane.org 1492602015 32268 195.159.176.226 (19 Apr 2017 11:40:15 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Wed, 19 Apr 2017 11:40:15 +0000 (UTC) To: Nicolas Petton , John Mastro , 26540@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Wed Apr 19 13:40:10 2017 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by blaine.gmane.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d0nxv-0008F3-W9 for geb-bug-gnu-emacs@m.gmane.org; Wed, 19 Apr 2017 13:40:08 +0200 Original-Received: from localhost ([::1]:47250 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d0ny1-0006xT-Im for geb-bug-gnu-emacs@m.gmane.org; Wed, 19 Apr 2017 07:40:13 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:58723) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d0nxv-0006xN-Ma for bug-gnu-emacs@gnu.org; Wed, 19 Apr 2017 07:40:09 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d0nxr-00047M-8w for bug-gnu-emacs@gnu.org; Wed, 19 Apr 2017 07:40:07 -0400 Original-Received: from debbugs.gnu.org ([208.118.235.43]:57411) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1d0nxq-00047E-Tq for bug-gnu-emacs@gnu.org; Wed, 19 Apr 2017 07:40:03 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1d0nxq-0003aR-Kb for bug-gnu-emacs@gnu.org; Wed, 19 Apr 2017 07:40:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Damien Cassou Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 19 Apr 2017 11:40:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26540 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 26540-submit@debbugs.gnu.org id=B26540.149260196113733 (code B ref 26540); Wed, 19 Apr 2017 11:40:02 +0000 Original-Received: (at 26540) by debbugs.gnu.org; 19 Apr 2017 11:39:21 +0000 Original-Received: from localhost ([127.0.0.1]:55610 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d0nxB-0003ZQ-0N for submit@debbugs.gnu.org; Wed, 19 Apr 2017 07:39:21 -0400 Original-Received: from mail.choca.pics ([62.210.108.126]:48486) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d0nx7-0003ZF-Dw for 26540@debbugs.gnu.org; Wed, 19 Apr 2017 07:39:19 -0400 Original-Received: from localhost (localhost.localdomain [IPv6:::1]) by mail.choca.pics (Postfix) with ESMTP id 479FE232B542; Wed, 19 Apr 2017 13:39:16 +0200 (CEST) Original-Received: from mail.choca.pics ([IPv6:::1]) by localhost (mail.choca.pics [IPv6:::1]) (amavisd-new, port 10032) with ESMTP id HqP5opAFhLZw; Wed, 19 Apr 2017 13:39:15 +0200 (CEST) Original-Received: from localhost (localhost.localdomain [IPv6:::1]) by mail.choca.pics (Postfix) with ESMTP id 0E117232B547; Wed, 19 Apr 2017 13:39:15 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.10.3 mail.choca.pics 0E117232B547 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cassou.me; s=9EA44F5C-DEF4-11E6-A83F-A08DF322D8FB; t=1492601955; bh=d7PeXG+ENNIVFOTGEdfsRF9HXsTMnteo/U0aebxxwsU=; h=From:To:Date:Message-ID:MIME-Version; b=BDU568inwsR2ZnemzCHWFuHCIn3Kuch7KoD8cZvoSWHRuYFIJCC9yEMOqiq+lOfwT aapKO9SNJlruto9eEWymubwUGhwS3Uyj1o+nVG9yPCgqRhAgLapZd5t2d8oEX1Qt0h ptw6ubm0TOca84sJCOnZfquCF1w9TsNI7URg2cS46chLcf0KUs2mdOydvQuuf8wTaq nTa5Fq4muPgiJK5DhOv4ynnPrWzYaplm6LscoNJfd6WeV7dUt4kGT/B5eWYGP2flWC IuXGul0XBPgGFkphiXpnu4rq6SyxUUKiwq79YAsTTZVtKChnvO7GDptEHIvGQj/YaS KeCq+aqx7Fb5w== X-Virus-Scanned: amavisd-new at choca.pics Original-Received: from mail.choca.pics ([IPv6:::1]) by localhost (mail.choca.pics [IPv6:::1]) (amavisd-new, port 10026) with ESMTP id WhYg15ZEdkCA; Wed, 19 Apr 2017 13:39:14 +0200 (CEST) Original-Received: from luz4 (31-211-216-84.customers.ownit.se [31.211.216.84]) by mail.choca.pics (Postfix) with ESMTPSA id 87A57232B542; Wed, 19 Apr 2017 13:39:14 +0200 (CEST) In-Reply-To: <87wpag8yog.fsf@cassou.me> X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.org gmane.emacs.bugs:131755 Archived-At: --=-=-= Content-Type: text/plain; format=flowed Damien Cassou writes: > it makes sense and I will try this way. Nevertheless, it also > means giving up on the :key feature. I guess it's ok. here it is. Any feedback? -- Damien Cassou http://damiencassou.seasidehosting.st "Success is the ability to go from one failure to another without losing enthusiasm." --Winston Churchill --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-Add-seq-set-equal-to-test-for-set-equality.patch >From b30eaba87be980c8fbaea3c124c3cadd9aec6fe0 Mon Sep 17 00:00:00 2001 From: Damien Cassou Date: Mon, 17 Apr 2017 11:01:39 +0200 Subject: [PATCH] Add seq-set-equal to test for set equality * lisp/emacs-lisp/seq.el (seq-set-equal): Add function to compare two lists as if they were sets. * test/lisp/emacs-lisp/seq-tests.el (test-seq-set-equal): Add test for seq-set-equal. --- doc/lispref/sequences.texi | 28 ++++++++++++++++++++++++++++ etc/NEWS | 3 +++ lisp/emacs-lisp/seq.el | 8 ++++++++ test/lisp/emacs-lisp/seq-tests.el | 25 +++++++++++++++++++++++++ 4 files changed, 64 insertions(+) diff --git a/doc/lispref/sequences.texi b/doc/lispref/sequences.texi index 93e8fa8..2f6fb1d 100644 --- a/doc/lispref/sequences.texi +++ b/doc/lispref/sequences.texi @@ -792,6 +792,34 @@ Sequence Functions @end defun +@defun seq-set-equal sequence1 sequence2 &optional testfn +This function checks whether every element of @var{sequence1} also +appears in @var{sequence2} and if every element of @var{sequence2} +also appears in @var{sequence1}. If the optional argument +@var{testfn} is non-@code{nil}, it is a function of two arguments to +use instead of the default @code{equal}. + +@example +@group +(seq-set-equal '(a b c) '(c b a)) +@result{} t +@end group +@group +(seq-set-equal '(a b c) '(c b)) +@result{} nil +@end group +@group +(seq-set-equal '("a" "b" "c") '("c" "b" "a")) +@result{} t +@end group +@group +(seq-set-equal '("a" "b" "c") '("c" "b" "a") #'eq) +@result{} nil +@end group +@end example + +@end defun + @defun seq-position sequence elt &optional function This function returns the index of the first element in @var{sequence} that is equal to @var{elt}. If the optional argument diff --git a/etc/NEWS b/etc/NEWS index 76c9dbc..9b6c89d 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -874,6 +874,9 @@ instead of its first. * Lisp Changes in Emacs 26.1 +** New function 'seq-set-equal' to check if every element of LIST1 also +appears in LIST2 and if every element of LIST2 also appears in LIST1. + +++ ** Emacs now supports records for user-defined types, via the new functions 'make-record', 'record', and 'recordp'. Records are now diff --git a/lisp/emacs-lisp/seq.el b/lisp/emacs-lisp/seq.el index 10de248..40f2988 100644 --- a/lisp/emacs-lisp/seq.el +++ b/lisp/emacs-lisp/seq.el @@ -355,6 +355,14 @@ seq-sort-by e)) sequence)) +(cl-defgeneric seq-set-equal (sequence1 sequence2 &optional testfn) + "Return true if SEQUENCE1 and SEQUENCE2 have same elements. +I.e., if every element of SEQUENCE1 also appears in SEQUENCE2 and if +every element of SEQUENCE2 also appears in SEQUENCE1. +Equality is defined by TESTFN if non-nil or by `equal' if nil." + (and (seq-every-p (lambda (item1) (seq-contains sequence2 item1 testfn)) sequence1) + (seq-every-p (lambda (item2) (seq-contains sequence1 item2 testfn)) sequence2))) + (cl-defgeneric seq-position (sequence elt &optional testfn) "Return the index of the first element in SEQUENCE that is equal to ELT. Equality is defined by TESTFN if non-nil or by `equal' if nil." diff --git a/test/lisp/emacs-lisp/seq-tests.el b/test/lisp/emacs-lisp/seq-tests.el index 788524b..9cc54d8 100644 --- a/test/lisp/emacs-lisp/seq-tests.el +++ b/test/lisp/emacs-lisp/seq-tests.el @@ -197,6 +197,31 @@ test-sequences-oddp (should (seq-every-p #'identity seq)) (should (seq-every-p #'test-sequences-evenp seq)))) +(ert-deftest test-seq-set-equal () + (with-test-sequences (seq1 '(1 2 3)) + (should (seq-set-equal seq1 seq1)) + (should (seq-set-equal seq1 seq1 #'eq)) + + (with-test-sequences (seq2 '(3 2 1)) + (should (seq-set-equal seq1 seq2)) + (should (seq-set-equal seq2 seq1)) + (should (seq-set-equal seq1 seq2 #'eq)) + (should (seq-set-equal seq2 seq1 #'eq))) + + (with-test-sequences (seq2 '(3 1)) + (should-not (seq-set-equal seq1 seq2)) + (should-not (seq-set-equal seq2 seq1)))) + + (should (seq-set-equal '("a" "b" "c") + '("c" "b" "a"))) + (should-not (seq-set-equal '("a" "b" "c") + '("c" "b" "a") #'eq)) + (should-not (seq-set-equal '(("a" 1) ("b" 1) ("c" 1)) + '(("c" 2) ("b" 2) ("a" 2)))) + (should (seq-set-equal '(("a" 1) ("b" 1) ("c" 1)) + '(("c" 2) ("b" 2) ("a" 2)) + (lambda (i1 i2) (equal (car i1) (car i2)))))) + (ert-deftest test-seq-empty-p () (with-test-sequences (seq '(0)) (should-not (seq-empty-p seq))) -- 2.9.3 --=-=-=--