* [Ada] Fix calls to Error_Msg_NE instead of Error_Msg_N
@ 2021-05-03 9:29 Pierre-Marie de Rodat
0 siblings, 0 replies; only message in thread
From: Pierre-Marie de Rodat @ 2021-05-03 9:29 UTC (permalink / raw)
To: gcc-patches; +Cc: Piotr Trojanek
[-- Attachment #1: Type: text/plain, Size: 482 bytes --]
Replace calls to Error_Msg_NE whose Msg parameters have no insertion
characters corresponding to the E parameter with equivalent but simpler
calls to Error_Msg_N. Code cleanup; behaviour is unaffected.
Tested on x86_64-pc-linux-gnu, committed on trunk
gcc/ada/
* freeze.adb (Freeze_Profile): Replace Error_Msg_NE with
Error_Msg_N; change to continuation message.
* sem_cat.adb, sem_ch10.adb, sem_ch12.adb, sem_ch5.adb: Replace
calls to Error_Msg_NE with calls to Error_Msg_N.
[-- Attachment #2: patch.diff --]
[-- Type: text/x-diff, Size: 4397 bytes --]
diff --git a/gcc/ada/freeze.adb b/gcc/ada/freeze.adb
--- a/gcc/ada/freeze.adb
+++ b/gcc/ada/freeze.adb
@@ -3749,8 +3749,8 @@ package body Freeze is
Error_Msg_NE ("?x?type of argument& is unconstrained array",
Warn_Node, Formal);
- Error_Msg_NE ("?x?foreign caller must pass bounds explicitly",
- Warn_Node, Formal);
+ Error_Msg_N ("\?x?foreign caller must pass bounds explicitly",
+ Warn_Node);
Error_Msg_Qual_Level := 0;
end if;
diff --git a/gcc/ada/sem_cat.adb b/gcc/ada/sem_cat.adb
--- a/gcc/ada/sem_cat.adb
+++ b/gcc/ada/sem_cat.adb
@@ -296,18 +296,16 @@ package body Sem_Cat is
-- Add further explanation for Pure/Preelaborate common cases
if Unit_Category = Pure then
- Error_Msg_NE
- ("\<<pure unit cannot depend on non-pure unit",
- N, Depended_Entity);
+ Error_Msg_N
+ ("\<<pure unit cannot depend on non-pure unit", N);
elsif Is_Preelaborated (Unit_Entity)
and then not Is_Preelaborated (Depended_Entity)
and then not Is_Pure (Depended_Entity)
then
- Error_Msg_NE
+ Error_Msg_N
("\<<preelaborated unit cannot depend on "
- & "non-preelaborated unit",
- N, Depended_Entity);
+ & "non-preelaborated unit", N);
end if;
end if;
end Check_Categorization_Dependencies;
diff --git a/gcc/ada/sem_ch10.adb b/gcc/ada/sem_ch10.adb
--- a/gcc/ada/sem_ch10.adb
+++ b/gcc/ada/sem_ch10.adb
@@ -1561,9 +1561,9 @@ package body Sem_Ch10 is
Error_Msg_N
("simultaneous visibility of limited and "
& "unlimited views not allowed", Item);
- Error_Msg_NE
+ Error_Msg_N
("\unlimited view visible through context "
- & "clause #", Item, It);
+ & "clause #", Item);
exit;
elsif Nkind (Unit_Name) = N_Identifier then
diff --git a/gcc/ada/sem_ch12.adb b/gcc/ada/sem_ch12.adb
--- a/gcc/ada/sem_ch12.adb
+++ b/gcc/ada/sem_ch12.adb
@@ -13828,9 +13828,9 @@ package body Sem_Ch12 is
Actual_Discr := First_Discriminant (Act_T);
while Formal_Discr /= Empty loop
if Actual_Discr = Empty then
- Error_Msg_NE
+ Error_Msg_N
("discriminants on actual do not match formal",
- Actual, Gen_T);
+ Actual);
Abandon_Instantiation (Actual);
end if;
@@ -13851,18 +13851,18 @@ package body Sem_Ch12 is
elsif Base_Type (Formal_Subt) /=
Base_Type (Etype (Actual_Discr))
then
- Error_Msg_NE
+ Error_Msg_N
("types of actual discriminants must match formal",
- Actual, Gen_T);
+ Actual);
Abandon_Instantiation (Actual);
elsif not Subtypes_Statically_Match
(Formal_Subt, Etype (Actual_Discr))
and then Ada_Version >= Ada_95
then
- Error_Msg_NE
+ Error_Msg_N
("subtypes of actual discriminants must match formal",
- Actual, Gen_T);
+ Actual);
Abandon_Instantiation (Actual);
end if;
diff --git a/gcc/ada/sem_ch5.adb b/gcc/ada/sem_ch5.adb
--- a/gcc/ada/sem_ch5.adb
+++ b/gcc/ada/sem_ch5.adb
@@ -2037,8 +2037,8 @@ package body Sem_Ch5 is
then
null;
else
- Error_Msg_NE
- ("container type does not support reverse iteration", N, Typ);
+ Error_Msg_N
+ ("container type does not support reverse iteration", N);
end if;
end if;
end Check_Reverse_Iteration;
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2021-05-03 9:29 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-05-03 9:29 [Ada] Fix calls to Error_Msg_NE instead of Error_Msg_N Pierre-Marie de Rodat
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).