diff options
author | charlet <charlet@138bc75d-0d04-0410-961f-82ee72b054a4> | 2009-09-17 10:38:31 +0000 |
---|---|---|
committer | charlet <charlet@138bc75d-0d04-0410-961f-82ee72b054a4> | 2009-09-17 10:38:31 +0000 |
commit | 7ac0f4a57adbba6fd8e68bb4619055459b1f6f9f (patch) | |
tree | 49238d52872cb62ea7b3b2ed01b0bb7f1bcb4397 /gcc/ada/prj-pars.adb | |
parent | 84ec5566784efbac633966ca76a31eca3160dcc0 (diff) | |
download | gcc-7ac0f4a57adbba6fd8e68bb4619055459b1f6f9f.tar.gz |
2009-09-17 Bob Duff <duff@adacore.com>
* gnat_rm.texi, s-oscons-tmplt.c: Minor typo
2009-09-17 Emmanuel Briot <briot@adacore.com>
* gnatcmd.adb, prj-proc.adb, make.adb, prj-ext.adb, prj-ext.ads,
makeutl.adb, makeutl.ads, clean.adb, prj-pars.adb, prj-pars.ads,
prj-conf.adb, prj-conf.ads, prj-tree.adb, prj-tree.ads, prj-proc.ads,
prj-nmsc.ads (Add, Value_Of, Reset): new parameter Tree.
Scenario variables are now specific to each project tree loaded in
memory.
Code clean ups.
2009-09-17 Javier Miranda <miranda@adacore.com>
* exp_disp.adb (Make_DT): Remove wrong line of code that was
undocumented and probably added by mistake.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@151792 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/ada/prj-pars.adb')
-rw-r--r-- | gcc/ada/prj-pars.adb | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/gcc/ada/prj-pars.adb b/gcc/ada/prj-pars.adb index bacbf8d7f87..a2b1c42ecc6 100644 --- a/gcc/ada/prj-pars.adb +++ b/gcc/ada/prj-pars.adb @@ -45,18 +45,21 @@ package body Prj.Pars is Project_File_Name : String; Packages_To_Check : String_List_Access := All_Packages; Flags : Processing_Flags; - Reset_Tree : Boolean := True) + 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; + Project_Node_Tree : Prj.Tree.Project_Node_Tree_Ref := In_Node_Tree; Automatically_Generated : Boolean; Config_File_Path : String_Access; begin - Project_Node_Tree := new Project_Node_Tree_Data; - Prj.Tree.Initialize (Project_Node_Tree); + if Project_Node_Tree = null then + Project_Node_Tree := new Project_Node_Tree_Data; + Prj.Tree.Initialize (Project_Node_Tree); + end if; -- Parse the main project file into a tree |