Info messages are used in GNATprove to inform the user of subtleties in
how source constructs are verified. They should not be mistaken for
error messages in continuation messages. Now fixed.
Tested on x86_64-pc-linux-gnu, committed on trunk
2017-04-25 Yannick Moy <m...@adacore.com>
* errout.adb (Error_Msg): Adapt continuation
message in instantiations and inlined bodies for info messages.
Index: errout.adb
===================================================================
--- errout.adb (revision 247177)
+++ errout.adb (working copy)
@@ -423,9 +423,14 @@
-- or
- -- warning: in instantiation at
+ -- warning: in instantiation at ...
-- warning: original warning message
+ -- or
+
+ -- info: in instantiation at ...
+ -- info: original info message
+
-- All these messages are posted at the location of the top level
-- instantiation. If there are nested instantiations, then the
-- instantiation error message can be repeated, pointing to each
@@ -440,9 +445,14 @@
-- or
- -- warning: in inlined body at
+ -- warning: in inlined body at ...
-- warning: original warning message
+ -- or
+
+ -- info: in inlined body at ...
+ -- info: original info message
+
-- OK, here we have an instantiation error, and we need to generate the
-- error on the instantiation, rather than on the template.
@@ -494,8 +504,12 @@
-- Case of inlined body
if Inlined_Body (X) then
- if Is_Warning_Msg or Is_Style_Msg then
+ if Is_Info_Msg then
Error_Msg_Internal
+ ("info: in inlined body #",
+ Actual_Error_Loc, Flag_Location, Msg_Cont_Status);
+ elsif Is_Warning_Msg or Is_Style_Msg then
+ Error_Msg_Internal
(Warn_Insertion & "in inlined body #",
Actual_Error_Loc, Flag_Location, Msg_Cont_Status);
else
@@ -507,8 +521,12 @@
-- Case of generic instantiation
else
- if Is_Warning_Msg or else Is_Style_Msg then
+ if Is_Info_Msg then
Error_Msg_Internal
+ ("info: in instantiation #",
+ Actual_Error_Loc, Flag_Location, Msg_Cont_Status);
+ elsif Is_Warning_Msg or else Is_Style_Msg then
+ Error_Msg_Internal
(Warn_Insertion & "in instantiation #",
Actual_Error_Loc, Flag_Location, Msg_Cont_Status);
else
