Commit 9a5245da by Hristian Kirtchev Committed by Pierre-Marie de Rodat

[Ada] Spelling mistakes in error messages

This patch updates certain error messages to eliminate spelling
mistakes. No need for a test as this is a minor cosmetic fix.

2019-07-10  Hristian Kirtchev  <kirtchev@adacore.com>

gcc/ada/

	* sem_ch3.adb (Check_Nonoverridable_Aspects): Correct the
	spelling in certain error messages.
	(Check_Pragma_Implemented): Correct the spelling in certain
	error messages.

From-SVN: r273341
parent 9ead6ee5
2019-07-10 Hristian Kirtchev <kirtchev@adacore.com>
* sem_ch3.adb (Check_Nonoverridable_Aspects): Correct the
spelling in certain error messages.
(Check_Pragma_Implemented): Correct the spelling in certain
error messages.
2019-07-10 Eric Botcazou <ebotcazou@adacore.com> 2019-07-10 Eric Botcazou <ebotcazou@adacore.com>
* Makefile.rtl (GNATRTL_NONTASKING_OBJS): Add g-brapre. * Makefile.rtl (GNATRTL_NONTASKING_OBJS): Add g-brapre.
......
...@@ -3009,14 +3009,15 @@ package body Sem_Ch3 is ...@@ -3009,14 +3009,15 @@ package body Sem_Ch3 is
-- is consistent with that of the parent. -- is consistent with that of the parent.
declare declare
Par_Discr : constant Entity_Id := Cur_Discr : constant Entity_Id :=
Get_Reference_Discriminant (Par_Type);
Cur_Discr : constant Entity_Id :=
Get_Reference_Discriminant (Prev); Get_Reference_Discriminant (Prev);
Par_Discr : constant Entity_Id :=
Get_Reference_Discriminant (Par_Type);
begin begin
if Corresponding_Discriminant (Cur_Discr) /= Par_Discr then if Corresponding_Discriminant (Cur_Discr) /= Par_Discr then
Error_Msg_N ("aspect incosistent with that of parent", N); Error_Msg_N
("aspect inconsistent with that of parent", N);
end if; end if;
-- Check that specification in partial view matches the -- Check that specification in partial view matches the
...@@ -3029,7 +3030,7 @@ package body Sem_Ch3 is ...@@ -3029,7 +3030,7 @@ package body Sem_Ch3 is
Chars (Cur_Discr) Chars (Cur_Discr)
then then
Error_Msg_N Error_Msg_N
("aspect incosistent with that of parent", N); ("aspect inconsistent with that of parent", N);
end if; end if;
end; end;
end if; end if;
...@@ -10641,9 +10642,9 @@ package body Sem_Ch3 is ...@@ -10641,9 +10642,9 @@ package body Sem_Ch3 is
if Ekind (Contr_Typ) /= E_Protected_Type then if Ekind (Contr_Typ) /= E_Protected_Type then
Error_Msg_Node_2 := Contr_Typ; Error_Msg_Node_2 := Contr_Typ;
Error_Msg_NE Error_Msg_NE
("interface subprogram & cannot be implemented by a " & ("interface subprogram & cannot be implemented by a "
"primitive procedure of task type &", Subp_Alias, & "primitive procedure of task type &",
Iface_Alias); Subp_Alias, Iface_Alias);
-- An interface subprogram whose implementation kind is By_ -- An interface subprogram whose implementation kind is By_
-- Protected_Procedure must be implemented by a procedure. -- Protected_Procedure must be implemented by a procedure.
...@@ -10651,28 +10652,27 @@ package body Sem_Ch3 is ...@@ -10651,28 +10652,27 @@ package body Sem_Ch3 is
elsif Ekind (Impl_Subp) /= E_Procedure then elsif Ekind (Impl_Subp) /= E_Procedure then
Error_Msg_Node_2 := Iface_Alias; Error_Msg_Node_2 := Iface_Alias;
Error_Msg_NE Error_Msg_NE
("type & must implement abstract subprogram & with a " & ("type & must implement abstract subprogram & with a "
"procedure", Subp_Alias, Contr_Typ); & "procedure", Subp_Alias, Contr_Typ);
elsif Present (Get_Rep_Pragma (Impl_Subp, Name_Implemented)) elsif Present (Get_Rep_Pragma (Impl_Subp, Name_Implemented))
and then Implementation_Kind (Impl_Subp) /= Impl_Kind and then Implementation_Kind (Impl_Subp) /= Impl_Kind
then then
Error_Msg_Name_1 := Impl_Kind; Error_Msg_Name_1 := Impl_Kind;
Error_Msg_N Error_Msg_N
("overriding operation& must have synchronization%", ("overriding operation& must have synchronization%",
Subp_Alias); Subp_Alias);
end if; end if;
-- If primitive has Optional synchronization, overriding operation -- If primitive has Optional synchronization, overriding operation
-- must match if it has an explicit synchronization.. -- must match if it has an explicit synchronization.
elsif Present (Get_Rep_Pragma (Impl_Subp, Name_Implemented)) elsif Present (Get_Rep_Pragma (Impl_Subp, Name_Implemented))
and then Implementation_Kind (Impl_Subp) /= Impl_Kind and then Implementation_Kind (Impl_Subp) /= Impl_Kind
then then
Error_Msg_Name_1 := Impl_Kind; Error_Msg_Name_1 := Impl_Kind;
Error_Msg_N Error_Msg_N
("overriding operation& must have syncrhonization%", ("overriding operation& must have synchronization%", Subp_Alias);
Subp_Alias);
end if; end if;
end Check_Pragma_Implemented; end Check_Pragma_Implemented;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment