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

1 files changed, 9 insertions, 2 deletions

diff --git a/gcc/ada/clean.adb b/gcc/ada/clean.adb
index 790b8423529..a113e6bc844 100644
--- a/gcc/ada/clean.adb
+++ b/gcc/ada/clean.adb
@@ -35,6 +35,7 @@ with Prj;      use Prj;
 with Prj.Env;
 with Prj.Ext;
 with Prj.Pars;
+with Prj.Tree; use Prj.Tree;
 with Prj.Util; use Prj.Util;
 with Snames;
 with Switch;   use Switch;
@@ -90,7 +91,7 @@ package body Clean is
 
    Project_File_Name : String_Access := null;
 
-   Project_Tree : constant Prj.Project_Tree_Ref := new Prj.Project_Tree_Data;
+   Project_Node_Tree : Project_Node_Tree_Ref;
 
    Main_Project : Prj.Project_Id := Prj.No_Project;
 
@@ -1402,6 +1403,7 @@ package body Clean is
          Prj.Pars.Parse
            (Project           => Main_Project,
             In_Tree           => Project_Tree,
+            In_Node_Tree      => Project_Node_Tree,
             Project_File_Name => Project_File_Name.all,
             Flags             => Gnatmake_Flags,
             Packages_To_Check => Packages_To_Check_By_Gnatmake);
@@ -1556,6 +1558,10 @@ package body Clean is
          Csets.Initialize;
          Namet.Initialize;
          Snames.Initialize;
+
+         Project_Node_Tree := new Project_Node_Tree_Data;
+         Prj.Tree.Initialize (Project_Node_Tree);
+
          Prj.Initialize (Project_Tree);
 
          --  Check if the platform is VMS and, if it is, change some variables
@@ -1873,7 +1879,8 @@ package body Clean is
 
                            if OK then
                               Prj.Ext.Add
-                                (External_Name =>
+                                (Project_Node_Tree,
+                                 External_Name =>
                                    Ext_Asgn (Start .. Equal_Pos - 1),
                                  Value         =>
                                    Ext_Asgn (Equal_Pos + 1 .. Stop));