OSDN Git Service

./:
[pf3gnuchains/gcc-fork.git] / gcc / ada / prj-nmsc.adb
index c166baa..0bb83a5 100644 (file)
@@ -6,7 +6,7 @@
 --                                                                          --
 --                                 B o d y                                  --
 --                                                                          --
---          Copyright (C) 2000-2004 Free Software Foundation, Inc.          --
+--          Copyright (C) 2000-2007, 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- --
@@ -16,8 +16,8 @@
 -- 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. --
 -- Extensive contributions were provided by Ada Core Technologies Inc.      --
 with Err_Vars; use Err_Vars;
 with Fmap;     use Fmap;
 with Hostparm;
-with MLib.Tgt;
-with Namet;    use Namet;
+with MLib.Tgt; use MLib.Tgt;
 with Opt;      use Opt;
 with Osint;    use Osint;
 with Output;   use Output;
-with MLib.Tgt; use MLib.Tgt;
-with Prj.Com;  use Prj.Com;
 with Prj.Env;  use Prj.Env;
 with Prj.Err;
 with Prj.Util; use Prj.Util;
 with Sinput.P;
 with Snames;   use Snames;
 with Table;    use Table;
-with Types;    use Types;
+with Targparm; use Targparm;
 
 with Ada.Characters.Handling;    use Ada.Characters.Handling;
+with Ada.Directories;            use Ada.Directories;
 with Ada.Strings;                use Ada.Strings;
 with Ada.Strings.Fixed;          use Ada.Strings.Fixed;
 with Ada.Strings.Maps.Constants; use Ada.Strings.Maps.Constants;
 
 with GNAT.Case_Util;             use GNAT.Case_Util;
 with GNAT.Directory_Operations;  use GNAT.Directory_Operations;
-with GNAT.OS_Lib;                use GNAT.OS_Lib;
 with GNAT.HTable;
 
 package body Prj.Nmsc is
@@ -57,42 +54,46 @@ package body Prj.Nmsc is
    Error_Report : Put_Line_Access := null;
    --  Set to point to error reporting procedure
 
+   When_No_Sources : Error_Warning := Error;
+   --  Indicates what should be done when there is no Ada sources in a non
+   --  extending Ada project.
+
    ALI_Suffix   : constant String := ".ali";
    --  File suffix for ali files
 
-   Object_Suffix : constant String := Get_Object_Suffix.all;
+   Object_Suffix : constant String := Get_Target_Object_Suffix.all;
    --  File suffix for object files
 
    type Name_Location is record
-      Name     : Name_Id;
+      Name     : File_Name_Type;
       Location : Source_Ptr;
       Found    : Boolean := False;
    end record;
    --  Information about file names found in string list attribute
    --  Source_Files or in a source list file, stored in hash table
-   --  Source_Names, used by procedure
-   --  Ada_Check.Get_Path_Names_And_Record_Sources.
+   --  Source_Names, used by procedure Get_Path_Names_And_Record_Sources.
 
    No_Name_Location : constant Name_Location :=
-     (Name => No_Name, Location => No_Location, Found => False);
+                        (Name     => No_File,
+                         Location => No_Location,
+                         Found    => False);
 
    package Source_Names is new GNAT.HTable.Simple_HTable
      (Header_Num => Header_Num,
       Element    => Name_Location,
       No_Element => No_Name_Location,
-      Key        => Name_Id,
+      Key        => File_Name_Type,
       Hash       => Hash,
       Equal      => "=");
    --  Hash table to store file names found in string list attribute
    --  Source_Files or in a source list file, stored in hash table
-   --  Source_Names, used by procedure
-   --  Ada_Check.Get_Path_Names_And_Record_Sources.
+   --  Source_Names, used by procedure Get_Path_Names_And_Record_Sources.
 
    package Recursive_Dirs is new GNAT.HTable.Simple_HTable
      (Header_Num => Header_Num,
       Element    => Boolean,
       No_Element => False,
-      Key        => Name_Id,
+      Key        => File_Name_Type,
       Hash       => Hash,
       Equal      => "=");
    --  Hash table to store recursive source directories, to avoid looking
@@ -122,7 +123,7 @@ package body Prj.Nmsc is
      (Header_Num => Header_Num,
       Element    => Ada_Naming_Exception_Id,
       No_Element => No_Ada_Naming_Exception,
-      Key        => Name_Id,
+      Key        => File_Name_Type,
       Hash       => Hash,
       Equal      => "=");
    --  A hash table to store naming exceptions for Ada. For each file name
@@ -148,48 +149,97 @@ package body Prj.Nmsc is
    --  a source with a file name following the naming convention.
 
    function ALI_File_Name (Source : String) return String;
-   --  Return the ALI file name corresponding to a source.
+   --  Return the ALI file name corresponding to a source
 
-   procedure Check_Ada_Name
-     (Name : String;
-      Unit : out Name_Id);
-   --  Check that a name is a valid Ada unit name.
+   procedure Check_Ada_Name (Name : String; Unit : out Name_Id);
+   --  Check that Name is a valid Ada unit name. If not, an error message is
+   --  output, and Unit is set to No_Name, otherwise Unit is set to the
+   --  unit name referenced by Name.
 
-   procedure Check_Ada_Naming_Scheme
+   procedure Check_Naming_Scheme
      (Data    : in out Project_Data;
-      Project : Project_Id);
+      Project : Project_Id;
+      In_Tree : Project_Tree_Ref);
    --  Check the naming scheme part of Data
 
    procedure Check_Ada_Naming_Scheme_Validity
      (Project : Project_Id;
+      In_Tree : Project_Tree_Ref;
       Naming  : Naming_Data);
-   --  Check that the package Naming is correct.
+   --  Check that the package Naming is correct
 
    procedure Check_For_Source
-     (File_Name        : Name_Id;
-      Path_Name        : Name_Id;
+     (File_Name        : File_Name_Type;
+      Path_Name        : File_Name_Type;
       Project          : Project_Id;
+      In_Tree          : Project_Tree_Ref;
       Data             : in out Project_Data;
       Location         : Source_Ptr;
-      Language         : Other_Programming_Language;
+      Language         : Language_Index;
       Suffix           : String;
       Naming_Exception : Boolean);
-   --  Check if a file in a source directory is a source for a specific
-   --  language other than Ada.
+   --  Check if a file, with name File_Name and path Path_Name, in a source
+   --  directory is a source for language Language in project Project of
+   --  project tree In_Tree. ???
+
+   procedure Check_If_Externally_Built
+     (Project : Project_Id;
+      In_Tree : Project_Tree_Ref;
+      Data    : in out Project_Data);
+   --  Check attribute Externally_Built of project Project in project tree
+   --  In_Tree and modify its data Data if it has the value "true".
+
+   procedure Check_Library_Attributes
+     (Project   : Project_Id;
+      In_Tree : Project_Tree_Ref;
+      Data      : in out Project_Data);
+   --  Check the library attributes of project Project in project tree In_Tree
+   --  and modify its data Data accordingly.
+
+   procedure Check_Package_Naming
+     (Project : Project_Id;
+      In_Tree : Project_Tree_Ref;
+      Data    : in out Project_Data);
+   --  Check package Naming of project Project in project tree In_Tree and
+   --  modify its data Data accordingly.
+
+   procedure Check_Programming_Languages
+     (In_Tree : Project_Tree_Ref; Data : in out Project_Data);
+   --  Check attribute Languages for the project with data Data in project
+   --  tree In_Tree and set the components of Data for all the programming
+   --  languages indicated in attribute Languages, if any.
 
    function Check_Project
      (P            : Project_Id;
       Root_Project : Project_Id;
+      In_Tree      : Project_Tree_Ref;
       Extending    : Boolean) return Boolean;
    --  Returns True if P is Root_Project or, if Extending is True, a project
    --  extended by Root_Project.
 
+   procedure Check_Stand_Alone_Library
+     (Project   : Project_Id;
+      In_Tree   : Project_Tree_Ref;
+      Data      : in out Project_Data;
+      Extending : Boolean);
+   --  Check if project Project in project tree In_Tree is a Stand-Alone
+   --  Library project, and modify its data Data accordingly if it is one.
+
    function Compute_Directory_Last (Dir : String) return Natural;
    --  Return the index of the last significant character in Dir. This is used
    --  to avoid duplicates '/' at the end of directory names
 
+   function Body_Suffix_Of
+     (Language   : Language_Index;
+      In_Project : Project_Data;
+      In_Tree    : Project_Tree_Ref)
+      return String;
+   --  Returns the suffix of sources of language Language in project In_Project
+   --  in project tree In_Tree.
+
    procedure Error_Msg
      (Project       : Project_Id;
+      In_Tree       : Project_Tree_Ref;
       Msg           : String;
       Flag_Location : Source_Ptr);
    --  Output an error message. If Error_Report is null, simply call
@@ -198,8 +248,9 @@ package body Prj.Nmsc is
 
    procedure Find_Sources
      (Project      : Project_Id;
+      In_Tree      : Project_Tree_Ref;
       Data         : in out Project_Data;
-      For_Language : Programming_Language;
+      For_Language : Language_Index;
       Follow_Links : Boolean := False);
    --  Find all the sources in all of the source directories of a project for
    --  a specified language.
@@ -207,19 +258,30 @@ package body Prj.Nmsc is
    procedure Free_Ada_Naming_Exceptions;
    --  Free the internal hash tables used for checking naming exceptions
 
-   procedure Get_Mains (Project : Project_Id; Data : in out Project_Data);
+   procedure Get_Directories
+     (Project : Project_Id;
+      In_Tree : Project_Tree_Ref;
+      Data    : in out Project_Data);
+   --  Get the object directory, the exec directory and the source directories
+   --  of a project.
+
+   procedure Get_Mains
+     (Project : Project_Id;
+      In_Tree : Project_Tree_Ref;
+      Data    : in out Project_Data);
    --  Get the mains of a project from attribute Main, if it exists, and put
    --  them in the project data.
 
    procedure Get_Sources_From_File
      (Path     : String;
       Location : Source_Ptr;
-      Project  : Project_Id);
+      Project  : Project_Id;
+      In_Tree  : Project_Tree_Ref);
    --  Get the list of sources from a text file and put them in hash table
    --  Source_Names.
 
    procedure Get_Unit
-     (Canonical_File_Name : Name_Id;
+     (Canonical_File_Name : File_Name_Type;
       Naming              : Naming_Data;
       Exception_Id        : out Ada_Naming_Exception_Id;
       Unit_Name           : out Name_Id;
@@ -238,41 +300,56 @@ package body Prj.Nmsc is
    --  a spec suffix, a body suffix or a separate suffix.
 
    procedure Locate_Directory
-     (Name     : Name_Id;
-      Parent   : Name_Id;
-      Dir      : out Name_Id;
-      Display  : out Name_Id;
-      Project  : Project_Id := No_Project;
-      Kind     : String := "";
+     (Project  : Project_Id;
+      In_Tree  : Project_Tree_Ref;
+      Name     : File_Name_Type;
+      Parent   : Path_Name_Type;
+      Dir      : out Path_Name_Type;
+      Display  : out Path_Name_Type;
+      Create   : String := "";
       Location : Source_Ptr := No_Location);
-   --  Locate a directory. Dir is the canonical path name. Display is the
-   --  path name for display purpose.
-   --  When the directory does not exist, Setup_Projects is True and Kind is
-   --  not the empty string, an attempt is made to create the directory.
-   --  Returns No_Name in Dir and Display if directory does not exist or
-   --  cannot be created.
+   --  Locate a directory. Name is the directory name. Parent is the root
+   --  directory, if Name a relative path name. Dir is set to the canonical
+   --  case path name of the directory, and Display is the directory path name
+   --  for display purposes. If the directory does not exist and Project_Setup
+   --  is True and Create is a non null string, an attempt is made to create
+   --  the directory. If the directory does not exist and Project_Setup is
+   --  false, then Dir and Display are set to No_Name.
+
+   procedure Look_For_Sources
+     (Project      : Project_Id;
+      In_Tree      : Project_Tree_Ref;
+      Data         : in out Project_Data;
+      Follow_Links : Boolean);
+   --  Find all the sources of project Project in project tree In_Tree and
+   --  update its Data accordingly. Resolve symbolic links in the path names
+   --  if Follow_Links is True.
 
    function Path_Name_Of
-     (File_Name : Name_Id;
-      Directory : Name_Id) return String;
-   --  Returns the path name of a (non project) file.
-   --  Returns an empty string if file cannot be found.
+     (File_Name : File_Name_Type;
+      Directory : Path_Name_Type) return String;
+   --  Returns the path name of a (non project) file. Returns an empty string
+   --  if file cannot be found.
 
    procedure Prepare_Ada_Naming_Exceptions
-     (List : Array_Element_Id;
-      Kind : Spec_Or_Body);
+     (List    : Array_Element_Id;
+      In_Tree : Project_Tree_Ref;
+      Kind    : Spec_Or_Body);
    --  Prepare the internal hash tables used for checking naming exceptions
    --  for Ada. Insert all elements of List in the tables.
 
    function Project_Extends
      (Extending : Project_Id;
-      Extended  : Project_Id) return Boolean;
-   --  Returns True if Extending is extending directly or indirectly Extended.
+      Extended  : Project_Id;
+      In_Tree   : Project_Tree_Ref) return Boolean;
+   --  Returns True if Extending is extending Extended either directly or
+   --  indirectly.
 
    procedure Record_Ada_Source
-     (File_Name       : Name_Id;
-      Path_Name       : Name_Id;
+     (File_Name       : File_Name_Type;
+      Path_Name       : File_Name_Type;
       Project         : Project_Id;
+      In_Tree         : Project_Tree_Ref;
       Data            : in out Project_Data;
       Location        : Source_Ptr;
       Current_Source  : in out String_List_Id;
@@ -283,2120 +360,2687 @@ package body Prj.Nmsc is
 
    procedure Record_Other_Sources
      (Project           : Project_Id;
+      In_Tree           : Project_Tree_Ref;
       Data              : in out Project_Data;
-      Language          : Programming_Language;
+      Language          : Language_Index;
       Naming_Exceptions : Boolean);
    --  Record the sources of a language in a project.
    --  When Naming_Exceptions is True, mark the found sources as such, to
    --  later remove those that are not named in a list of sources.
 
-   procedure Show_Source_Dirs (Project : Project_Id);
-   --  List all the source directories of a project.
+   procedure Report_No_Ada_Sources
+     (Project  : Project_Id;
+      In_Tree  : Project_Tree_Ref;
+      Location : Source_Ptr);
+   --  Report an error or a warning depending on the value of When_No_Sources
+
+   procedure Show_Source_Dirs
+     (Project : Project_Id; In_Tree : Project_Tree_Ref);
+   --  List all the source directories of a project
 
    function Suffix_For
-     (Language : Programming_Language;
-      Naming   : Naming_Data) return Name_Id;
+     (Language : Language_Index;
+      Naming   : Naming_Data;
+      In_Tree  : Project_Tree_Ref) return File_Name_Type;
    --  Get the suffix for the source of a language from a package naming.
    --  If not specified, return the default for the language.
 
-   ---------------
-   -- Ada_Check --
-   ---------------
-
-   procedure Ada_Check
-     (Project      : Project_Id;
-      Report_Error : Put_Line_Access;
-      Follow_Links : Boolean)
-   is
-      Data         : Project_Data;
-      Languages    : Variable_Value := Nil_Variable_Value;
-
-      Extending    : Boolean := False;
-
-      procedure Get_Path_Names_And_Record_Sources;
-      --  Find the path names of the source files in the Source_Names table
-      --  in the source directories and record those that are Ada sources.
+   procedure Warn_If_Not_Sources
+     (Project     : Project_Id;
+      In_Tree     : Project_Tree_Ref;
+      Conventions : Array_Element_Id;
+      Specs       : Boolean;
+      Extending   : Boolean);
+   --  Check that individual naming conventions apply to immediate
+   --  sources of the project; if not, issue a warning.
 
-      procedure Get_Sources_From_File
-        (Path     : String;
-         Location : Source_Ptr);
-      --  Get the sources of a project from a text file
+   -------------------
+   -- ALI_File_Name --
+   -------------------
 
-      procedure Warn_If_Not_Sources
-        (Conventions : Array_Element_Id;
-         Specs       : Boolean);
-      --  Check that individual naming conventions apply to immediate
-      --  sources of the project; if not, issue a warning.
+   function ALI_File_Name (Source : String) return String is
+   begin
+      --  If the source name has an extension, then replace it with
+      --  the ALI suffix.
 
-      ---------------------------------------
-      -- Get_Path_Names_And_Record_Sources --
-      ---------------------------------------
+      for Index in reverse Source'First + 1 .. Source'Last loop
+         if Source (Index) = '.' then
+            return Source (Source'First .. Index - 1) & ALI_Suffix;
+         end if;
+      end loop;
 
-      procedure Get_Path_Names_And_Record_Sources is
-         Source_Dir : String_List_Id := Data.Source_Dirs;
-         Element    : String_Element;
-         Path       : Name_Id;
+      --  If there is no dot, or if it is the first character, just add the
+      --  ALI suffix.
 
-         Dir      : Dir_Type;
-         Name     : Name_Id;
-         Canonical_Name : Name_Id;
-         Name_Str : String (1 .. 1_024);
-         Last     : Natural := 0;
-         NL       : Name_Location;
+      return Source & ALI_Suffix;
+   end ALI_File_Name;
 
-         Current_Source : String_List_Id := Nil_String;
+   -----------
+   -- Check --
+   -----------
 
-         First_Error : Boolean := True;
+   procedure Check
+     (Project         : Project_Id;
+      In_Tree         : Project_Tree_Ref;
+      Report_Error    : Put_Line_Access;
+      Follow_Links    : Boolean;
+      When_No_Sources : Error_Warning)
+   is
+      Data      : Project_Data := In_Tree.Projects.Table (Project);
+      Extending : Boolean := False;
 
-         Source_Recorded : Boolean := False;
+   begin
+      Nmsc.When_No_Sources := When_No_Sources;
+      Error_Report := Report_Error;
 
-      begin
-         --  We look in all source directories for the file names in the
-         --  hash table Source_Names
+      Recursive_Dirs.Reset;
 
-         while Source_Dir /= Nil_String loop
-            Source_Recorded := False;
-            Element := String_Elements.Table (Source_Dir);
+      --  Object, exec and source directories
 
-            declare
-               Dir_Path : constant String := Get_Name_String (Element.Value);
-            begin
-               if Current_Verbosity = High then
-                  Write_Str ("checking directory """);
-                  Write_Str (Dir_Path);
-                  Write_Line ("""");
-               end if;
+      Get_Directories (Project, In_Tree, Data);
 
-               Open (Dir, Dir_Path);
+      --  Get the programming languages
 
-               loop
-                  Read (Dir, Name_Str, Last);
-                  exit when Last = 0;
-                  Name_Len := Last;
-                  Name_Buffer (1 .. Name_Len) := Name_Str (1 .. Last);
-                  Name := Name_Find;
-                  Canonical_Case_File_Name (Name_Str (1 .. Last));
-                  Name_Len := Last;
-                  Name_Buffer (1 .. Name_Len) := Name_Str (1 .. Last);
-                  Canonical_Name := Name_Find;
-                  NL := Source_Names.Get (Canonical_Name);
+      Check_Programming_Languages (In_Tree, Data);
 
-                  if NL /= No_Name_Location and then not NL.Found then
-                     NL.Found := True;
-                     Source_Names.Set (Canonical_Name, NL);
-                     Name_Len := Dir_Path'Length;
-                     Name_Buffer (1 .. Name_Len) := Dir_Path;
-                     Add_Char_To_Name_Buffer (Directory_Separator);
-                     Add_Str_To_Name_Buffer (Name_Str (1 .. Last));
-                     Path := Name_Find;
+      --  Library attributes
 
-                     if Current_Verbosity = High then
-                        Write_Str  ("  found ");
-                        Write_Line (Get_Name_String (Name));
-                     end if;
+      Check_Library_Attributes (Project, In_Tree, Data);
 
-                     --  Register the source if it is an Ada compilation unit.
+      Check_If_Externally_Built (Project, In_Tree, Data);
 
-                     Record_Ada_Source
-                       (File_Name       => Name,
-                        Path_Name       => Path,
-                        Project         => Project,
-                        Data            => Data,
-                        Location        => NL.Location,
-                        Current_Source  => Current_Source,
-                        Source_Recorded => Source_Recorded,
-                        Follow_Links    => Follow_Links);
-                  end if;
-               end loop;
+      if Current_Verbosity = High then
+         Show_Source_Dirs (Project, In_Tree);
+      end if;
 
-               Close (Dir);
-            end;
+      Check_Package_Naming (Project, In_Tree, Data);
 
-            if Source_Recorded then
-               String_Elements.Table (Source_Dir).Flag := True;
-            end if;
+      Extending := Data.Extends /= No_Project;
 
-            Source_Dir := Element.Next;
-         end loop;
+      Check_Naming_Scheme (Data, Project, In_Tree);
 
-         --  It is an error if a source file name in a source list or
-         --  in a source list file is not found.
+      Prepare_Ada_Naming_Exceptions
+        (Data.Naming.Bodies, In_Tree, Body_Part);
+      Prepare_Ada_Naming_Exceptions
+        (Data.Naming.Specs, In_Tree, Specification);
 
-         NL := Source_Names.Get_First;
+      --  Find the sources
 
-         while NL /= No_Name_Location loop
-            if not NL.Found then
-               Err_Vars.Error_Msg_Name_1 := NL.Name;
+      if Data.Source_Dirs /= Nil_String then
+         Look_For_Sources (Project, In_Tree, Data, Follow_Links);
+      end if;
 
-               if First_Error then
-                  Error_Msg
-                    (Project,
-                     "source file { cannot be found",
-                     NL.Location);
-                  First_Error := False;
+      if Data.Ada_Sources_Present then
 
-               else
-                  Error_Msg
-                    (Project,
-                     "\source file { cannot be found",
-                     NL.Location);
-               end if;
-            end if;
+         --  Check that all individual naming conventions apply to sources of
+         --  this project file.
+
+         Warn_If_Not_Sources
+           (Project, In_Tree, Data.Naming.Bodies,
+            Specs     => False,
+            Extending => Extending);
+         Warn_If_Not_Sources
+           (Project, In_Tree, Data.Naming.Specs,
+            Specs     => True,
+            Extending => Extending);
+      end if;
 
-            NL := Source_Names.Get_Next;
-         end loop;
-      end Get_Path_Names_And_Record_Sources;
+      --  If it is a library project file, check if it is a standalone library
 
-      ---------------------------
-      -- Get_Sources_From_File --
-      ---------------------------
+      if Data.Library then
+         Check_Stand_Alone_Library (Project, In_Tree, Data, Extending);
+      end if;
 
-      procedure Get_Sources_From_File
-        (Path     : String;
-         Location : Source_Ptr)
-      is
-      begin
-         --  Get the list of sources from the file and put them in hash table
-         --  Source_Names.
+      --  Put the list of Mains, if any, in the project data
 
-         Get_Sources_From_File (Path, Location, Project);
+      Get_Mains (Project, In_Tree, Data);
 
-         --  Look in the source directories to find those sources
+      --  Update the project data in the Projects table
 
-         Get_Path_Names_And_Record_Sources;
+      In_Tree.Projects.Table (Project) := Data;
 
-         --  We should have found at least one source.
-         --  If not, report an error.
+      Free_Ada_Naming_Exceptions;
+   end Check;
 
-         if Data.Sources = Nil_String then
-            Error_Msg (Project,
-                       "there are no Ada sources in this project",
-                       Location);
-         end if;
-      end Get_Sources_From_File;
+   --------------------
+   -- Check_Ada_Name --
+   --------------------
 
-      -------------------------
-      -- Warn_If_Not_Sources --
-      -------------------------
+   procedure Check_Ada_Name (Name : String; Unit : out Name_Id) is
+      The_Name        : String := Name;
+      Real_Name       : Name_Id;
+      Need_Letter     : Boolean := True;
+      Last_Underscore : Boolean := False;
+      OK              : Boolean := The_Name'Length > 0;
 
-      procedure Warn_If_Not_Sources
-        (Conventions : Array_Element_Id;
-         Specs       : Boolean)
-      is
-         Conv          : Array_Element_Id := Conventions;
-         Unit          : Name_Id;
-         The_Unit_Id   : Unit_Id;
-         The_Unit_Data : Unit_Data;
-         Location      : Source_Ptr;
+   begin
+      To_Lower (The_Name);
 
-      begin
-         while Conv /= No_Array_Element loop
-            Unit := Array_Elements.Table (Conv).Index;
-            Error_Msg_Name_1 := Unit;
-            Get_Name_String (Unit);
-            To_Lower (Name_Buffer (1 .. Name_Len));
-            Unit := Name_Find;
-            The_Unit_Id := Units_Htable.Get (Unit);
-            Location := Array_Elements.Table (Conv).Value.Location;
-
-            if The_Unit_Id = Prj.Com.No_Unit then
-               Error_Msg
-                 (Project,
-                  "?unknown unit {",
-                  Location);
+      Name_Len := The_Name'Length;
+      Name_Buffer (1 .. Name_Len) := The_Name;
 
-            else
-               The_Unit_Data := Units.Table (The_Unit_Id);
+      --  Special cases of children of packages A, G, I and S on VMS
 
-               if Specs then
-                  if not Check_Project
-                    (The_Unit_Data.File_Names (Specification).Project,
-                     Project, Extending)
-                  then
-                     Error_Msg
-                       (Project,
-                        "?unit{ has no spec in this project",
-                        Location);
-                  end if;
+      if OpenVMS_On_Target and then
+        Name_Len > 3 and then
+        Name_Buffer (2 .. 3) = "__" and then
+        ((Name_Buffer (1) = 'a') or else (Name_Buffer (1) = 'g') or else
+         (Name_Buffer (1) = 'i') or else (Name_Buffer (1) = 's'))
+      then
+         Name_Buffer (2) := '.';
+         Name_Buffer (3 .. Name_Len - 1) := Name_Buffer (4 .. Name_Len);
+         Name_Len := Name_Len - 1;
+      end if;
 
-               else
-                  if not Check_Project
-                    (The_Unit_Data.File_Names (Com.Body_Part).Project,
-                     Project, Extending)
-                  then
-                     Error_Msg
-                       (Project,
-                        "?unit{ has no body in this project",
-                        Location);
-                  end if;
-               end if;
-            end if;
+      Real_Name := Name_Find;
 
-            Conv := Array_Elements.Table (Conv).Next;
-         end loop;
-      end Warn_If_Not_Sources;
+      --  Check first that the given name is not an Ada reserved word
 
-   --  Start of processing for Ada_Check
+      if Get_Name_Table_Byte (Real_Name) /= 0
+        and then Real_Name /= Name_Project
+        and then Real_Name /= Name_Extends
+        and then Real_Name /= Name_External
+      then
+         Unit := No_Name;
 
-   begin
-      Language_Independent_Check (Project, Report_Error);
+         if Current_Verbosity = High then
+            Write_Str (The_Name);
+            Write_Line (" is an Ada reserved word.");
+         end if;
 
-      Error_Report    := Report_Error;
+         return;
+      end if;
 
-      Data      := Projects.Table (Project);
-      Extending := Data.Extends /= No_Project;
-      Languages := Prj.Util.Value_Of (Name_Languages, Data.Decl.Attributes);
+      for Index in The_Name'Range loop
+         if Need_Letter then
 
-      Data.Naming.Current_Language := Name_Ada;
-      Data.Ada_Sources_Present     := Data.Source_Dirs /= Nil_String;
+            --  We need a letter (at the beginning, and following a dot),
+            --  but we don't have one.
 
-      if not Languages.Default then
-         declare
-            Current   : String_List_Id := Languages.Values;
-            Element   : String_Element;
-            Ada_Found : Boolean := False;
+            if Is_Letter (The_Name (Index)) then
+               Need_Letter := False;
 
-         begin
-            Look_For_Ada : while Current /= Nil_String loop
-               Element := String_Elements.Table (Current);
-               Get_Name_String (Element.Value);
-               To_Lower (Name_Buffer (1 .. Name_Len));
+            else
+               OK := False;
 
-               if Name_Buffer (1 .. Name_Len) = "ada" then
-                  Ada_Found := True;
-                  exit Look_For_Ada;
+               if Current_Verbosity = High then
+                  Write_Int  (Types.Int (Index));
+                  Write_Str  (": '");
+                  Write_Char (The_Name (Index));
+                  Write_Line ("' is not a letter.");
                end if;
 
-               Current := Element.Next;
-            end loop Look_For_Ada;
+               exit;
+            end if;
 
-            if not Ada_Found then
+         elsif Last_Underscore
+           and then (The_Name (Index) = '_' or else The_Name (Index) = '.')
+         then
+            --  Two underscores are illegal, and a dot cannot follow
+            --  an underscore.
 
-               --  Mark the project file as having no sources for Ada
+            OK := False;
 
-               Data.Ada_Sources_Present := False;
+            if Current_Verbosity = High then
+               Write_Int  (Types.Int (Index));
+               Write_Str  (": '");
+               Write_Char (The_Name (Index));
+               Write_Line ("' is illegal here.");
             end if;
-         end;
-      end if;
 
-      Check_Ada_Naming_Scheme (Data, Project);
+            exit;
 
-      Prepare_Ada_Naming_Exceptions (Data.Naming.Bodies, Body_Part);
-      Prepare_Ada_Naming_Exceptions (Data.Naming.Specs,  Specification);
+         elsif The_Name (Index) = '.' then
 
-      --  If we have source directories, then find the sources
+            --  We need a letter after a dot
 
-      if Data.Ada_Sources_Present then
-         if Data.Source_Dirs = Nil_String then
-            Data.Ada_Sources_Present := False;
+            Need_Letter := True;
 
-         else
-            declare
-               Sources : constant Variable_Value :=
-                           Util.Value_Of
-                             (Name_Source_Files,
-                              Data.Decl.Attributes);
+         elsif The_Name (Index) = '_' then
+            Last_Underscore := True;
 
-               Source_List_File : constant Variable_Value :=
-                                    Util.Value_Of
-                                      (Name_Source_List_File,
-                                       Data.Decl.Attributes);
+         else
+            --  We need an letter or a digit
 
-               Locally_Removed : constant Variable_Value :=
-                           Util.Value_Of
-                             (Name_Locally_Removed_Files,
-                              Data.Decl.Attributes);
+            Last_Underscore := False;
 
-            begin
-               pragma Assert
-                 (Sources.Kind = List,
-                    "Source_Files is not a list");
+            if not Is_Alphanumeric (The_Name (Index)) then
+               OK := False;
 
-               pragma Assert
-                 (Source_List_File.Kind = Single,
-                    "Source_List_File is not a single string");
+               if Current_Verbosity = High then
+                  Write_Int  (Types.Int (Index));
+                  Write_Str  (": '");
+                  Write_Char (The_Name (Index));
+                  Write_Line ("' is not alphanumeric.");
+               end if;
 
-               if not Sources.Default then
-                  if not Source_List_File.Default then
-                     Error_Msg
-                       (Project,
-                        "?both variables source_files and " &
-                        "source_list_file are present",
-                        Source_List_File.Location);
-                  end if;
-
-                  --  Sources is a list of file names
-
-                  declare
-                     Current        : String_List_Id := Sources.Values;
-                     Element        : String_Element;
-                     Location       : Source_Ptr;
-                     Name           : Name_Id;
-
-                  begin
-                     Source_Names.Reset;
+               exit;
+            end if;
+         end if;
+      end loop;
 
-                     Data.Ada_Sources_Present := Current /= Nil_String;
+      --  Cannot end with an underscore or a dot
 
-                     while Current /= Nil_String loop
-                        Element := String_Elements.Table (Current);
-                        Get_Name_String (Element.Value);
-                        Canonical_Case_File_Name
-                          (Name_Buffer (1 .. Name_Len));
-                        Name := Name_Find;
+      OK := OK and then not Need_Letter and then not Last_Underscore;
 
-                        --  If the element has no location, then use the
-                        --  location of Sources to report possible errors.
+      if OK then
+         Unit := Real_Name;
 
-                        if Element.Location = No_Location then
-                           Location := Sources.Location;
+      else
+         --  Signal a problem with No_Name
 
-                        else
-                           Location := Element.Location;
-                        end if;
+         Unit := No_Name;
+      end if;
+   end Check_Ada_Name;
 
-                        Source_Names.Set
-                          (K => Name,
-                           E =>
-                             (Name     => Name,
-                              Location => Location,
-                              Found    => False));
+   --------------------------------------
+   -- Check_Ada_Naming_Scheme_Validity --
+   --------------------------------------
 
-                        Current := Element.Next;
-                     end loop;
+   procedure Check_Ada_Naming_Scheme_Validity
+     (Project : Project_Id;
+      In_Tree : Project_Tree_Ref;
+      Naming  : Naming_Data)
+   is
+   begin
+      --  Only check if we are not using the Default naming scheme
 
-                     Get_Path_Names_And_Record_Sources;
-                  end;
+      if Naming /= In_Tree.Private_Part.Default_Naming then
+         declare
+            Dot_Replacement : constant String :=
+                                Get_Name_String
+                                  (Naming.Dot_Replacement);
 
-                  --  No source_files specified
+            Spec_Suffix     : constant String :=
+                                Get_Name_String
+                                  (Naming.Ada_Spec_Suffix);
 
-                  --  We check Source_List_File has been specified.
+            Body_Suffix     : constant String :=
+                                Get_Name_String
+                                  (Naming.Ada_Body_Suffix);
 
-               elsif not Source_List_File.Default then
+            Separate_Suffix : constant String :=
+                                Get_Name_String
+                                  (Naming.Separate_Suffix);
 
-                  --  Source_List_File is the name of the file
-                  --  that contains the source file names
+         begin
+            --  Dot_Replacement cannot
+            --   - be empty
+            --   - start or end with an alphanumeric
+            --   - be a single '_'
+            --   - start with an '_' followed by an alphanumeric
+            --   - contain a '.' except if it is "."
 
-                  declare
-                     Source_File_Path_Name : constant String :=
-                       Path_Name_Of
-                       (Source_List_File.Value,
-                        Data.Directory);
+            if Dot_Replacement'Length = 0
+              or else Is_Alphanumeric
+                        (Dot_Replacement (Dot_Replacement'First))
+              or else Is_Alphanumeric
+                        (Dot_Replacement (Dot_Replacement'Last))
+              or else (Dot_Replacement (Dot_Replacement'First) = '_'
+                        and then
+                        (Dot_Replacement'Length = 1
+                          or else
+                           Is_Alphanumeric
+                             (Dot_Replacement (Dot_Replacement'First + 1))))
+              or else (Dot_Replacement'Length > 1
+                         and then
+                           Index (Source => Dot_Replacement,
+                                  Pattern => ".") /= 0)
+            then
+               Error_Msg
+                 (Project, In_Tree,
+                  '"' & Dot_Replacement &
+                  """ is illegal for Dot_Replacement.",
+                  Naming.Dot_Repl_Loc);
+            end if;
 
-                  begin
-                     if Source_File_Path_Name'Length = 0 then
-                        Err_Vars.Error_Msg_Name_1 := Source_List_File.Value;
-                        Error_Msg
-                          (Project,
-                           "file with sources { does not exist",
-                           Source_List_File.Location);
+            --  Suffixes cannot
+            --   - be empty
 
-                     else
-                        Get_Sources_From_File
-                          (Source_File_Path_Name,
-                           Source_List_File.Location);
-                     end if;
-                  end;
+            if Is_Illegal_Suffix
+                 (Spec_Suffix, Dot_Replacement = ".")
+            then
+               Err_Vars.Error_Msg_File_1 := Naming.Ada_Spec_Suffix;
+               Error_Msg
+                 (Project, In_Tree,
+                  "{ is illegal for Spec_Suffix",
+                  Naming.Spec_Suffix_Loc);
+            end if;
 
-               else
-                  --  Neither Source_Files nor Source_List_File has been
-                  --  specified. Find all the files that satisfy the naming
-                  --  scheme in all the source directories.
+            if Is_Illegal_Suffix (Body_Suffix, Dot_Replacement = ".") then
+               Err_Vars.Error_Msg_File_1 := Naming.Ada_Body_Suffix;
+               Error_Msg
+                 (Project, In_Tree,
+                  "{ is illegal for Body_Suffix",
+                  Naming.Body_Suffix_Loc);
+            end if;
 
-                  Find_Sources (Project, Data, Lang_Ada, Follow_Links);
+            if Body_Suffix /= Separate_Suffix then
+               if Is_Illegal_Suffix
+                 (Separate_Suffix, Dot_Replacement = ".")
+               then
+                  Err_Vars.Error_Msg_File_1 := Naming.Separate_Suffix;
+                  Error_Msg
+                    (Project, In_Tree,
+                     "{ is illegal for Separate_Suffix",
+                     Naming.Sep_Suffix_Loc);
                end if;
+            end if;
+
+            --  Spec_Suffix cannot have the same termination as
+            --  Body_Suffix or Separate_Suffix
 
-               --  If there are sources that are locally removed, mark them as
-               --  such in the Units table.
+            if Spec_Suffix'Length <= Body_Suffix'Length
+              and then
+                Body_Suffix (Body_Suffix'Last -
+                             Spec_Suffix'Length + 1 ..
+                             Body_Suffix'Last) = Spec_Suffix
+            then
+               Error_Msg
+                 (Project, In_Tree,
+                  "Body_Suffix (""" &
+                  Body_Suffix &
+                  """) cannot end with" &
+                  " Spec_Suffix  (""" &
+                  Spec_Suffix & """).",
+                  Naming.Body_Suffix_Loc);
+            end if;
 
-               if not Locally_Removed.Default then
+            if Body_Suffix /= Separate_Suffix
+              and then Spec_Suffix'Length <= Separate_Suffix'Length
+              and then
+                Separate_Suffix
+                  (Separate_Suffix'Last - Spec_Suffix'Length + 1
+                    ..
+                   Separate_Suffix'Last) = Spec_Suffix
+            then
+               Error_Msg
+                 (Project, In_Tree,
+                  "Separate_Suffix (""" &
+                  Separate_Suffix &
+                  """) cannot end with" &
+                  " Spec_Suffix (""" &
+                  Spec_Suffix & """).",
+                  Naming.Sep_Suffix_Loc);
+            end if;
+         end;
+      end if;
+   end Check_Ada_Naming_Scheme_Validity;
 
-                  --  Sources can be locally removed only in extending
-                  --  project files.
+   ----------------------
+   -- Check_For_Source --
+   ----------------------
 
-                  if Data.Extends = No_Project then
-                     Error_Msg
-                       (Project,
-                        "Locally_Removed_Files can only be used " &
-                        "in an extending project file",
-                        Locally_Removed.Location);
+   procedure Check_For_Source
+     (File_Name        : File_Name_Type;
+      Path_Name        : File_Name_Type;
+      Project          : Project_Id;
+      In_Tree          : Project_Tree_Ref;
+      Data             : in out Project_Data;
+      Location         : Source_Ptr;
+      Language         : Language_Index;
+      Suffix           : String;
+      Naming_Exception : Boolean)
+   is
+      Name          : String := Get_Name_String (File_Name);
+      Real_Location : Source_Ptr := Location;
 
-                  else
-                     declare
-                        Current        : String_List_Id :=
-                                           Locally_Removed.Values;
-                        Element        : String_Element;
-                        Location       : Source_Ptr;
-                        OK             : Boolean;
-                        Unit           : Unit_Data;
-                        Name           : Name_Id;
-                        Extended       : Project_Id;
+   begin
+      Canonical_Case_File_Name (Name);
 
-                     begin
-                        while Current /= Nil_String loop
-                           Element := String_Elements.Table (Current);
-                           Get_Name_String (Element.Value);
-                           Canonical_Case_File_Name
-                             (Name_Buffer (1 .. Name_Len));
-                           Name := Name_Find;
+      --  A file is a source of a language if Naming_Exception is True (case
+      --  of naming exceptions) or if its file name ends with the suffix.
 
-                           --  If the element has no location, then use the
-                           --  location of Locally_Removed to report
-                           --  possible errors.
+      if Naming_Exception
+        or else
+          (Name'Length > Suffix'Length
+            and then
+              Name (Name'Last - Suffix'Length + 1 .. Name'Last) = Suffix)
+      then
+         if Real_Location = No_Location then
+            Real_Location := Data.Location;
+         end if;
 
-                           if Element.Location = No_Location then
-                              Location := Locally_Removed.Location;
+         declare
+            Path   : constant String := Get_Name_String (Path_Name);
+            C_Path : String := Path;
 
-                           else
-                              Location := Element.Location;
-                           end if;
+            Path_Id   : Path_Name_Type;
+            C_Path_Id : Path_Name_Type;
+            --  The path name id (in canonical case)
 
-                           OK := False;
+            File_Id : File_Name_Type;
+            --  The file name id (in canonical case)
 
-                           for Index in 1 .. Units.Last loop
-                              Unit := Units.Table (Index);
+            Obj_Id : File_Name_Type;
+            --  The object file name
 
-                              if
-                                Unit.File_Names (Specification).Name = Name
-                              then
-                                 OK := True;
+            Obj_Path_Id : Path_Name_Type;
+            --  The object path name
 
-                                 --  Check that this is from a project that
-                                 --  the current project extends, but not the
-                                 --  current project.
+            Dep_Id : File_Name_Type;
+            --  The dependency file name
 
-                                 Extended := Unit.File_Names
-                                                    (Specification).Project;
+            Dep_Path_Id : Path_Name_Type;
+            --  The dependency path name
 
-                                 if Extended = Project then
-                                    Error_Msg
-                                      (Project,
-                                       "cannot remove a source " &
-                                       "of the same project",
-                                       Location);
+            Dot_Pos : Natural := 0;
+            --  Position of the last dot in Name
 
-                                 elsif
-                                   Project_Extends (Project, Extended)
-                                 then
-                                    Unit.File_Names
-                                      (Specification).Path := Slash;
-                                    Unit.File_Names
-                                      (Specification).Needs_Pragma := False;
-                                    Units.Table (Index) := Unit;
-                                    Add_Forbidden_File_Name
-                                      (Unit.File_Names (Specification).Name);
-                                    exit;
-
-                                 else
-                                    Error_Msg
-                                      (Project,
-                                       "cannot remove a source from " &
-                                       "another project",
-                                       Location);
-                                 end if;
+            Source    : Other_Source;
+            Source_Id : Other_Source_Id := Data.First_Other_Source;
 
-                              elsif
-                                Unit.File_Names (Body_Part).Name = Name
-                              then
-                                 OK := True;
+         begin
+            Canonical_Case_File_Name (C_Path);
 
-                                 --  Check that this is from a project that
-                                 --  the current project extends, but not the
-                                 --  current project.
+            --  Get the file name id
 
-                                 Extended := Unit.File_Names
-                                                    (Body_Part).Project;
+            Name_Len := Name'Length;
+            Name_Buffer (1 .. Name_Len) := Name;
+            File_Id := Name_Find;
 
-                                 if Extended = Project then
-                                    Error_Msg
-                                      (Project,
-                                       "cannot remove a source " &
-                                       "of the same project",
-                                       Location);
+            --  Get the path name id
 
-                                 elsif
-                                   Project_Extends (Project, Extended)
-                                 then
-                                    Unit.File_Names (Body_Part).Path := Slash;
-                                    Unit.File_Names (Body_Part).Needs_Pragma
-                                      := False;
-                                    Units.Table (Index) := Unit;
-                                    Add_Forbidden_File_Name
-                                      (Unit.File_Names (Body_Part).Name);
-                                    exit;
-                                 end if;
+            Name_Len := Path'Length;
+            Name_Buffer (1 .. Name_Len) := Path;
+            Path_Id := Name_Find;
 
-                              end if;
-                           end loop;
+            Name_Len := C_Path'Length;
+            Name_Buffer (1 .. Name_Len) := C_Path;
+            C_Path_Id := Name_Find;
 
-                           if not OK then
-                              Err_Vars.Error_Msg_Name_1 := Name;
-                              Error_Msg (Project, "unknown file {", Location);
-                           end if;
+            --  Find the position of the last dot
 
-                           Current := Element.Next;
-                        end loop;
-                     end;
-                  end if;
+            for J in reverse Name'Range loop
+               if Name (J) = '.' then
+                  Dot_Pos := J;
+                  exit;
                end if;
-            end;
-         end if;
-      end if;
+            end loop;
 
-      if Data.Ada_Sources_Present then
+            if Dot_Pos <= Name'First then
+               Dot_Pos := Name'Last + 1;
+            end if;
 
-         --  Check that all individual naming conventions apply to
-         --  sources of this project file.
+            --  Compute the object file name
 
-         Warn_If_Not_Sources (Data.Naming.Bodies, Specs => False);
-         Warn_If_Not_Sources (Data.Naming.Specs,  Specs => True);
-      end if;
+            Get_Name_String (File_Id);
+            Name_Len := Dot_Pos - Name'First;
 
-      --  If it is a library project file, check if it is a standalone library
+            for J in Object_Suffix'Range loop
+               Name_Len := Name_Len + 1;
+               Name_Buffer (Name_Len) := Object_Suffix (J);
+            end loop;
 
-      if Data.Library then
-         Standalone_Library : declare
-            Lib_Interfaces : constant Prj.Variable_Value :=
-                               Prj.Util.Value_Of
-                                 (Snames.Name_Library_Interface,
-                                  Data.Decl.Attributes);
-            Lib_Auto_Init  : constant Prj.Variable_Value :=
-                               Prj.Util.Value_Of
-                                 (Snames.Name_Library_Auto_Init,
-                                  Data.Decl.Attributes);
+            Obj_Id := Name_Find;
 
-            Lib_Src_Dir : constant Prj.Variable_Value :=
-                            Prj.Util.Value_Of
-                              (Snames.Name_Library_Src_Dir,
-                               Data.Decl.Attributes);
+            --  Compute the object path name
 
-            Lib_Symbol_File : constant Prj.Variable_Value :=
-                                Prj.Util.Value_Of
-                                  (Snames.Name_Library_Symbol_File,
-                                   Data.Decl.Attributes);
+            Get_Name_String (Data.Display_Object_Dir);
 
-            Lib_Symbol_Policy : constant Prj.Variable_Value :=
-                                  Prj.Util.Value_Of
-                                    (Snames.Name_Library_Symbol_Policy,
-                                     Data.Decl.Attributes);
+            if Name_Buffer (Name_Len) /= Directory_Separator
+              and then Name_Buffer (Name_Len) /= '/'
+            then
+               Name_Len := Name_Len + 1;
+               Name_Buffer (Name_Len) := Directory_Separator;
+            end if;
 
-            Lib_Ref_Symbol_File : constant Prj.Variable_Value :=
-                                  Prj.Util.Value_Of
-                                    (Snames.Name_Library_Reference_Symbol_File,
-                                     Data.Decl.Attributes);
+            Add_Str_To_Name_Buffer (Get_Name_String (Obj_Id));
+            Obj_Path_Id := Name_Find;
 
-            Auto_Init_Supported : constant Boolean :=
-                                    MLib.Tgt.
-                                     Standalone_Library_Auto_Init_Is_Supported;
+            --  Compute the dependency file name
 
-            OK : Boolean := True;
+            Get_Name_String (File_Id);
+            Name_Len := Dot_Pos - Name'First + 1;
+            Name_Buffer (Name_Len) := '.';
+            Name_Len := Name_Len + 1;
+            Name_Buffer (Name_Len) := 'd';
+            Dep_Id := Name_Find;
 
-         begin
-            pragma Assert (Lib_Interfaces.Kind = List);
+            --  Compute the dependency path name
 
-            --  It is a stand-alone library project file if attribute
-            --  Library_Interface is defined.
+            Get_Name_String (Data.Display_Object_Dir);
 
-            if not Lib_Interfaces.Default then
-               declare
-                  Interfaces : String_List_Id := Lib_Interfaces.Values;
-                  Interface_ALIs : String_List_Id := Nil_String;
-                  Unit : Name_Id;
-                  The_Unit_Id : Unit_Id;
-                  The_Unit_Data : Unit_Data;
+            if Name_Buffer (Name_Len) /= Directory_Separator
+              and then Name_Buffer (Name_Len) /= '/'
+            then
+               Name_Len := Name_Len + 1;
+               Name_Buffer (Name_Len) := Directory_Separator;
+            end if;
 
-                  procedure Add_ALI_For (Source : Name_Id);
-                  --  Add an ALI file name to the list of Interface ALIs
+            Add_Str_To_Name_Buffer (Get_Name_String (Dep_Id));
+            Dep_Path_Id := Name_Find;
 
-                  -----------------
-                  -- Add_ALI_For --
-                  -----------------
+            --  Check if source is already in the list of source for this
+            --  project: it may have already been specified as a naming
+            --  exception for the same language or an other language, or
+            --  they may be two identical file names in different source
+            --  directories.
 
-                  procedure Add_ALI_For (Source : Name_Id) is
-                  begin
-                     Get_Name_String (Source);
+            while Source_Id /= No_Other_Source loop
+               Source := In_Tree.Other_Sources.Table (Source_Id);
 
-                     declare
-                        ALI : constant String :=
-                                ALI_File_Name (Name_Buffer (1 .. Name_Len));
-                        ALI_Name_Id : Name_Id;
-                     begin
-                        Name_Len := ALI'Length;
-                        Name_Buffer (1 .. Name_Len) := ALI;
-                        ALI_Name_Id := Name_Find;
-
-                        String_Elements.Increment_Last;
-                        String_Elements.Table (String_Elements.Last) :=
-                          (Value    => ALI_Name_Id,
-                           Index    => 0,
-                           Display_Value => ALI_Name_Id,
-                           Location => String_Elements.Table
-                                                         (Interfaces).Location,
-                           Flag     => False,
-                           Next     => Interface_ALIs);
-                        Interface_ALIs := String_Elements.Last;
-                     end;
-                  end Add_ALI_For;
-
-               begin
-                  Data.Standalone_Library := True;
+               if Source.File_Name = File_Id then
 
-                  --  Library_Interface cannot be an empty list
+                  --  Two sources of different languages cannot have the same
+                  --  file name.
 
-                  if Interfaces = Nil_String then
+                  if Source.Language /= Language then
+                     Error_Msg_File_1 := File_Name;
                      Error_Msg
-                       (Project,
-                        "Library_Interface cannot be an empty list",
-                        Lib_Interfaces.Location);
-                  end if;
-
-                  --  Process each unit name specified in the attribute
-                  --  Library_Interface.
-
-                  while Interfaces /= Nil_String loop
-                     Get_Name_String
-                       (String_Elements.Table (Interfaces).Value);
-                     To_Lower (Name_Buffer (1 .. Name_Len));
+                       (Project, In_Tree,
+                        "{ cannot be a source of several languages",
+                        Real_Location);
+                     return;
 
-                     if Name_Len = 0 then
-                        Error_Msg
-                          (Project,
-                           "an interface cannot be an empty string",
-                           String_Elements.Table (Interfaces).Location);
+                  --  No problem if a file has already been specified as
+                  --  a naming exception of this language.
 
-                     else
-                        Unit := Name_Find;
-                        Error_Msg_Name_1 := Unit;
-                        The_Unit_Id := Units_Htable.Get (Unit);
+                  elsif Source.Path_Name = C_Path_Id then
 
-                        if The_Unit_Id = Prj.Com.No_Unit then
-                           Error_Msg
-                             (Project,
-                              "unknown unit {",
-                              String_Elements.Table (Interfaces).Location);
+                     --  Reset the naming exception flag, if this is not a
+                     --  naming exception.
 
-                        else
-                           --  Check that the unit is part of the project
+                     if not Naming_Exception then
+                        In_Tree.Other_Sources.Table
+                          (Source_Id).Naming_Exception := False;
+                     end if;
 
-                           The_Unit_Data := Units.Table (The_Unit_Id);
+                     return;
 
-                           if The_Unit_Data.File_Names
-                                (Com.Body_Part).Name /= No_Name
-                             and then The_Unit_Data.File_Names
-                                        (Com.Body_Part).Path /= Slash
-                           then
-                              if Check_Project
-                                (The_Unit_Data.File_Names (Body_Part).Project,
-                                 Project, Extending)
-                              then
-                                 --  There is a body for this unit.
-                                 --  If there is no spec, we need to check
-                                 --  that it is not a subunit.
+                  --  There are several files with the same names, but the
+                  --  order of the source directories is known (no /**):
+                  --  only the first one encountered is kept, the other ones
+                  --  are ignored.
 
-                                 if The_Unit_Data.File_Names
-                                      (Specification).Name = No_Name
-                                 then
-                                    declare
-                                       Src_Ind : Source_File_Index;
-
-                                    begin
-                                       Src_Ind := Sinput.P.Load_Project_File
-                                                   (Get_Name_String
-                                                      (The_Unit_Data.File_Names
-                                                         (Body_Part).Path));
-
-                                       if Sinput.P.Source_File_Is_Subunit
-                                                     (Src_Ind)
-                                       then
-                                          Error_Msg
-                                            (Project,
-                                             "{ is a subunit; " &
-                                             "it cannot be an interface",
-                                             String_Elements.Table
-                                               (Interfaces).Location);
-                                       end if;
-                                    end;
-                                 end if;
+                  elsif Data.Known_Order_Of_Source_Dirs then
+                     return;
 
-                                 --  The unit is not a subunit, so we add
-                                 --  to the Interface ALIs the ALI file
-                                 --  corresponding to the body.
+                  --  But it is an error if the order of the source directories
+                  --  is not known.
 
-                                 Add_ALI_For
-                                   (The_Unit_Data.File_Names (Body_Part).Name);
+                  else
+                     Error_Msg_File_1 := File_Name;
+                     Error_Msg
+                       (Project, In_Tree,
+                        "{ is found in several source directories",
+                        Real_Location);
+                     return;
+                  end if;
 
-                              else
-                                 Error_Msg
-                                   (Project,
-                                    "{ is not an unit of this project",
-                                    String_Elements.Table
-                                      (Interfaces).Location);
-                              end if;
+               --  Two sources with different file names cannot have the same
+               --  object file name.
 
-                           elsif The_Unit_Data.File_Names
-                                   (Com.Specification).Name /= No_Name
-                              and then The_Unit_Data.File_Names
-                                         (Com.Specification).Path /= Slash
-                              and then Check_Project
-                                         (The_Unit_Data.File_Names
-                                              (Specification).Project,
-                                          Project, Extending)
+               elsif Source.Object_Name = Obj_Id then
+                  Error_Msg_File_1 := File_Id;
+                  Error_Msg_File_2 := Source.File_Name;
+                  Error_Msg_File_3 := Obj_Id;
+                  Error_Msg
+                    (Project, In_Tree,
+                     "{ and { have the same object file {",
+                     Real_Location);
+                     return;
+               end if;
 
-                           then
-                              --  The unit is part of the project, it has
-                              --  a spec, but no body. We add to the Interface
-                              --  ALIs the ALI file corresponding to the spec.
+               Source_Id := Source.Next;
+            end loop;
 
-                              Add_ALI_For
-                               (The_Unit_Data.File_Names (Specification).Name);
+            if Current_Verbosity = High then
+               Write_Str ("      found ");
+               Display_Language_Name (Language);
+               Write_Str (" source """);
+               Write_Str (Get_Name_String (File_Name));
+               Write_Line ("""");
+               Write_Str ("      object path = ");
+               Write_Line (Get_Name_String (Obj_Path_Id));
+            end if;
 
-                           else
-                              Error_Msg
-                                (Project,
-                                 "{ is not an unit of this project",
-                                 String_Elements.Table (Interfaces).Location);
-                           end if;
-                        end if;
+            --  Create the Other_Source record
 
-                     end if;
+            Source :=
+              (Language         => Language,
+               File_Name        => File_Id,
+               Path_Name        => Path_Id,
+               Source_TS        => File_Stamp (Path_Id),
+               Object_Name      => Obj_Id,
+               Object_Path      => Obj_Path_Id,
+               Object_TS        => File_Stamp (Obj_Path_Id),
+               Dep_Name         => Dep_Id,
+               Dep_Path         => Dep_Path_Id,
+               Dep_TS           => File_Stamp (Dep_Path_Id),
+               Naming_Exception => Naming_Exception,
+               Next             => No_Other_Source);
 
-                     Interfaces := String_Elements.Table (Interfaces).Next;
-                  end loop;
+            --  And add it to the Other_Sources table
 
-                  --  Put the list of Interface ALIs in the project data
+            Other_Source_Table.Increment_Last (In_Tree.Other_Sources);
+            In_Tree.Other_Sources.Table
+              (Other_Source_Table.Last (In_Tree.Other_Sources)) := Source;
 
-                  Data.Lib_Interface_ALIs := Interface_ALIs;
+            --  There are sources of languages other than Ada in this project
 
-                  --  Check value of attribute Library_Auto_Init and set
-                  --  Lib_Auto_Init accordingly.
+            Data.Other_Sources_Present := True;
 
-                  if Lib_Auto_Init.Default then
+            --  And there are sources of this language in this project
 
-                     --  If no attribute Library_Auto_Init is declared, then
-                     --  set auto init only if it is supported.
+            Set (Language, True, Data, In_Tree);
 
-                     Data.Lib_Auto_Init := Auto_Init_Supported;
+            --  Add this source to the list of sources of languages other than
+            --  Ada of the project.
 
-                  else
-                     Get_Name_String (Lib_Auto_Init.Value);
-                     To_Lower (Name_Buffer (1 .. Name_Len));
+            if Data.First_Other_Source = No_Other_Source then
+               Data.First_Other_Source :=
+                 Other_Source_Table.Last (In_Tree.Other_Sources);
 
-                     if Name_Buffer (1 .. Name_Len) = "false" then
-                        Data.Lib_Auto_Init := False;
+            else
+               In_Tree.Other_Sources.Table (Data.Last_Other_Source).Next :=
+                 Other_Source_Table.Last (In_Tree.Other_Sources);
+            end if;
 
-                     elsif Name_Buffer (1 .. Name_Len) = "true" then
-                        if Auto_Init_Supported then
-                           Data.Lib_Auto_Init := True;
+            Data.Last_Other_Source :=
+              Other_Source_Table.Last (In_Tree.Other_Sources);
+         end;
+      end if;
+   end Check_For_Source;
 
-                        else
-                           --  Library_Auto_Init cannot be "true" if auto init
-                           --  is not supported
+   -------------------------------
+   -- Check_If_Externally_Built --
+   -------------------------------
 
-                           Error_Msg
-                             (Project,
-                              "library auto init not supported " &
-                              "on this platform",
-                              Lib_Auto_Init.Location);
-                        end if;
+   procedure Check_If_Externally_Built
+     (Project : Project_Id;
+      In_Tree : Project_Tree_Ref;
+      Data    : in out Project_Data)
+   is
+      Externally_Built : constant Variable_Value :=
+                           Util.Value_Of
+                            (Name_Externally_Built,
+                             Data.Decl.Attributes, In_Tree);
 
-                     else
-                        Error_Msg
-                          (Project,
-                           "invalid value for attribute Library_Auto_Init",
-                           Lib_Auto_Init.Location);
-                     end if;
-                  end if;
-               end;
+   begin
+      if not Externally_Built.Default then
+         Get_Name_String (Externally_Built.Value);
+         To_Lower (Name_Buffer (1 .. Name_Len));
 
-               --  If attribute Library_Src_Dir is defined and not the
-               --  empty string, check if the directory exist and is not
-               --  the object directory or one of the source directories.
-               --  This is the directory where copies of the interface
-               --  sources will be copied. Note that this directory may be
-               --  the library directory. If setting up projects (gnat setup)
-               --  and the directory does not exist, attempt to create it.
+         if Name_Buffer (1 .. Name_Len) = "true" then
+            Data.Externally_Built := True;
 
-               if Lib_Src_Dir.Value /= Empty_String then
-                  declare
-                     Dir_Id : constant Name_Id := Lib_Src_Dir.Value;
+         elsif Name_Buffer (1 .. Name_Len) /= "false" then
+            Error_Msg (Project, In_Tree,
+                       "Externally_Built may only be true or false",
+                       Externally_Built.Location);
+         end if;
+      end if;
 
-                  begin
-                     Locate_Directory
-                       (Dir_Id, Data.Display_Directory,
-                        Data.Library_Src_Dir,
-                        Data.Display_Library_Src_Dir,
-                        Project  => Project,
-                        Kind     => "library interface copy",
-                        Location => Lib_Src_Dir.Location);
-
-                     --  If directory does not exist, report an error. No need
-                     --  to do that if Setup_Projects is True, as an error
-                     --  has already been reported by Locate_Directory.
-
-                     if not Setup_Projects
-                       and then Data.Library_Src_Dir = No_Name
-                     then
+      if Current_Verbosity = High then
+         Write_Str ("Project is ");
 
-                        --  Get the absolute name of the library directory
-                        --  that does not exist, to report an error.
+         if not Data.Externally_Built then
+            Write_Str ("not ");
+         end if;
 
-                        declare
-                           Dir_Name : constant String :=
-                                        Get_Name_String (Dir_Id);
+         Write_Line ("externally built.");
+      end if;
+   end Check_If_Externally_Built;
 
-                        begin
-                           if Is_Absolute_Path (Dir_Name) then
-                              Err_Vars.Error_Msg_Name_1 := Dir_Id;
+   -----------------------------
+   -- Check_Naming_Scheme --
+   -----------------------------
 
-                           else
-                              Get_Name_String (Data.Directory);
+   procedure Check_Naming_Scheme
+     (Data    : in out Project_Data;
+      Project : Project_Id;
+      In_Tree : Project_Tree_Ref)
+   is
+      Naming_Id : constant Package_Id :=
+                    Util.Value_Of (Name_Naming, Data.Decl.Packages, In_Tree);
 
-                              if Name_Buffer (Name_Len) /=
-                                Directory_Separator
-                              then
-                                 Name_Len := Name_Len + 1;
-                                 Name_Buffer (Name_Len) :=
-                                   Directory_Separator;
-                              end if;
+      Naming : Package_Element;
 
-                              Name_Buffer
-                                (Name_Len + 1 ..
-                                   Name_Len + Dir_Name'Length) :=
-                                  Dir_Name;
-                              Name_Len := Name_Len + Dir_Name'Length;
-                              Err_Vars.Error_Msg_Name_1 := Name_Find;
-                           end if;
+      procedure Check_Unit_Names (List : Array_Element_Id);
+      --  Check that a list of unit names contains only valid names
 
-                           --  Report the error
+      ----------------------
+      -- Check_Unit_Names --
+      ----------------------
 
-                           Error_Msg
-                             (Project,
-                              "Directory { does not exist",
-                              Lib_Src_Dir.Location);
-                        end;
+      procedure Check_Unit_Names (List : Array_Element_Id) is
+         Current   : Array_Element_Id := List;
+         Element   : Array_Element;
+         Unit_Name : Name_Id;
 
-                     --  Report an error if it is the same as the object
-                     --  directory.
+      begin
+         --  Loop through elements of the string list
 
-                     elsif Data.Library_Src_Dir = Data.Object_Directory then
-                        Error_Msg
-                          (Project,
-                           "directory to copy interfaces cannot be " &
-                           "the object directory",
-                           Lib_Src_Dir.Location);
-                        Data.Library_Src_Dir := No_Name;
+         while Current /= No_Array_Element loop
+            Element := In_Tree.Array_Elements.Table (Current);
 
-                     --  Check if it is the same as one of the source
-                     --  directories.
+            --  Put file name in canonical case
 
-                     else
-                        declare
-                           Src_Dirs : String_List_Id := Data.Source_Dirs;
-                           Src_Dir  : String_Element;
+            Get_Name_String (Element.Value.Value);
+            Canonical_Case_File_Name (Name_Buffer (1 .. Name_Len));
+            Element.Value.Value := Name_Find;
 
-                        begin
-                           while Src_Dirs /= Nil_String loop
-                              Src_Dir := String_Elements.Table (Src_Dirs);
-                              Src_Dirs := Src_Dir.Next;
+            --  Check that it contains a valid unit name
 
-                              --  Report an error if it is one of the
-                              --  source directories.
+            Get_Name_String (Element.Index);
+            Check_Ada_Name (Name_Buffer (1 .. Name_Len), Unit_Name);
 
-                              if Data.Library_Src_Dir = Src_Dir.Value then
-                                 Error_Msg
-                                   (Project,
-                                    "directory to copy interfaces cannot " &
-                                    "be one of the source directories",
-                                    Lib_Src_Dir.Location);
-                                 Data.Library_Src_Dir := No_Name;
-                                 exit;
-                              end if;
-                           end loop;
-                        end;
+            if Unit_Name = No_Name then
+               Error_Msg_Name_1 := Element.Index;
+               --  Errutil.Set_Msg_Txt ignores '$' (unit name insertion)
+               Error_Msg
+                 (Project, In_Tree,
+                  "%% is not a valid unit name.",
+                  Element.Value.Location);
 
-                        if Data.Library_Src_Dir /= No_Name
-                          and then Current_Verbosity = High
-                        then
-                           Write_Str ("Directory to copy interfaces =""");
-                           Write_Str (Get_Name_String (Data.Library_Dir));
-                           Write_Line ("""");
-                        end if;
-                     end if;
-                  end;
+            else
+               if Current_Verbosity = High then
+                  Write_Str ("    Unit (""");
+                  Write_Str (Get_Name_String (Unit_Name));
+                  Write_Line (""")");
                end if;
 
-               if not Lib_Symbol_Policy.Default then
-                  declare
-                     Value : constant String :=
-                               To_Lower
-                                 (Get_Name_String (Lib_Symbol_Policy.Value));
+               Element.Index := Unit_Name;
+               In_Tree.Array_Elements.Table (Current) := Element;
+            end if;
 
-                  begin
-                     if Value = "autonomous" or else Value = "default" then
-                        Data.Symbol_Data.Symbol_Policy := Autonomous;
+            Current := Element.Next;
+         end loop;
+      end Check_Unit_Names;
 
-                     elsif Value = "compliant" then
-                        Data.Symbol_Data.Symbol_Policy := Compliant;
+   --  Start of processing for Check_Naming_Scheme
 
-                     elsif Value = "controlled" then
-                        Data.Symbol_Data.Symbol_Policy := Controlled;
+   begin
+      --  If there is a package Naming, we will put in Data.Naming what is in
+      --  this package Naming.
 
-                     elsif Value = "restricted" then
-                        Data.Symbol_Data.Symbol_Policy := Restricted;
+      if Naming_Id /= No_Package then
+         Naming := In_Tree.Packages.Table (Naming_Id);
 
-                     else
-                        Error_Msg
-                          (Project,
-                           "illegal value for Library_Symbol_Policy",
-                           Lib_Symbol_Policy.Location);
-                     end if;
-                  end;
-               end if;
+         if Current_Verbosity = High then
+            Write_Line ("Checking ""Naming"" for Ada.");
+         end if;
 
-               if Lib_Symbol_File.Default then
-                  if Data.Symbol_Data.Symbol_Policy = Restricted then
-                     Error_Msg
-                       (Project,
-                        "Library_Symbol_File needs to be defined when " &
-                        "symbol policy is Restricted",
-                        Lib_Symbol_Policy.Location);
-                  end if;
+         declare
+            Bodies : constant Array_Element_Id :=
+                       Util.Value_Of (Name_Body, Naming.Decl.Arrays, In_Tree);
 
-               else
-                  Data.Symbol_Data.Symbol_File := Lib_Symbol_File.Value;
+            Specs : constant Array_Element_Id :=
+                      Util.Value_Of (Name_Spec, Naming.Decl.Arrays, In_Tree);
 
-                  Get_Name_String (Lib_Symbol_File.Value);
+         begin
+            if Bodies /= No_Array_Element then
 
-                  if Name_Len = 0 then
-                     Error_Msg
-                       (Project,
-                        "symbol file name cannot be an empty string",
-                        Lib_Symbol_File.Location);
+               --  We have elements in the array Body_Part
 
-                  else
-                     OK := not Is_Absolute_Path (Name_Buffer (1 .. Name_Len));
+               if Current_Verbosity = High then
+                  Write_Line ("Found Bodies.");
+               end if;
 
-                     if OK then
-                        for J in 1 .. Name_Len loop
-                           if Name_Buffer (J) = '/'
-                             or else Name_Buffer (J) = Directory_Separator
-                           then
-                              OK := False;
-                              exit;
-                           end if;
-                        end loop;
-                     end if;
+               Data.Naming.Bodies := Bodies;
+               Check_Unit_Names (Bodies);
 
-                     if not OK then
-                        Error_Msg_Name_1 := Lib_Symbol_File.Value;
-                        Error_Msg
-                          (Project,
-                           "symbol file name { is illegal. " &
-                           "Name canot include directory info.",
-                           Lib_Symbol_File.Location);
-                     end if;
-                  end if;
+            else
+               if Current_Verbosity = High then
+                  Write_Line ("No Bodies.");
                end if;
+            end if;
 
-               if Lib_Ref_Symbol_File.Default then
-                  if Data.Symbol_Data.Symbol_Policy = Compliant
-                    or else Data.Symbol_Data.Symbol_Policy = Controlled
-                  then
-                     Error_Msg
-                       (Project,
-                        "a reference symbol file need to be defined",
-                        Lib_Symbol_Policy.Location);
-                  end if;
+            if Specs /= No_Array_Element then
 
-               else
-                  Data.Symbol_Data.Reference := Lib_Ref_Symbol_File.Value;
+               --  We have elements in the array Specs
 
-                  Get_Name_String (Lib_Ref_Symbol_File.Value);
+               if Current_Verbosity = High then
+                  Write_Line ("Found Specs.");
+               end if;
 
-                  if Name_Len = 0 then
-                     Error_Msg
-                       (Project,
-                        "reference symbol file name cannot be an empty string",
-                        Lib_Symbol_File.Location);
+               Data.Naming.Specs := Specs;
+               Check_Unit_Names (Specs);
 
-                  else
-                     OK := not Is_Absolute_Path (Name_Buffer (1 .. Name_Len));
+            else
+               if Current_Verbosity = High then
+                  Write_Line ("No Specs.");
+               end if;
+            end if;
+         end;
 
-                     if OK then
-                        for J in 1 .. Name_Len loop
-                           if Name_Buffer (J) = '/'
-                             or else Name_Buffer (J) = Directory_Separator
-                           then
-                              OK := False;
-                              exit;
-                           end if;
-                        end loop;
-                     end if;
+         --  We are now checking if variables Dot_Replacement, Casing,
+         --  Spec_Suffix, Body_Suffix and/or Separate_Suffix
+         --  exist.
 
-                     if not OK then
-                        Error_Msg_Name_1 := Lib_Ref_Symbol_File.Value;
-                        Error_Msg
-                          (Project,
-                           "reference symbol file { name is illegal. " &
-                           "Name canot include directory info.",
-                           Lib_Ref_Symbol_File.Location);
-                     end if;
+         --  For each variable, if it does not exist, we do nothing,
+         --  because we already have the default.
 
-                     if not Is_Regular_File
-                       (Get_Name_String (Data.Object_Directory) &
-                        Directory_Separator &
-                        Get_Name_String (Lib_Ref_Symbol_File.Value))
-                     then
-                        Error_Msg_Name_1 := Lib_Ref_Symbol_File.Value;
-                        Error_Msg
-                          (Project,
-                           "library reference symbol file { does not exist",
-                           Lib_Ref_Symbol_File.Location);
-                     end if;
+         --  Check Dot_Replacement
 
-                     if Data.Symbol_Data.Symbol_File /= No_Name then
-                        declare
-                           Symbol : String :=
-                                      Get_Name_String
-                                        (Data.Symbol_Data.Symbol_File);
+         declare
+            Dot_Replacement : constant Variable_Value :=
+                                Util.Value_Of
+                                  (Name_Dot_Replacement,
+                                   Naming.Decl.Attributes, In_Tree);
 
-                           Reference : String :=
-                                         Get_Name_String
-                                           (Data.Symbol_Data.Reference);
+         begin
+            pragma Assert (Dot_Replacement.Kind = Single,
+                           "Dot_Replacement is not a single string");
 
-                        begin
-                           Canonical_Case_File_Name (Symbol);
-                           Canonical_Case_File_Name (Reference);
+            if not Dot_Replacement.Default then
+               Get_Name_String (Dot_Replacement.Value);
 
-                           if Symbol = Reference then
-                              Error_Msg
-                                (Project,
-                                 "reference symbol file and symbol file " &
-                                 "cannot be the same file",
-                                 Lib_Ref_Symbol_File.Location);
-                           end if;
-                        end;
-                     end if;
-                  end if;
+               if Name_Len = 0 then
+                  Error_Msg
+                    (Project, In_Tree,
+                     "Dot_Replacement cannot be empty",
+                     Dot_Replacement.Location);
+
+               else
+                  Canonical_Case_File_Name (Name_Buffer (1 .. Name_Len));
+                  Data.Naming.Dot_Replacement := Name_Find;
+                  Data.Naming.Dot_Repl_Loc := Dot_Replacement.Location;
                end if;
             end if;
-         end Standalone_Library;
-      end if;
+         end;
 
-      --  Put the list of Mains, if any, in the project data
+         if Current_Verbosity = High then
+            Write_Str  ("  Dot_Replacement = """);
+            Write_Str  (Get_Name_String (Data.Naming.Dot_Replacement));
+            Write_Char ('"');
+            Write_Eol;
+         end if;
 
-      Get_Mains (Project, Data);
+         --  Check Casing
 
-      Projects.Table (Project) := Data;
+         declare
+            Casing_String : constant Variable_Value :=
+                              Util.Value_Of
+                                (Name_Casing, Naming.Decl.Attributes, In_Tree);
 
-      Free_Ada_Naming_Exceptions;
-   end Ada_Check;
+         begin
+            pragma Assert (Casing_String.Kind = Single,
+                           "Casing is not a single string");
 
-   -------------------
-   -- ALI_File_Name --
-   -------------------
+            if not Casing_String.Default then
+               declare
+                  Casing_Image : constant String :=
+                                   Get_Name_String (Casing_String.Value);
+               begin
+                  declare
+                     Casing_Value : constant Casing_Type :=
+                                      Value (Casing_Image);
+                  begin
+                     Data.Naming.Casing := Casing_Value;
+                  end;
 
-   function ALI_File_Name (Source : String) return String is
-   begin
-      --  If the source name has an extension, then replace it with
-      --  the ALI suffix.
+               exception
+                  when Constraint_Error =>
+                     if Casing_Image'Length = 0 then
+                        Error_Msg
+                          (Project, In_Tree,
+                           "Casing cannot be an empty string",
+                           Casing_String.Location);
 
-      for Index in reverse Source'First + 1 .. Source'Last loop
-         if Source (Index) = '.' then
-            return Source (Source'First .. Index - 1) & ALI_Suffix;
+                     else
+                        Name_Len := Casing_Image'Length;
+                        Name_Buffer (1 .. Name_Len) := Casing_Image;
+                        Err_Vars.Error_Msg_Name_1 := Name_Find;
+                        Error_Msg
+                          (Project, In_Tree,
+                           "%% is not a correct Casing",
+                           Casing_String.Location);
+                     end if;
+               end;
+            end if;
+         end;
+
+         if Current_Verbosity = High then
+            Write_Str  ("  Casing = ");
+            Write_Str  (Image (Data.Naming.Casing));
+            Write_Char ('.');
+            Write_Eol;
          end if;
-      end loop;
 
-      --  If there is no dot, or if it is the first character, just add the
-      --  ALI suffix.
+         --  Check Spec_Suffix
 
-      return Source & ALI_Suffix;
-   end ALI_File_Name;
+         declare
+            Ada_Spec_Suffix : constant Variable_Value :=
+                                Prj.Util.Value_Of
+                                  (Index     => Name_Ada,
+                                   Src_Index => 0,
+                                   In_Array  => Data.Naming.Spec_Suffix,
+                                   In_Tree   => In_Tree);
 
-   --------------------
-   -- Check_Ada_Name --
-   --------------------
+         begin
+            if Ada_Spec_Suffix.Kind = Single
+              and then Get_Name_String (Ada_Spec_Suffix.Value) /= ""
+            then
+               Get_Name_String (Ada_Spec_Suffix.Value);
+               Canonical_Case_File_Name (Name_Buffer (1 .. Name_Len));
+               Data.Naming.Ada_Spec_Suffix := Name_Find;
+               Data.Naming.Spec_Suffix_Loc := Ada_Spec_Suffix.Location;
 
-   procedure Check_Ada_Name
-     (Name : String;
-      Unit : out Name_Id)
-   is
-      The_Name        : String := Name;
-      Real_Name       : Name_Id;
-      Need_Letter     : Boolean := True;
-      Last_Underscore : Boolean := False;
-      OK              : Boolean := The_Name'Length > 0;
+            else
+               Data.Naming.Ada_Spec_Suffix := Default_Ada_Spec_Suffix;
+            end if;
+         end;
 
-   begin
-      To_Lower (The_Name);
+         if Current_Verbosity = High then
+            Write_Str  ("  Spec_Suffix = """);
+            Write_Str  (Get_Name_String (Data.Naming.Ada_Spec_Suffix));
+            Write_Char ('"');
+            Write_Eol;
+         end if;
 
-      Name_Len := The_Name'Length;
-      Name_Buffer (1 .. Name_Len) := The_Name;
-      Real_Name := Name_Find;
+         --  Check Body_Suffix
 
-      --  Check first that the given name is not an Ada reserved word
+         declare
+            Ada_Body_Suffix : constant Variable_Value :=
+              Prj.Util.Value_Of
+                (Index     => Name_Ada,
+                 Src_Index => 0,
+                 In_Array  => Data.Naming.Body_Suffix,
+                 In_Tree   => In_Tree);
 
-      if Get_Name_Table_Byte (Real_Name) /= 0
-        and then Real_Name /= Name_Project
-        and then Real_Name /= Name_Extends
-        and then Real_Name /= Name_External
-      then
-         Unit := No_Name;
+         begin
+            if Ada_Body_Suffix.Kind = Single
+              and then Get_Name_String (Ada_Body_Suffix.Value) /= ""
+            then
+               Get_Name_String (Ada_Body_Suffix.Value);
+               Canonical_Case_File_Name (Name_Buffer (1 .. Name_Len));
+               Data.Naming.Ada_Body_Suffix := Name_Find;
+               Data.Naming.Body_Suffix_Loc := Ada_Body_Suffix.Location;
+
+            else
+               Data.Naming.Ada_Body_Suffix := Default_Ada_Body_Suffix;
+            end if;
+         end;
 
          if Current_Verbosity = High then
-            Write_Str (The_Name);
-            Write_Line (" is an Ada reserved word.");
+            Write_Str  ("  Body_Suffix = """);
+            Write_Str  (Get_Name_String (Data.Naming.Ada_Body_Suffix));
+            Write_Char ('"');
+            Write_Eol;
          end if;
 
-         return;
-      end if;
-
-      for Index in The_Name'Range loop
-         if Need_Letter then
+         --  Check Separate_Suffix
 
-            --  We need a letter (at the beginning, and following a dot),
-            --  but we don't have one.
+         declare
+            Ada_Sep_Suffix : constant Variable_Value :=
+                               Prj.Util.Value_Of
+                                 (Variable_Name => Name_Separate_Suffix,
+                                  In_Variables  => Naming.Decl.Attributes,
+                                  In_Tree       => In_Tree);
 
-            if Is_Letter (The_Name (Index)) then
-               Need_Letter := False;
+         begin
+            if Ada_Sep_Suffix.Default then
+               Data.Naming.Separate_Suffix :=
+                 Data.Naming.Ada_Body_Suffix;
 
             else
-               OK := False;
+               Get_Name_String (Ada_Sep_Suffix.Value);
 
-               if Current_Verbosity = High then
-                  Write_Int  (Types.Int (Index));
-                  Write_Str  (": '");
-                  Write_Char (The_Name (Index));
-                  Write_Line ("' is not a letter.");
-               end if;
+               if Name_Len = 0 then
+                  Error_Msg
+                    (Project, In_Tree,
+                     "Separate_Suffix cannot be empty",
+                     Ada_Sep_Suffix.Location);
 
-               exit;
+               else
+                  Canonical_Case_File_Name (Name_Buffer (1 .. Name_Len));
+                  Data.Naming.Separate_Suffix := Name_Find;
+                  Data.Naming.Sep_Suffix_Loc  := Ada_Sep_Suffix.Location;
+               end if;
             end if;
+         end;
 
-         elsif Last_Underscore
-           and then (The_Name (Index) = '_' or else The_Name (Index) = '.')
-         then
-            --  Two underscores are illegal, and a dot cannot follow
-            --  an underscore.
+         if Current_Verbosity = High then
+            Write_Str  ("  Separate_Suffix = """);
+            Write_Str  (Get_Name_String (Data.Naming.Separate_Suffix));
+            Write_Char ('"');
+            Write_Eol;
+         end if;
 
-            OK := False;
+         --  Check if Data.Naming is valid
 
-            if Current_Verbosity = High then
-               Write_Int  (Types.Int (Index));
-               Write_Str  (": '");
-               Write_Char (The_Name (Index));
-               Write_Line ("' is illegal here.");
-            end if;
+         Check_Ada_Naming_Scheme_Validity (Project, In_Tree, Data.Naming);
 
-            exit;
+      else
+         Data.Naming.Ada_Spec_Suffix := Default_Ada_Spec_Suffix;
+         Data.Naming.Ada_Body_Suffix := Default_Ada_Body_Suffix;
+         Data.Naming.Separate_Suffix := Default_Ada_Body_Suffix;
+      end if;
+   end Check_Naming_Scheme;
 
-         elsif The_Name (Index) = '.' then
+   ------------------------------
+   -- Check_Library_Attributes --
+   ------------------------------
 
-            --  We need a letter after a dot
+   procedure Check_Library_Attributes
+     (Project : Project_Id;
+      In_Tree : Project_Tree_Ref;
+      Data    : in out Project_Data)
+   is
+      Attributes   : constant Prj.Variable_Id := Data.Decl.Attributes;
 
-            Need_Letter := True;
+      Lib_Dir      : constant Prj.Variable_Value :=
+                       Prj.Util.Value_Of
+                         (Snames.Name_Library_Dir, Attributes, In_Tree);
 
-         elsif The_Name (Index) = '_' then
-            Last_Underscore := True;
+      Lib_Name     : constant Prj.Variable_Value :=
+                       Prj.Util.Value_Of
+                         (Snames.Name_Library_Name, Attributes, In_Tree);
 
-         else
-            --  We need an letter or a digit
+      Lib_Version  : constant Prj.Variable_Value :=
+                       Prj.Util.Value_Of
+                         (Snames.Name_Library_Version, Attributes, In_Tree);
 
-            Last_Underscore := False;
+      Lib_ALI_Dir  : constant Prj.Variable_Value :=
+                       Prj.Util.Value_Of
+                         (Snames.Name_Library_Ali_Dir, Attributes, In_Tree);
 
-            if not Is_Alphanumeric (The_Name (Index)) then
-               OK := False;
+      The_Lib_Kind : constant Prj.Variable_Value :=
+                       Prj.Util.Value_Of
+                         (Snames.Name_Library_Kind, Attributes, In_Tree);
 
-               if Current_Verbosity = High then
-                  Write_Int  (Types.Int (Index));
-                  Write_Str  (": '");
-                  Write_Char (The_Name (Index));
-                  Write_Line ("' is not alphanumeric.");
+   begin
+      --  Special case of extending project
+
+      if Data.Extends /= No_Project then
+         declare
+            Extended_Data : constant Project_Data :=
+                           In_Tree.Projects.Table (Data.Extends);
+
+         begin
+            --  If the project extended is a library project, we inherit
+            --  the library name, if it is not redefined; we check that
+            --  the library directory is specified; and we reset the
+            --  library flag for the extended project.
+
+            if Extended_Data.Library then
+               if Lib_Name.Default then
+                  Data.Library_Name := Extended_Data.Library_Name;
                end if;
 
-               exit;
-            end if;
-         end if;
-      end loop;
+               if Lib_Dir.Default then
+                  if not Data.Virtual then
+                     Error_Msg
+                       (Project, In_Tree,
+                        "a project extending a library project must " &
+                        "specify an attribute Library_Dir",
+                        Data.Location);
+                  end if;
+               end if;
 
-      --  Cannot end with an underscore or a dot
+               In_Tree.Projects.Table (Data.Extends).Library :=
+                 False;
+            end if;
+         end;
+      end if;
 
-      OK := OK and then not Need_Letter and then not Last_Underscore;
+      pragma Assert (Lib_Dir.Kind = Single);
 
-      if OK then
-         Unit := Real_Name;
+      if Lib_Dir.Value = Empty_String then
+         if Current_Verbosity = High then
+            Write_Line ("No library directory");
+         end if;
 
       else
-         --  Signal a problem with No_Name
+         --  Find path name, check that it is a directory
 
-         Unit := No_Name;
-      end if;
-   end Check_Ada_Name;
+         Locate_Directory
+           (Project,
+            In_Tree,
+            File_Name_Type (Lib_Dir.Value),
+            Data.Display_Directory,
+            Data.Library_Dir,
+            Data.Display_Library_Dir,
+            Create   => "library",
+            Location => Lib_Dir.Location);
 
-   ----------------------
-   -- Check_For_Source --
-   ----------------------
+         if Data.Library_Dir = No_Path then
 
-   procedure Check_For_Source
-     (File_Name        : Name_Id;
-      Path_Name        : Name_Id;
-      Project          : Project_Id;
-      Data             : in out Project_Data;
-      Location         : Source_Ptr;
-      Language         : Other_Programming_Language;
-      Suffix           : String;
-      Naming_Exception : Boolean)
-   is
-      Name : String := Get_Name_String (File_Name);
-      Real_Location : Source_Ptr := Location;
+            --  Get the absolute name of the library directory that
+            --  does not exist, to report an error.
 
-   begin
-      Canonical_Case_File_Name (Name);
+            declare
+               Dir_Name : constant String := Get_Name_String (Lib_Dir.Value);
 
-      --  A file is a source of a language if Naming_Exception is True (case
-      --  of naming exceptions) or if its file name ends with the suffix.
+            begin
+               if Is_Absolute_Path (Dir_Name) then
+                  Err_Vars.Error_Msg_File_1 :=
+                    File_Name_Type (Lib_Dir.Value);
 
-      if Naming_Exception or else
-        (Name'Length > Suffix'Length and then
-         Name (Name'Last - Suffix'Length + 1 .. Name'Last) = Suffix)
-      then
-         if Real_Location = No_Location then
-            Real_Location := Data.Location;
-         end if;
+               else
+                  Get_Name_String (Data.Display_Directory);
 
-         declare
-            Path : String := Get_Name_String (Path_Name);
+                  if Name_Buffer (Name_Len) /= Directory_Separator then
+                     Name_Len := Name_Len + 1;
+                     Name_Buffer (Name_Len) := Directory_Separator;
+                  end if;
 
-            Path_Id     : Name_Id;
-            --  The path name id (in canonical case)
+                  Name_Buffer (Name_Len + 1 .. Name_Len + Dir_Name'Length) :=
+                    Dir_Name;
+                  Name_Len := Name_Len + Dir_Name'Length;
+                  Err_Vars.Error_Msg_File_1 := Name_Find;
+               end if;
 
-            File_Id     : Name_Id;
-            --  The file name id (in canonical case)
+               --  Report the error
 
-            Obj_Id      : Name_Id;
-            --  The object file name
+               Error_Msg
+                 (Project, In_Tree,
+                  "library directory { does not exist",
+                  Lib_Dir.Location);
+            end;
 
-            Obj_Path_Id : Name_Id;
-            --  The object path name
+         --  The library directory cannot be the same as the Object directory
 
-            Dep_Id      : Name_Id;
-            --  The dependency file name
+         elsif Data.Library_Dir = Data.Object_Directory then
+            Error_Msg
+              (Project, In_Tree,
+               "library directory cannot be the same " &
+               "as object directory",
+               Lib_Dir.Location);
+            Data.Library_Dir := No_Path;
+            Data.Display_Library_Dir := No_Path;
 
-            Dep_Path_Id : Name_Id;
-            --  The dependency path name
+         else
+            declare
+               OK       : Boolean := True;
+               Dirs_Id  : String_List_Id;
+               Dir_Elem : String_Element;
 
-            Dot_Pos     : Natural := 0;
-            --  Position of the last dot in Name
+            begin
+               --  The library directory cannot be the same as a source
+               --  directory of the current project.
 
-            Source      : Other_Source;
-            Source_Id   : Other_Source_Id := Data.First_Other_Source;
+               Dirs_Id := Data.Source_Dirs;
+               while Dirs_Id /= Nil_String loop
+                  Dir_Elem := In_Tree.String_Elements.Table (Dirs_Id);
+                  Dirs_Id  := Dir_Elem.Next;
 
-         begin
-            Canonical_Case_File_Name (Path);
+                  if Data.Library_Dir =
+                    Path_Name_Type (Dir_Elem.Value)
+                  then
+                     Err_Vars.Error_Msg_File_1 :=
+                       File_Name_Type (Dir_Elem.Value);
+                     Error_Msg
+                       (Project, In_Tree,
+                        "library directory cannot be the same " &
+                        "as source directory {",
+                        Lib_Dir.Location);
+                     OK := False;
+                     exit;
+                  end if;
+               end loop;
 
-            --  Get the file name id
+               if OK then
 
-            Name_Len := Name'Length;
-            Name_Buffer (1 .. Name_Len) := Name;
-            File_Id := Name_Find;
+                  --  The library directory cannot be the same as a source
+                  --  directory of another project either.
 
-            --  Get the path name id
+                  Project_Loop :
+                  for Pid in 1 .. Project_Table.Last (In_Tree.Projects) loop
+                     if Pid /= Project then
+                        Dirs_Id := In_Tree.Projects.Table (Pid).Source_Dirs;
 
-            Name_Len := Path'Length;
-            Name_Buffer (1 .. Name_Len) := Path;
-            Path_Id := Name_Find;
+                        Dir_Loop : while Dirs_Id /= Nil_String loop
+                           Dir_Elem := In_Tree.String_Elements.Table (Dirs_Id);
+                           Dirs_Id  := Dir_Elem.Next;
 
-            --  Find the position of the last dot
+                           if Data.Library_Dir =
+                             Path_Name_Type (Dir_Elem.Value)
+                           then
+                              Err_Vars.Error_Msg_File_1 :=
+                                File_Name_Type (Dir_Elem.Value);
+                              Err_Vars.Error_Msg_Name_1 :=
+                                In_Tree.Projects.Table (Pid).Name;
 
-            for J in reverse Name'Range loop
-               if Name (J) = '.' then
-                  Dot_Pos := J;
-                  exit;
+                              Error_Msg
+                                (Project, In_Tree,
+                                 "library directory cannot be the same " &
+                                 "as source directory { of project %%",
+                                 Lib_Dir.Location);
+                              OK := False;
+                              exit Project_Loop;
+                           end if;
+                        end loop Dir_Loop;
+                     end if;
+                  end loop Project_Loop;
                end if;
-            end loop;
-
-            if Dot_Pos <= Name'First then
-               Dot_Pos := Name'Last + 1;
-            end if;
 
-            --  Compute the object file name
+               if not OK then
+                  Data.Library_Dir := No_Path;
+                  Data.Display_Library_Dir := No_Path;
 
-            Get_Name_String (File_Id);
-            Name_Len := Dot_Pos - Name'First;
+               elsif Current_Verbosity = High then
 
-            for J in Object_Suffix'Range loop
-               Name_Len := Name_Len + 1;
-               Name_Buffer (Name_Len) := Object_Suffix (J);
-            end loop;
+                  --  Display the Library directory in high verbosity
 
-            Obj_Id := Name_Find;
+                  Write_Str ("Library directory =""");
+                  Write_Str (Get_Name_String (Data.Display_Library_Dir));
+                  Write_Line ("""");
+               end if;
+            end;
+         end if;
+      end if;
 
-            --  Compute the object path name
+      pragma Assert (Lib_Name.Kind = Single);
 
-            Get_Name_String (Data.Object_Directory);
+      if Lib_Name.Value = Empty_String then
+         if Current_Verbosity = High
+           and then Data.Library_Name = No_File
+         then
+            Write_Line ("No library name");
+         end if;
 
-            if Name_Buffer (Name_Len) /= Directory_Separator and then
-              Name_Buffer (Name_Len) /= '/'
-            then
-               Name_Len := Name_Len + 1;
-               Name_Buffer (Name_Len) := Directory_Separator;
-            end if;
+      else
+         --  There is no restriction on the syntax of library names
 
-            Add_Str_To_Name_Buffer (Get_Name_String (Obj_Id));
-            Obj_Path_Id := Name_Find;
+         Data.Library_Name := File_Name_Type (Lib_Name.Value);
+      end if;
 
-            --  Compute the dependency file name
+      if Data.Library_Name /= No_File
+        and then Current_Verbosity = High
+      then
+         Write_Str ("Library name = """);
+         Write_Str (Get_Name_String (Data.Library_Name));
+         Write_Line ("""");
+      end if;
 
-            Get_Name_String (File_Id);
-            Name_Len := Dot_Pos - Name'First + 1;
-            Name_Buffer (Name_Len) := '.';
-            Name_Len := Name_Len + 1;
-            Name_Buffer (Name_Len) := 'd';
-            Dep_Id := Name_Find;
+      Data.Library :=
+        Data.Library_Dir /= No_Path
+          and then Data.Library_Name /= No_File;
 
-            --  Compute the dependency path name
+      if Data.Library then
+         if MLib.Tgt.Support_For_Libraries = MLib.Tgt.None then
+            Error_Msg
+              (Project, In_Tree,
+               "?libraries are not supported on this platform",
+               Lib_Name.Location);
+            Data.Library := False;
 
-            Get_Name_String (Data.Object_Directory);
+         else
+            if Lib_ALI_Dir.Value = Empty_String then
+               if Current_Verbosity = High then
+                  Write_Line ("No library 'A'L'I directory specified");
+               end if;
+               Data.Library_ALI_Dir := Data.Library_Dir;
+               Data.Display_Library_ALI_Dir := Data.Display_Library_Dir;
 
-            if Name_Buffer (Name_Len) /= Directory_Separator and then
-              Name_Buffer (Name_Len) /= '/'
-            then
-               Name_Len := Name_Len + 1;
-               Name_Buffer (Name_Len) := Directory_Separator;
-            end if;
+            else
+               --  Find path name, check that it is a directory
 
-            Add_Str_To_Name_Buffer (Get_Name_String (Dep_Id));
-            Dep_Path_Id := Name_Find;
+               Locate_Directory
+                 (Project,
+                  In_Tree,
+                  File_Name_Type (Lib_ALI_Dir.Value),
+                  Data.Display_Directory,
+                  Data.Library_ALI_Dir,
+                  Data.Display_Library_ALI_Dir,
+                  Create   => "library ALI",
+                  Location => Lib_ALI_Dir.Location);
 
-            --  Check if source is already in the list of source for this
-            --  project: it may have already been specified as a naming
-            --  exception for the same language or an other language, or they
-            --  may be two identical file names in different source
-            --  directories.
+               if Data.Library_ALI_Dir = No_Path then
 
-            while Source_Id /= No_Other_Source loop
-               Source := Other_Sources.Table (Source_Id);
-               Source_Id := Source.Next;
+                  --  Get the absolute name of the library ALI directory that
+                  --  does not exist, to report an error.
 
-               if Source.File_Name = File_Id then
-                  --  Two sources of different languages cannot have the same
-                  --  file name.
+                  declare
+                     Dir_Name : constant String :=
+                                  Get_Name_String (Lib_ALI_Dir.Value);
 
-                  if Source.Language /= Language then
-                     Error_Msg_Name_1 := File_Name;
-                     Error_Msg
-                       (Project,
-                        "{ cannot be a source of several languages",
-                        Real_Location);
-                     return;
+                  begin
+                     if Is_Absolute_Path (Dir_Name) then
+                        Err_Vars.Error_Msg_File_1 :=
+                          File_Name_Type (Lib_Dir.Value);
 
-                  --  No problem if a file has already been specified as
-                  --  a naming exception of this language.
+                     else
+                        Get_Name_String (Data.Display_Directory);
 
-                  elsif Source.Path_Name = Path_Id then
-                     --  Reset the naming exception flag, if this is not a
-                     --  naming exception.
+                        if Name_Buffer (Name_Len) /= Directory_Separator then
+                           Name_Len := Name_Len + 1;
+                           Name_Buffer (Name_Len) := Directory_Separator;
+                        end if;
 
-                     if not Naming_Exception then
-                        Other_Sources.Table (Source_Id).Naming_Exception :=
-                          False;
+                        Name_Buffer
+                          (Name_Len + 1 .. Name_Len + Dir_Name'Length) :=
+                          Dir_Name;
+                        Name_Len := Name_Len + Dir_Name'Length;
+                        Err_Vars.Error_Msg_File_1 := Name_Find;
                      end if;
 
-                     return;
+                     --  Report the error
 
-                  --  There are several files with the same names, but the
-                  --  order of the source directories is known (no /**):
-                  --  only the first one encountered is kept, the other ones
-                  --  are ignored.
+                     Error_Msg
+                       (Project, In_Tree,
+                        "library 'A'L'I directory { does not exist",
+                        Lib_ALI_Dir.Location);
+                  end;
+               end if;
 
-                  elsif Data.Known_Order_Of_Source_Dirs then
-                     return;
+               if Data.Library_ALI_Dir /= Data.Library_Dir then
 
-                  --  But it is an error if the order of the source directories
-                  --  is not known.
+                  --  The library ALI directory cannot be the same as the
+                  --  Object directory.
 
-                  else
-                     Error_Msg_Name_1 := File_Name;
+                  if Data.Library_ALI_Dir = Data.Object_Directory then
                      Error_Msg
-                       (Project,
-                        "{ is found in several source directories",
-                        Real_Location);
-                     return;
+                       (Project, In_Tree,
+                        "library 'A'L'I directory cannot be the same " &
+                        "as object directory",
+                        Lib_ALI_Dir.Location);
+                     Data.Library_ALI_Dir := No_Path;
+                     Data.Display_Library_ALI_Dir := No_Path;
+
+                  else
+                     declare
+                        OK       : Boolean := True;
+                        Dirs_Id  : String_List_Id;
+                        Dir_Elem : String_Element;
+
+                     begin
+                        --  The library ALI directory cannot be the same as
+                        --  a source directory of the current project.
+
+                        Dirs_Id := Data.Source_Dirs;
+                        while Dirs_Id /= Nil_String loop
+                           Dir_Elem := In_Tree.String_Elements.Table (Dirs_Id);
+                           Dirs_Id  := Dir_Elem.Next;
+
+                           if Data.Library_ALI_Dir =
+                             Path_Name_Type (Dir_Elem.Value)
+                           then
+                              Err_Vars.Error_Msg_File_1 :=
+                                File_Name_Type (Dir_Elem.Value);
+                              Error_Msg
+                                (Project, In_Tree,
+                                 "library 'A'L'I directory cannot be " &
+                                 "the same as source directory {",
+                                 Lib_ALI_Dir.Location);
+                              OK := False;
+                              exit;
+                           end if;
+                        end loop;
+
+                        if OK then
+
+                           --  The library ALI directory cannot be the same as
+                           --  a source directory of another project either.
+
+                           ALI_Project_Loop :
+                           for
+                             Pid in 1 .. Project_Table.Last (In_Tree.Projects)
+                           loop
+                              if Pid /= Project then
+                                 Dirs_Id :=
+                                   In_Tree.Projects.Table (Pid).Source_Dirs;
+
+                                 ALI_Dir_Loop :
+                                 while Dirs_Id /= Nil_String loop
+                                    Dir_Elem :=
+                                      In_Tree.String_Elements.Table (Dirs_Id);
+                                    Dirs_Id  := Dir_Elem.Next;
+
+                                    if
+                                      Data.Library_ALI_Dir =
+                                        Path_Name_Type (Dir_Elem.Value)
+                                    then
+                                       Err_Vars.Error_Msg_File_1 :=
+                                         File_Name_Type (Dir_Elem.Value);
+                                       Err_Vars.Error_Msg_Name_1 :=
+                                         In_Tree.Projects.Table (Pid).Name;
+
+                                       Error_Msg
+                                         (Project, In_Tree,
+                                          "library 'A'L'I directory cannot " &
+                                          "be the same as source directory " &
+                                          "{ of project %%",
+                                          Lib_ALI_Dir.Location);
+                                       OK := False;
+                                       exit ALI_Project_Loop;
+                                    end if;
+                                 end loop ALI_Dir_Loop;
+                              end if;
+                           end loop ALI_Project_Loop;
+                        end if;
+
+                        if not OK then
+                           Data.Library_ALI_Dir := No_Path;
+                           Data.Display_Library_ALI_Dir := No_Path;
+
+                        elsif Current_Verbosity = High then
+
+                           --  Display the Library ALI directory in high
+                           --  verbosity.
+
+                           Write_Str ("Library ALI directory =""");
+                           Write_Str
+                             (Get_Name_String (Data.Display_Library_ALI_Dir));
+                           Write_Line ("""");
+                        end if;
+                     end;
                   end if;
+               end if;
+            end if;
 
-               --  Two sources with different file names cannot have the same
-               --  object file name.
+            pragma Assert (Lib_Version.Kind = Single);
 
-               elsif Source.Object_Name = Obj_Id then
-                  Error_Msg_Name_1 := File_Id;
-                  Error_Msg_Name_2 := Source.File_Name;
-                  Error_Msg_Name_3 := Obj_Id;
-                  Error_Msg
-                       (Project,
-                        "{ and { have the same object file {",
-                        Real_Location);
-                     return;
+            if Lib_Version.Value = Empty_String then
+               if Current_Verbosity = High then
+                  Write_Line ("No library version specified");
                end if;
-            end loop;
 
-            if Current_Verbosity = High then
-               Write_Str ("      found ");
-               Write_Str (Lang_Display_Names (Language).all);
-               Write_Str (" source """);
-               Write_Str (Get_Name_String (File_Name));
-               Write_Line ("""");
-               Write_Str ("      object path = ");
-               Write_Line (Get_Name_String (Obj_Path_Id));
+            else
+               Data.Lib_Internal_Name := File_Name_Type (Lib_Version.Value);
             end if;
 
-            --  Create the Other_Source record
-            Source :=
-              (Language         => Language,
-               File_Name        => File_Id,
-               Path_Name        => Path_Id,
-               Source_TS        => File_Stamp (Path_Id),
-               Object_Name      => Obj_Id,
-               Object_Path      => Obj_Path_Id,
-               Object_TS        => File_Stamp (Obj_Path_Id),
-               Dep_Name         => Dep_Id,
-               Dep_Path         => Dep_Path_Id,
-               Dep_TS           => File_Stamp (Dep_Path_Id),
-               Naming_Exception => Naming_Exception,
-               Next             => No_Other_Source);
+            pragma Assert (The_Lib_Kind.Kind = Single);
 
-            --  And add it to the Other_Sources table
+            if The_Lib_Kind.Value = Empty_String then
+               if Current_Verbosity = High then
+                  Write_Line ("No library kind specified");
+               end if;
 
-            Other_Sources.Increment_Last;
-            Other_Sources.Table (Other_Sources.Last) := Source;
+            else
+               Get_Name_String (The_Lib_Kind.Value);
 
-            --  There are sources of languages other than Ada in this project
+               declare
+                  Kind_Name : constant String :=
+                                To_Lower (Name_Buffer (1 .. Name_Len));
 
-            Data.Other_Sources_Present := True;
+                  OK : Boolean := True;
 
-            --  And there are sources of this language in this project
+               begin
+                  if Kind_Name = "static" then
+                     Data.Library_Kind := Static;
 
-            Data.Languages (Language) := True;
+                  elsif Kind_Name = "dynamic" then
+                     Data.Library_Kind := Dynamic;
 
-            --  Add this source to the list of sources of languages other than
-            --  Ada of the project.
+                  elsif Kind_Name = "relocatable" then
+                     Data.Library_Kind := Relocatable;
 
-            if Data.First_Other_Source = No_Other_Source then
-               Data.First_Other_Source := Other_Sources.Last;
+                  else
+                     Error_Msg
+                       (Project, In_Tree,
+                        "illegal value for Library_Kind",
+                        The_Lib_Kind.Location);
+                     OK := False;
+                  end if;
 
-            else
-               Other_Sources.Table (Data.Last_Other_Source).Next :=
-                 Other_Sources.Last;
+                  if Current_Verbosity = High and then OK then
+                     Write_Str ("Library kind = ");
+                     Write_Line (Kind_Name);
+                  end if;
+
+                  if Data.Library_Kind /= Static and then
+                    MLib.Tgt.Support_For_Libraries = MLib.Tgt.Static_Only
+                  then
+                     Error_Msg
+                       (Project, In_Tree,
+                        "only static libraries are supported " &
+                        "on this platform",
+                        The_Lib_Kind.Location);
+                     Data.Library := False;
+                  end if;
+               end;
             end if;
 
-            Data.Last_Other_Source  := Other_Sources.Last;
-         end;
+            if Data.Library and then Current_Verbosity = High then
+               Write_Line ("This is a library project file");
+            end if;
+
+         end if;
       end if;
-   end Check_For_Source;
+   end Check_Library_Attributes;
 
-   --------------------------------------
-   -- Check_Ada_Naming_Scheme_Validity --
-   --------------------------------------
+   --------------------------
+   -- Check_Package_Naming --
+   --------------------------
 
-   procedure Check_Ada_Naming_Scheme_Validity
+   procedure Check_Package_Naming
      (Project : Project_Id;
-      Naming  : Naming_Data)
+      In_Tree : Project_Tree_Ref;
+      Data    : in out Project_Data)
    is
+      Naming_Id : constant Package_Id :=
+                    Util.Value_Of (Name_Naming, Data.Decl.Packages, In_Tree);
+
+      Naming    : Package_Element;
+
    begin
-      --  Only check if we are not using the standard naming scheme
+      --  If there is a package Naming, we will put in Data.Naming
+      --  what is in this package Naming.
 
-      if Naming /= Standard_Naming_Data then
-         declare
-            Dot_Replacement       : constant String :=
-                                     Get_Name_String
-                                       (Naming.Dot_Replacement);
+      if Naming_Id /= No_Package then
+         Naming := In_Tree.Packages.Table (Naming_Id);
+
+         if Current_Verbosity = High then
+            Write_Line ("Checking ""Naming"".");
+         end if;
 
-            Spec_Suffix : constant String :=
-                                     Get_Name_String
-                                       (Naming.Current_Spec_Suffix);
+         --  Check Spec_Suffix
 
-            Body_Suffix : constant String :=
-                                     Get_Name_String
-                                       (Naming.Current_Body_Suffix);
+         declare
+            Spec_Suffixs : Array_Element_Id :=
+                             Util.Value_Of
+                               (Name_Spec_Suffix,
+                                Naming.Decl.Arrays,
+                                In_Tree);
 
-            Separate_Suffix       : constant String :=
-                                     Get_Name_String
-                                       (Naming.Separate_Suffix);
+            Suffix  : Array_Element_Id;
+            Element : Array_Element;
+            Suffix2 : Array_Element_Id;
 
          begin
-            --  Dot_Replacement cannot
-            --   - be empty
-            --   - start or end with an alphanumeric
-            --   - be a single '_'
-            --   - start with an '_' followed by an alphanumeric
-            --   - contain a '.' except if it is "."
+            --  If some suffixs have been specified, we make sure that
+            --  for each language for which a default suffix has been
+            --  specified, there is a suffix specified, either the one
+            --  in the project file or if there were none, the default.
+
+            if Spec_Suffixs /= No_Array_Element then
+               Suffix := Data.Naming.Spec_Suffix;
+
+               while Suffix /= No_Array_Element loop
+                  Element :=
+                    In_Tree.Array_Elements.Table (Suffix);
+                  Suffix2 := Spec_Suffixs;
+
+                  while Suffix2 /= No_Array_Element loop
+                     exit when In_Tree.Array_Elements.Table
+                                (Suffix2).Index = Element.Index;
+                     Suffix2 := In_Tree.Array_Elements.Table
+                                 (Suffix2).Next;
+                  end loop;
 
-            if Dot_Replacement'Length = 0
-              or else Is_Alphanumeric
-                        (Dot_Replacement (Dot_Replacement'First))
-              or else Is_Alphanumeric
-                        (Dot_Replacement (Dot_Replacement'Last))
-              or else (Dot_Replacement (Dot_Replacement'First) = '_'
-                        and then
-                        (Dot_Replacement'Length = 1
-                          or else
-                           Is_Alphanumeric
-                             (Dot_Replacement (Dot_Replacement'First + 1))))
-              or else (Dot_Replacement'Length > 1
-                         and then
-                           Index (Source => Dot_Replacement,
-                                  Pattern => ".") /= 0)
-            then
-               Error_Msg
-                 (Project,
-                  '"' & Dot_Replacement &
-                  """ is illegal for Dot_Replacement.",
-                  Naming.Dot_Repl_Loc);
-            end if;
+                  --  There is a registered default suffix, but no
+                  --  suffix specified in the project file.
+                  --  Add the default to the array.
+
+                  if Suffix2 = No_Array_Element then
+                     Array_Element_Table.Increment_Last
+                       (In_Tree.Array_Elements);
+                     In_Tree.Array_Elements.Table
+                       (Array_Element_Table.Last
+                          (In_Tree.Array_Elements)) :=
+                       (Index                => Element.Index,
+                        Src_Index            => Element.Src_Index,
+                        Index_Case_Sensitive => False,
+                        Value                => Element.Value,
+                        Next                 => Spec_Suffixs);
+                     Spec_Suffixs := Array_Element_Table.Last
+                                       (In_Tree.Array_Elements);
+                  end if;
 
-            --  Suffixes cannot
-            --   - be empty
+                  Suffix := Element.Next;
+               end loop;
 
-            if Is_Illegal_Suffix
-                 (Spec_Suffix, Dot_Replacement = ".")
-            then
-               Err_Vars.Error_Msg_Name_1 := Naming.Current_Spec_Suffix;
-               Error_Msg
-                 (Project,
-                  "{ is illegal for Spec_Suffix",
-                  Naming.Spec_Suffix_Loc);
-            end if;
+               --  Put the resulting array as the specification suffixs
 
-            if Is_Illegal_Suffix
-                 (Body_Suffix, Dot_Replacement = ".")
-            then
-               Err_Vars.Error_Msg_Name_1 := Naming.Current_Body_Suffix;
-               Error_Msg
-                 (Project,
-                  "{ is illegal for Body_Suffix",
-                  Naming.Body_Suffix_Loc);
+               Data.Naming.Spec_Suffix := Spec_Suffixs;
             end if;
+         end;
 
-            if Body_Suffix /= Separate_Suffix then
-               if Is_Illegal_Suffix
-                    (Separate_Suffix, Dot_Replacement = ".")
-               then
-                  Err_Vars.Error_Msg_Name_1 := Naming.Separate_Suffix;
+         declare
+            Current : Array_Element_Id := Data.Naming.Spec_Suffix;
+            Element : Array_Element;
+
+         begin
+            while Current /= No_Array_Element loop
+               Element := In_Tree.Array_Elements.Table (Current);
+               Get_Name_String (Element.Value.Value);
+
+               if Name_Len = 0 then
                   Error_Msg
-                    (Project,
-                     "{ is illegal for Separate_Suffix",
-                     Naming.Sep_Suffix_Loc);
+                    (Project, In_Tree,
+                     "Spec_Suffix cannot be empty",
+                     Element.Value.Location);
                end if;
-            end if;
 
-            --  Spec_Suffix cannot have the same termination as
-            --  Body_Suffix or Separate_Suffix
+               In_Tree.Array_Elements.Table (Current) := Element;
+               Current := Element.Next;
+            end loop;
+         end;
 
-            if Spec_Suffix'Length <= Body_Suffix'Length
-              and then
-                Body_Suffix (Body_Suffix'Last -
-                             Spec_Suffix'Length + 1 ..
-                             Body_Suffix'Last) = Spec_Suffix
-            then
-               Error_Msg
-                 (Project,
-                  "Body_Suffix (""" &
-                  Body_Suffix &
-                  """) cannot end with" &
-                  " Spec_Suffix  (""" &
-                  Spec_Suffix & """).",
-                  Naming.Body_Suffix_Loc);
-            end if;
+         --  Check Body_Suffix
 
-            if Body_Suffix /= Separate_Suffix
-              and then Spec_Suffix'Length <= Separate_Suffix'Length
-              and then
-                Separate_Suffix
-                  (Separate_Suffix'Last - Spec_Suffix'Length + 1
-                    ..
-                   Separate_Suffix'Last) = Spec_Suffix
-            then
-               Error_Msg
-                 (Project,
-                  "Separate_Suffix (""" &
-                  Separate_Suffix &
-                  """) cannot end with" &
-                  " Spec_Suffix (""" &
-                  Spec_Suffix & """).",
-                  Naming.Sep_Suffix_Loc);
+         declare
+            Impl_Suffixs : Array_Element_Id :=
+              Util.Value_Of
+                (Name_Body_Suffix,
+                 Naming.Decl.Arrays,
+                 In_Tree);
+
+            Suffix       : Array_Element_Id;
+            Element      : Array_Element;
+            Suffix2      : Array_Element_Id;
+
+         begin
+            --  If some suffixes have been specified, we make sure that
+            --  for each language for which a default suffix has been
+            --  specified, there is a suffix specified, either the one
+            --  in the project file or if there were noe, the default.
+
+            if Impl_Suffixs /= No_Array_Element then
+               Suffix := Data.Naming.Body_Suffix;
+
+               while Suffix /= No_Array_Element loop
+                  Element :=
+                    In_Tree.Array_Elements.Table (Suffix);
+                  Suffix2 := Impl_Suffixs;
+
+                  while Suffix2 /= No_Array_Element loop
+                     exit when In_Tree.Array_Elements.Table
+                                (Suffix2).Index = Element.Index;
+                     Suffix2 := In_Tree.Array_Elements.Table
+                                  (Suffix2).Next;
+                  end loop;
+
+                  --  There is a registered default suffix, but no suffix was
+                  --  specified in the project file. Add the default to the
+                  --  array.
+
+                  if Suffix2 = No_Array_Element then
+                     Array_Element_Table.Increment_Last
+                       (In_Tree.Array_Elements);
+                     In_Tree.Array_Elements.Table
+                       (Array_Element_Table.Last
+                          (In_Tree.Array_Elements)) :=
+                       (Index                => Element.Index,
+                        Src_Index            => Element.Src_Index,
+                        Index_Case_Sensitive => False,
+                        Value                => Element.Value,
+                        Next                 => Impl_Suffixs);
+                     Impl_Suffixs := Array_Element_Table.Last
+                                       (In_Tree.Array_Elements);
+                  end if;
+
+                  Suffix := Element.Next;
+               end loop;
+
+               --  Put the resulting array as the implementation suffixs
+
+               Data.Naming.Body_Suffix := Impl_Suffixs;
             end if;
          end;
+
+         declare
+            Current : Array_Element_Id := Data.Naming.Body_Suffix;
+            Element : Array_Element;
+
+         begin
+            while Current /= No_Array_Element loop
+               Element := In_Tree.Array_Elements.Table (Current);
+               Get_Name_String (Element.Value.Value);
+
+               if Name_Len = 0 then
+                  Error_Msg
+                    (Project, In_Tree,
+                     "Body_Suffix cannot be empty",
+                     Element.Value.Location);
+               end if;
+
+               In_Tree.Array_Elements.Table (Current) := Element;
+               Current := Element.Next;
+            end loop;
+         end;
+
+         --  Get the exceptions, if any
+
+         Data.Naming.Specification_Exceptions :=
+           Util.Value_Of
+             (Name_Specification_Exceptions,
+              In_Arrays => Naming.Decl.Arrays,
+              In_Tree   => In_Tree);
+
+         Data.Naming.Implementation_Exceptions :=
+           Util.Value_Of
+             (Name_Implementation_Exceptions,
+              In_Arrays => Naming.Decl.Arrays,
+              In_Tree   => In_Tree);
       end if;
-   end Check_Ada_Naming_Scheme_Validity;
+   end Check_Package_Naming;
 
-   -----------------------------
-   -- Check_Ada_Naming_Scheme --
-   -----------------------------
+   ---------------------------------
+   -- Check_Programming_Languages --
+   ---------------------------------
 
-   procedure Check_Ada_Naming_Scheme
-     (Data    : in out Project_Data;
-      Project : Project_Id)
+   procedure Check_Programming_Languages
+     (In_Tree : Project_Tree_Ref;
+      Data    : in out Project_Data)
    is
-      Naming_Id : constant Package_Id :=
-                    Util.Value_Of (Name_Naming, Data.Decl.Packages);
+      Languages : Variable_Value := Nil_Variable_Value;
 
-      Naming : Package_Element;
+   begin
+      Languages :=
+        Prj.Util.Value_Of (Name_Languages, Data.Decl.Attributes, In_Tree);
+      Data.Ada_Sources_Present   := Data.Source_Dirs /= Nil_String;
+      Data.Other_Sources_Present := Data.Source_Dirs /= Nil_String;
 
-      procedure Check_Unit_Names (List : Array_Element_Id);
-      --  Check that a list of unit names contains only valid names.
+      if Data.Source_Dirs /= Nil_String then
 
-      ----------------------
-      -- Check_Unit_Names --
-      ----------------------
+         --  Check if languages are specified in this project
 
-      procedure Check_Unit_Names (List : Array_Element_Id) is
-         Current   : Array_Element_Id := List;
-         Element   : Array_Element;
-         Unit_Name : Name_Id;
+         if Languages.Default then
 
-      begin
-         --  Loop through elements of the string list
+            --  Attribute Languages is not specified. So, it defaults to
+            --  a project of language Ada only.
 
-         while Current /= No_Array_Element loop
-            Element := Array_Elements.Table (Current);
+            Data.Languages (Ada_Language_Index) := True;
 
-            --  Put file name in canonical case
+            --  No sources of languages other than Ada
 
-            Get_Name_String (Element.Value.Value);
-            Canonical_Case_File_Name (Name_Buffer (1 .. Name_Len));
-            Element.Value.Value := Name_Find;
+            Data.Other_Sources_Present := False;
 
-            --  Check that it contains a valid unit name
+         else
+            declare
+               Current   : String_List_Id := Languages.Values;
+               Element   : String_Element;
+               Lang_Name : Name_Id;
+               Index     : Language_Index;
 
-            Get_Name_String (Element.Index);
-            Check_Ada_Name (Name_Buffer (1 .. Name_Len), Unit_Name);
+            begin
+               --  Assume that there is no language specified yet
 
-            if Unit_Name = No_Name then
-               Err_Vars.Error_Msg_Name_1 := Element.Index;
-               Error_Msg
-                 (Project,
-                  "{ is not a valid unit name.",
-                  Element.Value.Location);
+               Data.Other_Sources_Present := False;
+               Data.Ada_Sources_Present   := False;
 
-            else
-               if Current_Verbosity = High then
-                  Write_Str ("    Unit (""");
-                  Write_Str (Get_Name_String (Unit_Name));
-                  Write_Line (""")");
-               end if;
+               --  Look through all the languages specified in attribute
+               --  Languages, if any
 
-               Element.Index := Unit_Name;
-               Array_Elements.Table (Current) := Element;
-            end if;
+               while Current /= Nil_String loop
+                  Element :=
+                    In_Tree.String_Elements.Table (Current);
+                  Get_Name_String (Element.Value);
+                  To_Lower (Name_Buffer (1 .. Name_Len));
+                  Lang_Name := Name_Find;
+                  Index := Language_Indexes.Get (Lang_Name);
 
-            Current := Element.Next;
-         end loop;
-      end Check_Unit_Names;
+                  if Index = No_Language_Index then
+                     Add_Language_Name (Lang_Name);
+                     Index := Last_Language_Index;
+                  end if;
 
-   --  Start of processing for Check_Ada_Naming_Scheme
+                  Set (Index, True, Data, In_Tree);
+                  Set (Language_Processing => Default_Language_Processing_Data,
+                       For_Language        => Index,
+                       In_Project          => Data,
+                       In_Tree             => In_Tree);
 
-   begin
-      --  If there is a package Naming, we will put in Data.Naming what is in
-      --  this package Naming.
+                  if Index = Ada_Language_Index then
+                     Data.Ada_Sources_Present := True;
 
-      if Naming_Id /= No_Package then
-         Naming := Packages.Table (Naming_Id);
+                  else
+                     Data.Other_Sources_Present := True;
+                  end if;
 
-         if Current_Verbosity = High then
-            Write_Line ("Checking ""Naming"" for Ada.");
+                  Current := Element.Next;
+               end loop;
+            end;
          end if;
+      end if;
+   end Check_Programming_Languages;
 
-         declare
-            Bodies : constant Array_Element_Id :=
-                       Util.Value_Of (Name_Body, Naming.Decl.Arrays);
+   -------------------
+   -- Check_Project --
+   -------------------
 
-            Specs : constant Array_Element_Id :=
-                      Util.Value_Of (Name_Spec, Naming.Decl.Arrays);
+   function Check_Project
+     (P            : Project_Id;
+      Root_Project : Project_Id;
+      In_Tree      : Project_Tree_Ref;
+      Extending    : Boolean) return Boolean
+   is
+   begin
+      if P = Root_Project then
+         return True;
+
+      elsif Extending then
+         declare
+            Data : Project_Data := In_Tree.Projects.Table (Root_Project);
 
          begin
-            if Bodies /= No_Array_Element then
+            while Data.Extends /= No_Project loop
+               if P = Data.Extends then
+                  return True;
+               end if;
 
-               --  We have elements in the array Body_Part
+               Data := In_Tree.Projects.Table (Data.Extends);
+            end loop;
+         end;
+      end if;
 
-               if Current_Verbosity = High then
-                  Write_Line ("Found Bodies.");
-               end if;
+      return False;
+   end Check_Project;
 
-               Data.Naming.Bodies := Bodies;
-               Check_Unit_Names (Bodies);
+   -------------------------------
+   -- Check_Stand_Alone_Library --
+   -------------------------------
 
-            else
-               if Current_Verbosity = High then
-                  Write_Line ("No Bodies.");
-               end if;
-            end if;
+   procedure Check_Stand_Alone_Library
+     (Project   : Project_Id;
+      In_Tree   : Project_Tree_Ref;
+      Data      : in out Project_Data;
+      Extending : Boolean)
+   is
+      Lib_Interfaces      : constant Prj.Variable_Value :=
+                              Prj.Util.Value_Of
+                                (Snames.Name_Library_Interface,
+                                 Data.Decl.Attributes,
+                                 In_Tree);
+
+      Lib_Auto_Init       : constant Prj.Variable_Value :=
+                              Prj.Util.Value_Of
+                                (Snames.Name_Library_Auto_Init,
+                                 Data.Decl.Attributes,
+                                 In_Tree);
+
+      Lib_Src_Dir         : constant Prj.Variable_Value :=
+                              Prj.Util.Value_Of
+                                (Snames.Name_Library_Src_Dir,
+                                 Data.Decl.Attributes,
+                                 In_Tree);
+
+      Lib_Symbol_File     : constant Prj.Variable_Value :=
+                              Prj.Util.Value_Of
+                                (Snames.Name_Library_Symbol_File,
+                                 Data.Decl.Attributes,
+                                 In_Tree);
+
+      Lib_Symbol_Policy   : constant Prj.Variable_Value :=
+                              Prj.Util.Value_Of
+                                (Snames.Name_Library_Symbol_Policy,
+                                 Data.Decl.Attributes,
+                                 In_Tree);
+
+      Lib_Ref_Symbol_File : constant Prj.Variable_Value :=
+                              Prj.Util.Value_Of
+                                (Snames.Name_Library_Reference_Symbol_File,
+                                 Data.Decl.Attributes,
+                                 In_Tree);
+
+      Auto_Init_Supported : constant Boolean :=
+                              MLib.Tgt.
+                                Standalone_Library_Auto_Init_Is_Supported;
+
+      OK : Boolean := True;
 
-            if Specs /= No_Array_Element then
+   begin
+      pragma Assert (Lib_Interfaces.Kind = List);
 
-               --  We have elements in the array Specs
+      --  It is a stand-alone library project file if attribute
+      --  Library_Interface is defined.
 
-               if Current_Verbosity = High then
-                  Write_Line ("Found Specs.");
-               end if;
+      if not Lib_Interfaces.Default then
+         SAL_Library : declare
+            Interfaces     : String_List_Id := Lib_Interfaces.Values;
+            Interface_ALIs : String_List_Id := Nil_String;
+            Unit           : Name_Id;
+            The_Unit_Id    : Unit_Id;
+            The_Unit_Data  : Unit_Data;
 
-               Data.Naming.Specs := Specs;
-               Check_Unit_Names (Specs);
+            procedure Add_ALI_For (Source : File_Name_Type);
+            --  Add an ALI file name to the list of Interface ALIs
 
-            else
-               if Current_Verbosity = High then
-                  Write_Line ("No Specs.");
-               end if;
-            end if;
-         end;
+            -----------------
+            -- Add_ALI_For --
+            -----------------
 
-         --  We are now checking if variables Dot_Replacement, Casing,
-         --  Spec_Suffix, Body_Suffix and/or Separate_Suffix
-         --  exist.
+            procedure Add_ALI_For (Source : File_Name_Type) is
+            begin
+               Get_Name_String (Source);
 
-         --  For each variable, if it does not exist, we do nothing,
-         --  because we already have the default.
+               declare
+                  ALI : constant String :=
+                          ALI_File_Name (Name_Buffer (1 .. Name_Len));
 
-         --  Check Dot_Replacement
+                  ALI_Name_Id : File_Name_Type;
 
-         declare
-            Dot_Replacement : constant Variable_Value :=
-                                Util.Value_Of
-                                  (Name_Dot_Replacement,
-                                   Naming.Decl.Attributes);
+               begin
+                  Name_Len := ALI'Length;
+                  Name_Buffer (1 .. Name_Len) := ALI;
+                  ALI_Name_Id := Name_Find;
+
+                  String_Element_Table.Increment_Last
+                    (In_Tree.String_Elements);
+
+                  In_Tree.String_Elements.Table
+                    (String_Element_Table.Last
+                      (In_Tree.String_Elements)) :=
+                    (Value         => Name_Id (ALI_Name_Id),
+                     Index         => 0,
+                     Display_Value => Name_Id (ALI_Name_Id),
+                     Location      =>
+                       In_Tree.String_Elements.Table
+                         (Interfaces).Location,
+                     Flag          => False,
+                     Next          => Interface_ALIs);
+
+                  Interface_ALIs := String_Element_Table.Last
+                                      (In_Tree.String_Elements);
+               end;
+            end Add_ALI_For;
+
+         --  Start of processing for SAL_Library
 
          begin
-            pragma Assert (Dot_Replacement.Kind = Single,
-                           "Dot_Replacement is not a single string");
+            Data.Standalone_Library := True;
 
-            if not Dot_Replacement.Default then
-               Get_Name_String (Dot_Replacement.Value);
+            --  Library_Interface cannot be an empty list
+
+            if Interfaces = Nil_String then
+               Error_Msg
+                 (Project, In_Tree,
+                  "Library_Interface cannot be an empty list",
+                  Lib_Interfaces.Location);
+            end if;
+
+            --  Process each unit name specified in the attribute
+            --  Library_Interface.
+
+            while Interfaces /= Nil_String loop
+               Get_Name_String
+                 (In_Tree.String_Elements.Table
+                                                     (Interfaces).Value);
+               To_Lower (Name_Buffer (1 .. Name_Len));
 
                if Name_Len = 0 then
                   Error_Msg
-                    (Project,
-                     "Dot_Replacement cannot be empty",
-                     Dot_Replacement.Location);
+                    (Project, In_Tree,
+                     "an interface cannot be an empty string",
+                     In_Tree.String_Elements.Table
+                                                   (Interfaces).Location);
 
                else
-                  Canonical_Case_File_Name (Name_Buffer (1 .. Name_Len));
-                  Data.Naming.Dot_Replacement := Name_Find;
-                  Data.Naming.Dot_Repl_Loc := Dot_Replacement.Location;
-               end if;
-            end if;
-         end;
+                  Unit := Name_Find;
+                  Error_Msg_Name_1 := Unit;
+                  The_Unit_Id :=
+                    Units_Htable.Get (In_Tree.Units_HT, Unit);
 
-         if Current_Verbosity = High then
-            Write_Str  ("  Dot_Replacement = """);
-            Write_Str  (Get_Name_String (Data.Naming.Dot_Replacement));
-            Write_Char ('"');
-            Write_Eol;
-         end if;
+                  if The_Unit_Id = No_Unit then
+                     Error_Msg
+                       (Project, In_Tree,
+                        "unknown unit %%",
+                        In_Tree.String_Elements.Table
+                          (Interfaces).Location);
 
-         --  Check Casing
+                  else
+                     --  Check that the unit is part of the project
 
-         declare
-            Casing_String : constant Variable_Value :=
-                              Util.Value_Of
-                                (Name_Casing, Naming.Decl.Attributes);
+                     The_Unit_Data :=
+                       In_Tree.Units.Table (The_Unit_Id);
 
-         begin
-            pragma Assert (Casing_String.Kind = Single,
-                           "Casing is not a single string");
+                     if The_Unit_Data.File_Names (Body_Part).Name /= No_File
+                       and then The_Unit_Data.File_Names (Body_Part).Path /=
+                                                                        Slash
+                     then
+                        if Check_Project
+                          (The_Unit_Data.File_Names (Body_Part).Project,
+                           Project, In_Tree, Extending)
+                        then
+                           --  There is a body for this unit.
+                           --  If there is no spec, we need to check
+                           --  that it is not a subunit.
 
-            if not Casing_String.Default then
-               declare
-                  Casing_Image : constant String :=
-                                   Get_Name_String (Casing_String.Value);
-               begin
-                  declare
-                     Casing_Value : constant Casing_Type :=
-                                      Value (Casing_Image);
-                  begin
-                     --  Ignore Casing on platforms where file names are
-                     --  case-insensitive.
+                           if The_Unit_Data.File_Names (Specification).Name =
+                                                              No_File
+                           then
+                              declare
+                                 Src_Ind : Source_File_Index;
+
+                              begin
+                                 Src_Ind :=
+                                   Sinput.P.Load_Project_File
+                                     (Get_Name_String
+                                        (The_Unit_Data.File_Names
+                                           (Body_Part).Path));
+
+                                 if Sinput.P.Source_File_Is_Subunit
+                                     (Src_Ind)
+                                 then
+                                    Error_Msg
+                                      (Project, In_Tree,
+                                       "%% is a subunit; " &
+                                       "it cannot be an interface",
+                                       In_Tree.
+                                         String_Elements.Table
+                                           (Interfaces).Location);
+                                 end if;
+                              end;
+                           end if;
 
-                     if not File_Names_Case_Sensitive then
-                        Data.Naming.Casing := All_Lower_Case;
+                           --  The unit is not a subunit, so we add
+                           --  to the Interface ALIs the ALI file
+                           --  corresponding to the body.
 
-                     else
-                        Data.Naming.Casing := Casing_Value;
-                     end if;
-                  end;
+                           Add_ALI_For
+                             (The_Unit_Data.File_Names (Body_Part).Name);
 
-               exception
-                  when Constraint_Error =>
-                     if Casing_Image'Length = 0 then
-                        Error_Msg
-                          (Project,
-                           "Casing cannot be an empty string",
-                           Casing_String.Location);
+                        else
+                           Error_Msg
+                             (Project, In_Tree,
+                              "%% is not an unit of this project",
+                              In_Tree.String_Elements.Table
+                                (Interfaces).Location);
+                        end if;
+
+                     elsif The_Unit_Data.File_Names (Specification).Name /=
+                                                                       No_File
+                       and then
+                         The_Unit_Data.File_Names (Specification).Path /= Slash
+                       and then
+                         Check_Project
+                          (The_Unit_Data.File_Names (Specification).Project,
+                           Project, In_Tree, Extending)
+
+                     then
+                        --  The unit is part of the project, it has
+                        --  a spec, but no body. We add to the Interface
+                        --  ALIs the ALI file corresponding to the spec.
+
+                        Add_ALI_For
+                          (The_Unit_Data.File_Names (Specification).Name);
 
                      else
-                        Name_Len := Casing_Image'Length;
-                        Name_Buffer (1 .. Name_Len) := Casing_Image;
-                        Err_Vars.Error_Msg_Name_1 := Name_Find;
                         Error_Msg
-                          (Project,
-                           "{ is not a correct Casing",
-                           Casing_String.Location);
+                          (Project, In_Tree,
+                           "%% is not an unit of this project",
+                           In_Tree.String_Elements.Table
+                                                    (Interfaces).Location);
                      end if;
-               end;
-            end if;
-         end;
-
-         if Current_Verbosity = High then
-            Write_Str  ("  Casing = ");
-            Write_Str  (Image (Data.Naming.Casing));
-            Write_Char ('.');
-            Write_Eol;
-         end if;
+                  end if;
 
-         --  Check Spec_Suffix
+               end if;
 
-         declare
-            Ada_Spec_Suffix : constant Variable_Value :=
-                                Prj.Util.Value_Of
-                                  (Index     => Name_Ada,
-                                   Src_Index => 0,
-                                   In_Array  => Data.Naming.Spec_Suffix);
+               Interfaces :=
+                 In_Tree.String_Elements.Table (Interfaces).Next;
+            end loop;
 
-         begin
-            if Ada_Spec_Suffix.Kind = Single
-              and then Get_Name_String (Ada_Spec_Suffix.Value) /= ""
-            then
-               Get_Name_String (Ada_Spec_Suffix.Value);
-               Canonical_Case_File_Name (Name_Buffer (1 .. Name_Len));
-               Data.Naming.Current_Spec_Suffix := Name_Find;
-               Data.Naming.Spec_Suffix_Loc := Ada_Spec_Suffix.Location;
+            --  Put the list of Interface ALIs in the project data
 
-            else
-               Data.Naming.Current_Spec_Suffix := Default_Ada_Spec_Suffix;
-            end if;
-         end;
+            Data.Lib_Interface_ALIs := Interface_ALIs;
 
-         if Current_Verbosity = High then
-            Write_Str  ("  Spec_Suffix = """);
-            Write_Str  (Get_Name_String (Data.Naming.Current_Spec_Suffix));
-            Write_Char ('"');
-            Write_Eol;
-         end if;
+            --  Check value of attribute Library_Auto_Init and set
+            --  Lib_Auto_Init accordingly.
 
-         --  Check Body_Suffix
+            if Lib_Auto_Init.Default then
 
-         declare
-            Ada_Body_Suffix : constant Variable_Value :=
-              Prj.Util.Value_Of
-                (Index     => Name_Ada,
-                 Src_Index => 0,
-                 In_Array  => Data.Naming.Body_Suffix);
+               --  If no attribute Library_Auto_Init is declared, then
+               --  set auto init only if it is supported.
 
-         begin
-            if Ada_Body_Suffix.Kind = Single
-              and then Get_Name_String (Ada_Body_Suffix.Value) /= ""
-            then
-               Get_Name_String (Ada_Body_Suffix.Value);
-               Canonical_Case_File_Name (Name_Buffer (1 .. Name_Len));
-               Data.Naming.Current_Body_Suffix := Name_Find;
-               Data.Naming.Body_Suffix_Loc := Ada_Body_Suffix.Location;
+               Data.Lib_Auto_Init := Auto_Init_Supported;
 
             else
-               Data.Naming.Current_Body_Suffix := Default_Ada_Body_Suffix;
-            end if;
-         end;
-
-         if Current_Verbosity = High then
-            Write_Str  ("  Body_Suffix = """);
-            Write_Str  (Get_Name_String (Data.Naming.Current_Body_Suffix));
-            Write_Char ('"');
-            Write_Eol;
-         end if;
-
-         --  Check Separate_Suffix
+               Get_Name_String (Lib_Auto_Init.Value);
+               To_Lower (Name_Buffer (1 .. Name_Len));
 
-         declare
-            Ada_Sep_Suffix : constant Variable_Value :=
-                               Prj.Util.Value_Of
-                                 (Variable_Name => Name_Separate_Suffix,
-                                  In_Variables  => Naming.Decl.Attributes);
+               if Name_Buffer (1 .. Name_Len) = "false" then
+                  Data.Lib_Auto_Init := False;
 
-         begin
-            if Ada_Sep_Suffix.Default then
-               Data.Naming.Separate_Suffix :=
-                 Data.Naming.Current_Body_Suffix;
+               elsif Name_Buffer (1 .. Name_Len) = "true" then
+                  if Auto_Init_Supported then
+                     Data.Lib_Auto_Init := True;
 
-            else
-               Get_Name_String (Ada_Sep_Suffix.Value);
+                  else
+                     --  Library_Auto_Init cannot be "true" if auto init
+                     --  is not supported
 
-               if Name_Len = 0 then
-                  Error_Msg
-                    (Project,
-                     "Separate_Suffix cannot be empty",
-                     Ada_Sep_Suffix.Location);
+                     Error_Msg
+                       (Project, In_Tree,
+                        "library auto init not supported " &
+                        "on this platform",
+                        Lib_Auto_Init.Location);
+                  end if;
 
                else
-                  Canonical_Case_File_Name (Name_Buffer (1 .. Name_Len));
-                  Data.Naming.Separate_Suffix := Name_Find;
-                  Data.Naming.Sep_Suffix_Loc  := Ada_Sep_Suffix.Location;
+                  Error_Msg
+                    (Project, In_Tree,
+                     "invalid value for attribute Library_Auto_Init",
+                     Lib_Auto_Init.Location);
                end if;
             end if;
-         end;
+         end SAL_Library;
 
-         if Current_Verbosity = High then
-            Write_Str  ("  Separate_Suffix = """);
-            Write_Str  (Get_Name_String (Data.Naming.Separate_Suffix));
-            Write_Char ('"');
-            Write_Eol;
-         end if;
+         --  If attribute Library_Src_Dir is defined and not the
+         --  empty string, check if the directory exist and is not
+         --  the object directory or one of the source directories.
+         --  This is the directory where copies of the interface
+         --  sources will be copied. Note that this directory may be
+         --  the library directory.
 
-         --  Check if Data.Naming is valid
+         if Lib_Src_Dir.Value /= Empty_String then
+            declare
+               Dir_Id : constant File_Name_Type :=
+                          File_Name_Type (Lib_Src_Dir.Value);
 
-         Check_Ada_Naming_Scheme_Validity (Project, Data.Naming);
+            begin
+               Locate_Directory
+                 (Project,
+                  In_Tree,
+                  Dir_Id,
+                  Data.Display_Directory,
+                  Data.Library_Src_Dir,
+                  Data.Display_Library_Src_Dir,
+                  Create   => "library source copy",
+                  Location => Lib_Src_Dir.Location);
 
-      else
-         Data.Naming.Current_Spec_Suffix := Default_Ada_Spec_Suffix;
-         Data.Naming.Current_Body_Suffix := Default_Ada_Body_Suffix;
-         Data.Naming.Separate_Suffix     := Default_Ada_Body_Suffix;
-      end if;
-   end Check_Ada_Naming_Scheme;
+               --  If directory does not exist, report an error
 
-   -------------------
-   -- Check_Project --
-   -------------------
+               if Data.Library_Src_Dir = No_Path then
 
-   function Check_Project
-     (P            : Project_Id;
-      Root_Project : Project_Id;
-      Extending    : Boolean) return Boolean
-   is
-   begin
-      if P = Root_Project then
-         return True;
+                  --  Get the absolute name of the library directory
+                  --  that does not exist, to report an error.
 
-      elsif Extending then
-         declare
-            Data : Project_Data := Projects.Table (Root_Project);
+                  declare
+                     Dir_Name : constant String :=
+                       Get_Name_String (Dir_Id);
 
-         begin
-            while Data.Extends /= No_Project loop
-               if P = Data.Extends then
-                  return True;
-               end if;
+                  begin
+                     if Is_Absolute_Path (Dir_Name) then
+                        Err_Vars.Error_Msg_File_1 := Dir_Id;
 
-               Data := Projects.Table (Data.Extends);
-            end loop;
-         end;
-      end if;
+                     else
+                        Get_Name_String (Data.Directory);
 
-      return False;
-   end Check_Project;
+                        if Name_Buffer (Name_Len) /=
+                          Directory_Separator
+                        then
+                           Name_Len := Name_Len + 1;
+                           Name_Buffer (Name_Len) :=
+                             Directory_Separator;
+                        end if;
 
-   ----------------------------
-   -- Compute_Directory_Last --
-   ----------------------------
+                        Name_Buffer
+                          (Name_Len + 1 ..
+                             Name_Len + Dir_Name'Length) :=
+                            Dir_Name;
+                        Name_Len := Name_Len + Dir_Name'Length;
+                        Err_Vars.Error_Msg_File_1 := Name_Find;
+                     end if;
 
-   function Compute_Directory_Last (Dir : String) return Natural is
-   begin
-      if Dir'Length > 1
-        and then (Dir (Dir'Last - 1) = Directory_Separator
-                  or else Dir (Dir'Last - 1) = '/')
-      then
-         return Dir'Last - 1;
-      else
-         return Dir'Last;
-      end if;
-   end Compute_Directory_Last;
+                     --  Report the error
 
-   ---------------
-   -- Error_Msg --
-   ---------------
+                     Error_Msg
+                       (Project, In_Tree,
+                        "Directory { does not exist",
+                        Lib_Src_Dir.Location);
+                  end;
 
-   procedure Error_Msg
-     (Project       : Project_Id;
-      Msg           : String;
-      Flag_Location : Source_Ptr)
-   is
-      Error_Buffer : String (1 .. 5_000);
-      Error_Last   : Natural := 0;
-      Msg_Name     : Natural := 0;
-      First        : Positive := Msg'First;
+                  --  Report an error if it is the same as the object
+                  --  directory.
 
-      procedure Add (C : Character);
-      --  Add a character to the buffer
+               elsif Data.Library_Src_Dir = Data.Object_Directory then
+                  Error_Msg
+                    (Project, In_Tree,
+                     "directory to copy interfaces cannot be " &
+                     "the object directory",
+                     Lib_Src_Dir.Location);
+                  Data.Library_Src_Dir := No_Path;
 
-      procedure Add (S : String);
-      --  Add a string to the buffer
+               else
+                  declare
+                     Src_Dirs : String_List_Id;
+                     Src_Dir  : String_Element;
 
-      procedure Add (Id : Name_Id);
-      --  Add a name to the buffer
+                  begin
+                     --  Interface copy directory cannot be one of the source
+                     --  directory of the current project.
 
-      ---------
-      -- Add --
-      ---------
+                     Src_Dirs := Data.Source_Dirs;
+                     while Src_Dirs /= Nil_String loop
+                        Src_Dir := In_Tree.String_Elements.Table
+                                                          (Src_Dirs);
 
-      procedure Add (C : Character) is
-      begin
-         Error_Last := Error_Last + 1;
-         Error_Buffer (Error_Last) := C;
-      end Add;
+                        --  Report error if it is one of the source directories
 
-      procedure Add (S : String) is
-      begin
-         Error_Buffer (Error_Last + 1 .. Error_Last + S'Length) := S;
-         Error_Last := Error_Last + S'Length;
-      end Add;
+                        if Data.Library_Src_Dir =
+                             Path_Name_Type (Src_Dir.Value)
+                        then
+                           Error_Msg
+                             (Project, In_Tree,
+                              "directory to copy interfaces cannot " &
+                              "be one of the source directories",
+                              Lib_Src_Dir.Location);
+                           Data.Library_Src_Dir := No_Path;
+                           exit;
+                        end if;
 
-      procedure Add (Id : Name_Id) is
-      begin
-         Get_Name_String (Id);
-         Add (Name_Buffer (1 .. Name_Len));
-      end Add;
+                        Src_Dirs := Src_Dir.Next;
+                     end loop;
 
-   --  Start of processing for Error_Msg
+                     if Data.Library_Src_Dir /= No_Path then
 
-   begin
-      if Error_Report = null then
-         Prj.Err.Error_Msg (Msg, Flag_Location);
-         return;
-      end if;
+                        --  It cannot be a source directory of any other
+                        --  project either.
 
-      if Msg (First) = '\' then
+                        Project_Loop : for Pid in 1 ..
+                          Project_Table.Last (In_Tree.Projects)
+                        loop
+                           Src_Dirs :=
+                             In_Tree.Projects.Table (Pid).Source_Dirs;
+                           Dir_Loop : while Src_Dirs /= Nil_String loop
+                              Src_Dir :=
+                                In_Tree.String_Elements.Table (Src_Dirs);
 
-         --  Continuation character, ignore.
+                              --  Report error if it is one of the source
+                              --  directories
 
-         First := First + 1;
+                              if Data.Library_Src_Dir =
+                                        Path_Name_Type (Src_Dir.Value)
+                              then
+                                 Error_Msg_File_1 :=
+                                   File_Name_Type (Src_Dir.Value);
+                                 Error_Msg_Name_1 :=
+                                   In_Tree.Projects.Table (Pid).Name;
+                                 Error_Msg
+                                   (Project, In_Tree,
+                                    "directory to copy interfaces cannot " &
+                                    "be the same as source directory { of " &
+                                    "project %%",
+                                    Lib_Src_Dir.Location);
+                                 Data.Library_Src_Dir := No_Path;
+                                 exit Project_Loop;
+                              end if;
 
-      elsif Msg (First) = '?' then
+                              Src_Dirs := Src_Dir.Next;
+                           end loop Dir_Loop;
+                        end loop Project_Loop;
+                     end if;
+                  end;
 
-         --  Warning character. It is always the first one in this package
+                  --  In high verbosity, if there is a valid Library_Src_Dir,
+                  --  display its path name.
 
-         First := First + 1;
-         Add ("Warning: ");
+                  if Data.Library_Src_Dir /= No_Path
+                    and then Current_Verbosity = High
+                  then
+                     Write_Str ("Directory to copy interfaces =""");
+                     Write_Str (Get_Name_String (Data.Library_Src_Dir));
+                     Write_Line ("""");
+                  end if;
+               end if;
+            end;
+         end if;
+
+         --  Check the symbol related attributes
+
+         --  First, the symbol policy
+
+         if not Lib_Symbol_Policy.Default then
+            declare
+               Value : constant String :=
+                 To_Lower
+                   (Get_Name_String (Lib_Symbol_Policy.Value));
+
+            begin
+               --  Symbol policy must hove one of a limited number of values
+
+               if Value = "autonomous" or else Value = "default" then
+                  Data.Symbol_Data.Symbol_Policy := Autonomous;
+
+               elsif Value = "compliant" then
+                  Data.Symbol_Data.Symbol_Policy := Compliant;
+
+               elsif Value = "controlled" then
+                  Data.Symbol_Data.Symbol_Policy := Controlled;
+
+               elsif Value = "restricted" then
+                  Data.Symbol_Data.Symbol_Policy := Restricted;
+
+               elsif Value = "direct" then
+                  Data.Symbol_Data.Symbol_Policy := Direct;
+
+               else
+                  Error_Msg
+                    (Project, In_Tree,
+                     "illegal value for Library_Symbol_Policy",
+                     Lib_Symbol_Policy.Location);
+               end if;
+            end;
+         end if;
+
+         --  If attribute Library_Symbol_File is not specified, symbol policy
+         --  cannot be Restricted or Direct.
+
+         if Lib_Symbol_File.Default then
+            if Data.Symbol_Data.Symbol_Policy = Restricted then
+               Error_Msg
+                 (Project, In_Tree,
+                  "Library_Symbol_File needs to be defined when " &
+                  "symbol policy is Restricted",
+                  Lib_Symbol_Policy.Location);
+            end if;
+
+            Name_Len := 0;
+            Add_Str_To_Name_Buffer (Default_Symbol_File_Name);
+            Data.Symbol_Data.Symbol_File := Name_Find;
+            Get_Name_String (Data.Symbol_Data.Symbol_File);
+
+         else
+            --  Library_Symbol_File is defined
+
+            Data.Symbol_Data.Symbol_File := Lib_Symbol_File.Value;
+
+            Get_Name_String (Lib_Symbol_File.Value);
+
+            if Name_Len = 0 then
+               Error_Msg
+                 (Project, In_Tree,
+                  "symbol file name cannot be an empty string",
+                  Lib_Symbol_File.Location);
+            end if;
+         end if;
+
+         if Name_Len /= 0 then
+            OK := not Is_Absolute_Path (Name_Buffer (1 .. Name_Len));
+
+            if OK then
+               for J in 1 .. Name_Len loop
+                  if Name_Buffer (J) = '/'
+                    or else Name_Buffer (J) = Directory_Separator
+                  then
+                     OK := False;
+                     exit;
+                  end if;
+               end loop;
+            end if;
+
+            if not OK then
+               Error_Msg_File_1 :=
+                 File_Name_Type (Lib_Symbol_File.Value);
+               Error_Msg
+                 (Project, In_Tree,
+                  "symbol file name { is illegal. " &
+                  "Name canot include directory info.",
+                  Lib_Symbol_File.Location);
+            end if;
+         end if;
+
+         --  If attribute Library_Reference_Symbol_File is not defined,
+         --  symbol policy cannot be Compilant, Controlled or Direct.
+
+         if Lib_Ref_Symbol_File.Default then
+            if Data.Symbol_Data.Symbol_Policy = Compliant
+              or else Data.Symbol_Data.Symbol_Policy = Controlled
+              or else Data.Symbol_Data.Symbol_Policy = Direct
+            then
+               Error_Msg
+                 (Project, In_Tree,
+                  "a reference symbol file need to be defined",
+                  Lib_Symbol_Policy.Location);
+            end if;
+
+         else
+            --  Library_Reference_Symbol_File is defined, check file exists
+
+            Data.Symbol_Data.Reference := Lib_Ref_Symbol_File.Value;
+
+            Get_Name_String (Lib_Ref_Symbol_File.Value);
+
+            if Name_Len = 0 then
+               Error_Msg
+                 (Project, In_Tree,
+                  "reference symbol file name cannot be an empty string",
+                  Lib_Symbol_File.Location);
+
+            else
+               if not Is_Absolute_Path (Name_Buffer (1 .. Name_Len)) then
+                  Name_Len := 0;
+                  Add_Str_To_Name_Buffer (Get_Name_String (Data.Directory));
+                  Add_Char_To_Name_Buffer (Directory_Separator);
+                  Add_Str_To_Name_Buffer
+                    (Get_Name_String (Lib_Ref_Symbol_File.Value));
+                  Data.Symbol_Data.Reference := Name_Find;
+               end if;
+
+               if not Is_Regular_File
+                 (Get_Name_String (Data.Symbol_Data.Reference))
+               then
+                  Error_Msg_File_1 :=
+                    File_Name_Type (Lib_Ref_Symbol_File.Value);
+
+                  --  For controlled and direct symbol policies, it is an error
+                  --  if the reference symbol file does not exist. For other
+                  --  symbol policies, this is just a warning
+
+                  Error_Msg_Warn :=
+                    Data.Symbol_Data.Symbol_Policy /= Controlled
+                    and then Data.Symbol_Data.Symbol_Policy /= Direct;
+
+                  Error_Msg
+                    (Project, In_Tree,
+                     "<library reference symbol file { does not exist",
+                     Lib_Ref_Symbol_File.Location);
+
+                  --  In addition in the non-controlled case, if symbol policy
+                  --  is Compliant, it is changed to Autonomous, because there
+                  --  is no reference to check against, and we don't want to
+                  --  fail in this case.
+
+                  if Data.Symbol_Data.Symbol_Policy /= Controlled then
+                     if Data.Symbol_Data.Symbol_Policy = Compliant then
+                        Data.Symbol_Data.Symbol_Policy := Autonomous;
+                     end if;
+                  end if;
+               end if;
+
+               --  If both the reference symbol file and the symbol file are
+               --  defined, then check that they are not the same file.
+
+               Get_Name_String (Data.Symbol_Data.Symbol_File);
+
+               if Name_Len > 0 then
+                  declare
+                     Symb_Path : constant String :=
+                                   Normalize_Pathname
+                                     (Get_Name_String (Data.Object_Directory) &
+                                      Directory_Separator &
+                                      Name_Buffer (1 .. Name_Len));
+                     Ref_Path  : constant String :=
+                                   Normalize_Pathname
+                                     (Get_Name_String
+                                        (Data.Symbol_Data.Reference));
+
+                  begin
+                     if Symb_Path = Ref_Path then
+                        Error_Msg
+                          (Project, In_Tree,
+                           "library reference symbol file and library symbol" &
+                           " file cannot be the same file",
+                           Lib_Ref_Symbol_File.Location);
+                     end if;
+                  end;
+               end if;
+            end if;
+         end if;
+      end if;
+   end Check_Stand_Alone_Library;
+
+   ----------------------------
+   -- Compute_Directory_Last --
+   ----------------------------
+
+   function Compute_Directory_Last (Dir : String) return Natural is
+   begin
+      if Dir'Length > 1
+        and then (Dir (Dir'Last - 1) = Directory_Separator
+                  or else Dir (Dir'Last - 1) = '/')
+      then
+         return Dir'Last - 1;
+      else
+         return Dir'Last;
       end if;
+   end Compute_Directory_Last;
+
+   --------------------
+   -- Body_Suffix_Of --
+   --------------------
 
-      for Index in First .. Msg'Last loop
-         if Msg (Index) = '{' or else Msg (Index) = '%' then
+   function Body_Suffix_Of
+     (Language   : Language_Index;
+      In_Project : Project_Data;
+      In_Tree    : Project_Tree_Ref) return String
+   is
+      Suffix_Id : constant File_Name_Type :=
+                    Suffix_Of (Language, In_Project, In_Tree);
+   begin
+      if Suffix_Id /= No_File then
+         return Get_Name_String (Suffix_Id);
+      else
+         return "." & Get_Name_String (Language_Names.Table (Language));
+      end if;
+   end Body_Suffix_Of;
 
-            --  Include a name between double quotes.
+   ---------------
+   -- Error_Msg --
+   ---------------
 
-            Msg_Name := Msg_Name + 1;
-            Add ('"');
+   procedure Error_Msg
+     (Project       : Project_Id;
+      In_Tree       : Project_Tree_Ref;
+      Msg           : String;
+      Flag_Location : Source_Ptr)
+   is
+      Real_Location : Source_Ptr := Flag_Location;
+      Error_Buffer  : String (1 .. 5_000);
+      Error_Last    : Natural := 0;
+      Name_Number   : Natural := 0;
+      File_Number   : Natural := 0;
+      First         : Positive := Msg'First;
+      Index         : Positive;
 
-            case Msg_Name is
-               when 1 => Add (Err_Vars.Error_Msg_Name_1);
-               when 2 => Add (Err_Vars.Error_Msg_Name_2);
-               when 3 => Add (Err_Vars.Error_Msg_Name_3);
+      procedure Add (C : Character);
+      --  Add a character to the buffer
 
-               when others => null;
-            end case;
+      procedure Add (S : String);
+      --  Add a string to the buffer
+
+      procedure Add_Name;
+      --  Add a name to the buffer
+
+      procedure Add_File;
+      --  Add a file name to the buffer
+
+      ---------
+      -- Add --
+      ---------
+
+      procedure Add (C : Character) is
+      begin
+         Error_Last := Error_Last + 1;
+         Error_Buffer (Error_Last) := C;
+      end Add;
+
+      procedure Add (S : String) is
+      begin
+         Error_Buffer (Error_Last + 1 .. Error_Last + S'Length) := S;
+         Error_Last := Error_Last + S'Length;
+      end Add;
+
+      --------------
+      -- Add_File --
+      --------------
+
+      procedure Add_File is
+         File : File_Name_Type;
+      begin
+         Add ('"');
+         File_Number := File_Number + 1;
+
+         case File_Number is
+            when 1 =>
+               File := Err_Vars.Error_Msg_File_1;
+            when 2 =>
+               File := Err_Vars.Error_Msg_File_2;
+            when 3 =>
+               File := Err_Vars.Error_Msg_File_3;
+            when others =>
+               null;
+         end case;
+
+         Get_Name_String (File);
+         Add (Name_Buffer (1 .. Name_Len));
+         Add ('"');
+      end Add_File;
+
+      --------------
+      -- Add_Name --
+      --------------
+
+      procedure Add_Name is
+         Name : Name_Id;
+      begin
+         Add ('"');
+         Name_Number := Name_Number + 1;
+
+         case Name_Number is
+            when 1 =>
+               Name := Err_Vars.Error_Msg_Name_1;
+            when 2 =>
+               Name := Err_Vars.Error_Msg_Name_2;
+            when 3 =>
+               Name := Err_Vars.Error_Msg_Name_3;
+            when others =>
+               null;
+         end case;
+
+         Get_Name_String (Name);
+         Add (Name_Buffer (1 .. Name_Len));
+         Add ('"');
+      end Add_Name;
+
+   --  Start of processing for Error_Msg
+
+   begin
+      --  If location of error is unknown, use the location of the project
+
+      if Real_Location = No_Location then
+         Real_Location := In_Tree.Projects.Table (Project).Location;
+      end if;
+
+      if Error_Report = null then
+         Prj.Err.Error_Msg (Msg, Real_Location);
+         return;
+      end if;
+
+      --  Ignore continuation character
+
+      if Msg (First) = '\' then
+         First := First + 1;
+
+         --  Warning character is always the first one in this package
+         --  this is an undocumented kludge!!!
 
-            Add ('"');
+      elsif Msg (First) = '?' then
+         First := First + 1;
+         Add ("Warning: ");
+
+      elsif Msg (First) = '<' then
+         First := First + 1;
+
+         if Err_Vars.Error_Msg_Warn then
+            Add ("Warning: ");
+         end if;
+      end if;
 
+      Index := First;
+      while Index <= Msg'Last loop
+         if Msg (Index) = '{' then
+            Add_File;
+
+         elsif Msg (Index) = '%' then
+            if Index < Msg'Last and then Msg (Index + 1) = '%' then
+               Index := Index + 1;
+            end if;
+
+            Add_Name;
          else
             Add (Msg (Index));
          end if;
+         Index := Index + 1;
 
       end loop;
 
-      Error_Report (Error_Buffer (1 .. Error_Last), Project);
+      Error_Report (Error_Buffer (1 .. Error_Last), Project, In_Tree);
    end Error_Msg;
 
    ------------------
@@ -2405,8 +3049,9 @@ package body Prj.Nmsc is
 
    procedure Find_Sources
      (Project      : Project_Id;
+      In_Tree      : Project_Tree_Ref;
       Data         : in out Project_Data;
-      For_Language : Programming_Language;
+      For_Language : Language_Index;
       Follow_Links : Boolean := False)
    is
       Source_Dir      : String_List_Id := Data.Source_Dirs;
@@ -2425,15 +3070,18 @@ package body Prj.Nmsc is
       while Source_Dir /= Nil_String loop
          begin
             Source_Recorded := False;
-            Element := String_Elements.Table (Source_Dir);
+            Element := In_Tree.String_Elements.Table (Source_Dir);
+
             if Element.Value /= No_Name then
                Get_Name_String (Element.Display_Value);
 
                declare
                   Source_Directory : constant String :=
-                    Name_Buffer (1 .. Name_Len) & Directory_Separator;
+                                       Name_Buffer (1 .. Name_Len) &
+                                         Directory_Separator;
+
                   Dir_Last  : constant Natural :=
-                     Compute_Directory_Last (Source_Directory);
+                                Compute_Directory_Last (Source_Directory);
 
                begin
                   if Current_Verbosity = High then
@@ -2457,32 +3105,33 @@ package body Prj.Nmsc is
                      exit when Name_Len = 0;
 
                      declare
-                        File_Name : constant Name_Id := Name_Find;
+                        File_Name : constant File_Name_Type := Name_Find;
                         Path      : constant String :=
                           Normalize_Pathname
-                            (Name      => Name_Buffer (1 .. Name_Len),
-                             Directory => Source_Directory
+                            (Name           => Name_Buffer (1 .. Name_Len),
+                             Directory      => Source_Directory
                                (Source_Directory'First .. Dir_Last),
-                             Resolve_Links => Follow_Links,
+                             Resolve_Links  => Follow_Links,
                              Case_Sensitive => True);
-                        Path_Name : Name_Id;
+                        Path_Name : File_Name_Type;
 
                      begin
                         Name_Len := Path'Length;
                         Name_Buffer (1 .. Name_Len) := Path;
                         Path_Name := Name_Find;
 
-                        if For_Language = Lang_Ada then
-                           --  We attempt to register it as a source.
-                           --  However, there is no error if the file
-                           --  does not contain a valid source.
-                           --  But there is an error if we have a
-                           --  duplicate unit name.
+                        if For_Language = Ada_Language_Index then
+
+                           --  We attempt to register it as a source. However,
+                           --  there is no error if the file does not contain
+                           --  a valid source. But there is an error if we have
+                           --  duplicate unit name.
 
                            Record_Ada_Source
                              (File_Name       => File_Name,
                               Path_Name       => Path_Name,
                               Project         => Project,
+                              In_Tree         => In_Tree,
                               Data            => Data,
                               Location        => No_Location,
                               Current_Source  => Current_Source,
@@ -2494,484 +3143,103 @@ package body Prj.Nmsc is
                              (File_Name        => File_Name,
                               Path_Name        => Path_Name,
                               Project          => Project,
+                              In_Tree          => In_Tree,
                               Data             => Data,
                               Location         => No_Location,
                               Language         => For_Language,
                               Suffix           =>
-                                Get_Name_String
-                                  (Data.Impl_Suffixes (For_Language)),
+                                Body_Suffix_Of (For_Language, Data, In_Tree),
                               Naming_Exception => False);
                         end if;
                      end;
-                  end loop;
-
-                  Close (Dir);
-               end;
-            end if;
-
-         exception
-            when Directory_Error =>
-               null;
-         end;
-
-         if Source_Recorded then
-            String_Elements.Table (Source_Dir).Flag := True;
-         end if;
-
-         Source_Dir := Element.Next;
-      end loop;
-
-      if Current_Verbosity = High then
-         Write_Line ("end Looking for sources.");
-      end if;
-
-      if For_Language = Lang_Ada then
-         --  If we have looked for sources and found none, then
-         --  it is an error, except if it is an extending project.
-         --  If a non extending project is not supposed to contain
-         --  any source, then we never call Find_Sources.
-         --  No error either when setting up projects (gnat setup).
-
-         if Current_Source /= Nil_String then
-            Data.Ada_Sources_Present := True;
-
-         elsif not Setup_Projects and then Data.Extends = No_Project then
-            Error_Msg
-              (Project,
-               "there are no Ada sources in this project",
-               Data.Location);
-         end if;
-      end if;
-   end Find_Sources;
-
-   --------------------------------
-   -- Free_Ada_Naming_Exceptions --
-   --------------------------------
-
-   procedure Free_Ada_Naming_Exceptions is
-   begin
-      Ada_Naming_Exception_Table.Set_Last (0);
-      Ada_Naming_Exceptions.Reset;
-      Reverse_Ada_Naming_Exceptions.Reset;
-   end Free_Ada_Naming_Exceptions;
-
-   ---------------
-   -- Get_Mains --
-   ---------------
-
-   procedure Get_Mains (Project : Project_Id; Data : in out Project_Data) is
-      Mains : constant Variable_Value :=
-        Prj.Util.Value_Of (Name_Main, Data.Decl.Attributes);
-
-   begin
-      Data.Mains := Mains.Values;
-
-      --  If no Mains were specified, and if we are an extending
-      --  project, inherit the Mains from the project we are extending.
-
-      if Mains.Default then
-         if Data.Extends /= No_Project then
-            Data.Mains := Projects.Table (Data.Extends).Mains;
-         end if;
-
-      --  In a library project file, Main cannot be specified
-
-      elsif Data.Library then
-         Error_Msg
-           (Project,
-            "a library project file cannot have Main specified",
-            Mains.Location);
-      end if;
-   end Get_Mains;
-
-   ---------------------------
-   -- Get_Sources_From_File --
-   ---------------------------
-
-   procedure Get_Sources_From_File
-     (Path     : String;
-      Location : Source_Ptr;
-      Project  : Project_Id)
-   is
-      File           : Prj.Util.Text_File;
-      Line           : String (1 .. 250);
-      Last           : Natural;
-      Source_Name    : Name_Id;
-
-   begin
-      Source_Names.Reset;
-
-      if Current_Verbosity = High then
-         Write_Str  ("Opening """);
-         Write_Str  (Path);
-         Write_Line (""".");
-      end if;
-
-      --  Open the file
-
-      Prj.Util.Open (File, Path);
-
-      if not Prj.Util.Is_Valid (File) then
-         Error_Msg (Project, "file does not exist", Location);
-      else
-         --  Read the lines one by one
-
-         while not Prj.Util.End_Of_File (File) loop
-            Prj.Util.Get_Line (File, Line, Last);
-
-            --  A non empty, non comment line should contain a file name
-
-            if Last /= 0
-              and then (Last = 1 or else Line (1 .. 2) /= "--")
-            then
-               --  ??? we should check that there is no directory information
-
-               Name_Len := Last;
-               Name_Buffer (1 .. Name_Len) := Line (1 .. Last);
-               Canonical_Case_File_Name (Name_Buffer (1 .. Name_Len));
-               Source_Name := Name_Find;
-               Source_Names.Set
-                 (K => Source_Name,
-                  E =>
-                    (Name     => Source_Name,
-                     Location => Location,
-                     Found    => False));
-            end if;
-         end loop;
-
-         Prj.Util.Close (File);
-
-      end if;
-   end Get_Sources_From_File;
-
-   --------------
-   -- Get_Unit --
-   --------------
-
-   procedure Get_Unit
-     (Canonical_File_Name : Name_Id;
-      Naming              : Naming_Data;
-      Exception_Id        : out Ada_Naming_Exception_Id;
-      Unit_Name           : out Name_Id;
-      Unit_Kind           : out Spec_Or_Body;
-      Needs_Pragma        : out Boolean)
-   is
-      Info_Id  : Ada_Naming_Exception_Id
-        := Ada_Naming_Exceptions.Get (Canonical_File_Name);
-      VMS_Name : Name_Id;
-
-   begin
-      if Info_Id = No_Ada_Naming_Exception then
-         if Hostparm.OpenVMS then
-            VMS_Name := Canonical_File_Name;
-            Get_Name_String (VMS_Name);
-
-            if Name_Buffer (Name_Len) = '.' then
-               Name_Len := Name_Len - 1;
-               VMS_Name := Name_Find;
-            end if;
-
-            Info_Id := Ada_Naming_Exceptions.Get (VMS_Name);
-         end if;
-
-      end if;
-
-      if Info_Id /= No_Ada_Naming_Exception then
-         Exception_Id := Info_Id;
-         Unit_Name := No_Name;
-         Unit_Kind := Specification;
-         Needs_Pragma := True;
-         return;
-      end if;
-
-      Needs_Pragma := False;
-      Exception_Id := No_Ada_Naming_Exception;
-
-      Get_Name_String (Canonical_File_Name);
-
-      declare
-         File          : String := Name_Buffer (1 .. Name_Len);
-         First         : constant Positive := File'First;
-         Last          : Natural           := File'Last;
-         Standard_GNAT : Boolean;
-
-      begin
-         Standard_GNAT :=
-           Naming.Current_Spec_Suffix = Default_Ada_Spec_Suffix
-             and then Naming.Current_Body_Suffix = Default_Ada_Body_Suffix;
-
-         --  Check if the end of the file name is Specification_Append
-
-         Get_Name_String (Naming.Current_Spec_Suffix);
-
-         if File'Length > Name_Len
-           and then File (Last - Name_Len + 1 .. Last) =
-                                                Name_Buffer (1 .. Name_Len)
-         then
-            --  We have a spec
-
-            Unit_Kind := Specification;
-            Last := Last - Name_Len;
-
-            if Current_Verbosity = High then
-               Write_Str  ("   Specification: ");
-               Write_Line (File (First .. Last));
-            end if;
-
-         else
-            Get_Name_String (Naming.Current_Body_Suffix);
-
-            --  Check if the end of the file name is Body_Append
-
-            if File'Length > Name_Len
-              and then File (Last - Name_Len + 1 .. Last) =
-                                                Name_Buffer (1 .. Name_Len)
-            then
-               --  We have a body
-
-               Unit_Kind := Body_Part;
-               Last := Last - Name_Len;
-
-               if Current_Verbosity = High then
-                  Write_Str  ("   Body: ");
-                  Write_Line (File (First .. Last));
-               end if;
-
-            elsif Naming.Separate_Suffix /= Naming.Current_Spec_Suffix then
-               Get_Name_String (Naming.Separate_Suffix);
-
-               --  Check if the end of the file name is Separate_Append
-
-               if File'Length > Name_Len
-                 and then File (Last - Name_Len + 1 .. Last) =
-                                                Name_Buffer (1 .. Name_Len)
-               then
-                  --  We have a separate (a body)
-
-                  Unit_Kind := Body_Part;
-                  Last := Last - Name_Len;
-
-                  if Current_Verbosity = High then
-                     Write_Str  ("   Separate: ");
-                     Write_Line (File (First .. Last));
-                  end if;
-
-               else
-                  Last := 0;
-               end if;
-
-            else
-               Last := 0;
-            end if;
-         end if;
-
-         if Last = 0 then
-
-            --  This is not a source file
-
-            Unit_Name := No_Name;
-            Unit_Kind := Specification;
-
-            if Current_Verbosity = High then
-               Write_Line ("   Not a valid file name.");
-            end if;
-
-            return;
-         end if;
-
-         Get_Name_String (Naming.Dot_Replacement);
-         Standard_GNAT :=
-           Standard_GNAT and then Name_Buffer (1 .. Name_Len) = "-";
-
-         if Name_Buffer (1 .. Name_Len) /= "." then
-
-            --  If Dot_Replacement is not a single dot,
-            --  then there should not be any dot in the name.
-
-            for Index in First .. Last loop
-               if File (Index) = '.' then
-                  if Current_Verbosity = High then
-                     Write_Line
-                       ("   Not a valid file name (some dot not replaced).");
-                  end if;
-
-                  Unit_Name := No_Name;
-                  return;
-
-               end if;
-            end loop;
-
-            --  Replace the substring Dot_Replacement with dots
-
-            declare
-               Index : Positive := First;
-
-            begin
-               while Index <= Last - Name_Len + 1 loop
-
-                  if File (Index .. Index + Name_Len - 1) =
-                    Name_Buffer (1 .. Name_Len)
-                  then
-                     File (Index) := '.';
-
-                     if Name_Len > 1 and then Index < Last then
-                        File (Index + 1 .. Last - Name_Len + 1) :=
-                          File (Index + Name_Len .. Last);
-                     end if;
-
-                     Last := Last - Name_Len + 1;
-                  end if;
-
-                  Index := Index + 1;
-               end loop;
-            end;
-         end if;
-
-         --  Check if the casing is right
-
-         declare
-            Src : String := File (First .. Last);
-
-         begin
-            case Naming.Casing is
-               when All_Lower_Case =>
-                  Fixed.Translate
-                    (Source  => Src,
-                     Mapping => Lower_Case_Map);
-
-               when All_Upper_Case =>
-                  Fixed.Translate
-                    (Source  => Src,
-                     Mapping => Upper_Case_Map);
-
-               when Mixed_Case | Unknown =>
-                  null;
-            end case;
-
-            if Src /= File (First .. Last) then
-               if Current_Verbosity = High then
-                  Write_Line ("   Not a valid file name (casing).");
-               end if;
-
-               Unit_Name := No_Name;
-               return;
-            end if;
-
-            --  We put the name in lower case
-
-            Fixed.Translate
-              (Source  => Src,
-               Mapping => Lower_Case_Map);
-
-            --  In the standard GNAT naming scheme, check for special cases:
-            --  children or separates of A, G, I or S, and run time sources.
-
-            if Standard_GNAT and then Src'Length >= 3 then
-               declare
-                  S1 : constant Character := Src (Src'First);
-                  S2 : constant Character := Src (Src'First + 1);
-
-               begin
-                  if S1 = 'a' or else S1 = 'g'
-                    or else S1 = 'i' or else S1 = 's'
-                  then
-                     --  Children or separates of packages A, G, I or S
-
-                     if (Hostparm.OpenVMS and then S2 = '$')
-                       or else (not Hostparm.OpenVMS and then S2 = '~')
-                     then
-                        Src (Src'First + 1) := '.';
-
-                     --  If it is potentially a run time source, disable
-                     --  filling of the mapping file to avoid warnings.
-
-                     elsif S2 = '.' then
-                        Set_Mapping_File_Initial_State_To_Empty;
-                     end if;
-
-                  end if;
-               end;
-            end if;
-
-            if Current_Verbosity = High then
-               Write_Str  ("      ");
-               Write_Line (Src);
-            end if;
-
-            --  Now, we check if this name is a valid unit name
-
-            Check_Ada_Name (Name => Src, Unit => Unit_Name);
-         end;
-
-      end;
-   end Get_Unit;
-
-   ----------
-   -- Hash --
-   ----------
+                  end loop;
 
-   function Hash (Unit : Unit_Info) return Header_Num is
-   begin
-      return Header_Num (Unit.Unit mod 2048);
-   end Hash;
+                  Close (Dir);
+               end;
+            end if;
 
-   -----------------------
-   -- Is_Illegal_Suffix --
-   -----------------------
+         exception
+            when Directory_Error =>
+               null;
+         end;
 
-   function Is_Illegal_Suffix
-     (Suffix                          : String;
-      Dot_Replacement_Is_A_Single_Dot : Boolean) return Boolean
-   is
-   begin
-      if Suffix'Length = 0 or else Index (Suffix, ".") = 0 then
-         return True;
-      end if;
+         if Source_Recorded then
+            In_Tree.String_Elements.Table (Source_Dir).Flag :=
+              True;
+         end if;
 
-      --  If dot replacement is a single dot, and first character of
-      --  suffix is also a dot
+         Source_Dir := Element.Next;
+      end loop;
 
-      if Dot_Replacement_Is_A_Single_Dot
-        and then Suffix (Suffix'First) = '.'
-      then
-         for Index in Suffix'First + 1 .. Suffix'Last loop
+      if Current_Verbosity = High then
+         Write_Line ("end Looking for sources.");
+      end if;
 
-            --  If there is another dot
+      if For_Language = Ada_Language_Index then
 
-            if Suffix (Index) = '.' then
+         --  If we have looked for sources and found none, then
+         --  it is an error, except if it is an extending project.
+         --  If a non extending project is not supposed to contain
+         --  any source, then we never call Find_Sources.
 
-               --  It is illegal to have a letter following the initial dot
+         if Current_Source /= Nil_String then
+            Data.Ada_Sources_Present := True;
 
-               return Is_Letter (Suffix (Suffix'First + 1));
-            end if;
-         end loop;
+         elsif Data.Extends = No_Project then
+            Report_No_Ada_Sources (Project, In_Tree, Data.Location);
+         end if;
       end if;
-
-      --  Everything is OK
-
-      return False;
-   end Is_Illegal_Suffix;
+   end Find_Sources;
 
    --------------------------------
-   -- Language_Independent_Check --
+   -- Free_Ada_Naming_Exceptions --
    --------------------------------
 
-   procedure Language_Independent_Check
-     (Project      : Project_Id;
-      Report_Error : Put_Line_Access)
+   procedure Free_Ada_Naming_Exceptions is
+   begin
+      Ada_Naming_Exception_Table.Set_Last (0);
+      Ada_Naming_Exceptions.Reset;
+      Reverse_Ada_Naming_Exceptions.Reset;
+   end Free_Ada_Naming_Exceptions;
+
+   ---------------------
+   -- Get_Directories --
+   ---------------------
+
+   procedure Get_Directories
+     (Project : Project_Id;
+      In_Tree : Project_Tree_Ref;
+      Data    : in out Project_Data)
    is
+      Object_Dir  : constant Variable_Value :=
+                      Util.Value_Of
+                        (Name_Object_Dir, Data.Decl.Attributes, In_Tree);
+
+      Exec_Dir    : constant Variable_Value :=
+                      Util.Value_Of
+                        (Name_Exec_Dir, Data.Decl.Attributes, In_Tree);
+
+      Source_Dirs : constant Variable_Value :=
+                      Util.Value_Of
+                        (Name_Source_Dirs, Data.Decl.Attributes, In_Tree);
+
       Last_Source_Dir : String_List_Id  := Nil_String;
-      Data            : Project_Data    := Projects.Table (Project);
 
-      procedure Find_Source_Dirs (From : Name_Id; Location : Source_Ptr);
-      --  Find one or several source directories, and add them
-      --  to the list of source directories of the project.
+      procedure Find_Source_Dirs
+        (From     : File_Name_Type;
+         Location : Source_Ptr);
+      --  Find one or several source directories, and add them to the list of
+      --  source directories of the project.
+      --  What is Location??? and what is From???
 
       ----------------------
       -- Find_Source_Dirs --
       ----------------------
 
-      procedure Find_Source_Dirs (From : Name_Id; Location : Source_Ptr) is
+      procedure Find_Source_Dirs
+        (From     : File_Name_Type;
+         Location : Source_Ptr)
+      is
          Directory : constant String := Get_Name_String (From);
          Element   : String_Element;
 
@@ -2991,8 +3259,8 @@ package body Prj.Nmsc is
             Element  : String_Element;
             Found    : Boolean := False;
 
-            Non_Canonical_Path : Name_Id := No_Name;
-            Canonical_Path     : Name_Id := No_Name;
+            Non_Canonical_Path : File_Name_Type := No_File;
+            Canonical_Path     : File_Name_Type := No_File;
 
             The_Path : constant String :=
                          Normalize_Pathname (Get_Name_String (Path)) &
@@ -3025,10 +3293,10 @@ package body Prj.Nmsc is
             --  Check if directory is already in list
 
             while List /= Nil_String loop
-               Element := String_Elements.Table (List);
+               Element := In_Tree.String_Elements.Table (List);
 
                if Element.Value /= No_Name then
-                  Found := Element.Value = Canonical_Path;
+                  Found := Element.Value = Name_Id (Canonical_Path);
                   exit when Found;
                end if;
 
@@ -3043,33 +3311,37 @@ package body Prj.Nmsc is
                   Write_Line (The_Path (The_Path'First .. The_Path_Last));
                end if;
 
-               String_Elements.Increment_Last;
+               String_Element_Table.Increment_Last
+                 (In_Tree.String_Elements);
                Element :=
-                 (Value    => Canonical_Path,
-                  Display_Value => Non_Canonical_Path,
-                  Location => No_Location,
-                  Flag     => False,
-                  Next     => Nil_String,
-                  Index    => 0);
+                 (Value         => Name_Id (Canonical_Path),
+                  Display_Value => Name_Id (Non_Canonical_Path),
+                  Location      => No_Location,
+                  Flag          => False,
+                  Next          => Nil_String,
+                  Index         => 0);
 
                --  Case of first source directory
 
                if Last_Source_Dir = Nil_String then
-                  Data.Source_Dirs := String_Elements.Last;
+                  Data.Source_Dirs := String_Element_Table.Last
+                                        (In_Tree.String_Elements);
 
-                  --  Here we already have source directories.
+                  --  Here we already have source directories
 
                else
                   --  Link the previous last to the new one
 
-                  String_Elements.Table (Last_Source_Dir).Next :=
-                    String_Elements.Last;
+                  In_Tree.String_Elements.Table
+                    (Last_Source_Dir).Next :=
+                      String_Element_Table.Last (In_Tree.String_Elements);
                end if;
 
                --  And register this source directory as the new last
 
-               Last_Source_Dir  := String_Elements.Last;
-               String_Elements.Table (Last_Source_Dir) := Element;
+               Last_Source_Dir  := String_Element_Table.Last
+                 (In_Tree.String_Elements);
+               In_Tree.String_Elements.Table (Last_Source_Dir) := Element;
             end if;
 
             --  Now look for subdirectories. We do that even when this
@@ -3085,7 +3357,7 @@ package body Prj.Nmsc is
                if Name (1 .. Last) /= "."
                  and then Name (1 .. Last) /= ".."
                then
-                  --  Avoid . and ..
+                  --  Avoid . and .. directories
 
                   if Current_Verbosity = High then
                      Write_Str  ("   Checking ");
@@ -3164,34 +3436,34 @@ package body Prj.Nmsc is
             end if;
 
             declare
-               Base_Dir : constant Name_Id := Name_Find;
+               Base_Dir : constant File_Name_Type := Name_Find;
                Root_Dir : constant String :=
                             Normalize_Pathname
-                              (Name      => Get_Name_String (Base_Dir),
-                               Directory =>
+                              (Name           => Get_Name_String (Base_Dir),
+                               Directory      =>
                                  Get_Name_String (Data.Display_Directory),
                                Resolve_Links  => False,
                                Case_Sensitive => True);
 
             begin
                if Root_Dir'Length = 0 then
-                  Err_Vars.Error_Msg_Name_1 := Base_Dir;
+                  Err_Vars.Error_Msg_File_1 := Base_Dir;
 
                   if Location = No_Location then
                      Error_Msg
-                       (Project,
+                       (Project, In_Tree,
                         "{ is not a valid directory.",
                         Data.Location);
                   else
                      Error_Msg
-                       (Project,
+                       (Project, In_Tree,
                         "{ is not a valid directory.",
                         Location);
                   end if;
 
                else
-                  --  We have an existing directory,
-                  --  we register it and all of its subdirectories.
+                  --  We have an existing directory, we register it and all
+                  --  of its subdirectories.
 
                   if Current_Verbosity = High then
                      Write_Line ("Looking for source directories:");
@@ -3207,969 +3479,1225 @@ package body Prj.Nmsc is
                end if;
             end;
 
-         --  We have a single directory
+         --  We have a single directory
+
+         else
+            declare
+               Path_Name         : Path_Name_Type;
+               Display_Path_Name : Path_Name_Type;
+
+            begin
+               Locate_Directory
+                 (Project,
+                  In_Tree,
+                  From,
+                  Data.Display_Directory,
+                  Path_Name,
+                  Display_Path_Name);
+
+               if Path_Name = No_Path then
+                  Err_Vars.Error_Msg_File_1 := From;
+
+                  if Location = No_Location then
+                     Error_Msg
+                       (Project, In_Tree,
+                        "{ is not a valid directory",
+                        Data.Location);
+                  else
+                     Error_Msg
+                       (Project, In_Tree,
+                        "{ is not a valid directory",
+                        Location);
+                  end if;
+
+               else
+                  --  As it is an existing directory, we add it to the list of
+                  --  directories.
+
+                  String_Element_Table.Increment_Last
+                    (In_Tree.String_Elements);
+                  Element.Value := Name_Id (Path_Name);
+                  Element.Display_Value := Name_Id (Display_Path_Name);
+
+                  if Last_Source_Dir = Nil_String then
+
+                     --  This is the first source directory
+
+                     Data.Source_Dirs := String_Element_Table.Last
+                                        (In_Tree.String_Elements);
+
+                  else
+                     --  We already have source directories,
+                     --  link the previous last to the new one.
+
+                     In_Tree.String_Elements.Table
+                       (Last_Source_Dir).Next :=
+                         String_Element_Table.Last (In_Tree.String_Elements);
+                  end if;
+
+                  --  And register this source directory as the new last
+
+                  Last_Source_Dir := String_Element_Table.Last
+                    (In_Tree.String_Elements);
+                  In_Tree.String_Elements.Table (Last_Source_Dir) := Element;
+               end if;
+            end;
+         end if;
+      end Find_Source_Dirs;
+
+   --  Start of processing for Get_Directories
+
+   begin
+      if Current_Verbosity = High then
+         Write_Line ("Starting to look for directories");
+      end if;
+
+      --  Check the object directory
+
+      pragma Assert (Object_Dir.Kind = Single,
+                     "Object_Dir is not a single string");
+
+      --  We set the object directory to its default
+
+      Data.Object_Directory   := Data.Directory;
+      Data.Display_Object_Dir := Data.Display_Directory;
+
+      if Object_Dir.Value /= Empty_String then
+         Get_Name_String (Object_Dir.Value);
+
+         if Name_Len = 0 then
+            Error_Msg
+              (Project, In_Tree,
+               "Object_Dir cannot be empty",
+               Object_Dir.Location);
+
+         else
+            --  We check that the specified object directory does exist
+
+            Locate_Directory
+              (Project,
+               In_Tree,
+               File_Name_Type (Object_Dir.Value),
+               Data.Display_Directory,
+               Data.Object_Directory,
+               Data.Display_Object_Dir,
+               Create   => "object",
+               Location => Object_Dir.Location);
+
+            if Data.Object_Directory = No_Path then
+
+               --  The object directory does not exist, report an error
+
+               Err_Vars.Error_Msg_File_1 := File_Name_Type (Object_Dir.Value);
+               Error_Msg
+                 (Project, In_Tree,
+                  "the object directory { cannot be found",
+                  Data.Location);
+
+               --  Do not keep a nil Object_Directory. Set it to the specified
+               --  (relative or absolute) path. This is for the benefit of
+               --  tools that recover from errors; for example, these tools
+               --  could create the non existent directory.
+
+               Data.Display_Object_Dir := Path_Name_Type (Object_Dir.Value);
+               Get_Name_String (Object_Dir.Value);
+               Canonical_Case_File_Name (Name_Buffer (1 .. Name_Len));
+               Data.Object_Directory := Name_Find;
+            end if;
+         end if;
+      end if;
+
+      if Current_Verbosity = High then
+         if Data.Object_Directory = No_Path then
+            Write_Line ("No object directory");
+         else
+            Write_Str ("Object directory: """);
+            Write_Str (Get_Name_String (Data.Display_Object_Dir));
+            Write_Line ("""");
+         end if;
+      end if;
+
+      --  Check the exec directory
+
+      pragma Assert (Exec_Dir.Kind = Single,
+                     "Exec_Dir is not a single string");
+
+      --  We set the object directory to its default
+
+      Data.Exec_Directory   := Data.Object_Directory;
+      Data.Display_Exec_Dir := Data.Display_Object_Dir;
+
+      if Exec_Dir.Value /= Empty_String then
+         Get_Name_String (Exec_Dir.Value);
+
+         if Name_Len = 0 then
+            Error_Msg
+              (Project, In_Tree,
+               "Exec_Dir cannot be empty",
+               Exec_Dir.Location);
+
+         else
+            --  We check that the specified object directory does exist
+
+            Locate_Directory
+              (Project,
+               In_Tree,
+               File_Name_Type (Exec_Dir.Value),
+               Data.Display_Directory,
+               Data.Exec_Directory,
+               Data.Display_Exec_Dir,
+               Create   => "exec",
+               Location => Exec_Dir.Location);
+
+            if Data.Exec_Directory = No_Path then
+               Err_Vars.Error_Msg_File_1 :=
+                 File_Name_Type (Exec_Dir.Value);
+               Error_Msg
+                 (Project, In_Tree,
+                  "the exec directory { cannot be found",
+                  Data.Location);
+            end if;
+         end if;
+      end if;
+
+      if Current_Verbosity = High then
+         if Data.Exec_Directory = No_Path then
+            Write_Line ("No exec directory");
+         else
+            Write_Str ("Exec directory: """);
+            Write_Str (Get_Name_String (Data.Display_Exec_Dir));
+            Write_Line ("""");
+         end if;
+      end if;
+
+      --  Look for the source directories
+
+      if Current_Verbosity = High then
+         Write_Line ("Starting to look for source directories");
+      end if;
+
+      pragma Assert (Source_Dirs.Kind = List, "Source_Dirs is not a list");
+
+      if Source_Dirs.Default then
+
+         --  No Source_Dirs specified: the single source directory
+         --  is the one containing the project file
+
+         String_Element_Table.Increment_Last
+           (In_Tree.String_Elements);
+         Data.Source_Dirs := String_Element_Table.Last
+           (In_Tree.String_Elements);
+         In_Tree.String_Elements.Table (Data.Source_Dirs) :=
+           (Value         => Name_Id (Data.Directory),
+            Display_Value => Name_Id (Data.Display_Directory),
+            Location      => No_Location,
+            Flag          => False,
+            Next          => Nil_String,
+            Index         => 0);
+
+         if Current_Verbosity = High then
+            Write_Line ("Single source directory:");
+            Write_Str ("    """);
+            Write_Str (Get_Name_String (Data.Display_Directory));
+            Write_Line ("""");
+         end if;
+
+      elsif Source_Dirs.Values = Nil_String then
+
+         --  If Source_Dirs is an empty string list, this means
+         --  that this project contains no source. For projects that
+         --  don't extend other projects, this also means that there is no
+         --  need for an object directory, if not specified.
+
+         if Data.Extends = No_Project
+           and then  Data.Object_Directory = Data.Directory
+         then
+            Data.Object_Directory := No_Path;
+         end if;
+
+         Data.Source_Dirs           := Nil_String;
+         Data.Ada_Sources_Present   := False;
+         Data.Other_Sources_Present := False;
+
+      else
+         declare
+            Source_Dir : String_List_Id := Source_Dirs.Values;
+            Element    : String_Element;
+
+         begin
+            --  We will find the source directories for each
+            --  element of the list
+
+            while Source_Dir /= Nil_String loop
+               Element := In_Tree.String_Elements.Table (Source_Dir);
+               Find_Source_Dirs
+                 (File_Name_Type (Element.Value), Element.Location);
+               Source_Dir := Element.Next;
+            end loop;
+         end;
+      end if;
+
+      if Current_Verbosity = High then
+         Write_Line ("Putting source directories in canonical cases");
+      end if;
+
+      declare
+         Current : String_List_Id := Data.Source_Dirs;
+         Element : String_Element;
+
+      begin
+         while Current /= Nil_String loop
+            Element := In_Tree.String_Elements.Table (Current);
+            if Element.Value /= No_Name then
+               Get_Name_String (Element.Value);
+               Canonical_Case_File_Name (Name_Buffer (1 .. Name_Len));
+               Element.Value := Name_Find;
+               In_Tree.String_Elements.Table (Current) := Element;
+            end if;
+
+            Current := Element.Next;
+         end loop;
+      end;
+   end Get_Directories;
+
+   ---------------
+   -- Get_Mains --
+   ---------------
+
+   procedure Get_Mains
+     (Project : Project_Id;
+      In_Tree : Project_Tree_Ref;
+      Data    : in out Project_Data)
+   is
+      Mains : constant Variable_Value :=
+                Prj.Util.Value_Of (Name_Main, Data.Decl.Attributes, In_Tree);
+
+   begin
+      Data.Mains := Mains.Values;
+
+      --  If no Mains were specified, and if we are an extending
+      --  project, inherit the Mains from the project we are extending.
+
+      if Mains.Default then
+         if Data.Extends /= No_Project then
+            Data.Mains := In_Tree.Projects.Table (Data.Extends).Mains;
+         end if;
+
+      --  In a library project file, Main cannot be specified
+
+      elsif Data.Library then
+         Error_Msg
+           (Project, In_Tree,
+            "a library project file cannot have Main specified",
+            Mains.Location);
+      end if;
+   end Get_Mains;
+
+   ---------------------------
+   -- Get_Sources_From_File --
+   ---------------------------
+
+   procedure Get_Sources_From_File
+     (Path     : String;
+      Location : Source_Ptr;
+      Project  : Project_Id;
+      In_Tree  : Project_Tree_Ref)
+   is
+      File        : Prj.Util.Text_File;
+      Line        : String (1 .. 250);
+      Last        : Natural;
+      Source_Name : File_Name_Type;
 
-         else
-            declare
-               Path_Name : Name_Id;
-               Display_Path_Name : Name_Id;
-            begin
-               Locate_Directory
-                 (From, Data.Display_Directory, Path_Name, Display_Path_Name);
-               if Path_Name = No_Name then
-                  Err_Vars.Error_Msg_Name_1 := From;
+   begin
+      Source_Names.Reset;
 
-                  if Location = No_Location then
-                     Error_Msg
-                       (Project,
-                        "{ is not a valid directory",
-                        Data.Location);
-                  else
-                     Error_Msg
-                       (Project,
-                        "{ is not a valid directory",
-                        Location);
-                  end if;
-               else
+      if Current_Verbosity = High then
+         Write_Str  ("Opening """);
+         Write_Str  (Path);
+         Write_Line (""".");
+      end if;
 
-                  --  As it is an existing directory, we add it to
-                  --  the list of directories.
+      --  Open the file
 
-                  String_Elements.Increment_Last;
-                  Element.Value := Path_Name;
-                  Element.Display_Value := Display_Path_Name;
+      Prj.Util.Open (File, Path);
 
-                  if Last_Source_Dir = Nil_String then
+      if not Prj.Util.Is_Valid (File) then
+         Error_Msg (Project, In_Tree, "file does not exist", Location);
+      else
+         --  Read the lines one by one
 
-                     --  This is the first source directory
+         while not Prj.Util.End_Of_File (File) loop
+            Prj.Util.Get_Line (File, Line, Last);
 
-                     Data.Source_Dirs := String_Elements.Last;
+            --  A non empty, non comment line should contain a file name
 
-                  else
-                     --  We already have source directories,
-                     --  link the previous last to the new one.
+            if Last /= 0
+              and then (Last = 1 or else Line (1 .. 2) /= "--")
+            then
+               --  ??? we should check that there is no directory information
 
-                     String_Elements.Table (Last_Source_Dir).Next :=
-                       String_Elements.Last;
-                  end if;
+               Name_Len := Last;
+               Name_Buffer (1 .. Name_Len) := Line (1 .. Last);
+               Canonical_Case_File_Name (Name_Buffer (1 .. Name_Len));
+               Source_Name := Name_Find;
+               Source_Names.Set
+                 (K => Source_Name,
+                  E =>
+                    (Name     => Source_Name,
+                     Location => Location,
+                     Found    => False));
+            end if;
+         end loop;
 
-                  --  And register this source directory as the new last
+         Prj.Util.Close (File);
 
-                  Last_Source_Dir := String_Elements.Last;
-                  String_Elements.Table (Last_Source_Dir) := Element;
-               end if;
-            end;
-         end if;
-      end Find_Source_Dirs;
+      end if;
+   end Get_Sources_From_File;
 
-   --  Start of processing for Language_Independent_Check
+   --------------
+   -- Get_Unit --
+   --------------
+
+   procedure Get_Unit
+     (Canonical_File_Name : File_Name_Type;
+      Naming              : Naming_Data;
+      Exception_Id        : out Ada_Naming_Exception_Id;
+      Unit_Name           : out Name_Id;
+      Unit_Kind           : out Spec_Or_Body;
+      Needs_Pragma        : out Boolean)
+   is
+      Info_Id  : Ada_Naming_Exception_Id :=
+                   Ada_Naming_Exceptions.Get (Canonical_File_Name);
+      VMS_Name : File_Name_Type;
 
    begin
-      if Data.Language_Independent_Checked then
-         return;
-      end if;
+      if Info_Id = No_Ada_Naming_Exception then
+         if Hostparm.OpenVMS then
+            VMS_Name := Canonical_File_Name;
+            Get_Name_String (VMS_Name);
 
-      Data.Language_Independent_Checked := True;
+            if Name_Buffer (Name_Len) = '.' then
+               Name_Len := Name_Len - 1;
+               VMS_Name := Name_Find;
+            end if;
 
-      Error_Report := Report_Error;
+            Info_Id := Ada_Naming_Exceptions.Get (VMS_Name);
+         end if;
 
-      Recursive_Dirs.Reset;
+      end if;
 
-      if Current_Verbosity = High then
-         Write_Line ("Starting to look for directories");
+      if Info_Id /= No_Ada_Naming_Exception then
+         Exception_Id := Info_Id;
+         Unit_Name := No_Name;
+         Unit_Kind := Specification;
+         Needs_Pragma := True;
+         return;
       end if;
 
-      --  Check the object directory
+      Needs_Pragma := False;
+      Exception_Id := No_Ada_Naming_Exception;
+
+      Get_Name_String (Canonical_File_Name);
 
       declare
-         Object_Dir : constant Variable_Value :=
-                        Util.Value_Of (Name_Object_Dir, Data.Decl.Attributes);
+         File          : String := Name_Buffer (1 .. Name_Len);
+         First         : constant Positive := File'First;
+         Last          : Natural           := File'Last;
+         Standard_GNAT : Boolean;
 
       begin
-         pragma Assert (Object_Dir.Kind = Single,
-                        "Object_Dir is not a single string");
-
-         --  We set the object directory to its default
-
-         Data.Object_Directory   := Data.Directory;
-         Data.Display_Object_Dir := Data.Display_Directory;
-
-         if Object_Dir.Value /= Empty_String then
+         Standard_GNAT :=
+           Naming.Ada_Spec_Suffix = Default_Ada_Spec_Suffix
+             and then Naming.Ada_Body_Suffix = Default_Ada_Body_Suffix;
 
-            Get_Name_String (Object_Dir.Value);
+         --  Check if the end of the file name is Specification_Append
 
-            if Name_Len = 0 then
-               Error_Msg
-                 (Project,
-                  "Object_Dir cannot be empty",
-                  Object_Dir.Location);
+         Get_Name_String (Naming.Ada_Spec_Suffix);
 
-            else
-               --  We check that the specified object directory
-               --  does exist, and attempt to create it if setting up projects
-               --  (gnat setup).
+         if File'Length > Name_Len
+           and then File (Last - Name_Len + 1 .. Last) =
+                                                Name_Buffer (1 .. Name_Len)
+         then
+            --  We have a spec
 
-               Locate_Directory
-                 (Object_Dir.Value, Data.Display_Directory,
-                  Data.Object_Directory, Data.Display_Object_Dir,
-                  Project  => Project, Kind => "object",
-                  Location => Object_Dir.Location);
+            Unit_Kind := Specification;
+            Last := Last - Name_Len;
 
-               if not Setup_Projects
-                 and then Data.Object_Directory = No_Name
-               then
-                  --  The object directory does not exist, report an error
-                  Err_Vars.Error_Msg_Name_1 := Object_Dir.Value;
-                  Error_Msg
-                    (Project,
-                     "the object directory { cannot be found",
-                     Data.Location);
-
-                  --  Do not keep a nil Object_Directory. Set it to the
-                  --  specified (relative or absolute) path.
-                  --  This is for the benefit of tools that recover from
-                  --  errors; for example, these tools could create the
-                  --  non existent directory.
-
-                  Data.Display_Object_Dir := Object_Dir.Value;
-                  Get_Name_String (Object_Dir.Value);
-                  Canonical_Case_File_Name (Name_Buffer (1 .. Name_Len));
-                  Data.Object_Directory := Name_Find;
-               end if;
+            if Current_Verbosity = High then
+               Write_Str  ("   Specification: ");
+               Write_Line (File (First .. Last));
             end if;
-         end if;
-      end;
 
-      if Current_Verbosity = High then
-         if Data.Object_Directory = No_Name then
-            Write_Line ("No object directory");
          else
-            Write_Str ("Object directory: """);
-            Write_Str (Get_Name_String (Data.Display_Object_Dir));
-            Write_Line ("""");
-         end if;
-      end if;
+            Get_Name_String (Naming.Ada_Body_Suffix);
 
-      --  Check the exec directory
-
-      declare
-         Exec_Dir : constant Variable_Value :=
-                      Util.Value_Of (Name_Exec_Dir, Data.Decl.Attributes);
+            --  Check if the end of the file name is Body_Append
 
-      begin
-         pragma Assert (Exec_Dir.Kind = Single,
-                        "Exec_Dir is not a single string");
+            if File'Length > Name_Len
+              and then File (Last - Name_Len + 1 .. Last) =
+                                                Name_Buffer (1 .. Name_Len)
+            then
+               --  We have a body
 
-         --  We set the object directory to its default
+               Unit_Kind := Body_Part;
+               Last := Last - Name_Len;
 
-         Data.Exec_Directory   := Data.Object_Directory;
-         Data.Display_Exec_Dir := Data.Display_Object_Dir;
+               if Current_Verbosity = High then
+                  Write_Str  ("   Body: ");
+                  Write_Line (File (First .. Last));
+               end if;
 
-         if Exec_Dir.Value /= Empty_String then
+            elsif Naming.Separate_Suffix /= Naming.Ada_Spec_Suffix then
+               Get_Name_String (Naming.Separate_Suffix);
 
-            Get_Name_String (Exec_Dir.Value);
+               --  Check if the end of the file name is Separate_Append
 
-            if Name_Len = 0 then
-               Error_Msg
-                 (Project,
-                  "Exec_Dir cannot be empty",
-                  Exec_Dir.Location);
+               if File'Length > Name_Len
+                 and then File (Last - Name_Len + 1 .. Last) =
+                                                Name_Buffer (1 .. Name_Len)
+               then
+                  --  We have a separate (a body)
 
-            else
-               --  We check that the specified exec directory does exist and
-               --  attempt to create it if setting up projects (gnat setup).
+                  Unit_Kind := Body_Part;
+                  Last := Last - Name_Len;
 
-               Locate_Directory
-                 (Exec_Dir.Value, Data.Directory,
-                  Data.Exec_Directory, Data.Display_Exec_Dir,
-                  Project  => Project, Kind => "exec",
-                  Location => Exec_Dir.Location);
+                  if Current_Verbosity = High then
+                     Write_Str  ("   Separate: ");
+                     Write_Line (File (First .. Last));
+                  end if;
 
-               if not Setup_Projects
-                 and then Data.Exec_Directory = No_Name
-               then
-                  Err_Vars.Error_Msg_Name_1 := Exec_Dir.Value;
-                  Error_Msg
-                    (Project,
-                     "the exec directory { cannot be found",
-                     Data.Location);
+               else
+                  Last := 0;
                end if;
-            end if;
-         end if;
-      end;
 
-      if Current_Verbosity = High then
-         if Data.Exec_Directory = No_Name then
-            Write_Line ("No exec directory");
-         else
-            Write_Str ("Exec directory: """);
-            Write_Str (Get_Name_String (Data.Display_Exec_Dir));
-            Write_Line ("""");
+            else
+               Last := 0;
+            end if;
          end if;
-      end if;
 
-      --  Look for the source directories
+         if Last = 0 then
 
-      declare
-         Source_Dirs : constant Variable_Value :=
-                         Util.Value_Of
-                           (Name_Source_Dirs, Data.Decl.Attributes);
+            --  This is not a source file
 
-      begin
-         if Current_Verbosity = High then
-            Write_Line ("Starting to look for source directories");
-         end if;
+            Unit_Name := No_Name;
+            Unit_Kind := Specification;
 
-         pragma Assert (Source_Dirs.Kind = List,
-                          "Source_Dirs is not a list");
+            if Current_Verbosity = High then
+               Write_Line ("   Not a valid file name.");
+            end if;
 
-         if Source_Dirs.Default then
+            return;
+         end if;
 
-            --  No Source_Dirs specified: the single source directory
-            --  is the one containing the project file
+         Get_Name_String (Naming.Dot_Replacement);
+         Standard_GNAT :=
+           Standard_GNAT and then Name_Buffer (1 .. Name_Len) = "-";
 
-            String_Elements.Increment_Last;
-            Data.Source_Dirs := String_Elements.Last;
-            String_Elements.Table (Data.Source_Dirs) :=
-              (Value    => Data.Directory,
-               Display_Value => Data.Display_Directory,
-               Location => No_Location,
-               Flag     => False,
-               Next     => Nil_String,
-               Index    => 0);
+         if Name_Buffer (1 .. Name_Len) /= "." then
 
-            if Current_Verbosity = High then
-               Write_Line ("Single source directory:");
-               Write_Str ("    """);
-               Write_Str (Get_Name_String (Data.Display_Directory));
-               Write_Line ("""");
-            end if;
+            --  If Dot_Replacement is not a single dot, then there should
+            --  not be any dot in the name.
 
-         elsif Source_Dirs.Values = Nil_String then
+            for Index in First .. Last loop
+               if File (Index) = '.' then
+                  if Current_Verbosity = High then
+                     Write_Line
+                       ("   Not a valid file name (some dot not replaced).");
+                  end if;
 
-            --  If Source_Dirs is an empty string list, this means
-            --  that this project contains no source. For projects that
-            --  don't extend other projects, this also means that there is no
-            --  need for an object directory, if not specified.
+                  Unit_Name := No_Name;
+                  return;
 
-            if Data.Extends = No_Project
-              and then  Data.Object_Directory = Data.Directory
-            then
-               Data.Object_Directory := No_Name;
-            end if;
+               end if;
+            end loop;
 
-            Data.Source_Dirs           := Nil_String;
-            Data.Ada_Sources_Present   := False;
-            Data.Other_Sources_Present := False;
+            --  Replace the substring Dot_Replacement with dots
 
-         else
             declare
-               Source_Dir : String_List_Id := Source_Dirs.Values;
-               Element    : String_Element;
+               Index : Positive := First;
 
             begin
-               --  We will find the source directories for each
-               --  element of the list
-
-               while Source_Dir /= Nil_String loop
-                  Element := String_Elements.Table (Source_Dir);
-                  Find_Source_Dirs (Element.Value, Element.Location);
-                  Source_Dir := Element.Next;
-               end loop;
-            end;
-         end if;
-
-         if Current_Verbosity = High then
-            Write_Line ("Putting source directories in canonical cases");
-         end if;
+               while Index <= Last - Name_Len + 1 loop
 
-         declare
-            Current : String_List_Id := Data.Source_Dirs;
-            Element : String_Element;
+                  if File (Index .. Index + Name_Len - 1) =
+                    Name_Buffer (1 .. Name_Len)
+                  then
+                     File (Index) := '.';
 
-         begin
-            while Current /= Nil_String loop
-               Element := String_Elements.Table (Current);
-               if Element.Value /= No_Name then
-                  Get_Name_String (Element.Value);
-                  Canonical_Case_File_Name (Name_Buffer (1 .. Name_Len));
-                  Element.Value := Name_Find;
-                  String_Elements.Table (Current) := Element;
-               end if;
+                     if Name_Len > 1 and then Index < Last then
+                        File (Index + 1 .. Last - Name_Len + 1) :=
+                          File (Index + Name_Len .. Last);
+                     end if;
 
-               Current := Element.Next;
-            end loop;
-         end;
-      end;
+                     Last := Last - Name_Len + 1;
+                  end if;
 
-      --  Library attributes
+                  Index := Index + 1;
+               end loop;
+            end;
+         end if;
 
-      declare
-         Attributes : constant Prj.Variable_Id := Data.Decl.Attributes;
+         --  Check if the casing is right
 
-         Lib_Dir : constant Prj.Variable_Value :=
-                     Prj.Util.Value_Of (Snames.Name_Library_Dir, Attributes);
+         declare
+            Src      : String := File (First .. Last);
+            Src_Last : Positive := Last;
 
-         Lib_Name : constant Prj.Variable_Value :=
-                      Prj.Util.Value_Of (Snames.Name_Library_Name, Attributes);
+         begin
+            case Naming.Casing is
+               when All_Lower_Case =>
+                  Fixed.Translate
+                    (Source  => Src,
+                     Mapping => Lower_Case_Map);
 
-         Lib_Version : constant Prj.Variable_Value :=
-                         Prj.Util.Value_Of
-                           (Snames.Name_Library_Version, Attributes);
+               when All_Upper_Case =>
+                  Fixed.Translate
+                    (Source  => Src,
+                     Mapping => Upper_Case_Map);
 
-         The_Lib_Kind : constant Prj.Variable_Value :=
-                          Prj.Util.Value_Of
-                            (Snames.Name_Library_Kind, Attributes);
+               when Mixed_Case | Unknown =>
+                  null;
+            end case;
 
-      begin
-         --  Special case of extending project
+            if Src /= File (First .. Last) then
+               if Current_Verbosity = High then
+                  Write_Line ("   Not a valid file name (casing).");
+               end if;
 
-         if Data.Extends /= No_Project then
-            declare
-               Extended_Data : constant Project_Data :=
-                 Projects.Table (Data.Extends);
+               Unit_Name := No_Name;
+               return;
+            end if;
 
-            begin
-               --  If the project extended is a library project, we inherit
-               --  the library name, if it is not redefined; we check that
-               --  the library directory is specified; and we reset the
-               --  library flag for the extended project.
-
-               if Extended_Data.Library then
-                  if Lib_Name.Default then
-                     Data.Library_Name := Extended_Data.Library_Name;
-                  end if;
+            --  We put the name in lower case
 
-                  if Lib_Dir.Default then
+            Fixed.Translate
+              (Source  => Src,
+               Mapping => Lower_Case_Map);
 
-                     --  If the extending project is a virtual project, we
-                     --  put the error message in the library project that
-                     --  is extended, rather than in the extending all project.
-                     --  Of course, we cannot put it in the virtual extending
-                     --  project, because it has no source.
+            --  In the standard GNAT naming scheme, check for special cases:
+            --  children or separates of A, G, I or S, and run time sources.
 
-                     if Data.Virtual then
-                        Error_Msg_Name_1 := Extended_Data.Name;
+            if Standard_GNAT and then Src'Length >= 3 then
+               declare
+                  S1 : constant Character := Src (Src'First);
+                  S2 : constant Character := Src (Src'First + 1);
+                  S3 : constant Character := Src (Src'First + 2);
 
-                        Error_Msg
-                          (Project,
-                           "library project % cannot be virtually extended",
-                           Extended_Data.Location);
+               begin
+                  if S1 = 'a' or else
+                     S1 = 'g' or else
+                     S1 = 'i' or else
+                     S1 = 's'
+                  then
+                     --  Children or separates of packages A, G, I or S. These
+                     --  names are x__ ... or x~... (where x is a, g, i, or s).
+                     --  Both versions (x__... and x~...) are allowed in all
+                     --  platforms, because it is not possible to know the
+                     --  platform before processing of the project files.
 
-                     else
-                        Error_Msg
-                          (Project,
-                           "a project extending a library project must " &
-                           "specify an attribute Library_Dir",
-                           Data.Location);
-                     end if;
-                  end if;
+                     if S2 = '_' and then S3 = '_' then
+                        Src (Src'First + 1) := '.';
+                        Src_Last := Src_Last - 1;
+                        Src (Src'First + 2 .. Src_Last) :=
+                          Src (Src'First + 3 .. Src_Last + 1);
 
-                  Projects.Table (Data.Extends).Library := False;
-               end if;
-            end;
-         end if;
+                     elsif S2 = '~' then
+                        Src (Src'First + 1) := '.';
 
-         pragma Assert (Lib_Dir.Kind = Single);
+                     --  If it is potentially a run time source, disable
+                     --  filling of the mapping file to avoid warnings.
 
-         if Lib_Dir.Value = Empty_String then
+                     elsif S2 = '.' then
+                        Set_Mapping_File_Initial_State_To_Empty;
+                     end if;
+                  end if;
+               end;
+            end if;
 
             if Current_Verbosity = High then
-               Write_Line ("No library directory");
+               Write_Str  ("      ");
+               Write_Line (Src (Src'First .. Src_Last));
             end if;
 
-         else
-            --  Find path name, check that it is a directory, and attempt
-            --  to create it if setting up projects (gnat setup).
-
-            Locate_Directory
-              (Lib_Dir.Value, Data.Display_Directory,
-               Data.Library_Dir, Data.Display_Library_Dir,
-               Project => Project, Kind => "library",
-               Location => Lib_Dir.Location);
+            --  Now, we check if this name is a valid unit name
 
-            if not Setup_Projects and then Data.Library_Dir = No_Name then
+            Check_Ada_Name
+              (Name => Src (Src'First .. Src_Last), Unit => Unit_Name);
+         end;
 
-               --  Get the absolute name of the library directory that
-               --  does not exist, to report an error.
+      end;
+   end Get_Unit;
 
-               declare
-                  Dir_Name : constant String :=
-                    Get_Name_String (Lib_Dir.Value);
-               begin
-                  if Is_Absolute_Path (Dir_Name) then
-                     Err_Vars.Error_Msg_Name_1 := Lib_Dir.Value;
+   ----------
+   -- Hash --
+   ----------
 
-                  else
-                     Get_Name_String (Data.Display_Directory);
+   function Hash (Unit : Unit_Info) return Header_Num is
+   begin
+      return Header_Num (Unit.Unit mod 2048);
+   end Hash;
 
-                     if Name_Buffer (Name_Len) /= Directory_Separator then
-                        Name_Len := Name_Len + 1;
-                        Name_Buffer (Name_Len) := Directory_Separator;
-                     end if;
+   -----------------------
+   -- Is_Illegal_Suffix --
+   -----------------------
 
-                     Name_Buffer
-                       (Name_Len + 1 .. Name_Len + Dir_Name'Length) :=
-                       Dir_Name;
-                     Name_Len := Name_Len + Dir_Name'Length;
-                     Err_Vars.Error_Msg_Name_1 := Name_Find;
-                  end if;
+   function Is_Illegal_Suffix
+     (Suffix                          : String;
+      Dot_Replacement_Is_A_Single_Dot : Boolean) return Boolean
+   is
+   begin
+      if Suffix'Length = 0 or else Index (Suffix, ".") = 0 then
+         return True;
+      end if;
 
-                  --  Report the error
+      --  If dot replacement is a single dot, and first character of
+      --  suffix is also a dot
 
-                  Error_Msg
-                    (Project,
-                     "library directory { does not exist",
-                     Lib_Dir.Location);
-               end;
+      if Dot_Replacement_Is_A_Single_Dot
+        and then Suffix (Suffix'First) = '.'
+      then
+         for Index in Suffix'First + 1 .. Suffix'Last loop
 
-            elsif Data.Library_Dir = Data.Object_Directory then
-               Error_Msg
-                 (Project,
-                  "library directory cannot be the same " &
-                  "as object directory",
-                  Lib_Dir.Location);
-               Data.Library_Dir := No_Name;
-               Data.Display_Library_Dir := No_Name;
+            --  If there is another dot
 
-            else
-               if Current_Verbosity = High then
-                  Write_Str ("Library directory =""");
-                  Write_Str (Get_Name_String (Data.Display_Library_Dir));
-                  Write_Line ("""");
-               end if;
-            end if;
-         end if;
+            if Suffix (Index) = '.' then
 
-         pragma Assert (Lib_Name.Kind = Single);
+               --  It is illegal to have a letter following the initial dot
 
-         if Lib_Name.Value = Empty_String then
-            if Current_Verbosity = High
-              and then Data.Library_Name = No_Name
-            then
-               Write_Line ("No library name");
+               return Is_Letter (Suffix (Suffix'First + 1));
             end if;
+         end loop;
+      end if;
 
-         else
-            --  There is no restriction on the syntax of library names
-
-            Data.Library_Name := Lib_Name.Value;
-         end if;
-
-         if Data.Library_Name /= No_Name
-           and then Current_Verbosity = High
-         then
-            Write_Str ("Library name = """);
-            Write_Str (Get_Name_String (Data.Library_Name));
-            Write_Line ("""");
-         end if;
-
-         Data.Library :=
-           Data.Library_Dir /= No_Name
-             and then
-           Data.Library_Name /= No_Name;
+      --  Everything is OK
 
-         if Data.Library then
-            if MLib.Tgt.Support_For_Libraries = MLib.Tgt.None then
-               Error_Msg
-                 (Project,
-                  "?libraries are not supported on this platform",
-                  Lib_Name.Location);
-               Data.Library := False;
+      return False;
+   end Is_Illegal_Suffix;
 
-            else
-               pragma Assert (Lib_Version.Kind = Single);
+   ----------------------
+   -- Locate_Directory --
+   ----------------------
 
-               if Lib_Version.Value = Empty_String then
-                  if Current_Verbosity = High then
-                     Write_Line ("No library version specified");
-                  end if;
+   procedure Locate_Directory
+     (Project  : Project_Id;
+      In_Tree  : Project_Tree_Ref;
+      Name     : File_Name_Type;
+      Parent   : Path_Name_Type;
+      Dir      : out Path_Name_Type;
+      Display  : out Path_Name_Type;
+      Create   : String := "";
+      Location : Source_Ptr := No_Location)
+   is
+      The_Name : constant String := Get_Name_String (Name);
 
-               else
-                  Data.Lib_Internal_Name := Lib_Version.Value;
-               end if;
+      The_Parent : constant String :=
+                          Get_Name_String (Parent) & Directory_Separator;
 
-               pragma Assert (The_Lib_Kind.Kind = Single);
+      The_Parent_Last : constant Natural :=
+                          Compute_Directory_Last (The_Parent);
 
-               if The_Lib_Kind.Value = Empty_String then
-                  if Current_Verbosity = High then
-                     Write_Line ("No library kind specified");
-                  end if;
+      Full_Name : File_Name_Type;
 
-               else
-                  Get_Name_String (The_Lib_Kind.Value);
+   begin
+      if Current_Verbosity = High then
+         Write_Str ("Locate_Directory (""");
+         Write_Str (The_Name);
+         Write_Str (""", """);
+         Write_Str (The_Parent);
+         Write_Line (""")");
+      end if;
 
-                  declare
-                     Kind_Name : constant String :=
-                                   To_Lower (Name_Buffer (1 .. Name_Len));
+      Dir     := No_Path;
+      Display := No_Path;
 
-                     OK : Boolean := True;
+      if Is_Absolute_Path (The_Name) then
+         Full_Name := Name;
 
-                  begin
-                     if Kind_Name = "static" then
-                        Data.Library_Kind := Static;
+      else
+         Name_Len := 0;
+         Add_Str_To_Name_Buffer
+           (The_Parent (The_Parent'First .. The_Parent_Last));
+         Add_Str_To_Name_Buffer (The_Name);
+         Full_Name := Name_Find;
+      end if;
 
-                     elsif Kind_Name = "dynamic" then
-                        Data.Library_Kind := Dynamic;
+      declare
+         Full_Path_Name : constant String := Get_Name_String (Full_Name);
 
-                     elsif Kind_Name = "relocatable" then
-                        Data.Library_Kind := Relocatable;
+      begin
+         if Setup_Projects and then Create'Length > 0
+           and then not Is_Directory (Full_Path_Name)
+         then
+            begin
+               Create_Path (Full_Path_Name);
 
-                     else
-                        Error_Msg
-                          (Project,
-                           "illegal value for Library_Kind",
-                           The_Lib_Kind.Location);
-                        OK := False;
-                     end if;
+               if not Quiet_Output then
+                  Write_Str (Create);
+                  Write_Str (" directory """);
+                  Write_Str (Full_Path_Name);
+                  Write_Line (""" created");
+               end if;
 
-                     if Current_Verbosity = High and then OK then
-                        Write_Str ("Library kind = ");
-                        Write_Line (Kind_Name);
-                     end if;
+            exception
+               when Use_Error =>
+                  Error_Msg
+                    (Project, In_Tree,
+                     "could not create " & Create &
+                     " directory " & Full_Path_Name,
+                     Location);
+            end;
+         end if;
+         if Is_Directory (Full_Path_Name) then
+            declare
+               Normed : constant String :=
+                          Normalize_Pathname
+                            (Full_Path_Name,
+                             Resolve_Links  => False,
+                             Case_Sensitive => True);
 
-                     if Data.Library_Kind /= Static and then
-                       MLib.Tgt.Support_For_Libraries = MLib.Tgt.Static_Only
-                     then
-                        Error_Msg
-                          (Project,
-                           "only static libraries are supported " &
-                           "on this platform",
-                          The_Lib_Kind.Location);
-                        Data.Library := False;
-                     end if;
-                  end;
-               end if;
+               Canonical_Path : constant String :=
+                                  Normalize_Pathname
+                                    (Normed,
+                                     Resolve_Links  => True,
+                                     Case_Sensitive => False);
 
-               if Data.Library and then Current_Verbosity = High then
-                  Write_Line ("This is a library project file");
-               end if;
+            begin
+               Name_Len := Normed'Length;
+               Name_Buffer (1 .. Name_Len) := Normed;
+               Display := Name_Find;
 
-            end if;
+               Name_Len := Canonical_Path'Length;
+               Name_Buffer (1 .. Name_Len) := Canonical_Path;
+               Dir := Name_Find;
+            end;
          end if;
       end;
+   end Locate_Directory;
 
-      if Current_Verbosity = High then
-         Show_Source_Dirs (Project);
-      end if;
-
-      declare
-         Naming_Id : constant Package_Id :=
-                       Util.Value_Of (Name_Naming, Data.Decl.Packages);
+   ----------------------
+   -- Look_For_Sources --
+   ----------------------
 
-         Naming    : Package_Element;
+   procedure Look_For_Sources
+     (Project      : Project_Id;
+      In_Tree      : Project_Tree_Ref;
+      Data         : in out Project_Data;
+      Follow_Links : Boolean)
+   is
+      procedure Get_Path_Names_And_Record_Sources (Follow_Links : Boolean);
+      --  Find the path names of the source files in the Source_Names table
+      --  in the source directories and record those that are Ada sources.
 
-      begin
-         --  If there is a package Naming, we will put in Data.Naming
-         --  what is in this package Naming.
+      procedure Get_Sources_From_File
+        (Path     : String;
+         Location : Source_Ptr);
+      --  Get the sources of a project from a text file
 
-         if Naming_Id /= No_Package then
-            Naming := Packages.Table (Naming_Id);
+      ---------------------------------------
+      -- Get_Path_Names_And_Record_Sources --
+      ---------------------------------------
 
-            if Current_Verbosity = High then
-               Write_Line ("Checking ""Naming"".");
-            end if;
+      procedure Get_Path_Names_And_Record_Sources (Follow_Links : Boolean) is
+         Source_Dir : String_List_Id := Data.Source_Dirs;
+         Element    : String_Element;
+         Path       : File_Name_Type;
 
-            --  Check Spec_Suffix
+         Dir             : Dir_Type;
+         Name            : File_Name_Type;
+         Canonical_Name  : File_Name_Type;
+         Name_Str        : String (1 .. 1_024);
+         Last            : Natural := 0;
+         NL              : Name_Location;
 
-            declare
-               Spec_Suffixs : Array_Element_Id :=
-                                Util.Value_Of
-                                  (Name_Spec_Suffix,
-                                   Naming.Decl.Arrays);
-               Suffix  : Array_Element_Id;
-               Element : Array_Element;
-               Suffix2 : Array_Element_Id;
+         Current_Source  : String_List_Id := Nil_String;
 
-            begin
-               --  If some suffixs have been specified, we make sure that
-               --  for each language for which a default suffix has been
-               --  specified, there is a suffix specified, either the one
-               --  in the project file or if there were none, the default.
-
-               if Spec_Suffixs /= No_Array_Element then
-                  Suffix := Data.Naming.Spec_Suffix;
-
-                  while Suffix /= No_Array_Element loop
-                     Element := Array_Elements.Table (Suffix);
-                     Suffix2 := Spec_Suffixs;
-
-                     while Suffix2 /= No_Array_Element loop
-                        exit when Array_Elements.Table (Suffix2).Index =
-                          Element.Index;
-                        Suffix2 := Array_Elements.Table (Suffix2).Next;
-                     end loop;
+         First_Error     : Boolean := True;
 
-                     --  There is a registered default suffix, but no
-                     --  suffix specified in the project file.
-                     --  Add the default to the array.
-
-                     if Suffix2 = No_Array_Element then
-                        Array_Elements.Increment_Last;
-                        Array_Elements.Table (Array_Elements.Last) :=
-                          (Index     => Element.Index,
-                           Src_Index => Element.Src_Index,
-                           Index_Case_Sensitive => False,
-                           Value     => Element.Value,
-                           Next      => Spec_Suffixs);
-                        Spec_Suffixs := Array_Elements.Last;
-                     end if;
+         Source_Recorded : Boolean := False;
 
-                     Suffix := Element.Next;
-                  end loop;
+      begin
+         --  We look in all source directories for the file names in the
+         --  hash table Source_Names
 
-                  --  Put the resulting array as the specification suffixs
+         while Source_Dir /= Nil_String loop
+            Source_Recorded := False;
+            Element := In_Tree.String_Elements.Table (Source_Dir);
 
-                  Data.Naming.Spec_Suffix := Spec_Suffixs;
+            declare
+               Dir_Path : constant String :=
+                            Get_Name_String (Element.Display_Value);
+            begin
+               if Current_Verbosity = High then
+                  Write_Str ("checking directory """);
+                  Write_Str (Dir_Path);
+                  Write_Line ("""");
                end if;
-            end;
 
-            declare
-               Current : Array_Element_Id := Data.Naming.Spec_Suffix;
-               Element : Array_Element;
+               Open (Dir, Dir_Path);
 
-            begin
-               while Current /= No_Array_Element loop
-                  Element := Array_Elements.Table (Current);
-                  Get_Name_String (Element.Value.Value);
+               loop
+                  Read (Dir, Name_Str, Last);
+                  exit when Last = 0;
 
-                  if Name_Len = 0 then
-                     Error_Msg
-                       (Project,
-                        "Spec_Suffix cannot be empty",
-                        Element.Value.Location);
-                  end if;
+                  Name_Len := Last;
+                  Name_Buffer (1 .. Name_Len) := Name_Str (1 .. Last);
+                  Name := Name_Find;
 
-                  Array_Elements.Table (Current) := Element;
-                  Current := Element.Next;
-               end loop;
-            end;
+                  Canonical_Case_File_Name (Name_Str (1 .. Last));
+                  Name_Buffer (1 .. Name_Len) := Name_Str (1 .. Last);
+                  Canonical_Name := Name_Find;
 
-            --  Check Body_Suffix
+                  NL := Source_Names.Get (Canonical_Name);
 
-            declare
-               Impl_Suffixs : Array_Element_Id :=
-                                Util.Value_Of
-                                  (Name_Body_Suffix,
-                                   Naming.Decl.Arrays);
+                  if NL /= No_Name_Location and then not NL.Found then
+                     NL.Found := True;
+                     Source_Names.Set (Canonical_Name, NL);
+                     Name_Len := Dir_Path'Length;
+                     Name_Buffer (1 .. Name_Len) := Dir_Path;
 
-               Suffix  : Array_Element_Id;
-               Element : Array_Element;
-               Suffix2 : Array_Element_Id;
+                     if Name_Buffer (Name_Len) /= Directory_Separator then
+                        Add_Char_To_Name_Buffer (Directory_Separator);
+                     end if;
 
-            begin
-               --  If some suffixs have been specified, we make sure that
-               --  for each language for which a default suffix has been
-               --  specified, there is a suffix specified, either the one
-               --  in the project file or if there were noe, the default.
-
-               if Impl_Suffixs /= No_Array_Element then
-                  Suffix := Data.Naming.Body_Suffix;
-
-                  while Suffix /= No_Array_Element loop
-                     Element := Array_Elements.Table (Suffix);
-                     Suffix2 := Impl_Suffixs;
-
-                     while Suffix2 /= No_Array_Element loop
-                        exit when Array_Elements.Table (Suffix2).Index =
-                          Element.Index;
-                        Suffix2 := Array_Elements.Table (Suffix2).Next;
-                     end loop;
+                     Add_Str_To_Name_Buffer (Name_Str (1 .. Last));
+                     Path := Name_Find;
 
-                     --  There is a registered default suffix, but no
-                     --  suffix specified in the project file.
-                     --  Add the default to the array.
-
-                     if Suffix2 = No_Array_Element then
-                        Array_Elements.Increment_Last;
-                        Array_Elements.Table (Array_Elements.Last) :=
-                          (Index => Element.Index,
-                           Src_Index => Element.Src_Index,
-                           Index_Case_Sensitive => False,
-                           Value => Element.Value,
-                           Next  => Impl_Suffixs);
-                        Impl_Suffixs := Array_Elements.Last;
+                     if Current_Verbosity = High then
+                        Write_Str  ("  found ");
+                        Write_Line (Get_Name_String (Name));
                      end if;
 
-                     Suffix := Element.Next;
-                  end loop;
+                     --  Register the source if it is an Ada compilation unit
 
-                  --  Put the resulting array as the implementation suffixs
+                     Record_Ada_Source
+                       (File_Name       => Name,
+                        Path_Name       => Path,
+                        Project         => Project,
+                        In_Tree         => In_Tree,
+                        Data            => Data,
+                        Location        => NL.Location,
+                        Current_Source  => Current_Source,
+                        Source_Recorded => Source_Recorded,
+                        Follow_Links    => Follow_Links);
+                  end if;
+               end loop;
 
-                  Data.Naming.Body_Suffix := Impl_Suffixs;
-               end if;
+               Close (Dir);
             end;
 
-            declare
-               Current : Array_Element_Id := Data.Naming.Body_Suffix;
-               Element : Array_Element;
+            if Source_Recorded then
+               In_Tree.String_Elements.Table (Source_Dir).Flag := True;
+            end if;
 
-            begin
-               while Current /= No_Array_Element loop
-                  Element := Array_Elements.Table (Current);
-                  Get_Name_String (Element.Value.Value);
+            Source_Dir := Element.Next;
+         end loop;
 
-                  if Name_Len = 0 then
-                     Error_Msg
-                       (Project,
-                        "Body_Suffix cannot be empty",
-                        Element.Value.Location);
-                  end if;
+         --  It is an error if a source file name in a source list or
+         --  in a source list file is not found.
 
-                  Array_Elements.Table (Current) := Element;
-                  Current := Element.Next;
-               end loop;
-            end;
+         NL := Source_Names.Get_First;
 
-            --  Get the exceptions, if any
+         while NL /= No_Name_Location loop
+            if not NL.Found then
+               Err_Vars.Error_Msg_File_1 := NL.Name;
 
-            Data.Naming.Specification_Exceptions :=
-              Util.Value_Of
-                (Name_Specification_Exceptions,
-                 In_Arrays => Naming.Decl.Arrays);
+               if First_Error then
+                  Error_Msg
+                    (Project, In_Tree,
+                     "source file { cannot be found",
+                     NL.Location);
+                  First_Error := False;
 
-            Data.Naming.Implementation_Exceptions :=
-              Util.Value_Of
-                (Name_Implementation_Exceptions,
-                 In_Arrays => Naming.Decl.Arrays);
-         end if;
-      end;
+               else
+                  Error_Msg
+                    (Project, In_Tree,
+                     "\source file { cannot be found",
+                     NL.Location);
+               end if;
+            end if;
 
-      Projects.Table (Project) := Data;
-   end Language_Independent_Check;
+            NL := Source_Names.Get_Next;
+         end loop;
+      end Get_Path_Names_And_Record_Sources;
 
-   ----------------------
-   -- Locate_Directory --
-   ----------------------
+      ---------------------------
+      -- Get_Sources_From_File --
+      ---------------------------
 
-   procedure Locate_Directory
-     (Name     : Name_Id;
-      Parent   : Name_Id;
-      Dir      : out Name_Id;
-      Display  : out Name_Id;
-      Project  : Project_Id := No_Project;
-      Kind     : String := "";
-      Location : Source_Ptr := No_Location)
-   is
-      The_Name   : constant String := Get_Name_String (Name);
-      The_Parent : constant String :=
-                     Get_Name_String (Parent) & Directory_Separator;
-      The_Parent_Last : constant Natural :=
-                     Compute_Directory_Last (The_Parent);
+      procedure Get_Sources_From_File
+        (Path     : String;
+         Location : Source_Ptr)
+      is
+      begin
+         --  Get the list of sources from the file and put them in hash table
+         --  Source_Names.
 
-      procedure Create_Directory (Absolute_Path : String);
-      --  Attempt to create a new directory
+         Get_Sources_From_File (Path, Location, Project, In_Tree);
 
-      procedure Get_Names_For (Absolute_Path : String);
-      --  Create name ids Dir and Display for directory Absolute_Path
+         --  Look in the source directories to find those sources
 
-      ----------------------
-      -- Create_Directory --
-      ----------------------
+         Get_Path_Names_And_Record_Sources (Follow_Links);
 
-      procedure Create_Directory (Absolute_Path : String) is
-      begin
-         --  Attempt to create the directory
+         --  We should have found at least one source.
+         --  If not, report an error/warning.
 
-         Make_Dir (Absolute_Path);
+         if Data.Sources = Nil_String then
+            Report_No_Ada_Sources (Project, In_Tree, Location);
+         end if;
+      end Get_Sources_From_File;
 
-         --  Setup Dir and Display if creation was successful
+   begin
+      if Data.Ada_Sources_Present then
+         declare
+            Sources          : constant Variable_Value :=
+                                 Util.Value_Of
+                                   (Name_Source_Files,
+                                    Data.Decl.Attributes,
+                                    In_Tree);
+
+            Source_List_File : constant Variable_Value :=
+                                 Util.Value_Of
+                                   (Name_Source_List_File,
+                                    Data.Decl.Attributes,
+                                    In_Tree);
+
+            Locally_Removed  : constant Variable_Value :=
+                                 Util.Value_Of
+                                   (Name_Locally_Removed_Files,
+                                    Data.Decl.Attributes,
+                                    In_Tree);
 
-         Get_Names_For (Absolute_Path);
+         begin
+            pragma Assert
+              (Sources.Kind = List,
+               "Source_Files is not a list");
 
-      exception
-         when Directory_Error =>
-            Error_Msg
-              (Project,
-               "could not create " & Kind & " directory """ &
-               Absolute_Path & """",
-               Location);
-      end Create_Directory;
+            pragma Assert
+              (Source_List_File.Kind = Single,
+               "Source_List_File is not a single string");
 
-      -------------------
-      -- Get_Names_For --
-      -------------------
+            if not Sources.Default then
+               if not Source_List_File.Default then
+                  Error_Msg
+                    (Project, In_Tree,
+                     "?both variables source_files and " &
+                     "source_list_file are present",
+                     Source_List_File.Location);
+               end if;
 
-      procedure Get_Names_For (Absolute_Path : String) is
-         Normed         : constant String :=
-                            Normalize_Pathname
-                              (Absolute_Path,
-                               Resolve_Links  => False,
-                               Case_Sensitive => True);
+               --  Sources is a list of file names
 
-         Canonical_Path : constant String :=
-                            Normalize_Pathname
-                              (Normed,
-                               Resolve_Links  => True,
-                               Case_Sensitive => False);
+               declare
+                  Current  : String_List_Id := Sources.Values;
+                  Element  : String_Element;
+                  Location : Source_Ptr;
+                  Name     : File_Name_Type;
 
-      begin
-         Name_Len := Normed'Length;
-         Name_Buffer (1 .. Name_Len) := Normed;
-         Display := Name_Find;
+               begin
+                  Source_Names.Reset;
 
-         Name_Len := Canonical_Path'Length;
-         Name_Buffer (1 .. Name_Len) := Canonical_Path;
-         Dir := Name_Find;
-      end Get_Names_For;
+                  Data.Ada_Sources_Present := Current /= Nil_String;
 
-   --  Start of processing for Locate_Directory
+                  while Current /= Nil_String loop
+                     Element := In_Tree.String_Elements.Table (Current);
+                     Get_Name_String (Element.Value);
+                     Canonical_Case_File_Name (Name_Buffer (1 .. Name_Len));
+                     Name := Name_Find;
 
-   begin
-      if Current_Verbosity = High then
-         Write_Str ("Locate_Directory (""");
-         Write_Str (The_Name);
-         Write_Str (""", """);
-         Write_Str (The_Parent);
-         Write_Line (""")");
-      end if;
+                     --  If the element has no location, then use the
+                     --  location of Sources to report possible errors.
 
-      Dir     := No_Name;
-      Display := No_Name;
+                     if Element.Location = No_Location then
+                        Location := Sources.Location;
+                     else
+                        Location := Element.Location;
+                     end if;
 
-      if Is_Absolute_Path (The_Name) then
-         if Is_Directory (The_Name) then
-            Get_Names_For (The_Name);
+                     Source_Names.Set
+                       (K => Name,
+                        E =>
+                          (Name     => Name,
+                           Location => Location,
+                           Found    => False));
 
-         elsif Kind /= "" and then Setup_Projects then
-            Create_Directory (The_Name);
-         end if;
+                     Current := Element.Next;
+                  end loop;
 
-      else
-         declare
-            Full_Path : constant String :=
-                          The_Parent (The_Parent'First .. The_Parent_Last) &
-                          The_Name;
+                  Get_Path_Names_And_Record_Sources (Follow_Links);
+               end;
 
-         begin
-            if Is_Directory (Full_Path) then
-               Get_Names_For (Full_Path);
+               --  No source_files specified
 
-            elsif Kind /= "" and then Setup_Projects then
-               Create_Directory (Full_Path);
-            end if;
-         end;
-      end if;
-   end Locate_Directory;
+               --  We check Source_List_File has been specified
 
-   ---------------------------
-   -- Other_Languages_Check --
-   ---------------------------
+            elsif not Source_List_File.Default then
 
-   procedure Other_Languages_Check
-     (Project      : Project_Id;
-      Report_Error : Put_Line_Access) is
+               --  Source_List_File is the name of the file that contains the
+               --  source file names
 
-      Data         : Project_Data;
+               declare
+                  Source_File_Path_Name : constant String :=
+                                            Path_Name_Of
+                                              (File_Name_Type
+                                                 (Source_List_File.Value),
+                                               Data.Directory);
 
-      Languages    : Variable_Value := Nil_Variable_Value;
+               begin
+                  if Source_File_Path_Name'Length = 0 then
+                     Err_Vars.Error_Msg_File_1 :=
+                       File_Name_Type (Source_List_File.Value);
 
-   begin
-      Language_Independent_Check (Project, Report_Error);
+                     Error_Msg
+                       (Project, In_Tree,
+                        "file with sources { does not exist",
+                        Source_List_File.Location);
 
-      Error_Report := Report_Error;
+                  else
+                     Get_Sources_From_File
+                       (Source_File_Path_Name,
+                        Source_List_File.Location);
+                  end if;
+               end;
 
-      Data      := Projects.Table (Project);
-      Languages := Prj.Util.Value_Of (Name_Languages, Data.Decl.Attributes);
+            else
+               --  Neither Source_Files nor Source_List_File has been
+               --  specified. Find all the files that satisfy the naming
+               --  scheme in all the source directories.
 
-      Data.Other_Sources_Present := Data.Source_Dirs /= Nil_String;
+               Find_Sources
+                 (Project, In_Tree, Data, Ada_Language_Index, Follow_Links);
+            end if;
 
-      if Data.Other_Sources_Present then
-         --  Check if languages other than Ada are specified in this project
+            --  If there are sources that are locally removed, mark them as
+            --  such in the Units table.
 
-         if Languages.Default then
-            --  Attribute Languages is not specified. So, it defaults to
-            --  a project of language Ada only.
+            if not Locally_Removed.Default then
+               declare
+                  Current  : String_List_Id;
+                  Element  : String_Element;
+                  Location : Source_Ptr;
+                  OK       : Boolean;
+                  Unit     : Unit_Data;
+                  Name     : File_Name_Type;
+                  Extended : Project_Id;
 
-            Data.Languages (Lang_Ada) := True;
+               begin
+                  Current := Locally_Removed.Values;
+                  while Current /= Nil_String loop
+                     Element :=
+                       In_Tree.String_Elements.Table (Current);
+                     Get_Name_String (Element.Value);
+                     Canonical_Case_File_Name (Name_Buffer (1 .. Name_Len));
+                     Name := Name_Find;
+
+                     --  If the element has no location, then use the
+                     --  location of Locally_Removed to report
+                     --  possible errors.
+
+                     if Element.Location = No_Location then
+                        Location := Locally_Removed.Location;
+                     else
+                        Location := Element.Location;
+                     end if;
 
-            --  No sources of languages other than Ada
+                     OK := False;
 
-            Data.Other_Sources_Present := False;
+                     for Index in Unit_Table.First ..
+                       Unit_Table.Last (In_Tree.Units)
+                     loop
+                        Unit := In_Tree.Units.Table (Index);
 
-         else
-            declare
-               Current        : String_List_Id := Languages.Values;
-               Element        : String_Element;
-               OK             : Boolean := False;
-            begin
-               --  Assumethat there is no language other than Ada specified.
-               --  If in fact there is at least one, we will set back
-               --  Other_Sources_Present to True.
+                        if Unit.File_Names (Specification).Name = Name then
+                           OK := True;
 
-               Data.Other_Sources_Present := False;
+                           --  Check that this is from the current project or
+                           --  that the current project extends.
 
-               --  Look through all the languages specified in attribute
-               --  Languages, if any
+                           Extended := Unit.File_Names (Specification).Project;
 
-               while Current /= Nil_String loop
-                  Element := String_Elements.Table (Current);
-                  Get_Name_String (Element.Value);
-                  To_Lower (Name_Buffer (1 .. Name_Len));
-                  OK := False;
+                           if Extended = Project or else
+                              Project_Extends (Project, Extended, In_Tree)
+                           then
+                              Unit.File_Names
+                                (Specification).Path := Slash;
+                              Unit.File_Names
+                                (Specification).Needs_Pragma := False;
+                              In_Tree.Units.Table (Index) := Unit;
+                              Add_Forbidden_File_Name
+                                (Unit.File_Names (Specification).Name);
+                              exit;
 
-                  --  Check if it is a known language
+                           else
+                              Error_Msg
+                                (Project, In_Tree,
+                                 "cannot remove a source from " &
+                                 "another project",
+                                 Location);
+                           end if;
 
-                  Lang_Loop : for Lang in Programming_Language loop
-                     if
-                       Name_Buffer (1 .. Name_Len) = Lang_Names (Lang).all
-                     then
-                        --  Yes, this is a known language
+                        elsif
+                          Unit.File_Names (Body_Part).Name = Name
+                        then
+                           OK := True;
 
-                        OK := True;
+                           --  Check that this is from the current project or
+                           --  that the current project extends.
 
-                        --  Indicate the presence of this language
-                        Data.Languages (Lang) := True;
+                           Extended := Unit.File_Names
+                             (Body_Part).Project;
 
-                        --  If it is a language other than Ada, indicate that
-                        --  there should be some sources of a language other
-                        --  than Ada.
+                           if Extended = Project or else
+                              Project_Extends (Project, Extended, In_Tree)
+                           then
+                              Unit.File_Names (Body_Part).Path := Slash;
+                              Unit.File_Names (Body_Part).Needs_Pragma
+                                := False;
+                              In_Tree.Units.Table (Index) := Unit;
+                              Add_Forbidden_File_Name
+                                (Unit.File_Names (Body_Part).Name);
+                              exit;
+                           end if;
 
-                        if Lang /= Lang_Ada then
-                           Data.Other_Sources_Present := True;
                         end if;
+                     end loop;
 
-                        exit Lang_Loop;
+                     if not OK then
+                        Err_Vars.Error_Msg_File_1 := Name;
+                        Error_Msg
+                          (Project, In_Tree, "unknown file {", Location);
                      end if;
-                  end loop Lang_Loop;
-
-                  --  We don't support this language: report an error
-
-                  if not OK then
-                     Error_Msg_Name_1 := Element.Value;
-                     Error_Msg
-                       (Project,
-                        "unknown programming language {",
-                        Element.Location);
-                  end if;
 
-                  Current := Element.Next;
-               end loop;
-            end;
-         end if;
+                     Current := Element.Next;
+                  end loop;
+               end;
+            end if;
+         end;
       end if;
 
-      --  If there may be some sources, look for them
-
       if Data.Other_Sources_Present then
-         --  Set Source_Present to False. It will be set back to True whenever
-         --  a source is found.
+
+         --  Set Source_Present to False. It will be set back to True
+         --  whenever a source is found.
 
          Data.Other_Sources_Present := False;
+         for Lang in Ada_Language_Index + 1 .. Last_Language_Index loop
 
-         for Lang in Other_Programming_Language loop
             --  For each language (other than Ada) in the project file
 
-            if Data.Languages (Lang) then
+            if Is_Present (Lang, Data, In_Tree) then
+
                --  Reset the indication that there are sources of this
                --  language. It will be set back to True whenever we find a
                --  source of the language.
 
-               Data.Languages (Lang) := False;
+               Set (Lang, False, Data, In_Tree);
 
                --  First, get the source suffix for the language
 
-               Data.Impl_Suffixes (Lang) := Suffix_For (Lang, Data.Naming);
+               Set (Suffix       => Suffix_For (Lang, Data.Naming, In_Tree),
+                    For_Language => Lang,
+                    In_Project   => Data,
+                    In_Tree      => In_Tree);
 
                --  Then, deal with the naming exceptions, if any
 
@@ -4178,13 +4706,15 @@ package body Prj.Nmsc is
                declare
                   Naming_Exceptions : constant Variable_Value :=
                     Value_Of
-                      (Index     => Lang_Name_Ids (Lang),
+                      (Index     => Language_Names.Table (Lang),
                        Src_Index => 0,
-                       In_Array  => Data.Naming.Implementation_Exceptions);
-                  Element_Id : String_List_Id;
-                  Element    : String_Element;
-                  File_Id : Name_Id;
-                  Source_Found : Boolean := False;
+                       In_Array  => Data.Naming.Implementation_Exceptions,
+                       In_Tree   => In_Tree);
+                  Element_Id        : String_List_Id;
+                  Element           : String_Element;
+                  File_Id           : File_Name_Type;
+                  Source_Found      : Boolean := False;
+
                begin
                   --  If there are naming exceptions, look through them one
                   --  by one.
@@ -4193,16 +4723,20 @@ package body Prj.Nmsc is
                      Element_Id := Naming_Exceptions.Values;
 
                      while Element_Id /= Nil_String loop
-                        Element := String_Elements.Table (Element_Id);
+                        Element := In_Tree.String_Elements.Table
+                                                          (Element_Id);
                         Get_Name_String (Element.Value);
-                        Canonical_Case_File_Name (Name_Buffer (1 .. Name_Len));
+                        Canonical_Case_File_Name
+                          (Name_Buffer (1 .. Name_Len));
                         File_Id := Name_Find;
 
                         --  Put each naming exception in the Source_Names
                         --  hash table, but if there are repetition, don't
                         --  bother after the first instance.
 
-                        if Source_Names.Get (File_Id) = No_Name_Location then
+                        if
+                          Source_Names.Get (File_Id) = No_Name_Location
+                        then
                            Source_Found := True;
                            Source_Names.Set
                              (File_Id,
@@ -4220,6 +4754,7 @@ package body Prj.Nmsc is
                      if Source_Found then
                         Record_Other_Sources
                           (Project           => Project,
+                           In_Tree           => In_Tree,
                            Data              => Data,
                            Language          => Lang,
                            Naming_Exceptions => True);
@@ -4230,20 +4765,22 @@ package body Prj.Nmsc is
 
                --  Now, check if a list of sources is declared either through
                --  a string list (attribute Source_Files) or a text file
-               --  (attribute Source_List_File).
-               --  If a source list is declared, we will consider only those
-               --  naming exceptions that are on the list.
+               --  (attribute Source_List_File). If a source list is declared,
+               --  we will consider only those naming exceptions that are
+               --  on the list.
 
                declare
-                  Sources : constant Variable_Value :=
-                    Util.Value_Of
-                      (Name_Source_Files,
-                       Data.Decl.Attributes);
+                  Sources          : constant Variable_Value :=
+                                       Util.Value_Of
+                                         (Name_Source_Files,
+                                          Data.Decl.Attributes,
+                                          In_Tree);
 
                   Source_List_File : constant Variable_Value :=
-                    Util.Value_Of
-                      (Name_Source_List_File,
-                       Data.Decl.Attributes);
+                                       Util.Value_Of
+                                         (Name_Source_List_File,
+                                          Data.Decl.Attributes,
+                                          In_Tree);
 
                begin
                   pragma Assert
@@ -4257,7 +4794,7 @@ package body Prj.Nmsc is
                   if not Sources.Default then
                      if not Source_List_File.Default then
                         Error_Msg
-                          (Project,
+                          (Project, In_Tree,
                            "?both variables source_files and " &
                            "source_list_file are present",
                            Source_List_File.Location);
@@ -4266,19 +4803,20 @@ package body Prj.Nmsc is
                      --  Sources is a list of file names
 
                      declare
-                        Current        : String_List_Id := Sources.Values;
-                        Element        : String_Element;
-                        Location       : Source_Ptr;
-                        Name           : Name_Id;
+                        Current  : String_List_Id := Sources.Values;
+                        Element  : String_Element;
+                        Location : Source_Ptr;
+                        Name     : File_Name_Type;
 
                      begin
                         Source_Names.Reset;
 
-                        --  Put all the sources in the Source_Names hash
-                        --  table.
+                        --  Put all the sources in the Source_Names hash table
 
                         while Current /= Nil_String loop
-                           Element := String_Elements.Table (Current);
+                           Element :=
+                             In_Tree.String_Elements.Table
+                               (Current);
                            Get_Name_String (Element.Value);
                            Canonical_Case_File_Name
                              (Name_Buffer (1 .. Name_Len));
@@ -4289,7 +4827,6 @@ package body Prj.Nmsc is
 
                            if Element.Location = No_Location then
                               Location := Sources.Location;
-
                            else
                               Location := Element.Location;
                            end if;
@@ -4308,13 +4845,15 @@ package body Prj.Nmsc is
 
                         Record_Other_Sources
                           (Project           => Project,
+                           In_Tree           => In_Tree,
                            Data              => Data,
                            Language          => Lang,
                            Naming_Exceptions => False);
                      end;
 
-                     --  No source_files specified.
-                     --  We check if Source_List_File has been specified.
+                     --  No source_files specified
+
+                     --  We check if Source_List_File has been specified
 
                   elsif not Source_List_File.Default then
 
@@ -4324,14 +4863,16 @@ package body Prj.Nmsc is
                      declare
                         Source_File_Path_Name : constant String :=
                           Path_Name_Of
-                            (Source_List_File.Value,
+                            (File_Name_Type (Source_List_File.Value),
                              Data.Directory);
 
                      begin
                         if Source_File_Path_Name'Length = 0 then
-                           Err_Vars.Error_Msg_Name_1 := Source_List_File.Value;
+                           Err_Vars.Error_Msg_File_1 :=
+                             File_Name_Type (Source_List_File.Value);
+
                            Error_Msg
-                             (Project,
+                             (Project, In_Tree,
                               "file with sources { does not exist",
                               Source_List_File.Location);
 
@@ -4342,57 +4883,52 @@ package body Prj.Nmsc is
                            Get_Sources_From_File
                              (Source_File_Path_Name,
                               Source_List_File.Location,
-                              Project);
+                              Project, In_Tree);
 
-                           --  And look for their directories.
+                           --  And look for their directories
 
                            Record_Other_Sources
                              (Project           => Project,
+                              In_Tree           => In_Tree,
                               Data              => Data,
                               Language          => Lang,
                               Naming_Exceptions => False);
                         end if;
                      end;
 
+                  --  Neither Source_Files nor Source_List_File was specified
+
                   else
-                     --  Neither Source_Files nor Source_List_File has been
-                     --  specified. Find all the files that satisfy
-                     --  the naming scheme in all the source directories.
-                     --  All the naming exceptions that effectively exist are
-                     --  also part of the source of this language.
+                     --  Find all the files that satisfy the naming scheme in
+                     --  all the source directories. All the naming exceptions
+                     --  that effectively exist are also part of the source
+                     --  of this language.
 
-                     Find_Sources (Project, Data, Lang);
+                     Find_Sources (Project, In_Tree, Data, Lang);
                   end if;
-
                end;
             end if;
          end loop;
       end if;
-
-      --  Finally, get the mains, if any
-
-      Get_Mains (Project, Data);
-
-      Projects.Table (Project) := Data;
-
-   end Other_Languages_Check;
+   end Look_For_Sources;
 
    ------------------
    -- Path_Name_Of --
    ------------------
 
    function Path_Name_Of
-     (File_Name : Name_Id;
-      Directory : Name_Id) return String
+     (File_Name : File_Name_Type;
+      Directory : Path_Name_Type) return String
    is
-      Result : String_Access;
       The_Directory : constant String := Get_Name_String (Directory);
+      Result        : String_Access;
 
    begin
       Get_Name_String (File_Name);
-      Result := Locate_Regular_File
-        (File_Name => Name_Buffer (1 .. Name_Len),
-         Path      => The_Directory);
+      Result :=
+        Locate_Regular_File
+         (File_Name => Name_Buffer (1 .. Name_Len),
+          Path      => The_Directory);
 
       if Result = null then
          return "";
@@ -4407,33 +4943,36 @@ package body Prj.Nmsc is
    -------------------------------
 
    procedure Prepare_Ada_Naming_Exceptions
-     (List : Array_Element_Id;
-      Kind : Spec_Or_Body)
+     (List    : Array_Element_Id;
+      In_Tree : Project_Tree_Ref;
+      Kind    : Spec_Or_Body)
    is
       Current : Array_Element_Id := List;
       Element : Array_Element;
-
-      Unit : Unit_Info;
+      Unit    : Unit_Info;
 
    begin
       --  Traverse the list
 
       while Current /= No_Array_Element loop
-         Element := Array_Elements.Table (Current);
+         Element := In_Tree.Array_Elements.Table (Current);
 
          if Element.Index /= No_Name then
             Unit :=
               (Kind => Kind,
-               Unit => Element.Index,
+               Unit => Name_Id (Element.Index),
                Next => No_Ada_Naming_Exception);
             Reverse_Ada_Naming_Exceptions.Set
               (Unit, (Element.Value.Value, Element.Value.Index));
-            Unit.Next := Ada_Naming_Exceptions.Get (Element.Value.Value);
+            Unit.Next :=
+              (Ada_Naming_Exceptions.Get
+                (File_Name_Type (Element.Value.Value)));
             Ada_Naming_Exception_Table.Increment_Last;
             Ada_Naming_Exception_Table.Table
               (Ada_Naming_Exception_Table.Last) := Unit;
             Ada_Naming_Exceptions.Set
-              (Element.Value.Value, Ada_Naming_Exception_Table.Last);
+              (File_Name_Type (Element.Value.Value),
+               Ada_Naming_Exception_Table.Last);
          end if;
 
          Current := Element.Next;
@@ -4446,7 +4985,8 @@ package body Prj.Nmsc is
 
    function Project_Extends
      (Extending : Project_Id;
-      Extended  : Project_Id) return Boolean
+      Extended  : Project_Id;
+      In_Tree   : Project_Tree_Ref) return Boolean
    is
       Current : Project_Id := Extending;
    begin
@@ -4458,7 +4998,7 @@ package body Prj.Nmsc is
             return True;
          end if;
 
-         Current := Projects.Table (Current).Extends;
+         Current := In_Tree.Projects.Table (Current).Extends;
       end loop;
    end Project_Extends;
 
@@ -4467,17 +5007,19 @@ package body Prj.Nmsc is
    -----------------------
 
    procedure Record_Ada_Source
-     (File_Name       : Name_Id;
-      Path_Name       : Name_Id;
+     (File_Name       : File_Name_Type;
+      Path_Name       : File_Name_Type;
       Project         : Project_Id;
+      In_Tree         : Project_Tree_Ref;
       Data            : in out Project_Data;
       Location        : Source_Ptr;
       Current_Source  : in out String_List_Id;
       Source_Recorded : in out Boolean;
       Follow_Links    : Boolean)
    is
-      Canonical_File_Name : Name_Id;
-      Canonical_Path_Name : Name_Id;
+      Canonical_File_Name : File_Name_Type;
+      Canonical_Path_Name : File_Name_Type;
+
       Exception_Id : Ada_Naming_Exception_Id;
       Unit_Name    : Name_Id;
       Unit_Kind    : Spec_Or_Body;
@@ -4486,9 +5028,9 @@ package body Prj.Nmsc is
       Name_Index   : Name_And_Index;
       Needs_Pragma : Boolean;
 
-      The_Location    : Source_Ptr     := Location;
+      The_Location    : Source_Ptr              := Location;
       Previous_Source : constant String_List_Id := Current_Source;
-      Except_Name     : Name_And_Index := No_Name_And_Index;
+      Except_Name     : Name_And_Index          := No_Name_And_Index;
 
       Unit_Prj : Unit_Project;
 
@@ -4511,8 +5053,7 @@ package body Prj.Nmsc is
          Canonical_Path_Name := Name_Find;
       end;
 
-      --  Find out the unit name, the unit kind and if it needs
-      --  a specific SFN pragma.
+      --  Find out unit name/unit kind and if it needs a specific SFN pragma
 
       Get_Unit
         (Canonical_File_Name => Canonical_File_Name,
@@ -4532,7 +5073,6 @@ package body Prj.Nmsc is
          end if;
 
       else
-
          --  Check to see if the source has been hidden by an exception,
          --  but only if it is not an exception.
 
@@ -4569,33 +5109,37 @@ package body Prj.Nmsc is
                Unit_Index := Name_Index.Index;
                Unit_Kind  := Info.Kind;
             end if;
+
             --  Put the file name in the list of sources of the project
 
-            if not File_Name_Recorded then
-               String_Elements.Increment_Last;
-               String_Elements.Table (String_Elements.Last) :=
-                 (Value         => Canonical_File_Name,
-                  Display_Value => File_Name,
-                  Location      => No_Location,
-                  Flag          => False,
-                  Next          => Nil_String,
-                  Index         => Unit_Index);
-            end if;
+            String_Element_Table.Increment_Last (In_Tree.String_Elements);
+            In_Tree.String_Elements.Table
+              (String_Element_Table.Last
+                 (In_Tree.String_Elements)) :=
+              (Value         => Name_Id (Canonical_File_Name),
+               Display_Value => Name_Id (File_Name),
+               Location      => No_Location,
+               Flag          => False,
+               Next          => Nil_String,
+               Index         => Unit_Index);
 
             if Current_Source = Nil_String then
-               Data.Sources := String_Elements.Last;
-
+               Data.Sources :=
+                 String_Element_Table.Last (In_Tree.String_Elements);
             else
-               String_Elements.Table (Current_Source).Next :=
-                 String_Elements.Last;
+               In_Tree.String_Elements.Table (Current_Source).Next :=
+                 String_Element_Table.Last (In_Tree.String_Elements);
             end if;
 
-            Current_Source := String_Elements.Last;
+            Current_Source :=
+              String_Element_Table.Last (In_Tree.String_Elements);
 
             --  Put the unit in unit list
 
             declare
-               The_Unit      : Unit_Id := Units_Htable.Get (Unit_Name);
+               The_Unit : Unit_Id :=
+                            Units_Htable.Get (In_Tree.Units_HT, Unit_Name);
+
                The_Unit_Data : Unit_Data;
 
             begin
@@ -4609,13 +5153,18 @@ package body Prj.Nmsc is
                --  only the other unit kind (spec or body), or what is
                --  in the unit list is a unit of a project we are extending.
 
-               if The_Unit /= Prj.Com.No_Unit then
-                  The_Unit_Data := Units.Table (The_Unit);
+               if The_Unit /= No_Unit then
+                  The_Unit_Data := In_Tree.Units.Table (The_Unit);
 
-                  if The_Unit_Data.File_Names (Unit_Kind).Name = No_Name
+                  if (The_Unit_Data.File_Names (Unit_Kind).Name =
+                                                      Canonical_File_Name
+                        and then
+                          The_Unit_Data.File_Names (Unit_Kind).Path = Slash)
+                    or else The_Unit_Data.File_Names (Unit_Kind).Name = No_File
                     or else Project_Extends
                       (Data.Extends,
-                       The_Unit_Data.File_Names (Unit_Kind).Project)
+                       The_Unit_Data.File_Names (Unit_Kind).Project,
+                       In_Tree)
                   then
                      if The_Unit_Data.File_Names (Unit_Kind).Path = Slash then
                         Remove_Forbidden_File_Name
@@ -4625,7 +5174,8 @@ package body Prj.Nmsc is
                      --  Record the file name in the hash table Files_Htable
 
                      Unit_Prj := (Unit => The_Unit, Project => Project);
-                     Files_Htable.Set (Canonical_File_Name, Unit_Prj);
+                     Files_Htable.Set
+                       (In_Tree.Files_HT, Canonical_File_Name, Unit_Prj);
 
                      The_Unit_Data.File_Names (Unit_Kind) :=
                        (Name         => Canonical_File_Name,
@@ -4635,7 +5185,7 @@ package body Prj.Nmsc is
                         Display_Path => Path_Name,
                         Project      => Project,
                         Needs_Pragma => Needs_Pragma);
-                     Units.Table (The_Unit) := The_Unit_Data;
+                     In_Tree.Units.Table (The_Unit) := The_Unit_Data;
                      Source_Recorded := True;
 
                   elsif The_Unit_Data.File_Names (Unit_Kind).Project = Project
@@ -4646,9 +5196,10 @@ package body Prj.Nmsc is
                      if Previous_Source = Nil_String then
                         Data.Sources := Nil_String;
                      else
-                        String_Elements.Table (Previous_Source).Next :=
-                          Nil_String;
-                        String_Elements.Decrement_Last;
+                        In_Tree.String_Elements.Table
+                          (Previous_Source).Next := Nil_String;
+                        String_Element_Table.Decrement_Last
+                          (In_Tree.String_Elements);
                      end if;
 
                      Current_Source := Previous_Source;
@@ -4658,29 +5209,32 @@ package body Prj.Nmsc is
                      --  and the same kind (spec or body).
 
                      if The_Location = No_Location then
-                        The_Location := Projects.Table (Project).Location;
+                        The_Location :=
+                          In_Tree.Projects.Table (Project).Location;
                      end if;
 
                      Err_Vars.Error_Msg_Name_1 := Unit_Name;
-                     Error_Msg (Project, "duplicate source {", The_Location);
+                     Error_Msg
+                       (Project, In_Tree, "duplicate source %%", The_Location);
 
                      Err_Vars.Error_Msg_Name_1 :=
-                       Projects.Table
+                       In_Tree.Projects.Table
                          (The_Unit_Data.File_Names (Unit_Kind).Project).Name;
-                     Err_Vars.Error_Msg_Name_2 :=
+                     Err_Vars.Error_Msg_File_1 :=
                        The_Unit_Data.File_Names (Unit_Kind).Path;
                      Error_Msg
-                       (Project, "\   project file {, {", The_Location);
+                       (Project, In_Tree,
+                        "\\   project file %%, {", The_Location);
 
                      Err_Vars.Error_Msg_Name_1 :=
-                       Projects.Table (Project).Name;
-                     Err_Vars.Error_Msg_Name_2 := Canonical_Path_Name;
+                       In_Tree.Projects.Table (Project).Name;
+                     Err_Vars.Error_Msg_File_1 := Canonical_Path_Name;
                      Error_Msg
-                       (Project, "\   project file {, {", The_Location);
-
+                       (Project, In_Tree,
+                        "\\   project file %%, {", The_Location);
                   end if;
 
-                  --  It is a new unit, create a new record
+               --  It is a new unit, create a new record
 
                else
                   --  First, check if there is no other unit with this file
@@ -4688,25 +5242,27 @@ package body Prj.Nmsc is
                   --  Of course, we do that only for the first unit in the
                   --  source file.
 
-                  Unit_Prj := Files_Htable.Get (Canonical_File_Name);
+                  Unit_Prj := Files_Htable.Get
+                    (In_Tree.Files_HT, Canonical_File_Name);
 
                   if not File_Name_Recorded and then
                     Unit_Prj /= No_Unit_Project
                   then
-                     Error_Msg_Name_1 := File_Name;
-                     Error_Msg_Name_2 :=
-                       Projects.Table (Unit_Prj.Project).Name;
+                     Error_Msg_File_1 := File_Name;
+                     Error_Msg_Name_1 :=
+                       In_Tree.Projects.Table (Unit_Prj.Project).Name;
                      Error_Msg
-                       (Project,
-                        "{ is already a source of project {",
+                       (Project, In_Tree,
+                        "{ is already a source of project %%",
                         Location);
 
                   else
-                     Units.Increment_Last;
-                     The_Unit := Units.Last;
-                     Units_Htable.Set (Unit_Name, The_Unit);
+                     Unit_Table.Increment_Last (In_Tree.Units);
+                     The_Unit := Unit_Table.Last (In_Tree.Units);
+                     Units_Htable.Set (In_Tree.Units_HT, Unit_Name, The_Unit);
                      Unit_Prj := (Unit => The_Unit, Project => Project);
-                     Files_Htable.Set (Canonical_File_Name, Unit_Prj);
+                     Files_Htable.Set
+                       (In_Tree.Files_HT, Canonical_File_Name, Unit_Prj);
                      The_Unit_Data.Name := Unit_Name;
                      The_Unit_Data.File_Names (Unit_Kind) :=
                        (Name         => Canonical_File_Name,
@@ -4716,7 +5272,7 @@ package body Prj.Nmsc is
                         Display_Path => Path_Name,
                         Project      => Project,
                         Needs_Pragma => Needs_Pragma);
-                     Units.Table (The_Unit) := The_Unit_Data;
+                     In_Tree.Units.Table (The_Unit) := The_Unit_Data;
                      Source_Recorded := True;
                   end if;
                end if;
@@ -4734,31 +5290,31 @@ package body Prj.Nmsc is
 
    procedure Record_Other_Sources
      (Project           : Project_Id;
+      In_Tree           : Project_Tree_Ref;
       Data              : in out Project_Data;
-      Language          : Programming_Language;
+      Language          : Language_Index;
       Naming_Exceptions : Boolean)
    is
-      Source_Dir : String_List_Id := Data.Source_Dirs;
-      Element    : String_Element;
-      Path       : Name_Id;
-
-      Dir      : Dir_Type;
-      Canonical_Name : Name_Id;
-      Name_Str : String (1 .. 1_024);
-      Last     : Natural := 0;
-      NL       : Name_Location;
-
-      First_Error : Boolean := True;
-
-      Suffix : constant String :=
-        Get_Name_String (Data.Impl_Suffixes (Language));
+      Source_Dir     : String_List_Id;
+      Element        : String_Element;
+      Path           : File_Name_Type;
+      Dir            : Dir_Type;
+      Canonical_Name : File_Name_Type;
+      Name_Str       : String (1 .. 1_024);
+      Last           : Natural := 0;
+      NL             : Name_Location;
+      First_Error    : Boolean := True;
+
+      Suffix : constant String := Body_Suffix_Of (Language, Data, In_Tree);
 
    begin
+      Source_Dir := Data.Source_Dirs;
       while Source_Dir /= Nil_String loop
-         Element := String_Elements.Table (Source_Dir);
+         Element := In_Tree.String_Elements.Table (Source_Dir);
 
          declare
-            Dir_Path : constant String := Get_Name_String (Element.Value);
+            Dir_Path : constant String :=
+                         Get_Name_String (Element.Display_Value);
          begin
             if Current_Verbosity = High then
                Write_Str ("checking directory """);
@@ -4773,7 +5329,7 @@ package body Prj.Nmsc is
                end if;
 
                Write_Str (" of Language ");
-               Write_Line (Lang_Display_Names (Language).all);
+               Display_Language_Name (Language);
             end if;
 
             Open (Dir, Dir_Path);
@@ -4794,9 +5350,9 @@ package body Prj.Nmsc is
                   if NL /= No_Name_Location then
                      if NL.Found then
                         if not Data.Known_Order_Of_Source_Dirs then
-                           Error_Msg_Name_1 := Canonical_Name;
+                           Error_Msg_File_1 := Canonical_Name;
                            Error_Msg
-                             (Project,
+                             (Project, In_Tree,
                               "{ is found in several source directories",
                               NL.Location);
                         end if;
@@ -4814,6 +5370,7 @@ package body Prj.Nmsc is
                           (File_Name        => Canonical_Name,
                            Path_Name        => Path,
                            Project          => Project,
+                           In_Tree          => In_Tree,
                            Data             => Data,
                            Location         => NL.Location,
                            Language         => Language,
@@ -4831,7 +5388,6 @@ package body Prj.Nmsc is
       end loop;
 
       if not Naming_Exceptions then
-
          NL := Source_Names.Get_First;
 
          --  It is an error if a source file name in a source list or
@@ -4839,18 +5395,18 @@ package body Prj.Nmsc is
 
          while NL /= No_Name_Location loop
             if not NL.Found then
-               Err_Vars.Error_Msg_Name_1 := NL.Name;
+               Err_Vars.Error_Msg_File_1 := NL.Name;
 
                if First_Error then
                   Error_Msg
-                    (Project,
+                    (Project, In_Tree,
                      "source file { cannot be found",
                      NL.Location);
                   First_Error := False;
 
                else
                   Error_Msg
-                    (Project,
+                    (Project, In_Tree,
                      "\source file { cannot be found",
                      NL.Location);
                end if;
@@ -4866,9 +5422,10 @@ package body Prj.Nmsc is
             Source_Id : Other_Source_Id := Data.First_Other_Source;
             Prev_Id   : Other_Source_Id := No_Other_Source;
             Source    : Other_Source;
+
          begin
             while Source_Id /= No_Other_Source loop
-               Source := Other_Sources.Table (Source_Id);
+               Source := In_Tree.Other_Sources.Table (Source_Id);
 
                if Source.Language = Language
                  and then Source.Naming_Exception
@@ -4884,7 +5441,8 @@ package body Prj.Nmsc is
                      Data.First_Other_Source := Source.Next;
 
                   else
-                     Other_Sources.Table (Prev_Id).Next := Source.Next;
+                     In_Tree.Other_Sources.Table
+                       (Prev_Id).Next := Source.Next;
                   end if;
 
                   Source_Id := Source.Next;
@@ -4902,19 +5460,47 @@ package body Prj.Nmsc is
       end if;
    end Record_Other_Sources;
 
+   ---------------------------
+   -- Report_No_Ada_Sources --
+   ---------------------------
+
+   procedure Report_No_Ada_Sources
+     (Project  : Project_Id;
+      In_Tree  : Project_Tree_Ref;
+      Location : Source_Ptr)
+   is
+   begin
+      case When_No_Sources is
+         when Silent =>
+            null;
+
+         when Warning | Error =>
+            Error_Msg_Warn := When_No_Sources = Warning;
+
+            Error_Msg
+              (Project, In_Tree,
+               "<there are no Ada sources in this project",
+               Location);
+      end case;
+   end Report_No_Ada_Sources;
+
    ----------------------
    -- Show_Source_Dirs --
    ----------------------
 
-   procedure Show_Source_Dirs (Project : Project_Id) is
-      Current : String_List_Id := Projects.Table (Project).Source_Dirs;
+   procedure Show_Source_Dirs
+     (Project : Project_Id;
+      In_Tree : Project_Tree_Ref)
+   is
+      Current : String_List_Id;
       Element : String_Element;
 
    begin
       Write_Line ("Source_Dirs:");
 
+      Current := In_Tree.Projects.Table (Project).Source_Dirs;
       while Current /= Nil_String loop
-         Element := String_Elements.Table (Current);
+         Element := In_Tree.String_Elements.Table (Current);
          Write_Str  ("   ");
          Write_Line (Get_Name_String (Element.Value));
          Current := Element.Next;
@@ -4928,21 +5514,35 @@ package body Prj.Nmsc is
    ----------------
 
    function Suffix_For
-     (Language : Programming_Language;
-      Naming   : Naming_Data) return Name_Id
+     (Language : Language_Index;
+      Naming   : Naming_Data;
+      In_Tree  : Project_Tree_Ref) return File_Name_Type
    is
       Suffix : constant Variable_Value :=
         Value_Of
-          (Index     => Lang_Name_Ids (Language),
+          (Index     => Language_Names.Table (Language),
            Src_Index => 0,
-           In_Array  => Naming.Body_Suffix);
+           In_Array  => Naming.Body_Suffix,
+           In_Tree   => In_Tree);
    begin
-      --  If no suffix for this language is found in package Naming, use the
-      --  default.
+      --  If no suffix for this language in package Naming, use the default
 
       if Suffix = Nil_Variable_Value then
          Name_Len := 0;
-         Add_Str_To_Name_Buffer (Lang_Suffixes (Language).all);
+
+         case Language is
+            when Ada_Language_Index =>
+               Add_Str_To_Name_Buffer (".adb");
+
+            when C_Language_Index =>
+               Add_Str_To_Name_Buffer (".c");
+
+            when C_Plus_Plus_Language_Index =>
+               Add_Str_To_Name_Buffer (".cpp");
+
+            when others =>
+               return No_File;
+         end case;
 
       --  Otherwise use the one specified
 
@@ -4954,4 +5554,74 @@ package body Prj.Nmsc is
       return Name_Find;
    end Suffix_For;
 
+   -------------------------
+   -- Warn_If_Not_Sources --
+   -------------------------
+
+   --  comments needed in this body ???
+
+   procedure Warn_If_Not_Sources
+     (Project     : Project_Id;
+      In_Tree     : Project_Tree_Ref;
+      Conventions : Array_Element_Id;
+      Specs       : Boolean;
+      Extending   : Boolean)
+   is
+      Conv          : Array_Element_Id := Conventions;
+      Unit          : Name_Id;
+      The_Unit_Id   : Unit_Id;
+      The_Unit_Data : Unit_Data;
+      Location      : Source_Ptr;
+
+   begin
+      while Conv /= No_Array_Element loop
+         Unit := In_Tree.Array_Elements.Table (Conv).Index;
+         Error_Msg_Name_1 := Unit;
+         Get_Name_String (Unit);
+         To_Lower (Name_Buffer (1 .. Name_Len));
+         Unit := Name_Find;
+         The_Unit_Id := Units_Htable.Get (In_Tree.Units_HT, Unit);
+         Location := In_Tree.Array_Elements.Table (Conv).Value.Location;
+
+         if The_Unit_Id = No_Unit then
+            Error_Msg
+              (Project, In_Tree,
+               "?unknown unit %%",
+               Location);
+
+         else
+            The_Unit_Data := In_Tree.Units.Table (The_Unit_Id);
+            Error_Msg_Name_2 :=
+              In_Tree.Array_Elements.Table (Conv).Value.Value;
+
+            if Specs then
+               if not Check_Project
+                 (The_Unit_Data.File_Names (Specification).Project,
+                  Project, In_Tree, Extending)
+               then
+                  Error_Msg
+                    (Project, In_Tree,
+                     "?source of spec of unit %% (%%)" &
+                     " cannot be found in this project",
+                     Location);
+               end if;
+
+            else
+               if not Check_Project
+                 (The_Unit_Data.File_Names (Body_Part).Project,
+                  Project, In_Tree, Extending)
+               then
+                  Error_Msg
+                    (Project, In_Tree,
+                     "?source of body of unit %% (%%)" &
+                     " cannot be found in this project",
+                     Location);
+               end if;
+            end if;
+         end if;
+
+         Conv := In_Tree.Array_Elements.Table (Conv).Next;
+      end loop;
+   end Warn_If_Not_Sources;
+
 end Prj.Nmsc;