2007-04-20 Vincent Celier <celier@adacore.com>

[pf3gnuchains/gcc-fork.git] / gcc / ada / prj-pars.adb

diff --git a/gcc/ada/prj-pars.adb b/gcc/ada/prj-pars.adb
index 620d2e1..0b8e34e 100644 (file)
--- a/gcc/ada/prj-pars.adb
+++ b/gcc/ada/prj-pars.adb
@@ -2,13 +2,11 @@
 --                                                                          --
 --                         GNAT COMPILER COMPONENTS                         --
 --                                                                          --
---                             P R J . P A R S                             --
+--                             P R J . P A R S                              --
 --                                                                          --
 --                                 B o d y                                  --
 --                                                                          --
---                            $Revision: 1.19 $
---                                                                          --
---             Copyright (C) 2001 Free Software Foundation, Inc.            --
+--          Copyright (C) 2001-2006, Free Software Foundation, Inc.         --
 --                                                                          --
 -- GNAT is free software;  you can  redistribute it  and/or modify it under --
 -- terms of the  GNU General Public License as published  by the Free Soft- --
@@ -18,19 +16,19 @@
 -- or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License --
 -- for  more details.  You should have  received  a copy of the GNU General --
 -- Public License  distributed with GNAT;  see file COPYING.  If not, write --
--- to  the Free Software Foundation,  59 Temple Place - Suite 330,  Boston, --
--- MA 02111-1307, USA.                                                      --
+-- to  the  Free Software Foundation,  51  Franklin  Street,  Fifth  Floor, --
+-- Boston, MA 02110-1301, USA.                                              --
 --                                                                          --
 -- GNAT was originally developed  by the GNAT team at  New York University. --
--- It is now maintained by Ada Core Technologies Inc (http://www.gnat.com). --
+-- Extensive contributions were provided by Ada Core Technologies Inc.      --
 --                                                                          --
 ------------------------------------------------------------------------------
 
 with Ada.Exceptions; use Ada.Exceptions;
 
-with Errout;   use Errout;
+with Opt;
 with Output;   use Output;
-with Prj.Com;  use Prj.Com;
+with Prj.Err;  use Prj.Err;
 with Prj.Part;
 with Prj.Proc;
 with Prj.Tree; use Prj.Tree;
@@ -42,28 +40,47 @@ package body Prj.Pars is
    -----------
 
    procedure Parse
-     (Project           : out Project_Id;
-      Project_File_Name : String)
+     (In_Tree           : Project_Tree_Ref;
+      Project           : out Project_Id;
+      Project_File_Name : String;
+      Packages_To_Check : String_List_Access := All_Packages;
+      When_No_Sources   : Error_Warning := Error)
    is
-      Project_Tree      : Project_Node_Id := Empty_Node;
+      Project_Node_Tree : constant Project_Node_Tree_Ref :=
+                            new Project_Node_Tree_Data;
+      Project_Node      : Project_Node_Id := Empty_Node;
       The_Project       : Project_Id      := No_Project;
+      Success           : Boolean         := True;
 
    begin
+      Prj.Tree.Initialize (Project_Node_Tree);
+
       --  Parse the main project file into a tree
 
       Prj.Part.Parse
-        (Project                => Project_Tree,
+        (In_Tree                => Project_Node_Tree,
+         Project                => Project_Node,
          Project_File_Name      => Project_File_Name,
-         Always_Errout_Finalize => False);
+         Always_Errout_Finalize => False,
+         Packages_To_Check      => Packages_To_Check);
 
       --  If there were no error, process the tree
 
-      if Project_Tree /= Empty_Node then
+      if Project_Node /= Empty_Node then
          Prj.Proc.Process
-           (Project           => The_Project,
-            From_Project_Node => Project_Tree,
-            Report_Error      => null);
-         Errout.Finalize;
+           (In_Tree                => In_Tree,
+            Project                => The_Project,
+            Success                => Success,
+            From_Project_Node      => Project_Node,
+            From_Project_Node_Tree => Project_Node_Tree,
+            Report_Error           => null,
+            Follow_Links           => Opt.Follow_Links,
+            When_No_Sources        => When_No_Sources);
+         Prj.Err.Finalize;
+
+         if not Success then
+            The_Project := No_Project;
+         end if;
       end if;
 
       Project := The_Project;
@@ -84,7 +101,7 @@ package body Prj.Pars is
    -- Set_Verbosity --
    -------------------
 
-   procedure Set_Verbosity (To : in Verbosity) is
+   procedure Set_Verbosity (To : Verbosity) is
    begin
       Current_Verbosity := To;
    end Set_Verbosity;