From patchwork Wed Jul 6 13:31:35 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre-Marie de Rodat X-Patchwork-Id: 1652997 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.a=rsa-sha256 header.s=default header.b=QO7UJa3H; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=8.43.85.97; helo=sourceware.org; envelope-from=gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Received: from sourceware.org (ip-8-43-85-97.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4LdLCT6Bl2z9s07 for ; Wed, 6 Jul 2022 23:35:49 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 771803833004 for ; Wed, 6 Jul 2022 13:35:47 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 771803833004 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1657114547; bh=t2ZPbydh7KeE60MJyLVSPpfgjYDtoN1zJ6jtlbI620c=; h=Date:To:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:Cc:From; b=QO7UJa3HgNMbFpqPw9sqHkbrPHRJO7/W1c197PtpZCkFW4BlOV4SJnNpe4vDT2+wv Kb/7eXokuZLakrapwT5JVzNa252voC8mjlyqXOkJK4IShuiJ12LOWTMjUObcD+6QFY b98v/92VF+mrlldtrIuS+JPBGAprYvUpIbrjaHCk= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-wr1-x42f.google.com (mail-wr1-x42f.google.com [IPv6:2a00:1450:4864:20::42f]) by sourceware.org (Postfix) with ESMTPS id E424A385C413 for ; Wed, 6 Jul 2022 13:31:36 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org E424A385C413 Received: by mail-wr1-x42f.google.com with SMTP id v14so22105764wra.5 for ; Wed, 06 Jul 2022 06:31:36 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id:mime-version :content-disposition; bh=t2ZPbydh7KeE60MJyLVSPpfgjYDtoN1zJ6jtlbI620c=; b=dIbUE8Cl8x+ct398bv5OhViv7Kb7njc6z1gtfdB8Gj+Uzv197dAkOlWXzVTq08xGUw 8jZEkQmKlH3xFQkHBmC+4cCBeNmG+MjhFuV7hSmV+JR1p26EhYtLIBbDmV6X5TVjIohV oGphA4qetEuovgd96Hh63TsDzj+X6Y7MwTgMUhVnPPmf26/AM1eFWo2LxE70MJLY4UM4 XEkTXVBmyc35WbLtAvjrwZveH6FnpR0eIFtoP0w4UaKwKRNbq1+eNb2QEkMaw/JzfK4+ lr5ljGCA70R89vxtFIU7DPHK++PAN1/EdQEaEjKTOkOdbkKeXrT5Isvw7wAZSb+aeNjQ rJjw== X-Gm-Message-State: AJIora/4FNAH8/81Dzb+f6qXMob9ETgeAWEWNzpndw9iobUfg/I0MniW GW5C36k8u9c3+f5HgwuBruC+4ikb7AvwkA== X-Google-Smtp-Source: AGRyM1vi3BpfQw8SJw7t3nEU4TZC7JF/IjKji+6tvQBCeR20VSbuCC5d4qeDTJRgBmiERRG3WEL4RQ== X-Received: by 2002:a05:6000:1f05:b0:21b:a1b6:1829 with SMTP id bv5-20020a0560001f0500b0021ba1b61829mr37520704wrb.697.1657114296483; Wed, 06 Jul 2022 06:31:36 -0700 (PDT) Received: from adacore.com ([45.147.211.82]) by smtp.gmail.com with ESMTPSA id m3-20020a05600c4f4300b003a0502c620dsm12536491wmq.44.2022.07.06.06.31.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Jul 2022 06:31:35 -0700 (PDT) Date: Wed, 6 Jul 2022 13:31:35 +0000 To: gcc-patches@gcc.gnu.org Subject: [Ada] Simplify regular expression that matches 8 consecutive digits Message-ID: <20220706133135.GA2207748@adacore.com> MIME-Version: 1.0 Content-Disposition: inline X-Spam-Status: No, score=-13.3 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Pierre-Marie de Rodat via Gcc-patches From: Pierre-Marie de Rodat Reply-To: Pierre-Marie de Rodat Cc: Piotr Trojanek Errors-To: gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org Sender: "Gcc-patches" Makefile cleanup; behaviour is unaffected. Tested on x86_64-pc-linux-gnu, committed on trunk gcc/ada/ * gcc-interface/Make-lang.in (ada/generated/gnatvsn.ads): Simplify regular expression. The "interval expression", i.e. \{8\} is part of the POSIX regular expressions, so it should not be a problem for modern implementations of sed. diff --git a/gcc/ada/gcc-interface/Make-lang.in b/gcc/ada/gcc-interface/Make-lang.in --- a/gcc/ada/gcc-interface/Make-lang.in +++ b/gcc/ada/gcc-interface/Make-lang.in @@ -1158,7 +1158,7 @@ ada/generated/gnatvsn.ads: ada/gnatvsn.ads BASE-VER ada/GNAT_DATE s=`cat $(srcdir)/BASE-VER | sed -e "s/\([0-9]*\)\.\([0-9]*\)\..*/-\1\2/g"`; \ d=`if test -f $(srcdir)/ada/GNAT_DATE; then \ cat $(srcdir)/ada/GNAT_DATE; else date +%Y%m%d; fi`; \ - cat $< | sed -e "/Version/s/(\([0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]\).*)/($$d$$s)/g" >$@ + cat $< | sed -e "/Version/s/(\([0-9]\{8\}\).*)/($$d$$s)/g" >$@ ada/gnatvsn.o : ada/gnatvsn.adb ada/generated/gnatvsn.ads $(CC) -c $(ALL_ADAFLAGS) $(ADA_INCLUDES) $< $(ADA_OUTPUT_OPTION)