From patchwork Fri Jan 5 20:53:20 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christopher Baines X-Patchwork-Id: 58400 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 668C127BBEA; Fri, 5 Jan 2024 20:54:29 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 3D55127BBE9 for ; Fri, 5 Jan 2024 20:54:28 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rLrCc-0005wa-R7; Fri, 05 Jan 2024 15:54:02 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rLrCa-0005w4-JX for guix-patches@gnu.org; Fri, 05 Jan 2024 15:54:00 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rLrCZ-0007W5-KU; Fri, 05 Jan 2024 15:53:59 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rLrCb-00046d-V1; Fri, 05 Jan 2024 15:54:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68271] [PATCH 1/3] guix: utils: Add delete-duplicates/sort. References: <87h6jrqzc7.fsf@cbaines.net> In-Reply-To: <87h6jrqzc7.fsf@cbaines.net> Resent-From: Christopher Baines Original-Sender: "Debbugs-submit" Resent-CC: guix@cbaines.net, dev@jpoiret.xyz, ludo@gnu.org, othacehe@gnu.org, rekado@elephly.net, zimon.toutoune@gmail.com, me@tobias.gr, guix-patches@gnu.org Resent-Date: Fri, 05 Jan 2024 20:54:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68271 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68271@debbugs.gnu.org Cc: Christopher Baines , Josselin Poiret , Ludovic =?utf-8?q?Court=C3=A8s?= , Mathieu Othacehe , Ricardo Wurmus , Simon Tournier , Tobias Geerinckx-Rice X-Debbugs-Original-Xcc: Christopher Baines , Josselin Poiret , Ludovic =?utf-8?q?Court=C3=A8s?= , Mathieu Othacehe , Ricardo Wurmus , Simon Tournier , Tobias Geerinckx-Rice Received: via spool by 68271-submit@debbugs.gnu.org id=B68271.170448801115727 (code B ref 68271); Fri, 05 Jan 2024 20:54:01 +0000 Received: (at 68271) by debbugs.gnu.org; 5 Jan 2024 20:53:31 +0000 Received: from localhost ([127.0.0.1]:58036 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rLrC7-00045b-Ep for submit@debbugs.gnu.org; Fri, 05 Jan 2024 15:53:31 -0500 Received: from mira.cbaines.net ([212.71.252.8]:43068) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rLrC5-00045K-90 for 68271@debbugs.gnu.org; Fri, 05 Jan 2024 15:53:30 -0500 Received: from localhost (unknown [217.155.61.229]) by mira.cbaines.net (Postfix) with ESMTPSA id 94C4E27BBE2 for <68271@debbugs.gnu.org>; Fri, 5 Jan 2024 20:53:23 +0000 (GMT) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id 3df7c8f0 for <68271@debbugs.gnu.org>; Fri, 5 Jan 2024 20:53:22 +0000 (UTC) From: Christopher Baines Date: Fri, 5 Jan 2024 20:53:20 +0000 Message-ID: X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches Similar to delete-duplicates, but sorts the list first and then compares the pairs in the list. This is faster than delete-duplicates for larger lists. * guix/utils.scm (delete-duplicates): New procedure. Change-Id: Ibc2897cdb7c76be0d0e099bc47fee005a88bea2e --- guix/utils.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) base-commit: deeb7d1f53d7ddfa977b3eadd760312bbd0a2509 diff --git a/guix/utils.scm b/guix/utils.scm index e4e9d922e7..c1c967ee6c 100644 --- a/guix/utils.scm +++ b/guix/utils.scm @@ -146,6 +146,8 @@ (define-module (guix utils) edit-expression delete-expression + delete-duplicates/sort + filtered-port decompressed-port call-with-decompressed-port @@ -502,6 +504,32 @@ (define (delete-expression source-properties) "Delete the expression specified by SOURCE-PROPERTIES." (edit-expression source-properties (const "") #:include-trailing-newline? #t)) + +;;; +;;; Lists. +;;; + +(define* (delete-duplicates/sort unsorted-lst less #:optional (equal? eq?)) + (if (null? unsorted-lst) + unsorted-lst + (let ((sorted-lst (sort unsorted-lst + ;; Sort in the reverse order + (lambda (a b) (eq? #f (less a b)))))) + (let loop ((lst (cdr sorted-lst)) + (last-element (car sorted-lst)) + (result (list (car sorted-lst)))) + (if (null? lst) + result + (let ((current-element (car lst))) + (if (equal? current-element last-element) + (loop (cdr lst) + last-element + result) + (loop (cdr lst) + current-element + (cons current-element + result))))))))) + ;;; ;;; Keyword arguments.