Skip to content

R
riscv-gcc-1
Commit 8c35b40a by Arnaud Charlet
Options

[multiple changes] 

2014-02-06  Robert Dewar  <dewar@adacore.com>

	* sem_ch3.adb, sem_prag.adb, sem_res.adb, lib-xref.adb: Minor
	reformatting.

2014-02-06  Hristian Kirtchev  <kirtchev@adacore.com>

	* sem_ch6.adb (Process_Formals): Error message reformatting.

From-SVN: r207555
parent 0a756a3f
Showing with 44 additions and 36 deletions
gcc/ada/ChangeLog
2014-02-06 Robert Dewar <dewar@adacore.com>
* sem_ch3.adb, sem_prag.adb, sem_res.adb, lib-xref.adb: Minor
reformatting.
2014-02-06 Hristian Kirtchev <kirtchev@adacore.com>
* sem_ch6.adb (Process_Formals): Error message reformatting.
2014-02-06 Hristian Kirtchev <kirtchev@adacore.com>
* sem_ch3.adb (Handle_Late_Controlled_Primitive): Add local
......
gcc/ada/sem_ch3.adb
......@@ -2160,8 +2160,7 @@ package body Sem_Ch3 is
Spec := Copy_Separate_Tree (Body_Spec);
-- Ensure that the subprogram declaration does not inherit the null
-- indicator from the body as we now have a proper spec and body
-- pair.
-- indicator from the body as we now have a proper spec/body pair.
Set_Null_Present (Spec, False);
......
gcc/ada/sem_ch6.adb
......@@ -11243,8 +11243,8 @@ package body Sem_Ch6 is
elsif Is_SPARK_Volatile_Object (Formal) then
Error_Msg_N
("function cannot have a volatile formal parameter (SPARK RM "
& "7.1.3(10))", Formal);
("function cannot have a volatile formal parameter "
& "(SPARK RM 7.1.3(10))", Formal);
end if;
end if;
......
gcc/ada/sem_prag.adb
......@@ -850,8 +850,8 @@ package body Sem_Prag is
("cannot mention state & in global refinement",
Item, Item_Id);
Error_Msg_N
("\use its constituents instead (SPARK RM "
& "6.1.5(3))", Item);
("\use its constituents instead "
& "(SPARK RM 6.1.5(3))", Item);
return;
-- If the reference to the abstract state appears in
......@@ -958,8 +958,8 @@ package body Sem_Prag is
begin
if Ekind (Spec_Id) = E_Function and then not Result_Seen then
Error_Msg_NE
("result of & must appear in exactly one output list (SPARK RM "
& "6.1.5(10))", N, Spec_Id);
("result of & must appear in exactly one output list "
& "(SPARK RM 6.1.5(10))", N, Spec_Id);
end if;
end Check_Function_Return;
......@@ -1413,8 +1413,8 @@ package body Sem_Prag is
elsif Is_Attribute_Result (Output) then
Error_Msg_N
("function result cannot depend on itself (SPARK RM "
& "6.1.5(10))", Output);
("function result cannot depend on itself "
& "(SPARK RM 6.1.5(10))", Output);
return;
end if;
......@@ -1810,8 +1810,8 @@ package body Sem_Prag is
end if;
else
Error_Msg_N
("external property % must apply to a volatile object (SPARK RM "
& "7.1.3(2))", N);
("external property % must apply to a volatile object "
& "(SPARK RM 7.1.3(2))", N);
end if;
-- Ensure that the expression (if present) is static Boolean. A missing
......@@ -1954,16 +1954,16 @@ package body Sem_Prag is
elsif Ekind (Item_Id) = E_Constant then
Error_Msg_N
("global item cannot denote a constant (SPARK RM "
& "6.1.4(7))", Item);
("global item cannot denote a constant "
& "(SPARK RM 6.1.4(7))", Item);
-- The only legal references are those to abstract states and
-- variables.
elsif not Ekind_In (Item_Id, E_Abstract_State, E_Variable) then
Error_Msg_N
("global item must denote variable or state (SPARK RM "
& "6.1.4(4))", Item);
("global item must denote variable or state "
& "(SPARK RM 6.1.4(4))", Item);
return;
end if;
......@@ -2004,8 +2004,8 @@ package body Sem_Prag is
then
Error_Msg_NE
("volatile global item & with property Effective_Reads "
& "must have mode In_Out or Output (SPARK RM "
& "7.1.3(11))", Item, Item_Id);
& "must have mode In_Out or Output "
& "(SPARK RM 7.1.3(11))", Item, Item_Id);
return;
end if;
end if;
......@@ -2022,8 +2022,8 @@ package body Sem_Prag is
else
Error_Msg_N
("global item must denote variable or state (SPARK RM "
& "6.1.4(4))", Item);
("global item must denote variable or state "
& "(SPARK RM 6.1.4(4))", Item);
return;
end if;
......@@ -2150,8 +2150,8 @@ package body Sem_Prag is
begin
if Ekind (Spec_Id) = E_Function then
Error_Msg_N
("global mode & is not applicable to functions (SPARK RM "
& "6.1.4(10))", Mode);
("global mode & is not applicable to functions "
& "(SPARK RM 6.1.4(10))", Mode);
end if;
end Check_Mode_Restriction_In_Function;
......@@ -3538,8 +3538,8 @@ package body Sem_Prag is
if Placement = Not_In_Package then
Error_Msg_N
("indicator Part_Of may not appear in this context (SPARK RM "
& "7.2.6(5))", Indic);
("indicator Part_Of may not appear in this context "
& "(SPARK RM 7.2.6(5))", Indic);
Error_Msg_Name_1 := Chars (Scope (State_Id));
Error_Msg_NE
("\& is not part of the hidden state of package %",
......@@ -3593,8 +3593,8 @@ package body Sem_Prag is
else
Error_Msg_N
("indicator Part_Of may not appear in this context (SPARK RM "
& "7.2.6(5))", Indic);
("indicator Part_Of may not appear in this context "
& "(SPARK RM 7.2.6(5))", Indic);
if Scope (State_Id) = Pack_Id then
Error_Msg_Name_1 := Chars (Pack_Id);
......@@ -22384,8 +22384,8 @@ package body Sem_Prag is
Posted := True;
Error_Msg_NE
("output state & must be replaced by all its "
& "constituents in global refinement (SPARK RM "
& "7.2.5(3))", N, State_Id);
& "constituents in global refinement "
& "(SPARK RM 7.2.5(3))", N, State_Id);
end if;
Error_Msg_NE
......@@ -24002,8 +24002,8 @@ package body Sem_Prag is
else
Error_Msg_N
("indicator Part_Of is required in this context (SPARK RM "
& "7.2.6(3))", Item_Id);
("indicator Part_Of is required in this context "
& "(SPARK RM 7.2.6(3))", Item_Id);
Error_Msg_Name_1 := Chars (Pack_Id);
Error_Msg_N
("\& is declared in the visible part of private child unit %",
......@@ -24035,8 +24035,8 @@ package body Sem_Prag is
else
Error_Msg_N
("indicator Part_Of is required in this context (SPARK RM "
& "7.2.6(2))", Item_Id);
("indicator Part_Of is required in this context "
& "(SPARK RM 7.2.6(2))", Item_Id);
Error_Msg_Name_1 := Chars (Pack_Id);
Error_Msg_N
("\& is declared in the private part of package %", Item_Id);
......
gcc/ada/sem_res.adb
......@@ -4343,8 +4343,8 @@ package body Sem_Res is
Error_Msg_Name_1 := Name_Async_Writers;
Error_Msg_NE
("external variable & with enabled property % cannot "
& "appear as actual in procedure call (SPARK RM "
& "7.1.3(11))", A, A_Id);
& "appear as actual in procedure call "
& "(SPARK RM 7.1.3(11))", A, A_Id);
Error_Msg_N
("\\corresponding formal parameter has mode Out", A);
end if;
......@@ -6637,8 +6637,8 @@ package body Sem_Res is
if not Usage_OK then
Error_Msg_N
("volatile object cannot appear in this context (SPARK RM "
& "7.1.3(13))", N);
("volatile object cannot appear in this context "
& "(SPARK RM 7.1.3(13))", N);
end if;
end if;
end Resolve_Entity_Name;
......
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