* 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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@47678
138bc75d-0d04-0410-961f-
82ee72b054a4
+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
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,
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));
-- --
-- S p e c --
-- --
--- $Revision: 1.2 $
+-- $Revision$
-- --
-- Copyright (C) 2000 Free Software Foundation, Inc. --
-- --
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;
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);
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);
-- 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.
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 (" """);
-- 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);
-- --
-- B o d y --
-- --
--- $Revision: 1.10 $
+-- $Revision$
-- --
-- Copyright (C) 2001 Free Software Foundation, Inc. --
-- --
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;
Prj.Dect.Parse
(Declarations => Project_Declaration,
Current_Project => Project,
- Modifying => Modified_Project);
+ Extends => Modified_Project);
Set_Project_Declaration_Of (Project, Project_Declaration);
end;
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;
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;
-- project files.
Tok_Project,
- Tok_Modifying,
+ Tok_Extends,
Tok_External,
No_Token);
-- 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
OSDN Git Service
