diff options
| author | Arnaud Charlet <charlet@gcc.gnu.org> | 2014-08-01 15:26:17 +0200 |
|---|---|---|
| committer | Arnaud Charlet <charlet@gcc.gnu.org> | 2014-08-01 15:26:17 +0200 |
| commit | 12c5f1efb5d038d8638f517b8d73970573fbdaee (patch) | |
| tree | de670a27c04cef0d1bd19abfe5073ab8db9ccbfb /gcc/ada/errutil.adb | |
| parent | 511c5197c7964009f989f7a6d03ef2858d0fe6c0 (diff) | |
| download | gcc-12c5f1efb5d038d8638f517b8d73970573fbdaee.zip gcc-12c5f1efb5d038d8638f517b8d73970573fbdaee.tar.gz gcc-12c5f1efb5d038d8638f517b8d73970573fbdaee.tar.bz2 | |
[multiple changes]
2014-08-01 Ed Schonberg <schonberg@adacore.com>
* sem_ch5.adb (Analyze_Loop_Parameter_Specification): a)
An attribute_reference to Loop_Entry denotes an iterator
specification: its prefix is an object, as is the case for 'Old.
b) If the domain of iteration is an expression whose type has
the Iterable aspect defined, this is an iterator specification.
2014-08-01 Robert Dewar <dewar@adacore.com>
* gnatcmd.adb: Minor reformatting.
2014-08-01 Robert Dewar <dewar@adacore.com>
* atree.ads (Info_Messages): New counter.
* err_vars.ads: Minor comment update.
* errout.adb (Delete_Warning_And_Continuations): Deal
with new Info_Messages counter.
(Error_Msg_Internal): ditto.
(Delete_Warning): ditto.
(Initialize): ditto.
(Write_Error_Summary): ditto.
(Output_Messages): ditto.
(To_Be_Removed): ditto.
* erroutc.adb (Delete_Msg): Deal with Info_Messages counter.
(Compilation_Errors): ditto.
* errutil.adb (Error_Msg): Deal with Info_Messages counter.
(Finalize): ditto.
(Initialize): ditto.
* sem_prag.adb (Analyze_Pragma): Minor comment addition.
* gnat_ugn.texi: Document that -gnatwe does not affect info
messages.
From-SVN: r213457
Diffstat (limited to 'gcc/ada/errutil.adb')
| -rw-r--r-- | gcc/ada/errutil.adb | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/gcc/ada/errutil.adb b/gcc/ada/errutil.adb index 0c47f21..7eb85a4 100644 --- a/gcc/ada/errutil.adb +++ b/gcc/ada/errutil.adb @@ -309,6 +309,10 @@ package body Errutil is then Warnings_Detected := Warnings_Detected + 1; + if Errors.Table (Cur_Msg).Info then + Info_Messages := Info_Messages + 1; + end if; + else Total_Errors_Detected := Total_Errors_Detected + 1; @@ -536,19 +540,19 @@ package body Errutil is Write_Str (" errors"); end if; - if Warnings_Detected /= 0 then + if Warnings_Detected - Info_Messages /= 0 then Write_Str (", "); - Write_Int (Warnings_Detected); + Write_Int (Warnings_Detected - Info_Messages); Write_Str (" warning"); - if Warnings_Detected /= 1 then + if Warnings_Detected - Info_Messages /= 1 then Write_Char ('s'); end if; if Warning_Mode = Treat_As_Error then Write_Str (" (treated as error"); - if Warnings_Detected /= 1 then + if Warnings_Detected - Info_Messages /= 1 then Write_Char ('s'); end if; @@ -575,8 +579,9 @@ package body Errutil is end if; if Warning_Mode = Treat_As_Error then - Total_Errors_Detected := Total_Errors_Detected + Warnings_Detected; - Warnings_Detected := 0; + Total_Errors_Detected := + Total_Errors_Detected + Warnings_Detected - Info_Messages; + Warnings_Detected := Info_Messages; end if; -- Prevent displaying the same messages again in the future @@ -596,6 +601,7 @@ package body Errutil is Serious_Errors_Detected := 0; Total_Errors_Detected := 0; Warnings_Detected := 0; + Info_Messages := 0; Cur_Msg := No_Error_Msg; -- Initialize warnings table, if all warnings are suppressed, supply |