diff options
Diffstat (limited to 'gcc/ada')
| -rw-r--r-- | gcc/ada/ChangeLog | 21 | ||||
| -rw-r--r-- | gcc/ada/prj-dect.adb | 6 | ||||
| -rw-r--r-- | gcc/ada/prj-dect.ads | 4 | ||||
| -rw-r--r-- | gcc/ada/prj-env.adb | 4 | ||||
| -rw-r--r-- | gcc/ada/prj-nmsc.adb | 8 | ||||
| -rw-r--r-- | gcc/ada/prj-part.adb | 10 | ||||
| -rw-r--r-- | gcc/ada/prj.adb | 6 | ||||
| -rw-r--r-- | gcc/ada/prj.ads | 2 | ||||
| -rw-r--r-- | gcc/ada/scans.ads | 2 | ||||
| -rw-r--r-- | gcc/ada/snames.ads | 2 |
10 files changed, 41 insertions, 24 deletions
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index bbbe1359083..767e7362444 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,24 @@ +2001-12-05 Vincent Celier <celier@gnat.com> + + * prj-dect.adb (Parse): Rename parameter Modifying to Extends. + + * prj-dect.ads (Parse): Rename parameter Modifying to Extends. + + * prj-env.adb: Minor comment changes (modifying -> extends). + + * prj-nmsc.adb: Minor comment changes (modifying -> extends). + + * prj-part.adb (Parse_Single_Project): Change Tok_Modifying to + Tok_Extends. + + * prj.adb (Initialize): Change Modifying to Extends. + + * scans.ads (Token_Type): Change Tok_Modifying to Tok_Extends. + + * prj.ads: Minor comment change (Modifying -> extending). + + * snames.ads: Change modifying to extends. + 2001-12-05 Robert Dewar <dewar@gnat.com> * sem_warn.adb: Remove stuff for conditionals, we are not going to diff --git a/gcc/ada/prj-dect.adb b/gcc/ada/prj-dect.adb index df5528d0945..55bfb44bdb1 100644 --- a/gcc/ada/prj-dect.adb +++ b/gcc/ada/prj-dect.adb @@ -88,14 +88,14 @@ package body Prj.Dect is procedure Parse (Declarations : out Project_Node_Id; Current_Project : Project_Node_Id; - Modifying : Project_Node_Id) + Extends : Project_Node_Id) is First_Declarative_Item : Project_Node_Id := Empty_Node; begin Declarations := Default_Project_Node (Of_Kind => N_Project_Declaration); Set_Location_Of (Declarations, To => Token_Ptr); - Set_Modified_Project_Of (Declarations, To => Modifying); + Set_Modified_Project_Of (Declarations, To => Extends); Parse_Declarative_Items (Declarations => First_Declarative_Item, In_Zone => In_Project, @@ -177,7 +177,7 @@ package body Prj.Dect is else if Current_Attribute /= Empty_Attribute and then - Attributes.Table (Current_Attribute).Kind_2 = Associative_Array + Attributes.Table (Current_Attribute).Kind_2 /= Single then Error_Msg ("this attribute need to be an associative array", Location_Of (Attribute)); diff --git a/gcc/ada/prj-dect.ads b/gcc/ada/prj-dect.ads index 3072c573b62..b97524b7e83 100644 --- a/gcc/ada/prj-dect.ads +++ b/gcc/ada/prj-dect.ads @@ -6,7 +6,7 @@ -- -- -- S p e c -- -- -- --- $Revision: 1.2 $ +-- $Revision$ -- -- -- Copyright (C) 2000 Free Software Foundation, Inc. -- -- -- @@ -35,7 +35,7 @@ private package Prj.Dect is procedure Parse (Declarations : out Prj.Tree.Project_Node_Id; Current_Project : Prj.Tree.Project_Node_Id; - Modifying : Prj.Tree.Project_Node_Id); + Extends : Prj.Tree.Project_Node_Id); -- Parse project declarative items. end Prj.Dect; diff --git a/gcc/ada/prj-env.adb b/gcc/ada/prj-env.adb index cc812e958eb..65f282b183c 100644 --- a/gcc/ada/prj-env.adb +++ b/gcc/ada/prj-env.adb @@ -1023,7 +1023,7 @@ package body Prj.Env is Action (Name_Buffer (1 .. Name_Len)); end if; - -- If we are modifying a project, visit it + -- If we are extending a project, visit it if Data.Modifies /= No_Project then Add (Data.Modifies); @@ -1120,7 +1120,7 @@ package body Prj.Env is end loop; end; - -- If we are modifying a project, visit it + -- If we are extending a project, visit it if Data.Modifies /= No_Project then Add (Data.Modifies); diff --git a/gcc/ada/prj-nmsc.adb b/gcc/ada/prj-nmsc.adb index 777c99d95c8..004541f6796 100644 --- a/gcc/ada/prj-nmsc.adb +++ b/gcc/ada/prj-nmsc.adb @@ -249,8 +249,7 @@ package body Prj.Nmsc is -- We attempt to register it as a source. -- However, there is no error if the file - -- does not contain a valid source (as - -- indicated by Error_If_Invalid => False). + -- does not contain a valid source. -- But there is an error if we have a -- duplicate unit name. @@ -2224,9 +2223,6 @@ package body Prj.Nmsc is Unit_Kind => Unit_Kind, Needs_Pragma => Needs_Pragma); - -- If it is not a source file, report an error only if - -- Error_If_Invalid is true. - if Unit_Name = No_Name then if Current_Verbosity = High then Write_Str (" """); @@ -2271,7 +2267,7 @@ package body Prj.Nmsc is -- The unit is already in the list, but may be it is -- only the other unit kind (spec or body), or what is - -- in the unit list is a unit of a project we are modifying. + -- in the unit list is a unit of a project we are extending. if The_Unit /= Prj.Com.No_Unit then The_Unit_Data := Units.Table (The_Unit); diff --git a/gcc/ada/prj-part.adb b/gcc/ada/prj-part.adb index 8100ad49e95..99d2ea42628 100644 --- a/gcc/ada/prj-part.adb +++ b/gcc/ada/prj-part.adb @@ -6,7 +6,7 @@ -- -- -- B o d y -- -- -- --- $Revision: 1.10 $ +-- $Revision$ -- -- -- Copyright (C) 2001 Free Software Foundation, Inc. -- -- -- @@ -535,11 +535,11 @@ package body Prj.Part is end if; - if Token = Tok_Modifying then + if Token = Tok_Extends then - -- We are modifying another project + -- We are extending another project - -- Scan past "modifying" + -- Scan past "extends" Scan; @@ -595,7 +595,7 @@ package body Prj.Part is Prj.Dect.Parse (Declarations => Project_Declaration, Current_Project => Project, - Modifying => Modified_Project); + Extends => Modified_Project); Set_Project_Declaration_Of (Project, Project_Declaration); end; diff --git a/gcc/ada/prj.adb b/gcc/ada/prj.adb index 5f4cf46ef8b..55fd9f0bcb7 100644 --- a/gcc/ada/prj.adb +++ b/gcc/ada/prj.adb @@ -225,9 +225,9 @@ package body Prj is Std_Naming_Data.Separate_Suffix := Default_Ada_Impl_Suffix; Prj.Env.Initialize; Prj.Attr.Initialize; - Set_Name_Table_Byte (Name_Project, Token_Type'Pos (Tok_Project)); - Set_Name_Table_Byte (Name_Modifying, Token_Type'Pos (Tok_Modifying)); - Set_Name_Table_Byte (Name_External, Token_Type'Pos (Tok_External)); + Set_Name_Table_Byte (Name_Project, Token_Type'Pos (Tok_Project)); + Set_Name_Table_Byte (Name_Extends, Token_Type'Pos (Tok_Extends)); + Set_Name_Table_Byte (Name_External, Token_Type'Pos (Tok_External)); end if; end Initialize; diff --git a/gcc/ada/prj.ads b/gcc/ada/prj.ads index f59216577d3..ec6345ad312 100644 --- a/gcc/ada/prj.ads +++ b/gcc/ada/prj.ads @@ -296,7 +296,7 @@ package Prj is type Project_Data is record First_Referred_By : Project_Id := No_Project; -- The project, if any, that was the first to be known - -- as importing or modifying this project. + -- as importing or extending this project. -- Set by Prj.Proc.Process. Name : Name_Id := No_Name; diff --git a/gcc/ada/scans.ads b/gcc/ada/scans.ads index a68cbbfe375..d11023372b6 100644 --- a/gcc/ada/scans.ads +++ b/gcc/ada/scans.ads @@ -191,7 +191,7 @@ package Scans is -- project files. Tok_Project, - Tok_Modifying, + Tok_Extends, Tok_External, No_Token); diff --git a/gcc/ada/snames.ads b/gcc/ada/snames.ads index c98c25f5853..16795ce3e62 100644 --- a/gcc/ada/snames.ads +++ b/gcc/ada/snames.ads @@ -861,7 +861,7 @@ package Snames is -- Reserved words of GNAT Project Files Name_Project : constant Name_Id := N + 523; - Name_Modifying : constant Name_Id := N + 524; + Name_Extends : constant Name_Id := N + 524; -- Name_External is already declared as N + 161 -- Names used in GNAT Project Files |