From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id SLFUDL3rUWJbagAAgWs5BA (envelope-from ) for ; Sat, 09 Apr 2022 22:25:33 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id ALSmCb3rUWJNzQAA9RJhRA (envelope-from ) for ; Sat, 09 Apr 2022 22:25:33 +0200 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 B8CDC16A0A for ; Sat, 9 Apr 2022 22:25:32 +0200 (CEST) Received: from localhost ([::1]:45394 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ndHeF-00089P-UM for larch@yhetil.org; Sat, 09 Apr 2022 16:25:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33200) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ndHdq-0007t8-CV for guix-patches@gnu.org; Sat, 09 Apr 2022 16:25:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:44855) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ndHdn-0001Ok-Ny for guix-patches@gnu.org; Sat, 09 Apr 2022 16:25:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ndHdn-0002ph-Jp for guix-patches@gnu.org; Sat, 09 Apr 2022 16:25:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#54823] [PATCH 2/3] colors: Add 'colorize-full-matches'. Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 09 Apr 2022 20:25:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54823 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 54823@debbugs.gnu.org Cc: Ludovic =?UTF-8?Q?Court=C3=A8s?= Received: via spool by 54823-submit@debbugs.gnu.org id=B54823.164953586710823 (code B ref 54823); Sat, 09 Apr 2022 20:25:03 +0000 Received: (at 54823) by debbugs.gnu.org; 9 Apr 2022 20:24:27 +0000 Received: from localhost ([127.0.0.1]:38750 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ndHdC-0002oV-H6 for submit@debbugs.gnu.org; Sat, 09 Apr 2022 16:24:26 -0400 Received: from eggs.gnu.org ([209.51.188.92]:39766) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ndHcw-0002nW-2s for 54823@debbugs.gnu.org; Sat, 09 Apr 2022 16:24:25 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:56252) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ndHcq-00019D-SK; Sat, 09 Apr 2022 16:24:04 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=KWSC9tQImhYSyjPeKeFnX3+JHLwlWqc4xophC5mie/s=; b=EA5n2nB4oqrqLR9fomSU Nz7apqzSShZzghfFXFnokVmZqZFWQv6tI/1ughvz/VNumjsD9zER/gOiai09G7lyo6sNcC10UCVe5 xNIabDZjm6AbO0Az/nt1HtSLRowVRNdsgsPH4tFZtFkrMSXNGg1RiDON+T1UkKX0Uh9ktZ9AZNk92 cS5sKWD9nphINhrlepFtKRqgJbG37vs3tx6yTd5+OBguFdFOndn3Re6d3LaSdnYs3PHG9pYjGO3YJ FAoso+YIgZpklqF7Amca4LWgncrXksm92O9CDqJkgaW/7upQ/2v7zGBn47dz2KMspiiTQx3SgseJK mt6Mw5kMiO1XBg==; Received: from 91-160-117-201.subs.proxad.net ([91.160.117.201]:58105 helo=gnu.org) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ndHcq-0004pO-2I; Sat, 09 Apr 2022 16:24:04 -0400 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Date: Sat, 9 Apr 2022 22:23:43 +0200 Message-Id: <20220409202344.32090-2-ludo@gnu.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220409202344.32090-1-ludo@gnu.org> References: <20220409202344.32090-1-ludo@gnu.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-To: larch@yhetil.org X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1649535932; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=KWSC9tQImhYSyjPeKeFnX3+JHLwlWqc4xophC5mie/s=; b=NvG/zSA1jbEOmvPy6lXKk8MPmBxDwOvxOCNnKmox1km1BPCIHI1wNV2eXZEzrCZFWyWdV3 zV3und2u6HWn54ptflM5UG8SqYb2U7ldx02TRlcVab3xSrdS9HAxBdGTM6/q50hljdlKCr tn/t71zyh2B8v3B7PORkWjFx7nS8urX/+vDnRBrph4gdC4IkYUDJjRy2XWDUSAaIPJW2Yq hJMHdXHorAdtpe+ig0cwBSX96l+rkuYy9PMGr3MOwx79KeBTIN1OPTa76wu6H7yIw1opM5 /luexJOy+xYCW3YrqGHfpVXfMCt410M/7ksPT6rueqylcIQSZZF+Lr2tequEEQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1649535932; a=rsa-sha256; cv=none; b=Ium/WonbcnKwaHcO+FVhy6oYBwMOXPWFGHLyOw+qPPPY9sMdOkreeadR9Aviuzaak0d0n8 +aRqODSjNUpIcIblSm026R6Yi/UyLNvxx5WV0C/PKmnzVEu/kq+baraGALyKMpiw3siId3 VvMg68rnCRDRYtxBCZNO2efTjtwDfuedbhztDUfoIm/G9X7e8FTnWmfx6aca+nbA0dhpzY cGu+P5SQ8VQ7fC32nnlGcX+KA6hI6kPtyho7j3gCpZWn53qAMEPQx0grRXSyWNj/jPTMET gm0fUzJ45OAcA0py/S7xdsqD0XQHuJeTXjMfKuEGVPwzVXNqSKmp+XRsBhZByA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=EA5n2nB4; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: -2.77 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=EA5n2nB4; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: B8CDC16A0A X-Spam-Score: -2.77 X-Migadu-Scanner: scn0.migadu.com X-TUID: UYM7hbiiF8Di * guix/colors.scm (colorize-full-matches): New procedure. --- guix/colors.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/guix/colors.scm b/guix/colors.scm index 3fd36c68ef..543f4c3ec5 100644 --- a/guix/colors.scm +++ b/guix/colors.scm @@ -36,6 +36,7 @@ (define-module (guix colors) highlight/warn dim + colorize-full-matches color-rules color-output? isatty?* @@ -153,6 +154,27 @@ (define highlight (coloring-procedure (color BOLD))) (define highlight/warn (coloring-procedure (color BOLD MAGENTA))) (define dim (coloring-procedure (color DARK))) +(define (colorize-full-matches rules) + "Return a procedure that, given a string, colorizes according to RULES. +RULES must be a list of regexp/color pairs; the whole match of a regexp is +colorized with the corresponding color." + (define proc + (lambda (str) + (if (string-index str #\nul) + str + (let loop ((rules rules)) + (match rules + (() + str) + (((regexp . color) . rest) + (match (regexp-exec regexp str) + (#f (loop rest)) + (m (string-append (proc (match:prefix m)) + (colorize-string (match:substring m) + color) + (proc (match:suffix m))))))))))) + proc) + (define (colorize-matches rules) "Return a procedure that, when passed a string, returns that string colorized according to RULES. RULES must be a list of tuples like: -- 2.35.1