aboutsummaryrefslogtreecommitdiff
path: root/gcc/ada
diff options
context:
space:
mode:
authorRobert Dewar <dewar@adacore.com>2013-10-14 13:26:07 +0000
committerArnaud Charlet <charlet@gcc.gnu.org>2013-10-14 15:26:07 +0200
commit0895ac082ac9f48ab62051696ac3a61a5fe52939 (patch)
treec2c5568682e5a23aaab38810fa1ff0f5be6a3324 /gcc/ada
parent5ddcf7edb9fd375d92f7eb1e9f50f20f6849e0c4 (diff)
downloadgcc-0895ac082ac9f48ab62051696ac3a61a5fe52939.zip
gcc-0895ac082ac9f48ab62051696ac3a61a5fe52939.tar.gz
gcc-0895ac082ac9f48ab62051696ac3a61a5fe52939.tar.bz2
sem_ch3.adb, [...]: Minor reformatting.
2013-10-14 Robert Dewar <dewar@adacore.com> * sem_ch3.adb, sem_prag.adb, prj.ads: Minor reformatting. From-SVN: r203548
Diffstat (limited to 'gcc/ada')
-rw-r--r--gcc/ada/ChangeLog4
-rw-r--r--gcc/ada/prj.ads15
-rw-r--r--gcc/ada/sem_ch3.adb2
-rw-r--r--gcc/ada/sem_prag.adb60
4 files changed, 41 insertions, 40 deletions
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index fe4623b..ed67161 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,7 @@
+2013-10-14 Robert Dewar <dewar@adacore.com>
+
+ * sem_ch3.adb, sem_prag.adb, prj.ads: Minor reformatting.
+
2013-10-14 Hristian Kirtchev <kirtchev@adacore.com>
* sem_prag.adb (Analyze_Depends_In_Decl_Part):
diff --git a/gcc/ada/prj.ads b/gcc/ada/prj.ads
index 9558826..089d0c7 100644
--- a/gcc/ada/prj.ads
+++ b/gcc/ada/prj.ads
@@ -676,23 +676,23 @@ package Prj is
Clean_Source_Artifacts => No_Name_List);
type Language_Data is record
- Name : Name_Id := No_Name;
+ Name : Name_Id := No_Name;
-- The name of the language in lower case
- Display_Name : Name_Id := No_Name;
+ Display_Name : Name_Id := No_Name;
-- The name of the language, as found in attribute Languages
- Config : Language_Config := No_Language_Config;
+ Config : Language_Config := No_Language_Config;
-- Configuration of the language
- First_Source : Source_Id := No_Source;
+ First_Source : Source_Id := No_Source;
-- Head of the list of sources of the language in the project
Mapping_Files : Mapping_Files_Htable.Instance :=
Mapping_Files_Htable.Nil;
-- Hash table containing the mapping of the sources to their path names
- Next : Language_Ptr := No_Language_Index;
+ Next : Language_Ptr := No_Language_Index;
-- Next language of the project
end record;
@@ -1267,9 +1267,8 @@ package Prj is
---------------
Languages : Language_Ptr := No_Language_Index;
- -- First index of the language data in the project.
- -- Traversing the list gives access to all the languages supported by
- -- the project.
+ -- First index of the language data in the project. Traversing the list
+ -- gives access to all the languages supported by the project.
--------------
-- Projects --
diff --git a/gcc/ada/sem_ch3.adb b/gcc/ada/sem_ch3.adb
index 037527c..e81e61f 100644
--- a/gcc/ada/sem_ch3.adb
+++ b/gcc/ada/sem_ch3.adb
@@ -2091,13 +2091,11 @@ package body Sem_Ch3 is
procedure Remove_Visible_Refinements (Spec_Id : Entity_Id) is
State_Elmt : Elmt_Id;
-
begin
if Present (Abstract_States (Spec_Id)) then
State_Elmt := First_Elmt (Abstract_States (Spec_Id));
while Present (State_Elmt) loop
Set_Has_Visible_Refinement (Node (State_Elmt), False);
-
Next_Elmt (State_Elmt);
end loop;
end if;
diff --git a/gcc/ada/sem_prag.adb b/gcc/ada/sem_prag.adb
index e6a1bd6..661b3d0 100644
--- a/gcc/ada/sem_prag.adb
+++ b/gcc/ada/sem_prag.adb
@@ -525,12 +525,11 @@ package body Sem_Prag is
Item_Id : Entity_Id;
Is_Input : Boolean;
Self_Ref : Boolean);
- -- Ensure that an item has a proper "in", "in out" or "out" mode
- -- depending on its function. If this is not the case, emit an error.
- -- Item and Item_Id denote the attributes of an item. Flag Is_Input
- -- should be set when item comes from an input list. Flag Self_Ref
- -- should be set when the item is an output and the dependency clause
- -- has operator "+".
+ -- Ensure that an item has a proper IN, IN OUT, or OUT mode depending
+ -- on its function. If this is not the case, emit an error. Item and
+ -- Item_Id denote the attributes of an item. Flag Is_Input should be set
+ -- when item comes from an input list. Flag Self_Ref should be set when
+ -- the item is an output and the dependency clause has operator "+".
procedure Check_Usage
(Subp_Items : Elist_Id;
@@ -763,9 +762,9 @@ package body Sem_Prag is
Add_Item (Item_Id, Seen);
end if;
- -- Detect an illegal use of an input related to a null
- -- output. Such input items cannot appear in other input
- -- lists.
+ -- Detect illegal use of an input related to a null
+ -- output. Such input items cannot appear in other
+ -- input lists.
if Is_Input
and then Null_Output_Seen
@@ -908,21 +907,21 @@ package body Sem_Prag is
if Is_Input then
- -- "In" and "in out" parameters already have the proper mode to
- -- act as input. "Out" parameters are valid inputs only when their
- -- type is unconstrained or tagged as their discriminants, array
- -- bouns or tags can be read. In general, states and variables
- -- are considered to have mode "in out" unless they are moded by
- -- pragma [Refined_]Global. In that case, the item must appear in
- -- an input global list.
+ -- IN and IN OUT parameters already have the proper mode to act
+ -- as input. OUT parameters are valid inputs only when their type
+ -- is unconstrained or tagged as their discriminants, array bouns
+ -- or tags can be read. In general, states and variables are
+ -- considered to have mode IN OUT unless they are moded by pragma
+ -- [Refined_]Global. In that case, the item must appear in an
+ -- input global list.
if (Ekind (Item_Id) = E_Out_Parameter
and then not Is_Unconstrained_Or_Tagged_Item (Item_Id))
or else
- (Global_Seen and then not Appears_In (Subp_Inputs, Item_Id))
+ (Global_Seen and then not Appears_In (Subp_Inputs, Item_Id))
then
Error_Msg_NE
- ("item & must have mode in or in out", Item, Item_Id);
+ ("item & must have mode IN or `IN OUT`", Item, Item_Id);
end if;
-- Self-referential output
@@ -930,7 +929,7 @@ package body Sem_Prag is
elsif Self_Ref then
-- In general, states and variables are considered to have mode
- -- "in out" unless they are explicitly moded by pragma [Refined_]
+ -- IN OUT unless they are explicitly moded by pragma [Refined_]
-- Global. If this is the case, then the item must appear in both
-- an input and output global list.
@@ -941,10 +940,11 @@ package body Sem_Prag is
and then
Appears_In (Subp_Outputs, Item_Id))
then
- Error_Msg_NE ("item & must have mode in out", Item, Item_Id);
+ Error_Msg_NE
+ ("item & must have mode `IN OUT`", Item, Item_Id);
end if;
- -- A self-referential out parameter of an unconstrained or tagged
+ -- A self-referential OUT parameter of an unconstrained or tagged
-- type acts as an input because the discriminants, array bounds
-- or the tag may be read. Note that the presence of [Refined_]
-- Global is not significant here because the item is a parameter.
@@ -954,27 +954,27 @@ package body Sem_Prag is
then
null;
- -- The remaining cases are "in", "in out" and "out" parameters. To
- -- qualify as self-referential item, the parameter must be of mode
- -- "in out".
+ -- The remaining cases are IN, IN OUT, and OUT parameters. To
+ -- qualify as self-referential item, the parameter must be of
+ -- mode IN OUT.
elsif Ekind (Item_Id) /= E_In_Out_Parameter then
- Error_Msg_NE ("item & must have mode in out", Item, Item_Id);
+ Error_Msg_NE ("item & must have mode `IN OUT`", Item, Item_Id);
end if;
-- Output
- -- "In out" and "ou" parameters already have the proper mode to act
- -- as output. In general, states and variables are considered to have
- -- mode "in out" unless they are moded by pragma [Refined_]Global.
- -- In that case, the item must appear in an output global list.
+ -- IN OUT and OUT parameters already have the proper mode to act as
+ -- output. In general, states and variables are considered to have
+ -- mode IN OUT unless they are moded by pragma [Refined_]Global. In
+ -- that case, the item must appear in an output global list.
elsif Ekind (Item_Id) = E_In_Parameter
or else
(Global_Seen and then not Appears_In (Subp_Outputs, Item_Id))
then
Error_Msg_NE
- ("item & must have mode out or in out", Item, Item_Id);
+ ("item & must have mode OUT or `IN OUT`", Item, Item_Id);
end if;
end Check_Mode;