Remove trailing space in calls to Error_Msg_N routines. Cleanup only.
Tested on x86_64-pc-linux-gnu, committed on trunk
gcc/ada/
* exp_disp.adb, sem_aggr.adb, sem_cat.adb, sem_ch10.adb,
sem_ch12.adb, sem_ch3.adb, sem_ch4.adb, sem_ch5.adb,
sem_ch6.adb, sem_ch8.adb, sem_ch9.adb, sem_prag.adb,
sem_res.adb: Remove extra leading and trailing space in error
messages.diff --git a/gcc/ada/exp_disp.adb b/gcc/ada/exp_disp.adb
--- a/gcc/ada/exp_disp.adb
+++ b/gcc/ada/exp_disp.adb
@@ -4011,7 +4011,7 @@ package body Exp_Disp is
Error_Msg_NE
("\which is a component of untagged type& in the profile "
& "of primitive & of type % that is frozen by the "
- & "declaration ", N, Typ);
+ & "declaration", N, Typ);
end if;
end if;
end Check_Premature_Freezing;
diff --git a/gcc/ada/sem_aggr.adb b/gcc/ada/sem_aggr.adb
--- a/gcc/ada/sem_aggr.adb
+++ b/gcc/ada/sem_aggr.adb
@@ -4743,7 +4743,7 @@ package body Sem_Aggr is
then
Error_Msg_NE
("aggregate not available for type& whose ancestor "
- & "has unknown discriminants ", N, Typ);
+ & "has unknown discriminants", N, Typ);
end if;
if Has_Unknown_Discriminants (Typ)
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
@@ -275,7 +275,7 @@ package body Sem_Cat is
and then Is_Preelaborated (Depended_Entity)
then
Error_Msg_NE
- ("<<must use private with clause for preelaborated unit& ",
+ ("<<must use private with clause for preelaborated unit&",
N, Depended_Entity);
-- Subunit case
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
@@ -3832,7 +3832,7 @@ package body Sem_Ch10 is
if E2 = WEnt then
Error_Msg_N
- ("unlimited view visible through use clause ", W);
+ ("unlimited view visible through use clause", W);
return;
end if;
end if;
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
@@ -4283,7 +4283,7 @@ package body Sem_Ch12 is
and then Chars (Act_Decl_Id) = Chars (Prefix (Gen_Id))
then
Error_Msg_N
- ("& is hidden within declaration of instance ", Prefix (Gen_Id));
+ ("& is hidden within declaration of instance", Prefix (Gen_Id));
end if;
Set_Entity (Gen_Id, Gen_Unit);
diff --git a/gcc/ada/sem_ch3.adb b/gcc/ada/sem_ch3.adb
--- a/gcc/ada/sem_ch3.adb
+++ b/gcc/ada/sem_ch3.adb
@@ -4500,7 +4500,7 @@ package body Sem_Ch3 is
elsif Is_Class_Wide_Type (T) then
Error_Msg_N
- ("initialization required in class-wide declaration ", N);
+ ("initialization required in class-wide declaration", N);
else
Error_Msg_N
@@ -5088,7 +5088,7 @@ package body Sem_Ch3 is
elsif not Is_Tagged_Type (Parent_Type) then
Error_Msg_N
- ("parent of type extension must be a tagged type ", Indic);
+ ("parent of type extension must be a tagged type", Indic);
goto Leave;
elsif Ekind (Parent_Type) in E_Void | E_Incomplete_Type then
@@ -17448,10 +17448,10 @@ package body Sem_Ch3 is
and then Nkind (N) = N_Private_Type_Declaration
then
Error_Msg_NE
- ("declaration of private } must be a tagged type ", Id, Prev);
+ ("declaration of private } must be a tagged type", Id, Prev);
else
Error_Msg_NE
- ("full declaration of } must be a tagged type ", Id, Prev);
+ ("full declaration of } must be a tagged type", Id, Prev);
end if;
else
@@ -17459,10 +17459,10 @@ package body Sem_Ch3 is
and then Nkind (N) = N_Private_Type_Declaration
then
Error_Msg_NE
- ("declaration of private } must be a tagged type ", Prev, Id);
+ ("declaration of private } must be a tagged type", Prev, Id);
else
Error_Msg_NE
- ("full declaration of } must be a tagged type ", Prev, Id);
+ ("full declaration of } must be a tagged type", Prev, Id);
end if;
end if;
end Tag_Mismatch;
@@ -19359,7 +19359,7 @@ package body Sem_Ch3 is
else
if not Is_Entity_Name (N) or else not Is_Type (Entity (N)) then
- Error_Msg_N ("invalid subtype mark in discrete range ", N);
+ Error_Msg_N ("invalid subtype mark in discrete range", N);
Set_Etype (N, Any_Integer);
return;
diff --git a/gcc/ada/sem_ch4.adb b/gcc/ada/sem_ch4.adb
--- a/gcc/ada/sem_ch4.adb
+++ b/gcc/ada/sem_ch4.adb
@@ -4419,7 +4419,7 @@ package body Sem_Ch4 is
-- If result is Any_Type, then we did not find a compatible pair
if Etype (N) = Any_Type then
- Error_Msg_N ("incompatible types in range ", N);
+ Error_Msg_N ("incompatible types in range", N);
end if;
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
@@ -4337,8 +4337,8 @@ package body Sem_Ch5 is
Error_Msg_N
("ambiguous bounds in range of iteration", R_Copy);
Error_Msg_N ("\possible interpretations:", R_Copy);
- Error_Msg_NE ("\\} ", R_Copy, Found);
- Error_Msg_NE ("\\} ", R_Copy, It.Typ);
+ Error_Msg_NE ("\\}", R_Copy, Found);
+ Error_Msg_NE ("\\}", R_Copy, It.Typ);
exit;
end if;
end if;
diff --git a/gcc/ada/sem_ch6.adb b/gcc/ada/sem_ch6.adb
--- a/gcc/ada/sem_ch6.adb
+++ b/gcc/ada/sem_ch6.adb
@@ -1770,13 +1770,13 @@ package body Sem_Ch6 is
if Kind = E_Generic_Procedure
and then Nkind (Spec) /= N_Procedure_Specification
then
- Error_Msg_N ("invalid body for generic procedure ", Body_Id);
+ Error_Msg_N ("invalid body for generic procedure", Body_Id);
return;
elsif Kind = E_Generic_Function
and then Nkind (Spec) /= N_Function_Specification
then
- Error_Msg_N ("invalid body for generic function ", Body_Id);
+ Error_Msg_N ("invalid body for generic function", Body_Id);
return;
end if;
@@ -2328,7 +2328,7 @@ package body Sem_Ch6 is
if Present (Actuals) then
Analyze_Call_And_Resolve;
else
- Error_Msg_N ("missing explicit dereference in call ", N);
+ Error_Msg_N ("missing explicit dereference in call", N);
end if;
-- If not an access to subprogram, then the prefix must resolve to the
@@ -4061,7 +4061,7 @@ package body Sem_Ch6 is
and then Operator_Matches_Spec (Spec_Id, Spec_Id)
then
Error_Msg_NE
- ("subprogram& overrides predefined operator ",
+ ("subprogram& overrides predefined operator",
Body_Spec, Spec_Id);
-- Overriding indicators aren't allowed for protected subprogram
@@ -7307,7 +7307,7 @@ package body Sem_Ch6 is
elsif Can_Override_Operator (Subp) then
Error_Msg_NE
- ("subprogram& overrides predefined operator ", Spec, Subp);
+ ("subprogram& overrides predefined operator", Spec, Subp);
end if;
elsif Must_Override (Spec) then
diff --git a/gcc/ada/sem_ch8.adb b/gcc/ada/sem_ch8.adb
--- a/gcc/ada/sem_ch8.adb
+++ b/gcc/ada/sem_ch8.adb
@@ -1862,7 +1862,7 @@ package body Sem_Ch8 is
Old_S := Find_Renamed_Entity (N, Selector_Name (Nam), New_S);
if Old_S = Any_Id then
- Error_Msg_N (" no subprogram or entry matches specification", N);
+ Error_Msg_N ("no subprogram or entry matches specification", N);
else
if Is_Body then
Check_Subtype_Conformant (New_S, Old_S, N);
@@ -3577,7 +3577,7 @@ package body Sem_Ch8 is
end if;
if Original_Subprogram (Old_S) = Rename_Spec then
- Error_Msg_N ("unfrozen subprogram cannot rename itself ", N);
+ Error_Msg_N ("unfrozen subprogram cannot rename itself", N);
else
Check_Formal_Subprogram_Conformance (New_S, Old_S, Spec);
end if;
diff --git a/gcc/ada/sem_ch9.adb b/gcc/ada/sem_ch9.adb
--- a/gcc/ada/sem_ch9.adb
+++ b/gcc/ada/sem_ch9.adb
@@ -1522,7 +1522,7 @@ package body Sem_Ch9 is
if Nkind (Call) = N_Explicit_Dereference then
Error_Msg_N
- ("entry call or dispatching primitive of interface required ", N);
+ ("entry call or dispatching primitive of interface required", N);
end if;
if Is_Non_Empty_List (Statements (N)) then
@@ -2619,7 +2619,7 @@ package body Sem_Ch9 is
(Nkind (Delay_Statement (Alt)) = N_Delay_Relative_Statement)
then
Error_Msg_N
- ("delay_until and delay_relative alternatives ", Alt);
+ ("delay_until and delay_relative alternatives", Alt);
Error_Msg_N
("\cannot appear in the same selective_wait", Alt);
end if;
@@ -3677,7 +3677,7 @@ package body Sem_Ch9 is
elsif Nkind (Trigger) = N_Explicit_Dereference then
Error_Msg_N
- ("entry call or dispatching primitive of interface required ",
+ ("entry call or dispatching primitive of interface required",
Trigger);
end if;
end if;
diff --git a/gcc/ada/sem_prag.adb b/gcc/ada/sem_prag.adb
--- a/gcc/ada/sem_prag.adb
+++ b/gcc/ada/sem_prag.adb
@@ -6921,7 +6921,7 @@ package body Sem_Prag is
Set_Is_Overloaded (Name, False);
else
Error_Pragma_Arg
- ("ambiguous handler name for pragma% ", Arg);
+ ("ambiguous handler name for pragma%", Arg);
end if;
end if;
diff --git a/gcc/ada/sem_res.adb b/gcc/ada/sem_res.adb
--- a/gcc/ada/sem_res.adb
+++ b/gcc/ada/sem_res.adb
@@ -2233,7 +2233,7 @@ package body Sem_Res is
then
Is_Remote := False;
Error_Msg_N
- ("prefix must statically denote a remote subprogram ",
+ ("prefix must statically denote a remote subprogram",
N);
end if;
