From patchwork Mon Jun 1 00:00:27 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arun Isaac X-Patchwork-Id: 22487 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 3333C27BBE3; Mon, 1 Jun 2020 01:01:23 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 983A627BBE1 for ; Mon, 1 Jun 2020 01:01:21 +0100 (BST) Received: from localhost ([::1]:37434 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jfXtI-0002tW-WE for patchwork@mira.cbaines.net; Sun, 31 May 2020 20:01:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38228) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jfXt0-0002jw-Sc for guix-patches@gnu.org; Sun, 31 May 2020 20:01:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50796) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jfXt0-0005zu-IL for guix-patches@gnu.org; Sun, 31 May 2020 20:01:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jfXt0-0003aY-HH for guix-patches@gnu.org; Sun, 31 May 2020 20:01:02 -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: Arun Isaac Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 01 Jun 2020 00:01: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: 39258@debbugs.gnu.org Cc: Arun Isaac Received: via spool by 39258-submit@debbugs.gnu.org id=B39258.159096964013732 (code B ref 39258); Mon, 01 Jun 2020 00:01:02 +0000 Received: (at 39258) by debbugs.gnu.org; 1 Jun 2020 00:00:40 +0000 Received: from localhost ([127.0.0.1]:34102 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jfXse-0003ZK-Fg for submit@debbugs.gnu.org; Sun, 31 May 2020 20:00:40 -0400 Received: from mugam.systemreboot.net ([139.59.75.54]:37184) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jfXsa-0003Yh-Hb for 39258@debbugs.gnu.org; Sun, 31 May 2020 20:00:38 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=systemreboot.net; s=default; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=dT1VBs9ZDJ00QXb7pSgilowGUSaU3mCd3cia1N2k7HA=; b=XrsJtCMK3hw2aaL/QkeMxSnEXo L6rq1sKILtGc90Rcs6m8gQQ6627iM+Gdkoq1U57cdaNI6bOy+uQA3elRQ5OOWRh4m4u9bVwktkbDc Z+acADudoG+a6gH6EAPd3B3irJWlwRj5res+ybvWQAyHGhPanMTebS5TBsMYmcWCO+i8=; Received: from [192.168.2.1] (helo=steel.lan) by systemreboot.net with esmtpsa (TLS1.3) tls TLS_AES_256_GCM_SHA384 (Exim 4.93) (envelope-from ) id 1jfXsW-000Zk2-MW; Mon, 01 Jun 2020 05:30:33 +0530 From: Arun Isaac Date: Mon, 1 Jun 2020 05:30:27 +0530 Message-Id: <20200601000030.7443-2-arunisaac@systemreboot.net> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200601000030.7443-1-arunisaac@systemreboot.net> References: <20200601000030.7443-1-arunisaac@systemreboot.net> 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" X-getmail-retrieved-from-mailbox: Patches * 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. --- guix/ui.scm | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) 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 lst))))))))) 0 metrics))) - (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)))))) + (() total-score)))) (define %package-metrics ;; Metrics used to compute the "relevance score" of a package against a set