From patchwork Thu Jan 6 17:13:08 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: 1576205 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=UlGHvq6t; 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 (4096 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4JVD124x5rz9sXM for ; Fri, 7 Jan 2022 04:31:34 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id E2D0A3857C4D for ; Thu, 6 Jan 2022 17:31:31 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org E2D0A3857C4D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1641490291; bh=WCRZdODWGS+6jYHAzU4qKq1aIaL+IQU3fUiaRFcFeis=; h=Date:To:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:Cc:From; b=UlGHvq6tIOB9ii+ljnEWUO85rbDVo9QLpNjdPATGnEKchyXrhJbP6ZDQ+uVfDrd2B oLyIF140TilpDwYDlHYbQoa8kHzEcOf+UrJSKUp3E7tarzyqTjF7hKZ0bVB8GXA8Eg 6wFTA6PsoS+2p/6Gp79tB6ccLsYb2dojgLbD+CMQ= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-wm1-x32b.google.com (mail-wm1-x32b.google.com [IPv6:2a00:1450:4864:20::32b]) by sourceware.org (Postfix) with ESMTPS id A96683858027 for ; Thu, 6 Jan 2022 17:13:10 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org A96683858027 Received: by mail-wm1-x32b.google.com with SMTP id l12-20020a7bc34c000000b003467c58cbdfso3575108wmj.2 for ; Thu, 06 Jan 2022 09:13:10 -0800 (PST) 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=WCRZdODWGS+6jYHAzU4qKq1aIaL+IQU3fUiaRFcFeis=; b=oYDvoaICiAcZDkeBdJlZbIIuW5OBI9lP8geiZ6wJigixrEWFWzLSh06NEmFA9dkmtO fRjGWx4Po3WvwVwLxB3Dpol5beQcHoiEo3M638FLZKCDyCscF1O9C7yW7q2y1a9814vI dPlxPCeXNBWJynEh0Sh1IY/urRb6IyVqivggllvOj4Bvft+TZX0sfkF4J578RN2Mgism +wcwVzpeanjB9AJJFgotFMzzzOePc7HyB7GBy5qtNuMRiIEWLe42N1CxVm+wybbskY9/ u5WKWSuxRwnD8mGnI0O4ma2xYqfQ+GpXhC4OC2u3ZaLKx/bfYbCo980KDxC8jx9ZeIsy TTDA== X-Gm-Message-State: AOAM531B9UsXrbr5yOzsiS0P7pktlrloeMzTGIu7HRQSeASpsxoq+0oN gqB5K8KTd+PXsXBO/k2lQvwuk4LHQnChCg== X-Google-Smtp-Source: ABdhPJwWHhXCvJkhl8ziyf86mg++5KzroJ7jYewYuqh/Zj0RC/Uz4IcCpmRkp2jKkJJJJtgqHixx9A== X-Received: by 2002:a7b:c1d0:: with SMTP id a16mr7931663wmj.166.1641489189691; Thu, 06 Jan 2022 09:13:09 -0800 (PST) Received: from adacore.com ([45.147.211.82]) by smtp.gmail.com with ESMTPSA id p13sm2962788wrs.54.2022.01.06.09.13.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Jan 2022 09:13:09 -0800 (PST) Date: Thu, 6 Jan 2022 17:13:08 +0000 To: gcc-patches@gcc.gnu.org Subject: [Ada] Fix style in comments about warning messages Message-ID: <20220106171308.GA2921693@adacore.com> MIME-Version: 1.0 Content-Disposition: inline X-Spam-Status: No, score=-13.1 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 autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) 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" Cleanup related to handling of messages for compile-time known constraint errors. Tested on x86_64-pc-linux-gnu, committed on trunk gcc/ada/ * errout.adb (Error_Msg_Internal): Reorder words. * erroutc.ads (Is_Warning_Msg): Add closing paren. * sem_util.adb (Compile_Time_Constraint_Error): Fix casing. diff --git a/gcc/ada/errout.adb b/gcc/ada/errout.adb --- a/gcc/ada/errout.adb +++ b/gcc/ada/errout.adb @@ -1049,7 +1049,7 @@ package body Errout is elsif No (Cunit (Main_Unit)) then null; - -- If the flag location is not in the main extended source unit, then + -- If the flag location is not in the extended main source unit, then -- we want to eliminate the warning, unless it is in the extended -- main code unit and we want warnings on the instance. diff --git a/gcc/ada/erroutc.ads b/gcc/ada/erroutc.ads --- a/gcc/ada/erroutc.ads +++ b/gcc/ada/erroutc.ads @@ -69,7 +69,7 @@ package Erroutc is Is_Warning_Msg : Boolean := False; -- Set True to indicate if current message is warning message (contains ? - -- or contains < and Error_Msg_Warn is True. + -- or contains < and Error_Msg_Warn is True). Is_Info_Msg : Boolean := False; -- Set True to indicate that the current message starts with the characters diff --git a/gcc/ada/sem_util.adb b/gcc/ada/sem_util.adb --- a/gcc/ada/sem_util.adb +++ b/gcc/ada/sem_util.adb @@ -6604,7 +6604,7 @@ package body Sem_Util is Error_Msg_Warn := Warn or SPARK_Mode /= On; -- A static constraint error in an instance body is not a fatal error. - -- we choose to inhibit the message altogether, because there is no + -- We choose to inhibit the message altogether, because there is no -- obvious node (for now) on which to post it. On the other hand the -- offending node must be replaced with a constraint_error in any case.