2015-08-13 Florian Weimer <fweimer@redhat.com>
* prj.adb (For_Every_Project_Imported_Context.Recursive_Check_Context):
Move Name_Id_Set instantiation to the Prj package, to avoid trampolines.
* prj-proc.adb (Process.Process_Expression_Variable_Decl):
Move Name_Ids instantiation to the Prj.Proc package, to avoid
trampolines.
@@ -72,6 +72,8 @@ package body Prj.Proc is
Equal => "=");
-- Stores the default values of 'Runtime names for the various languages
+ package Name_Ids is new Ada.Containers.Vectors (Positive, Name_Id);
+
procedure Add (To_Exp : in out Name_Id; Str : Name_Id);
-- Concatenate two strings and returns another string if both
-- arguments are not null string.
@@ -2193,8 +2195,6 @@ package body Prj.Proc is
if Is_Attribute and then Name = Snames.Name_Project_Path then
if In_Tree.Is_Root_Tree then
declare
- package Name_Ids is
- new Ada.Containers.Vectors (Positive, Name_Id);
Val : String_List_Id := New_Value.Values;
List : Name_Ids.Vector;
begin
@@ -76,6 +76,9 @@ package body Prj is
All_Upper_Case => All_Upper_Case_Image'Access,
Mixed_Case => Mixed_Case_Image'Access);
+ package Name_Id_Set is
+ new Ada.Containers.Ordered_Sets (Element_Type => Name_Id);
+
procedure Free (Project : in out Project_Id);
-- Free memory allocated for Project
@@ -589,9 +592,6 @@ package body Prj is
In_Aggregate_Lib : Boolean;
From_Encapsulated_Lib : Boolean)
is
- package Name_Id_Set is
- new Ada.Containers.Ordered_Sets (Element_Type => Name_Id);
-
Seen_Name : Name_Id_Set.Set;
-- This set is needed to ensure that we do not handle the same
-- project twice in the context of aggregate libraries.