From patchwork Sun Feb 9 20:03:38 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Sandiford X-Patchwork-Id: 318625 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id D28B32C00AF for ; Mon, 10 Feb 2014 07:03:50 +1100 (EST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:from :to:subject:date:message-id:mime-version:content-type; q=dns; s= default; b=OEXiO8Kxd1eIVkLvp6HPvBQ7URw8Ovt8i6NJhNLWiNqSTxHBJGzLv zymaJpBl3Y1W9Yf9kBk3A0Y3rE8L+XZ/Mm9L+nX3BL3TumpfcK+tKtVgmuDrlq0g E4pDVGB0oNJhDZHhXdzsG1Qq+GRx0/uo+AFdShlilltwYxyOPp2QUE= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:from :to:subject:date:message-id:mime-version:content-type; s= default; bh=TaukdKmI6dvjm1bb6x0qMTpup2M=; b=QkhMGesVWoE43/NkywTz h0BzVD4Vefoar1UZoWu7qMRP8dxH4uqN3grAeASThk4gLcGIP+EfWuWTukg7tQCC 4JjC/hF2LsPWnU8AgoLx/EeKwI0R06Irtw2/ZmtI3q5uiZJMyzD7yRwyckeiZq8p 8pRrJmsA+CPDte2Al41qtPA= Received: (qmail 31235 invoked by alias); 9 Feb 2014 20:03:44 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Received: (qmail 31221 invoked by uid 89); 9 Feb 2014 20:03:44 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.7 required=5.0 tests=AWL, BAYES_00, FREEMAIL_FROM, RCVD_IN_DNSWL_LOW, SPF_PASS autolearn=ham version=3.3.2 X-HELO: mail-we0-f170.google.com Received: from mail-we0-f170.google.com (HELO mail-we0-f170.google.com) (74.125.82.170) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES128-SHA encrypted) ESMTPS; Sun, 09 Feb 2014 20:03:43 +0000 Received: by mail-we0-f170.google.com with SMTP id w62so3706925wes.1 for ; Sun, 09 Feb 2014 12:03:39 -0800 (PST) X-Received: by 10.180.73.19 with SMTP id h19mr7876863wiv.40.1391976219920; Sun, 09 Feb 2014 12:03:39 -0800 (PST) Received: from localhost ([2.28.234.162]) by mx.google.com with ESMTPSA id fb8sm29516498wic.3.2014.02.09.12.03.39 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 09 Feb 2014 12:03:39 -0800 (PST) From: Richard Sandiford To: gcc-patches@gcc.gnu.org Mail-Followup-To: gcc-patches@gcc.gnu.org, rdsandiford@googlemail.com Subject: [Ada] Use "[warning enabled by default]" for default warnings Date: Sun, 09 Feb 2014 20:03:38 +0000 Message-ID: <87a9e03vfp.fsf@talisman.default> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3 (gnu/linux) MIME-Version: 1.0 This switches Ada from using [enabled by default] to [warning enabled by default] for consistency with: http://gcc.gnu.org/ml/gcc-patches/2014-02/msg00549.html Tested on x86_64-linux-gnu. OK if the above patch goes in? Thanks, Richard gcc/ada/ * erroutc.adb (Output_Msg_Text): Use "[warning enabled by default]". * err_vars.ads, errout.ads, gnat_ugn.texi: Update comments and documentation accordingly. Index: gcc/ada/erroutc.adb =================================================================== --- gcc/ada/erroutc.adb 2014-02-09 20:02:00.971968883 +0000 +++ gcc/ada/erroutc.adb 2014-02-09 20:02:58.640471235 +0000 @@ -456,7 +456,7 @@ package body Erroutc is if Warn and then Warn_Chr /= ' ' then if Warn_Chr = '?' then - Warn_Tag := new String'(" [enabled by default]"); + Warn_Tag := new String'(" [warning enabled by default]"); elsif Warn_Chr in 'a' .. 'z' then Warn_Tag := new String'(" [-gnatw" & Warn_Chr & ']'); Index: gcc/ada/err_vars.ads =================================================================== --- gcc/ada/err_vars.ads 2014-02-09 20:02:00.971968883 +0000 +++ gcc/ada/err_vars.ads 2014-02-09 20:02:58.639471226 +0000 @@ -141,8 +141,8 @@ package Err_Vars is -- Setting is irrelevant if no < insertion character is present. Note -- that it is not necessary to reset this after using it, since the proper -- procedure is always to set it before issuing such a message. Note that - -- the warning documentation tag is always [enabled by default] in the - -- case where this flag is True. + -- the warning documentation tag is always [warning enabled by default] + -- in the case where this flag is True. Error_Msg_String : String (1 .. 4096); Error_Msg_Strlen : Natural; Index: gcc/ada/errout.ads =================================================================== --- gcc/ada/errout.ads 2014-02-09 20:02:00.971968883 +0000 +++ gcc/ada/errout.ads 2014-02-09 20:02:58.639471226 +0000 @@ -287,8 +287,8 @@ package Errout is -- Insertion character ?? (Two question marks: default warning) -- Like ?, but if the flag Warn_Doc_Switch is True, adds the string - -- "[enabled by default]" at the end of the warning message. For - -- continuations, use this in each continuation message. + -- "[warning enabled by default]" at the end of the warning message. + -- For continuations, use this in each continuation message. -- Insertion character ?x? (warning with switch) -- Like ?, but if the flag Warn_Doc_Switch is True, adds the string Index: gcc/ada/gnat_ugn.texi =================================================================== --- gcc/ada/gnat_ugn.texi 2014-02-09 20:02:00.971968883 +0000 +++ gcc/ada/gnat_ugn.texi 2014-02-09 20:02:58.644471270 +0000 @@ -5055,8 +5055,8 @@ indexed components, slices, and selected @cindex @option{-gnatw.d} (@command{gcc}) If this switch is set, then warning messages are tagged, either with the string ``@option{-gnatw?}'' showing which switch controls the warning, -or with ``[enabled by default]'' if the warning is not under control of a -specific @option{-gnatw?} switch. This mode is off by default, and is not +or with ``[warning enabled by default]'' if the warning is not under control +of a specific @option{-gnatw?} switch. This mode is off by default, and is not affected by the use of @code{-gnatwa}. @item -gnatw.D