On 2/9/2014 3:03 PM, Richard Sandiford wrote:
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?
I would say hold off on this until we can find the time
to coordinate updating our test suite, which we will do
as fast as possible.
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
