Commit 67efd80a by Arnaud Charlet

Minor reformatting.

From-SVN: r151797
parent 3fc5d116
...@@ -61,9 +61,11 @@ package Prj.Ext is ...@@ -61,9 +61,11 @@ package Prj.Ext is
------------------------- -------------------------
-- External References -- -- External References --
------------------------- -------------------------
-- External references influence the way a project tree is processed (in -- External references influence the way a project tree is processed (in
-- particular they provide the values for the typed string variables that -- particular they provide the values for the typed string variables that
-- are then used in case constructions). -- are then used in case constructions).
-- External references are project-tree specific, so that when multiple -- External references are project-tree specific, so that when multiple
-- trees are loaded in parallel we can have different scenarios (or even -- trees are loaded in parallel we can have different scenarios (or even
-- load the same tree twice and see different views of it). -- load the same tree twice and see different views of it).
......
...@@ -55,6 +55,7 @@ package body Prj.Pars is ...@@ -55,6 +55,7 @@ package body Prj.Pars is
Project_Node_Tree : Prj.Tree.Project_Node_Tree_Ref := In_Node_Tree; Project_Node_Tree : Prj.Tree.Project_Node_Tree_Ref := In_Node_Tree;
Automatically_Generated : Boolean; Automatically_Generated : Boolean;
Config_File_Path : String_Access; Config_File_Path : String_Access;
begin begin
if Project_Node_Tree = null then if Project_Node_Tree = null then
Project_Node_Tree := new Project_Node_Tree_Data; Project_Node_Tree := new Project_Node_Tree_Data;
......
...@@ -1341,8 +1341,10 @@ package body Prj.Part is ...@@ -1341,8 +1341,10 @@ package body Prj.Part is
-- Read the original casing of the project name -- Read the original casing of the project name
declare declare
Loc : Source_Ptr := Location_Of (Project, In_Tree); Loc : Source_Ptr;
begin begin
Loc := Location_Of (Project, In_Tree);
for J in 1 .. Name_Len loop for J in 1 .. Name_Len loop
Name_Buffer (J) := Sinput.Source (Loc); Name_Buffer (J) := Sinput.Source (Loc);
Loc := Loc + 1; Loc := Loc + 1;
......
...@@ -1041,8 +1041,8 @@ package body Prj.Proc is ...@@ -1041,8 +1041,8 @@ package body Prj.Proc is
end if; end if;
end if; end if;
Value := Prj.Ext.Value_Of Value :=
(From_Project_Node_Tree, Name, Default); Prj.Ext.Value_Of (From_Project_Node_Tree, Name, Default);
if Value = No_Name then if Value = No_Name then
if not Quiet_Output then if not Quiet_Output then
...@@ -2256,9 +2256,8 @@ package body Prj.Proc is ...@@ -2256,9 +2256,8 @@ package body Prj.Proc is
Check (In_Tree, Project, Flags); Check (In_Tree, Project, Flags);
end if; end if;
-- If main project is an extending all project, set the object -- If main project is an extending all project, set object directory of
-- directory of all virtual extending projects to the object -- all virtual extending projects to object directory of main project.
-- directory of the main project.
if Project /= No_Project if Project /= No_Project
and then and then
...@@ -2425,9 +2424,10 @@ package body Prj.Proc is ...@@ -2425,9 +2424,10 @@ package body Prj.Proc is
declare declare
Imported : Project_List; Imported : Project_List;
Declaration_Node : Project_Node_Id := Empty_Node; Declaration_Node : Project_Node_Id := Empty_Node;
Name : constant Name_Id := Name : constant Name_Id :=
Name_Of Name_Of (From_Project_Node, From_Project_Node_Tree);
(From_Project_Node, From_Project_Node_Tree);
Name_Node : constant Tree_Private_Part.Project_Name_And_Node := Name_Node : constant Tree_Private_Part.Project_Name_And_Node :=
Tree_Private_Part.Projects_Htable.Get Tree_Private_Part.Projects_Htable.Get
(From_Project_Node_Tree.Projects_HT, Name); (From_Project_Node_Tree.Projects_HT, Name);
......
...@@ -1000,8 +1000,8 @@ package Prj.Tree is ...@@ -1000,8 +1000,8 @@ package Prj.Tree is
package Tree_Private_Part is package Tree_Private_Part is
-- This is conceptually in the private part -- This is conceptually in the private part. However, for efficiency,
-- However, for efficiency, some packages are accessing it directly -- some packages are accessing it directly.
type Project_Node_Record is record type Project_Node_Record is record
...@@ -1377,6 +1377,7 @@ package Prj.Tree is ...@@ -1377,6 +1377,7 @@ package Prj.Tree is
Key => Name_Id, Key => Name_Id,
Hash => Hash, Hash => Hash,
Equal => "="); Equal => "=");
-- Comment required describing what this table is used for ???
type Project_Node_Tree_Data is record type Project_Node_Tree_Data is record
Project_Nodes : Tree_Private_Part.Project_Node_Table.Instance; Project_Nodes : Tree_Private_Part.Project_Node_Table.Instance;
...@@ -1399,7 +1400,6 @@ package Prj.Tree is ...@@ -1399,7 +1400,6 @@ package Prj.Tree is
-- particular when using different compilers with different default -- particular when using different compilers with different default
-- search directories. -- search directories.
end record; end record;
-- The data for a project node tree
procedure Free (Proj : in out Project_Node_Tree_Ref); procedure Free (Proj : in out Project_Node_Tree_Ref);
-- Free memory used by Prj -- Free memory used by Prj
......
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