From 6064d1cdef16f2eaee2bb8860e45f26ecaa67382 Mon Sep 17 00:00:00 2001 From: charlet Date: Thu, 17 Sep 2009 10:54:32 +0000 Subject: [PATCH] Minor reformatting. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@151797 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ada/prj-ext.ads | 2 ++ gcc/ada/prj-pars.adb | 11 ++++++----- gcc/ada/prj-part.adb | 4 +++- gcc/ada/prj-proc.adb | 22 +++++++++++----------- gcc/ada/prj-tree.ads | 6 +++--- 5 files changed, 25 insertions(+), 20 deletions(-) diff --git a/gcc/ada/prj-ext.ads b/gcc/ada/prj-ext.ads index c960e4e..c171f59 100644 --- a/gcc/ada/prj-ext.ads +++ b/gcc/ada/prj-ext.ads @@ -61,9 +61,11 @@ package Prj.Ext is ------------------------- -- External References -- ------------------------- + -- External references influence the way a project tree is processed (in -- particular they provide the values for the typed string variables that -- are then used in case constructions). + -- External references are project-tree specific, so that when multiple -- trees are loaded in parallel we can have different scenarios (or even -- load the same tree twice and see different views of it). diff --git a/gcc/ada/prj-pars.adb b/gcc/ada/prj-pars.adb index a2b1c42..7ab7ea0 100644 --- a/gcc/ada/prj-pars.adb +++ b/gcc/ada/prj-pars.adb @@ -48,13 +48,14 @@ package body Prj.Pars is Reset_Tree : Boolean := True; In_Node_Tree : Prj.Tree.Project_Node_Tree_Ref := null) is - Project_Node : Project_Node_Id := Empty_Node; - The_Project : Project_Id := No_Project; - Success : Boolean := True; - Current_Dir : constant String := Get_Current_Dir; - Project_Node_Tree : Prj.Tree.Project_Node_Tree_Ref := In_Node_Tree; + Project_Node : Project_Node_Id := Empty_Node; + The_Project : Project_Id := No_Project; + Success : Boolean := True; + Current_Dir : constant String := Get_Current_Dir; + Project_Node_Tree : Prj.Tree.Project_Node_Tree_Ref := In_Node_Tree; Automatically_Generated : Boolean; Config_File_Path : String_Access; + begin if Project_Node_Tree = null then Project_Node_Tree := new Project_Node_Tree_Data; diff --git a/gcc/ada/prj-part.adb b/gcc/ada/prj-part.adb index b55afc5..1ed78ab 100644 --- a/gcc/ada/prj-part.adb +++ b/gcc/ada/prj-part.adb @@ -1341,8 +1341,10 @@ package body Prj.Part is -- Read the original casing of the project name declare - Loc : Source_Ptr := Location_Of (Project, In_Tree); + Loc : Source_Ptr; + begin + Loc := Location_Of (Project, In_Tree); for J in 1 .. Name_Len loop Name_Buffer (J) := Sinput.Source (Loc); Loc := Loc + 1; diff --git a/gcc/ada/prj-proc.adb b/gcc/ada/prj-proc.adb index 8390348..0cd20c8 100644 --- a/gcc/ada/prj-proc.adb +++ b/gcc/ada/prj-proc.adb @@ -1041,8 +1041,8 @@ package body Prj.Proc is end if; end if; - Value := Prj.Ext.Value_Of - (From_Project_Node_Tree, Name, Default); + Value := + Prj.Ext.Value_Of (From_Project_Node_Tree, Name, Default); if Value = No_Name then if not Quiet_Output then @@ -2256,9 +2256,8 @@ package body Prj.Proc is Check (In_Tree, Project, Flags); end if; - -- If main project is an extending all project, set the object - -- directory of all virtual extending projects to the object - -- directory of the main project. + -- If main project is an extending all project, set object directory of + -- all virtual extending projects to object directory of main project. if Project /= No_Project and then @@ -2425,12 +2424,13 @@ package body Prj.Proc is declare Imported : Project_List; Declaration_Node : Project_Node_Id := Empty_Node; - Name : constant Name_Id := - Name_Of - (From_Project_Node, From_Project_Node_Tree); - Name_Node : constant Tree_Private_Part.Project_Name_And_Node := - Tree_Private_Part.Projects_Htable.Get - (From_Project_Node_Tree.Projects_HT, Name); + + Name : constant Name_Id := + Name_Of (From_Project_Node, From_Project_Node_Tree); + + Name_Node : constant Tree_Private_Part.Project_Name_And_Node := + Tree_Private_Part.Projects_Htable.Get + (From_Project_Node_Tree.Projects_HT, Name); begin Project := Processed_Projects.Get (Name); diff --git a/gcc/ada/prj-tree.ads b/gcc/ada/prj-tree.ads index 31a7424..53f2eef 100644 --- a/gcc/ada/prj-tree.ads +++ b/gcc/ada/prj-tree.ads @@ -1000,8 +1000,8 @@ package Prj.Tree is package Tree_Private_Part is - -- This is conceptually in the private part - -- However, for efficiency, some packages are accessing it directly + -- This is conceptually in the private part. However, for efficiency, + -- some packages are accessing it directly. type Project_Node_Record is record @@ -1377,6 +1377,7 @@ package Prj.Tree is Key => Name_Id, Hash => Hash, Equal => "="); + -- Comment required describing what this table is used for ??? type Project_Node_Tree_Data is record Project_Nodes : Tree_Private_Part.Project_Node_Table.Instance; @@ -1399,7 +1400,6 @@ package Prj.Tree is -- particular when using different compilers with different default -- search directories. end record; - -- The data for a project node tree procedure Free (Proj : in out Project_Node_Tree_Ref); -- Free memory used by Prj -- 2.7.4