From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id SLKFKptI315vFAAA0tVLHw (envelope-from ) for ; Tue, 09 Jun 2020 08:30:19 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id 2MdXJptI315IUAAA1q6Kng (envelope-from ) for ; Tue, 09 Jun 2020 08:30:19 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id CF3DB94001C for ; Tue, 9 Jun 2020 08:30:18 +0000 (UTC) Received: from localhost ([::1]:44438 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jiZeD-0007WO-8o for larch@yhetil.org; Tue, 09 Jun 2020 04:30:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47016) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jiZdz-0007WI-GK for guix-patches@gnu.org; Tue, 09 Jun 2020 04:30:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:47315) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jiZdz-0000Mx-6w for guix-patches@gnu.org; Tue, 09 Jun 2020 04:30:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jiZdz-0005Yk-2R for guix-patches@gnu.org; Tue, 09 Jun 2020 04:30:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#39258] [PATCH 1/4] ui: Cut off search early if any regexp does not match. Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 09 Jun 2020 08:30:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 39258 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Arun Isaac Cc: 39258@debbugs.gnu.org Received: via spool by 39258-submit@debbugs.gnu.org id=B39258.159169136521299 (code B ref 39258); Tue, 09 Jun 2020 08:30:02 +0000 Received: (at 39258) by debbugs.gnu.org; 9 Jun 2020 08:29:25 +0000 Received: from localhost ([127.0.0.1]:58861 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jiZdN-0005XT-6v for submit@debbugs.gnu.org; Tue, 09 Jun 2020 04:29:25 -0400 Received: from eggs.gnu.org ([209.51.188.92]:38846) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jiZdL-0005XF-JB for 39258@debbugs.gnu.org; Tue, 09 Jun 2020 04:29:24 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:37266) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jiZdF-0000J4-HC; Tue, 09 Jun 2020 04:29:17 -0400 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=59226 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1jiZdE-0001rU-MN; Tue, 09 Jun 2020 04:29:17 -0400 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= References: <20200601000030.7443-1-arunisaac@systemreboot.net> <20200601000030.7443-2-arunisaac@systemreboot.net> Date: Tue, 09 Jun 2020 10:29:14 +0200 In-Reply-To: <20200601000030.7443-2-arunisaac@systemreboot.net> (Arun Isaac's message of "Mon, 1 Jun 2020 05:30:27 +0530") Message-ID: <874krkod5x.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -3.3 (---) X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Scanner: scn0 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Spam-Score: -1.01 X-TUID: 7lvCXDPYYJMn Hi Arun, Arun Isaac skribis: > * guix/ui.scm (relevance): When one of the regexps does not match, cut off > early and return 0. Do not try to match the remaining regexps. Good catch, LGTM! > diff --git a/guix/ui.scm b/guix/ui.scm > index ea5f460865..4a22358963 100644 > --- a/guix/ui.scm > +++ b/guix/ui.scm > @@ -1519,11 +1519,16 @@ score, the more relevant OBJ is to REGEXPS." > (+ relevance (* weight (apply + (map score-regexp ls= t))))))))) > 0 metrics))) >=20=20 > - (let ((scores (map regexp->score regexps))) > - ;; Return zero if one of REGEXPS doesn't match. > - (if (any zero? scores) > - 0 > - (reduce + 0 scores)))) > + (let loop ((regexps regexps) > + (total-score 0)) > + (match regexps > + ((head . tail) > + (let ((score (regexp->score head))) > + ;; Return zero if one of PATTERNS doesn't match. > + (cond > + ((zero? score) 0) > + (else (loop tail (+ total-score score)))))) You can use =E2=80=98if=E2=80=99 since there are only two arms. Thanks, Ludo=E2=80=99.