Message ID | 1dcef02fe1f5f25657c6427d09c43bfc41091050.1644350657.git.julien@lepiller.eu |
---|---|
State | New |
Headers |
Return-Path: <guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org> X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 1C71027BBEA; Tue, 8 Feb 2022 21:11:35 +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.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED 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 DA4CC27BBE9 for <patchwork@mira.cbaines.net>; Tue, 8 Feb 2022 21:11:34 +0000 (GMT) Received: from localhost ([::1]:48390 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from <guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org>) id 1nHXlt-0000uY-Vv for patchwork@mira.cbaines.net; Tue, 08 Feb 2022 16:11:34 -0500 Received: from eggs.gnu.org ([209.51.188.92]:41042) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1nHWuB-0000Zi-5t for guix-patches@gnu.org; Tue, 08 Feb 2022 15:16:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:54939) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1nHWuA-0007Vx-Ha for guix-patches@gnu.org; Tue, 08 Feb 2022 15:16:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1nHWuA-0002Zm-CA for guix-patches@gnu.org; Tue, 08 Feb 2022 15:16:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#53882] [PATCH 01/24] import: opam: Accept tabulations. References: <20220208210815.7ae6484d@tachikoma.lepiller.eu> In-Reply-To: <20220208210815.7ae6484d@tachikoma.lepiller.eu> Resent-From: Julien Lepiller <julien@lepiller.eu> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org> Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 08 Feb 2022 20:16:02 +0000 Resent-Message-ID: <handler.53882.B53882.16443513049546@debbugs.gnu.org> Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 53882 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 53882@debbugs.gnu.org Received: via spool by 53882-submit@debbugs.gnu.org id=B53882.16443513049546 (code B ref 53882); Tue, 08 Feb 2022 20:16:02 +0000 Received: (at 53882) by debbugs.gnu.org; 8 Feb 2022 20:15:04 +0000 Received: from localhost ([127.0.0.1]:48768 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces@debbugs.gnu.org>) id 1nHWtB-0002TF-Hw for submit@debbugs.gnu.org; Tue, 08 Feb 2022 15:15:04 -0500 Received: from lepiller.eu ([89.234.186.109]:47110) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <julien@lepiller.eu>) id 1nHWt8-0002Sz-V1 for 53882@debbugs.gnu.org; Tue, 08 Feb 2022 15:15:00 -0500 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id e4819911 for <53882@debbugs.gnu.org>; Tue, 8 Feb 2022 20:14:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=from:to :subject:date:message-id:mime-version:content-transfer-encoding; s=dkim; bh=xHQWhwH/XjDtMuuy04bcGXc+oVCE6+O7FS7Bc/kBOII=; b=Jwjq GxE6sn+bSgQ/7wMaByiz/A32OxbSc/H680tbOjEPAUD7phw9RYVuMMiaQ9W02QQU YrSGyMGR7PRxQSfu3VmJ+hep2v3kddSuqWw0UrQD99Zl6CvW811RV1fvNkIMCy+4 GAgoKiPCgHG+11Vsj15sLkcn6mphLz1yAOXPWLkTbM9UgUyHyRLFSaljs0bjf9zK wasDT7H1gCMHzRgLhibLQ6aY9lkP4TTqEZ99bDoWNN1Y9xP89MOgWYmoBZ0Lw4cJ d8cPmY5/rv7TMGnBjk7DvjTC4Z2W8CrQH4iltby3nCaQcb1s1jR8n/93ojTDKEkG qZG8zKO0mHmkOHEolQ== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id e6c8db04 (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO) for <53882@debbugs.gnu.org>; Tue, 8 Feb 2022 20:14:56 +0000 (UTC) From: Julien Lepiller <julien@lepiller.eu> Date: Tue, 8 Feb 2022 21:14:27 +0100 Message-Id: <1dcef02fe1f5f25657c6427d09c43bfc41091050.1644350657.git.julien@lepiller.eu> X-Mailer: git-send-email 2.34.0 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: <guix-patches.gnu.org> List-Unsubscribe: <https://lists.gnu.org/mailman/options/guix-patches>, <mailto:guix-patches-request@gnu.org?subject=unsubscribe> List-Archive: <https://lists.gnu.org/archive/html/guix-patches> List-Post: <mailto:guix-patches@gnu.org> List-Help: <mailto:guix-patches-request@gnu.org?subject=help> List-Subscribe: <https://lists.gnu.org/mailman/listinfo/guix-patches>, <mailto:guix-patches-request@gnu.org?subject=subscribe> Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" <guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org> X-getmail-retrieved-from-mailbox: Patches |
Series |
[bug#53882,01/24] import: opam: Accept tabulations.
|
|
Commit Message
Julien Lepiller
Feb. 8, 2022, 8:14 p.m. UTC
* guix/import/opam.scm (SP, SP2): Accept tabulation as whitespace. --- guix/import/opam.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
Comments
Julien Lepiller schreef op di 08-02-2022 om 21:14 [+0100]: > ;; Define a PEG parser for the opam format > (define-peg-pattern comment none (and "#" (* COMMCHR) "\n")) > -(define-peg-pattern SP none (or " " "\n" comment)) > -(define-peg-pattern SP2 body (or " " "\n")) > +(define-peg-pattern SP none (or " " "\n" "\t" comment)) > +(define-peg-pattern SP2 body (or " " "\n" "\t")) To test this, perhaps a few spaces can be replaced by tabs in 'test-opam-file' in tests/opam.scm? Greetings, Maxime.
diff --git a/guix/import/opam.scm b/guix/import/opam.scm index f569c921b1..f51d17dea4 100644 --- a/guix/import/opam.scm +++ b/guix/import/opam.scm @@ -61,8 +61,8 @@ (define-module (guix import opam) ;; Define a PEG parser for the opam format (define-peg-pattern comment none (and "#" (* COMMCHR) "\n")) -(define-peg-pattern SP none (or " " "\n" comment)) -(define-peg-pattern SP2 body (or " " "\n")) +(define-peg-pattern SP none (or " " "\n" "\t" comment)) +(define-peg-pattern SP2 body (or " " "\n" "\t")) (define-peg-pattern QUOTE none "\"") (define-peg-pattern QUOTE2 body "\"") (define-peg-pattern COLON none ":")