OSDN Git Service

2009-04-24 Ed Schonberg <schonberg@adacore.com>
[pf3gnuchains/gcc-fork.git] / gcc / ada / prj-nmsc.adb
index fcdaf67..7c3677b 100644 (file)
 --                                                                          --
 --                                 B o d y                                  --
 --                                                                          --
---          Copyright (C) 2000-2005 Free Software Foundation, Inc.          --
+--          Copyright (C) 2000-2009, 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- --
--- ware  Foundation;  either version 2,  or (at your option) any later ver- --
+-- ware  Foundation;  either version 3,  or (at your option) any later ver- --
 -- sion.  GNAT is distributed in the hope that it will be useful, but WITH- --
 -- OUT ANY WARRANTY;  without even the  implied warranty of MERCHANTABILITY --
 -- 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.                                                      --
+-- Public License  distributed with GNAT; see file COPYING3.  If not, go to --
+-- http://www.gnu.org/licenses for a complete copy of the license.          --
 --                                                                          --
 -- GNAT was originally developed  by the GNAT team at  New York University. --
 -- Extensive contributions were provided by Ada Core Technologies Inc.      --
 --                                                                          --
 ------------------------------------------------------------------------------
 
+with GNAT.Case_Util;             use GNAT.Case_Util;
+with GNAT.Directory_Operations;  use GNAT.Directory_Operations;
+with GNAT.HTable;
+
 with Err_Vars; use Err_Vars;
 with Fmap;     use Fmap;
 with Hostparm;
 with MLib.Tgt;
-with Namet;    use Namet;
+with Opt;      use Opt;
 with Osint;    use Osint;
 with Output;   use Output;
-with MLib.Tgt; use MLib.Tgt;
 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
 
+   No_Continuation_String : aliased String := "";
+   Continuation_String    : aliased String := "\";
+   --  Used in Check_Library for continuation error messages at the same
+   --  location.
+
    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;
-   --  File suffix for object files
-
    type Name_Location is record
-      Name     : Name_Id;
+      Name     : File_Name_Type;
       Location : Source_Ptr;
+      Source   : Source_Id := No_Source;
+      Except   : Boolean := False;
       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
+   --  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 Get_Path_Names_And_Record_Sources.
+   --  Except is set to True if source is a naming exception in the project.
 
    No_Name_Location : constant Name_Location :=
-     (Name => No_Name, Location => No_Location, Found => False);
+                        (Name     => No_File,
+                         Location => No_Location,
+                         Source   => No_Source,
+                         Except   => False,
+                         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 Get_Path_Names_And_Record_Sources.
 
+   --  More documentation needed on what unit exceptions are about ???
+
+   type Unit_Exception is record
+      Name : Name_Id;
+      Spec : File_Name_Type;
+      Impl : File_Name_Type;
+   end record;
+   --  Record special naming schemes for Ada units (name of spec file and name
+   --  of implementation file).
+
+   No_Unit_Exception : constant Unit_Exception :=
+                         (Name => No_Name,
+                          Spec => No_File,
+                          Impl => No_File);
+
+   package Unit_Exceptions is new GNAT.HTable.Simple_HTable
+     (Header_Num => Header_Num,
+      Element    => Unit_Exception,
+      No_Element => No_Unit_Exception,
+      Key        => Name_Id,
+      Hash       => Hash,
+      Equal      => "=");
+   --  Hash table to store the unit exceptions.
+   --  ??? Seems to be used only by the multi_lang mode
+   --  ??? Should not be a global array, but stored in the project_data
+
    package Recursive_Dirs is new GNAT.HTable.Simple_HTable
      (Header_Num => Header_Num,
       Element    => Boolean,
@@ -103,8 +140,7 @@ package body Prj.Nmsc is
       Unit : Name_Id;
       Next : Ada_Naming_Exception_Id := No_Ada_Naming_Exception;
    end record;
-   --  No_Unit : constant Unit_Info :=
-   --              (Specification, No_Name, No_Ada_Naming_Exception);
+   --  Comment needed???
 
    package Ada_Naming_Exception_Table is new Table.Table
      (Table_Component_Type => Unit_Info,
@@ -118,11 +154,48 @@ 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
    --  there is one or several unit in table Ada_Naming_Exception_Table.
+   --  ??? This is for ada_only mode, we should be able to merge with
+   --  Unit_Exceptions table, used by multi_lang mode.
+
+   package Object_File_Names is new GNAT.HTable.Simple_HTable
+     (Header_Num => Header_Num,
+      Element    => File_Name_Type,
+      No_Element => No_File,
+      Key        => File_Name_Type,
+      Hash       => Hash,
+      Equal      => "=");
+   --  A hash table to store the object file names for a project, to check that
+   --  two different sources have different object file names.
+
+   type File_Found is record
+      File     : File_Name_Type  := No_File;
+      Found    : Boolean         := False;
+      Location : Source_Ptr      := No_Location;
+   end record;
+   No_File_Found : constant File_Found := (No_File, False, No_Location);
+   --  Comments needed ???
+
+   package Excluded_Sources_Htable is new GNAT.HTable.Simple_HTable
+     (Header_Num => Header_Num,
+      Element    => File_Found,
+      No_Element => No_File_Found,
+      Key        => File_Name_Type,
+      Hash       => Hash,
+      Equal      => "=");
+   --  A hash table to store the excluded files, if any. This is filled by
+   --  Find_Excluded_Sources below.
+
+   procedure Find_Excluded_Sources
+     (Project : Project_Id;
+      In_Tree : Project_Tree_Ref;
+      Data    : Project_Data);
+   --  Find the list of files that should not be considered as source files
+   --  for this project. Sets the list in the Excluded_Sources_Htable.
 
    function Hash (Unit : Unit_Info) return Header_Num;
 
@@ -140,8 +213,57 @@ package body Prj.Nmsc is
       Key        => Unit_Info,
       Hash       => Hash,
       Equal      => "=");
-   --  A table to check if a unit with an exceptional name will hide
-   --  a source with a file name following the naming convention.
+   --  A table to check if a unit with an exceptional name will hide a source
+   --  with a file name following the naming convention.
+
+   procedure Load_Naming_Exceptions
+     (Project : Project_Id;
+      In_Tree : Project_Tree_Ref);
+   --  All source files in Data.First_Source are considered as naming
+   --  exceptions, and copied into the Source_Names and Unit_Exceptions tables
+   --  as appropriate.
+
+   procedure Add_Source
+     (Id                  : out Source_Id;
+      In_Tree             : Project_Tree_Ref;
+      Project             : Project_Id;
+      Lang_Id             : Language_Ptr;
+      Kind                : Source_Kind;
+      File_Name           : File_Name_Type;
+      Display_File        : File_Name_Type;
+      Lang_Kind           : Language_Kind;
+      Naming_Exception    : Boolean := False;
+      Path                : Path_Name_Type := No_Path;
+      Display_Path        : Path_Name_Type := No_Path;
+      Alternate_Languages : Alternate_Language_Id := No_Alternate_Language;
+      Other_Part          : Source_Id := No_Source;
+      Unit                : Name_Id   := No_Name;
+      Index               : Int       := 0;
+      Source_To_Replace   : Source_Id := No_Source);
+   --  Add a new source to the different lists: list of all sources in the
+   --  project tree, list of source of a project and list of sources of a
+   --  language.
+   --
+   --  If Path is specified, the file is also added to Source_Paths_HT.
+   --  If Source_To_Replace is specified, it points to the source in the
+   --  extended project that the new file is overriding.
+
+   function Canonical_Case_File_Name (Name : Name_Id) return File_Name_Type;
+   --  Same as Osint.Canonical_Case_File_Name but applies to Name_Id.
+   --  This alters Name_Buffer
+
+   function Suffix_Matches
+     (Filename : String;
+      Suffix   : File_Name_Type) return Boolean;
+   --  True if the filename ends with the given suffix. It always returns False
+   --  if Suffix is No_Name
+
+   procedure Replace_Into_Name_Buffer
+     (Str         : String;
+      Pattern     : String;
+      Replacement : Character);
+   --  Copy Str into Name_Buffer, replacing Pattern with Replacement. Str is
+   --  converted to lower-case at the same time.
 
    function ALI_File_Name (Source : String) return String;
    --  Return the ALI file name corresponding to a source
@@ -149,31 +271,17 @@ package body Prj.Nmsc is
    procedure Check_Ada_Name (Name : String; Unit : out Name_Id);
    --  Check that a name is a valid Ada unit name
 
-   procedure Check_Naming_Scheme
+   procedure Check_Naming_Schemes
      (Data    : in out Project_Data;
       Project : Project_Id;
       In_Tree : Project_Tree_Ref);
    --  Check the naming scheme part of Data
 
-   procedure Check_Ada_Naming_Scheme_Validity
+   procedure Check_Configuration
      (Project : Project_Id;
       In_Tree : Project_Tree_Ref;
-      Naming  : Naming_Data);
-   --  Check that the package Naming is correct
-
-   procedure Check_For_Source
-     (File_Name        : Name_Id;
-      Path_Name        : Name_Id;
-      Project          : Project_Id;
-      In_Tree          : Project_Tree_Ref;
-      Data             : in out Project_Data;
-      Location         : Source_Ptr;
-      Language         : Language_Index;
-      Suffix           : String;
-      Naming_Exception : Boolean);
-   --  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. ???
+      Data    : in out Project_Data);
+   --  Check the configuration attributes for the project
 
    procedure Check_If_Externally_Built
      (Project : Project_Id;
@@ -182,12 +290,22 @@ package body Prj.Nmsc is
    --  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;
+   procedure Check_Interfaces
+     (Project : Project_Id;
       In_Tree : Project_Tree_Ref;
-      Data      : in out Project_Data);
+      Data    : in out Project_Data);
+   --  If a list of sources is specified in attribute Interfaces, set
+   --  In_Interfaces only for the sources specified in the list.
+
+   procedure Check_Library_Attributes
+     (Project     : Project_Id;
+      In_Tree     : Project_Tree_Ref;
+      Current_Dir : String;
+      Data        : in out Project_Data);
    --  Check the library attributes of project Project in project tree In_Tree
    --  and modify its data Data accordingly.
+   --  Current_Dir should represent the current directory, and is passed for
+   --  efficiency to avoid system calls to recompute it.
 
    procedure Check_Package_Naming
      (Project : Project_Id;
@@ -197,7 +315,9 @@ package body Prj.Nmsc is
    --  modify its data Data accordingly.
 
    procedure Check_Programming_Languages
-     (In_Tree : Project_Tree_Ref; Data : in out Project_Data);
+     (In_Tree : Project_Tree_Ref;
+      Project : Project_Id;
+      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.
@@ -211,24 +331,37 @@ package body Prj.Nmsc is
    --  extended by Root_Project.
 
    procedure Check_Stand_Alone_Library
-     (Project   : Project_Id;
-      In_Tree   : Project_Tree_Ref;
-      Data      : in out Project_Data;
-      Extending : Boolean);
+     (Project     : Project_Id;
+      In_Tree     : Project_Tree_Ref;
+      Data        : in out Project_Data;
+      Current_Dir : String;
+      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.
+   --  Current_Dir should represent the current directory, and is passed for
+   --  efficiency to avoid system calls to recompute it.
+
+   procedure Check_And_Normalize_Unit_Names
+     (Project    : Project_Id;
+      In_Tree    : Project_Tree_Ref;
+      List       : Array_Element_Id;
+      Debug_Name : String);
+   --  Check that a list of unit names contains only valid names. Casing
+   --  is normalized where appropriate.
+   --  Debug_Name is the name representing the list, and is used for debug
+   --  output only.
+
+   procedure Get_Path_Names_And_Record_Ada_Sources
+     (Project     : Project_Id;
+      In_Tree     : Project_Tree_Ref;
+      Data        : in out Project_Data;
+      Current_Dir : String);
+   --  Find the path names of the source files in the Source_Names table
+   --  in the source directories and record those that are Ada sources.
 
    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.
+   --  to avoid duplicate '/' (slash) characters at the end of directory names.
 
    procedure Error_Msg
      (Project       : Project_Id;
@@ -239,14 +372,72 @@ package body Prj.Nmsc is
    --  Prj.Err.Error_Msg. Otherwise, disregard Flag_Location and use
    --  Error_Report.
 
-   procedure Find_Sources
+   procedure Find_Ada_Sources
      (Project      : Project_Id;
       In_Tree      : Project_Tree_Ref;
       Data         : in out Project_Data;
-      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.
+      Current_Dir  : String);
+   --  Find all the Ada sources in all of the source directories of a project
+   --  Current_Dir should represent the current directory, and is passed for
+   --  efficiency to avoid system calls to recompute it.
+
+   procedure Search_Directories
+     (Project         : Project_Id;
+      In_Tree         : Project_Tree_Ref;
+      Data            : in out Project_Data;
+      For_All_Sources : Boolean);
+   --  Search the source directories to find the sources.
+   --  If For_All_Sources is True, check each regular file name against the
+   --  naming schemes of the different languages. Otherwise consider only the
+   --  file names in the hash table Source_Names.
+
+   procedure Check_File
+     (Project           : Project_Id;
+      In_Tree           : Project_Tree_Ref;
+      Data              : in out Project_Data;
+      Name              : String;
+      File_Name         : File_Name_Type;
+      Display_File_Name : File_Name_Type;
+      Source_Directory  : String;
+      For_All_Sources   : Boolean);
+   --  Check if file File_Name is a valid source of the project. This is used
+   --  in multi-language mode only.
+   --  When the file matches one of the naming schemes, it is added to
+   --  various htables through Add_Source and to Source_Paths_Htable.
+   --
+   --  Name is the name of the candidate file. It hasn't been normalized yet
+   --  and is the direct result of readdir().
+   --
+   --  File_Name is the same as Name, but has been normalized.
+   --  Display_File_Name, however, has not been normalized.
+   --
+   --  Source_Directory is the directory in which the file
+   --  was found. It hasn't been normalized (nor has had links resolved).
+   --  It should not end with a directory separator, to avoid duplicates
+   --  later on.
+   --
+   --  If For_All_Sources is True, then all possible file names are analyzed
+   --  otherwise only those currently set in the Source_Names htable.
+
+   procedure Check_File_Naming_Schemes
+     (In_Tree               : Project_Tree_Ref;
+      Data                  : in out Project_Data;
+      File_Name             : File_Name_Type;
+      Alternate_Languages   : out Alternate_Language_Id;
+      Language              : out Language_Ptr;
+      Language_Name         : out Name_Id;
+      Display_Language_Name : out Name_Id;
+      Unit                  : out Name_Id;
+      Lang_Kind             : out Language_Kind;
+      Kind                  : out Source_Kind);
+   --  Check if the file name File_Name conforms to one of the naming
+   --  schemes of the project.
+   --
+   --  If the file does not match one of the naming schemes, set Language
+   --  to No_Language_Index.
+   --
+   --  Filename is the name of the file being investigated. It has been
+   --  normalized (case-folded). File_Name is the same value.
 
    procedure Free_Ada_Naming_Exceptions;
    --  Free the internal hash tables used for checking naming exceptions
@@ -254,9 +445,13 @@ package body Prj.Nmsc is
    procedure Get_Directories
      (Project : Project_Id;
       In_Tree : Project_Tree_Ref;
+      Current_Dir : String;
       Data    : in out Project_Data);
    --  Get the object directory, the exec directory and the source directories
    --  of a project.
+   --
+   --  Current_Dir should represent the current directory, and is passed for
+   --  efficiency to avoid system calls to recompute it.
 
    procedure Get_Mains
      (Project : Project_Id;
@@ -273,48 +468,91 @@ package body Prj.Nmsc is
    --  Get the list of sources from a text file and put them in hash table
    --  Source_Names.
 
+   procedure Find_Explicit_Sources
+     (Current_Dir : String;
+      Project     : Project_Id;
+      In_Tree     : Project_Tree_Ref;
+      Data        : in out Project_Data);
+   --  Process the Source_Files and Source_List_File attributes, and store
+   --  the list of source files into the Source_Names htable.
+   --
+   --  Lang indicates which language is being processed when in Ada_Only mode
+   --  (all languages are processed anyway when in Multi_Language mode).
+
+   procedure Compute_Unit_Name
+     (File_Name       : File_Name_Type;
+      Dot_Replacement : File_Name_Type;
+      Separate_Suffix : File_Name_Type;
+      Body_Suffix     : File_Name_Type;
+      Spec_Suffix     : File_Name_Type;
+      Casing          : Casing_Type;
+      Kind            : out Source_Kind;
+      Unit            : out Name_Id;
+      In_Tree         : Project_Tree_Ref);
+   --  Check whether the file matches the naming scheme. If it does,
+   --  compute its unit name. If Unit is set to No_Name on exit, none of the
+   --  other out parameters are relevant.
+
    procedure Get_Unit
-     (Canonical_File_Name : Name_Id;
+     (In_Tree             : Project_Tree_Ref;
+      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);
    --  Find out, from a file name, the unit name, the unit kind and if a
-   --  specific SFN pragma is needed. If the file name corresponds to no
-   --  unit, then Unit_Name will be No_Name. If the file is a multi-unit source
-   --  or an exception to the naming scheme, then Exception_Id is set to
-   --  the unit or units that the source contains.
+   --  specific SFN pragma is needed. If the file name corresponds to no unit,
+   --  then Unit_Name will be No_Name. If the file is a multi-unit source or an
+   --  exception to the naming scheme, then Exception_Id is set to the unit or
+   --  units that the source contains.
 
    function Is_Illegal_Suffix
-     (Suffix                          : String;
-      Dot_Replacement_Is_A_Single_Dot : Boolean) return Boolean;
-   --  Returns True if the string Suffix cannot be used as
-   --  a spec suffix, a body suffix or a separate suffix.
+     (Suffix          : File_Name_Type;
+      Dot_Replacement : File_Name_Type) return Boolean;
+   --  Returns True if the string Suffix cannot be used as 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);
-   --  Locate a directory (returns No_Name for Dir and Display if directory
-   --  does not exist). Name is the directory name. Parent is the root
-   --  directory, if Name is a relative path name. Dir is the canonical case
-   --  path name of the directory, Display is the directory path name for
-   --  display purposes.
+     (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 := "";
+      Current_Dir      : String;
+      Location         : Source_Ptr := No_Location;
+      Externally_Built : Boolean := False);
+   --  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 Setup_Projects
+   --  is True and Create is a non null string, an attempt is made to create
+   --  the directory. If the directory does not exist and Setup_Projects is
+   --  false, then Dir and Display are set to No_Name.
+   --
+   --  Current_Dir should represent the current directory, and is passed for
+   --  efficiency to avoid system calls to recompute it.
 
    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 a project
+     (Project     : Project_Id;
+      In_Tree     : Project_Tree_Ref;
+      Data        : in out Project_Data;
+      Current_Dir : String);
+   --  Find all the sources of project Project in project tree In_Tree and
+   --  update its Data accordingly. This assumes that Data.First_Source has
+   --  been initialized with the list of excluded sources and special naming
+   --  exceptions.
+   --
+   --  Current_Dir should represent the current directory, and is passed for
+   --  efficiency to avoid system calls to recompute it.
 
    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;
@@ -323,55 +561,216 @@ package body Prj.Nmsc is
    --  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;
-      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       : Path_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);
+      Current_Dir     : String);
    --  Put a unit in the list of units of a project, if the file name
    --  corresponds to a valid unit name.
+   --
+   --  Current_Dir should represent the current directory, and is passed for
+   --  efficiency to avoid system calls to recompute it.
 
-   procedure Record_Other_Sources
-     (Project           : Project_Id;
-      In_Tree           : Project_Tree_Ref;
-      Data              : in out Project_Data;
-      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 Remove_Source
+     (Id          : Source_Id;
+      Replaced_By : Source_Id);
+   --  ??? needs comment
+
+   procedure Report_No_Sources
+     (Project      : Project_Id;
+      Lang_Name    : String;
+      In_Tree      : Project_Tree_Ref;
+      Location     : Source_Ptr;
+      Continuation : Boolean := False);
+   --  Report an error or a warning depending on the value of When_No_Sources
+   --  when there are no sources for language Lang_Name.
 
    procedure Show_Source_Dirs
-     (Project : Project_Id; In_Tree : Project_Tree_Ref);
+     (Data : Project_Data; In_Tree : Project_Tree_Ref);
    --  List all the source directories of a project
 
-   function Suffix_For
-     (Language : Language_Index;
-      Naming   : Naming_Data;
-      In_Tree  : Project_Tree_Ref) return Name_Id;
-   --  Get the suffix for the source of a language from a package naming.
-   --  If not specified, return the default for the language.
-
    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.
+   --  Check that individual naming conventions apply to immediate sources of
+   --  the project. If not, issue a warning.
+
+   procedure Write_Attr (Name, Value : String);
+   --  Debug print a value for a specific property. Does nothing when not in
+   --  debug mode
+
+   ------------------------------
+   -- Replace_Into_Name_Buffer --
+   ------------------------------
+
+   procedure Replace_Into_Name_Buffer
+     (Str         : String;
+      Pattern     : String;
+      Replacement : Character)
+   is
+      Max : constant Integer := Str'Last - Pattern'Length + 1;
+      J   : Positive;
+
+   begin
+      Name_Len := 0;
+
+      J := Str'First;
+      while J <= Str'Last loop
+         Name_Len := Name_Len + 1;
+
+         if J <= Max
+           and then Str (J .. J + Pattern'Length - 1) = Pattern
+         then
+            Name_Buffer (Name_Len) := Replacement;
+            J := J + Pattern'Length;
+
+         else
+            Name_Buffer (Name_Len) := GNAT.Case_Util.To_Lower (Str (J));
+            J := J + 1;
+         end if;
+      end loop;
+   end Replace_Into_Name_Buffer;
+
+   --------------------
+   -- Suffix_Matches --
+   --------------------
+
+   function Suffix_Matches
+     (Filename : String;
+      Suffix   : File_Name_Type) return Boolean
+   is
+   begin
+      if Suffix = No_File then
+         return False;
+      end if;
+
+      declare
+         Suf : constant String := Get_Name_String (Suffix);
+      begin
+         return Filename'Length > Suf'Length
+           and then Filename
+             (Filename'Last - Suf'Length + 1 .. Filename'Last) = Suf;
+      end;
+   end Suffix_Matches;
+
+   ----------------
+   -- Write_Attr --
+   ----------------
+
+   procedure Write_Attr (Name, Value : String) is
+   begin
+      if Current_Verbosity = High then
+         Write_Str  ("  " & Name & " = """);
+         Write_Str  (Value);
+         Write_Char ('"');
+         Write_Eol;
+      end if;
+   end Write_Attr;
+
+   ----------------
+   -- Add_Source --
+   ----------------
+
+   procedure Add_Source
+     (Id                  : out Source_Id;
+      In_Tree             : Project_Tree_Ref;
+      Project             : Project_Id;
+      Lang_Id             : Language_Ptr;
+      Kind                : Source_Kind;
+      File_Name           : File_Name_Type;
+      Display_File        : File_Name_Type;
+      Lang_Kind           : Language_Kind;
+      Naming_Exception    : Boolean := False;
+      Path                : Path_Name_Type := No_Path;
+      Display_Path        : Path_Name_Type := No_Path;
+      Alternate_Languages : Alternate_Language_Id := No_Alternate_Language;
+      Other_Part          : Source_Id := No_Source;
+      Unit                : Name_Id   := No_Name;
+      Index               : Int       := 0;
+      Source_To_Replace   : Source_Id := No_Source)
+   is
+      Config   : constant Language_Config := Lang_Id.Config;
+
+   begin
+      Id := new Source_Data;
+
+      if Current_Verbosity = High then
+         Write_Str ("Adding source File: ");
+         Write_Str (Get_Name_String (File_Name));
+
+         if Lang_Kind = Unit_Based then
+            Write_Str (" Unit: ");
+            --  ??? in gprclean, it seems we sometimes pass an empty Unit name
+            --  (see test extended_projects)
+            if Unit /= No_Name then
+               Write_Str (Get_Name_String (Unit));
+            end if;
+            Write_Str (" Kind: ");
+            Write_Str (Source_Kind'Image (Kind));
+         end if;
+
+         Write_Eol;
+      end if;
+
+      Id.Project             := Project;
+      Id.Language            := Lang_Id;
+      Id.Lang_Kind           := Lang_Kind;
+      Id.Compiled            := Lang_Id.Config.Compiler_Driver /=
+                                                             Empty_File_Name;
+      Id.Kind                := Kind;
+      Id.Alternate_Languages := Alternate_Languages;
+      Id.Other_Part          := Other_Part;
+
+      Id.Object_Exists       := Config.Object_Generated;
+      Id.Object_Linked       := Config.Objects_Linked;
+
+      if Other_Part /= No_Source then
+         Other_Part.Other_Part := Id;
+      end if;
+
+      Id.Unit                := Unit;
+      Id.Index               := Index;
+      Id.File                := File_Name;
+      Id.Display_File        := Display_File;
+      Id.Dependency          := Lang_Id.Config.Dependency_Kind;
+      Id.Dep_Name            := Dependency_Name (File_Name, Id.Dependency);
+      Id.Naming_Exception    := Naming_Exception;
+
+      if Id.Compiled and then Id.Object_Exists then
+         Id.Object   := Object_Name (File_Name, Config.Object_File_Suffix);
+         Id.Switches := Switches_Name (File_Name);
+      end if;
+
+      if Path /= No_Path then
+         Id.Path := (Path, Display_Path);
+         Source_Paths_Htable.Set (In_Tree.Source_Paths_HT, Path, Id);
+      end if;
+
+      --  Add the source id to the Unit_Sources_HT hash table, if the unit name
+      --  is not null.
+
+      if Unit /= No_Name then
+         Unit_Sources_Htable.Set (In_Tree.Unit_Sources_HT, Unit, Id);
+      end if;
+
+      --  Add the source to the language list
+
+      Id.Next_In_Lang := Lang_Id.First_Source;
+      Lang_Id.First_Source := Id;
+
+      if Source_To_Replace /= No_Source then
+         Remove_Source (Source_To_Replace, Id);
+      end if;
+   end Add_Source;
 
    -------------------
    -- ALI_File_Name --
@@ -394,78 +793,176 @@ package body Prj.Nmsc is
       return Source & ALI_Suffix;
    end ALI_File_Name;
 
+   ------------------------------
+   -- Canonical_Case_File_Name --
+   ------------------------------
+
+   function Canonical_Case_File_Name (Name : Name_Id) return File_Name_Type is
+   begin
+      if Osint.File_Names_Case_Sensitive then
+         return File_Name_Type (Name);
+      else
+         Get_Name_String (Name);
+         Canonical_Case_File_Name (Name_Buffer (1 .. Name_Len));
+         return Name_Find;
+      end if;
+   end Canonical_Case_File_Name;
+
    -----------
    -- Check --
    -----------
 
    procedure Check
-     (Project      : Project_Id;
-      In_Tree      : Project_Tree_Ref;
-      Report_Error : Put_Line_Access;
-      Follow_Links : Boolean)
+     (Project         : Project_Id;
+      In_Tree         : Project_Tree_Ref;
+      Report_Error    : Put_Line_Access;
+      When_No_Sources : Error_Warning;
+      Current_Dir     : String)
    is
-      Data      : Project_Data := In_Tree.Projects.Table (Project);
+      Data      : Project_Data renames In_Tree.Projects.Table (Project);
       Extending : Boolean := False;
 
    begin
+      Nmsc.When_No_Sources := When_No_Sources;
       Error_Report := Report_Error;
 
       Recursive_Dirs.Reset;
 
+      Check_If_Externally_Built (Project, In_Tree, Data);
+
       --  Object, exec and source directories
 
-      Get_Directories (Project, In_Tree, Data);
+      Get_Directories (Project, In_Tree, Current_Dir, Data);
 
       --  Get the programming languages
 
-      Check_Programming_Languages (In_Tree, Data);
+      Check_Programming_Languages (In_Tree, Project, Data);
 
-      --  Library attributes
+      if Data.Qualifier = Dry and then Data.Source_Dirs /= Nil_String then
+         Error_Msg
+           (Project, In_Tree,
+            "an abstract project needs to have no language, no sources " &
+            "or no source directories",
+            Data.Location);
+      end if;
 
-      Check_Library_Attributes (Project, In_Tree, Data);
+      --  Check configuration in multi language mode
 
-      Check_If_Externally_Built (Project, In_Tree, Data);
+      if Must_Check_Configuration then
+         Check_Configuration (Project, In_Tree, Data);
+      end if;
+
+      --  Library attributes
+
+      Check_Library_Attributes (Project, In_Tree, Current_Dir, Data);
 
       if Current_Verbosity = High then
-         Show_Source_Dirs (Project, In_Tree);
+         Show_Source_Dirs (Data, In_Tree);
       end if;
 
       Check_Package_Naming (Project, In_Tree, Data);
 
       Extending := Data.Extends /= No_Project;
 
-      Check_Naming_Scheme (Data, Project, In_Tree);
+      Check_Naming_Schemes (Data, Project, In_Tree);
 
-      Prepare_Ada_Naming_Exceptions
-        (Data.Naming.Bodies, In_Tree, Body_Part);
-      Prepare_Ada_Naming_Exceptions
-        (Data.Naming.Specs, In_Tree, Specification);
+      if Get_Mode = Ada_Only then
+         Prepare_Ada_Naming_Exceptions
+           (Data.Naming.Bodies, In_Tree, Body_Part);
+         Prepare_Ada_Naming_Exceptions
+           (Data.Naming.Specs, In_Tree, Specification);
+      end if;
 
       --  Find the sources
 
       if Data.Source_Dirs /= Nil_String then
-         Look_For_Sources (Project, In_Tree, Data, Follow_Links);
+         Look_For_Sources (Project, In_Tree, Data, Current_Dir);
+
+         if Get_Mode = Ada_Only then
+
+            --  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);
+
+         elsif Get_Mode = Multi_Language and then
+               (not Data.Externally_Built) and then
+               (not Extending)
+         then
+            declare
+               Language      : Language_Ptr;
+               Source        : Source_Id;
+               Alt_Lang      : Alternate_Language_Id;
+               Alt_Lang_Data : Alternate_Language_Data;
+               Continuation  : Boolean := False;
+               Iter          : Source_Iterator;
+
+            begin
+               Language := Data.Languages;
+               while Language /= No_Language_Index loop
+
+                  --  If there are no sources for this language, check whether
+                  --  there are sources for which this is an alternate
+                  --  language.
+
+                  if Language.First_Source = No_Source then
+                     Iter := For_Each_Source (In_Tree => In_Tree,
+                                              Project => Project);
+                     Source_Loop : loop
+                        Source := Element (Iter);
+                        exit Source_Loop when Source = No_Source
+                          or else Source.Language = Language;
+
+                        Alt_Lang := Source.Alternate_Languages;
+
+                        Alternate_Loop :
+                        while Alt_Lang /= No_Alternate_Language loop
+                           Alt_Lang_Data := In_Tree.Alt_Langs.Table (Alt_Lang);
+                           exit Source_Loop
+                           when Alt_Lang_Data.Language = Language;
+                           Alt_Lang := Alt_Lang_Data.Next;
+                        end loop Alternate_Loop;
+
+                        Next (Iter);
+                     end loop Source_Loop;
+
+                     if Source = No_Source then
+                        Report_No_Sources
+                          (Project,
+                           Get_Name_String (Language.Display_Name),
+                           In_Tree,
+                           Data.Location,
+                           Continuation);
+                        Continuation := True;
+                     end if;
+                  end if;
+
+                  Language := Language.Next;
+               end loop;
+            end;
+         end if;
       end if;
 
-      if Data.Ada_Sources_Present then
+      if Get_Mode = Multi_Language then
 
-         --  Check that all individual naming conventions apply to sources of
-         --  this project file.
+         --  If a list of sources is specified in attribute Interfaces, set
+         --  In_Interfaces only for the sources specified in the list.
 
-         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);
+         Check_Interfaces (Project, In_Tree, Data);
       end if;
 
       --  If it is a library project file, check if it is a standalone library
 
       if Data.Library then
-         Check_Stand_Alone_Library (Project, In_Tree, Data, Extending);
+         Check_Stand_Alone_Library
+           (Project, In_Tree, Data, Current_Dir, Extending);
       end if;
 
       --  Put the list of Mains, if any, in the project data
@@ -489,31 +986,85 @@ package body Prj.Nmsc is
       Need_Letter     : Boolean := True;
       Last_Underscore : Boolean := False;
       OK              : Boolean := The_Name'Length > 0;
+      First           : Positive;
+
+      function Is_Reserved (Name : Name_Id) return Boolean;
+      function Is_Reserved (S    : String)  return Boolean;
+      --  Check that the given name is not an Ada 95 reserved word. The reason
+      --  for the Ada 95 here is that we do not want to exclude the case of an
+      --  Ada 95 unit called Interface (for example). In Ada 2005, such a unit
+      --  name would be rejected anyway by the compiler. That means there is no
+      --  requirement that the project file parser reject this.
+
+      -----------------
+      -- Is_Reserved --
+      -----------------
+
+      function Is_Reserved (S : String) return Boolean is
+      begin
+         Name_Len := 0;
+         Add_Str_To_Name_Buffer (S);
+         return Is_Reserved (Name_Find);
+      end Is_Reserved;
+
+      -----------------
+      -- Is_Reserved --
+      -----------------
+
+      function Is_Reserved (Name : Name_Id) return Boolean is
+      begin
+         if Get_Name_Table_Byte (Name) /= 0
+           and then Name /= Name_Project
+           and then Name /= Name_Extends
+           and then Name /= Name_External
+           and then Name not in Ada_2005_Reserved_Words
+         then
+            Unit := No_Name;
+
+            if Current_Verbosity = High then
+               Write_Str (The_Name);
+               Write_Line (" is an Ada reserved word.");
+            end if;
+
+            return True;
+
+         else
+            return False;
+         end if;
+      end Is_Reserved;
+
+   --  Start of processing for Check_Ada_Name
 
    begin
       To_Lower (The_Name);
 
       Name_Len := The_Name'Length;
       Name_Buffer (1 .. Name_Len) := The_Name;
-      Real_Name := Name_Find;
 
-      --  Check first that the given name is not an Ada reserved word
+      --  Special cases of children of packages A, G, I and S on VMS
 
-      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
+      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
-         Unit := No_Name;
+         Name_Buffer (2) := '.';
+         Name_Buffer (3 .. Name_Len - 1) := Name_Buffer (4 .. Name_Len);
+         Name_Len := Name_Len - 1;
+      end if;
 
-         if Current_Verbosity = High then
-            Write_Str (The_Name);
-            Write_Line (" is an Ada reserved word.");
-         end if;
+      Real_Name := Name_Find;
 
+      if Is_Reserved (Real_Name) then
          return;
       end if;
 
+      First := The_Name'First;
+
       for Index in The_Name'Range loop
          if Need_Letter then
 
@@ -555,6 +1106,13 @@ package body Prj.Nmsc is
 
          elsif The_Name (Index) = '.' then
 
+            --  First, check if the name before the dot is not a reserved word
+            if Is_Reserved (The_Name (First .. Index - 1)) then
+               return;
+            end if;
+
+            First := Index + 1;
+
             --  We need a letter after a dot
 
             Need_Letter := True;
@@ -587,6 +1145,12 @@ package body Prj.Nmsc is
       OK := OK and then not Need_Letter and then not Last_Underscore;
 
       if OK then
+         if First /= Name'First and then
+           Is_Reserved (The_Name (First .. The_Name'Last))
+         then
+            return;
+         end if;
+
          Unit := Real_Name;
 
       else
@@ -596,908 +1160,2399 @@ package body Prj.Nmsc is
       end if;
    end Check_Ada_Name;
 
-   --------------------------------------
-   -- Check_Ada_Naming_Scheme_Validity --
-   --------------------------------------
+   -------------------------
+   -- Check_Configuration --
+   -------------------------
 
-   procedure Check_Ada_Naming_Scheme_Validity
+   procedure Check_Configuration
      (Project : Project_Id;
       In_Tree : Project_Tree_Ref;
-      Naming  : Naming_Data)
+      Data    : in out Project_Data)
    is
-   begin
-      --  Only check if we are not using the Default naming scheme
+      Dot_Replacement : File_Name_Type := No_File;
+      Casing          : Casing_Type    := All_Lower_Case;
+      Separate_Suffix : File_Name_Type := No_File;
 
-      if Naming /= In_Tree.Private_Part.Default_Naming then
-         declare
-            Dot_Replacement       : constant String :=
-                                     Get_Name_String
-                                       (Naming.Dot_Replacement);
+      Lang_Index : Language_Ptr := No_Language_Index;
+      --  The index of the language data being checked
 
-            Spec_Suffix : constant String :=
-                                     Get_Name_String
-                                       (Naming.Ada_Spec_Suffix);
+      Prev_Index : Language_Ptr := No_Language_Index;
+      --  The index of the previous language
 
-            Body_Suffix : constant String :=
-                                     Get_Name_String
-                                       (Naming.Ada_Body_Suffix);
+      Current_Language : Name_Id := No_Name;
+      --  The name of the language
 
-            Separate_Suffix       : constant String :=
-                                     Get_Name_String
-                                       (Naming.Separate_Suffix);
+      procedure Get_Language_Index_Of (Language : Name_Id);
+      --  Get the language index of Language, if Language is one of the
+      --  languages of the project.
 
-         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 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;
+      procedure Process_Project_Level_Simple_Attributes;
+      --  Process the simple attributes at the project level
 
-            --  Suffixes cannot
-            --   - be empty
+      procedure Process_Project_Level_Array_Attributes;
+      --  Process the associate array attributes at the project level
 
-            if Is_Illegal_Suffix
-                 (Spec_Suffix, Dot_Replacement = ".")
-            then
-               Err_Vars.Error_Msg_Name_1 := Naming.Ada_Spec_Suffix;
-               Error_Msg
-                 (Project, In_Tree,
-                  "{ is illegal for Spec_Suffix",
-                  Naming.Spec_Suffix_Loc);
-            end if;
+      procedure Process_Packages;
+      --  Read the packages of the project
 
-            if Is_Illegal_Suffix
-                 (Body_Suffix, Dot_Replacement = ".")
-            then
-               Err_Vars.Error_Msg_Name_1 := Naming.Ada_Body_Suffix;
-               Error_Msg
-                 (Project, In_Tree,
-                  "{ is illegal for Body_Suffix",
-                  Naming.Body_Suffix_Loc);
-            end if;
+      ---------------------------
+      -- Get_Language_Index_Of --
+      ---------------------------
 
-            if Body_Suffix /= Separate_Suffix then
-               if Is_Illegal_Suffix
-                    (Separate_Suffix, Dot_Replacement = ".")
-               then
-                  Err_Vars.Error_Msg_Name_1 := Naming.Separate_Suffix;
-                  Error_Msg
-                    (Project, In_Tree,
-                     "{ is illegal for Separate_Suffix",
-                     Naming.Sep_Suffix_Loc);
-               end if;
-            end if;
+      procedure Get_Language_Index_Of (Language : Name_Id) is
+         Real_Language : Name_Id;
 
-            --  Spec_Suffix cannot have the same termination as
-            --  Body_Suffix or Separate_Suffix
+      begin
+         Get_Name_String (Language);
+         To_Lower (Name_Buffer (1 .. Name_Len));
+         Real_Language := Name_Find;
 
-            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;
+         --  Nothing to do if the language is the same as the current language
 
-            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;
+         if Current_Language /= Real_Language then
+            Lang_Index := Data.Languages;
+            while Lang_Index /= No_Language_Index loop
+               exit when Lang_Index.Name = Real_Language;
+               Lang_Index := Lang_Index.Next;
+            end loop;
 
-   ----------------------
-   -- Check_For_Source --
-   ----------------------
+            if Lang_Index = No_Language_Index then
+               Current_Language := No_Name;
+            else
+               Current_Language := Real_Language;
+            end if;
+         end if;
+      end Get_Language_Index_Of;
 
-   procedure Check_For_Source
-     (File_Name        : Name_Id;
-      Path_Name        : Name_Id;
-      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;
+      ----------------------
+      -- Process_Packages --
+      ----------------------
 
-   begin
-      Canonical_Case_File_Name (Name);
+      procedure Process_Packages is
+         Packages : Package_Id;
+         Element  : Package_Element;
 
-      --  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.
+         procedure Process_Binder (Arrays : Array_Id);
+         --  Process the associate array attributes of package Binder
 
-      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;
+         procedure Process_Builder (Attributes : Variable_Id);
+         --  Process the simple attributes of package Builder
 
-         declare
-            Path : String := Get_Name_String (Path_Name);
+         procedure Process_Compiler (Arrays : Array_Id);
+         --  Process the associate array attributes of package Compiler
 
-            Path_Id : Name_Id;
-            --  The path name id (in canonical case)
+         procedure Process_Naming (Attributes : Variable_Id);
+         --  Process the simple attributes of package Naming
 
-            File_Id : Name_Id;
-            --  The file name id (in canonical case)
+         procedure Process_Naming (Arrays : Array_Id);
+         --  Process the associate array attributes of package Naming
 
-            Obj_Id : Name_Id;
-            --  The object file name
+         procedure Process_Linker (Attributes : Variable_Id);
+         --  Process the simple attributes of package Linker of a
+         --  configuration project.
 
-            Obj_Path_Id : Name_Id;
-            --  The object path name
+         --------------------
+         -- Process_Binder --
+         --------------------
 
-            Dep_Id : Name_Id;
-            --  The dependency file name
+         procedure Process_Binder (Arrays : Array_Id) is
+            Current_Array_Id : Array_Id;
+            Current_Array    : Array_Data;
+            Element_Id       : Array_Element_Id;
+            Element          : Array_Element;
 
-            Dep_Path_Id : Name_Id;
-            --  The dependency path name
+         begin
+            --  Process the associative array attribute of package Binder
 
-            Dot_Pos : Natural := 0;
-            --  Position of the last dot in Name
+            Current_Array_Id := Arrays;
+            while Current_Array_Id /= No_Array loop
+               Current_Array := In_Tree.Arrays.Table (Current_Array_Id);
 
-            Source    : Other_Source;
-            Source_Id : Other_Source_Id := Data.First_Other_Source;
+               Element_Id := Current_Array.Value;
+               while Element_Id /= No_Array_Element loop
+                  Element := In_Tree.Array_Elements.Table (Element_Id);
 
-         begin
-            Canonical_Case_File_Name (Path);
+                  if Element.Index /= All_Other_Names then
 
-            --  Get the file name id
+                     --  Get the name of the language
 
-            Name_Len := Name'Length;
-            Name_Buffer (1 .. Name_Len) := Name;
-            File_Id := Name_Find;
+                     Get_Language_Index_Of (Element.Index);
 
-            --  Get the path name id
+                     if Lang_Index /= No_Language_Index then
+                        case Current_Array.Name is
+                        when Name_Driver =>
 
-            Name_Len := Path'Length;
-            Name_Buffer (1 .. Name_Len) := Path;
-            Path_Id := Name_Find;
+                           --  Attribute Driver (<language>)
 
-            --  Find the position of the last dot
+                           Lang_Index.Config.Binder_Driver :=
+                             File_Name_Type (Element.Value.Value);
 
-            for J in reverse Name'Range loop
-               if Name (J) = '.' then
-                  Dot_Pos := J;
-                  exit;
-               end if;
-            end loop;
+                        when Name_Required_Switches =>
+                           Put (Into_List =>
+                                   Lang_Index.Config.Binder_Required_Switches,
+                                From_List => Element.Value.Values,
+                                In_Tree   => In_Tree);
 
-            if Dot_Pos <= Name'First then
-               Dot_Pos := Name'Last + 1;
-            end if;
+                        when Name_Prefix =>
 
-            --  Compute the object file name
+                           --  Attribute Prefix (<language>)
 
-            Get_Name_String (File_Id);
-            Name_Len := Dot_Pos - Name'First;
+                           Lang_Index.Config.Binder_Prefix :=
+                             Element.Value.Value;
 
-            for J in Object_Suffix'Range loop
-               Name_Len := Name_Len + 1;
-               Name_Buffer (Name_Len) := Object_Suffix (J);
-            end loop;
+                        when Name_Objects_Path =>
 
-            Obj_Id := Name_Find;
+                           --  Attribute Objects_Path (<language>)
 
-            --  Compute the object path name
+                           Lang_Index.Config.Objects_Path :=
+                             Element.Value.Value;
 
-            Get_Name_String (Data.Object_Directory);
+                        when Name_Objects_Path_File =>
 
-            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;
+                           --  Attribute Objects_Path (<language>)
 
-            Add_Str_To_Name_Buffer (Get_Name_String (Obj_Id));
-            Obj_Path_Id := Name_Find;
+                           Lang_Index.Config.Objects_Path_File :=
+                             Element.Value.Value;
 
-            --  Compute the dependency file name
+                        when others =>
+                           null;
+                        end case;
+                     end if;
+                  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;
+                  Element_Id := Element.Next;
+               end loop;
 
-            --  Compute the dependency path name
+               Current_Array_Id := Current_Array.Next;
+            end loop;
+         end Process_Binder;
 
-            Get_Name_String (Data.Object_Directory);
+         ---------------------
+         -- Process_Builder --
+         ---------------------
 
-            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 Process_Builder (Attributes : Variable_Id) is
+            Attribute_Id : Variable_Id;
+            Attribute    : Variable;
 
-            Add_Str_To_Name_Buffer (Get_Name_String (Dep_Id));
-            Dep_Path_Id := Name_Find;
+         begin
+            --  Process non associated array attribute from package Builder
 
-            --  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.
+            Attribute_Id := Attributes;
+            while Attribute_Id /= No_Variable loop
+               Attribute :=
+                 In_Tree.Variable_Elements.Table (Attribute_Id);
 
-            while Source_Id /= No_Other_Source loop
-               Source := In_Tree.Other_Sources.Table (Source_Id);
-               Source_Id := Source.Next;
+               if not Attribute.Value.Default then
+                  if Attribute.Name = Name_Executable_Suffix then
 
-               if Source.File_Name = File_Id then
+                     --  Attribute Executable_Suffix: the suffix of the
+                     --  executables.
 
-                  --  Two sources of different languages cannot have the same
-                  --  file name.
+                     Data.Config.Executable_Suffix :=
+                       Attribute.Value.Value;
+                  end if;
+               end if;
 
-                  if Source.Language /= Language then
-                     Error_Msg_Name_1 := File_Name;
-                     Error_Msg
-                       (Project, In_Tree,
-                        "{ cannot be a source of several languages",
-                        Real_Location);
-                     return;
+               Attribute_Id := Attribute.Next;
+            end loop;
+         end Process_Builder;
 
-                  --  No problem if a file has already been specified as
-                  --  a naming exception of this language.
+         ----------------------
+         -- Process_Compiler --
+         ----------------------
 
-                  elsif Source.Path_Name = Path_Id then
+         procedure Process_Compiler (Arrays : Array_Id) is
+            Current_Array_Id : Array_Id;
+            Current_Array    : Array_Data;
+            Element_Id       : Array_Element_Id;
+            Element          : Array_Element;
+            List             : String_List_Id;
 
-                     --  Reset the naming exception flag, if this is not a
-                     --  naming exception.
+         begin
+            --  Process the associative array attribute of package Compiler
 
-                     if not Naming_Exception then
-                        In_Tree.Other_Sources.Table
-                          (Source_Id).Naming_Exception := False;
-                     end if;
+            Current_Array_Id := Arrays;
+            while Current_Array_Id /= No_Array loop
+               Current_Array := In_Tree.Arrays.Table (Current_Array_Id);
 
-                     return;
+               Element_Id := Current_Array.Value;
+               while Element_Id /= No_Array_Element loop
+                  Element := In_Tree.Array_Elements.Table (Element_Id);
 
-                  --  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 Element.Index /= All_Other_Names then
 
-                  elsif Data.Known_Order_Of_Source_Dirs then
-                     return;
+                     --  Get the name of the language
 
-                  --  But it is an error if the order of the source directories
-                  --  is not known.
+                     Get_Language_Index_Of (Element.Index);
 
-                  else
-                     Error_Msg_Name_1 := File_Name;
-                     Error_Msg
-                       (Project, In_Tree,
-                        "{ is found in several source directories",
-                        Real_Location);
-                     return;
-                  end if;
+                     if Lang_Index /= No_Language_Index then
+                        case Current_Array.Name is
+                        when Name_Dependency_Switches =>
 
-               --  Two sources with different file names cannot have the same
-               --  object file name.
+                           --  Attribute Dependency_Switches (<language>)
 
-               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, In_Tree,
-                        "{ and { have the same object file {",
-                        Real_Location);
-                     return;
-               end if;
-            end loop;
+                           if Lang_Index.Config.Dependency_Kind = None then
+                              Lang_Index.Config.Dependency_Kind := Makefile;
+                           end if;
 
-            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;
+                           List := Element.Value.Values;
 
-            --  Create the Other_Source record
+                           if List /= Nil_String then
+                              Put (Into_List =>
+                                     Lang_Index.Config.Dependency_Option,
+                                   From_List => List,
+                                   In_Tree   => In_Tree);
+                           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);
+                        when Name_Dependency_Driver =>
 
-            --  And add it to the Other_Sources table
+                           --  Attribute Dependency_Driver (<language>)
 
-            Other_Source_Table.Increment_Last
-              (In_Tree.Other_Sources);
-            In_Tree.Other_Sources.Table
-              (Other_Source_Table.Last (In_Tree.Other_Sources)) :=
-                 Source;
+                           if Lang_Index.Config.Dependency_Kind = None then
+                              Lang_Index.Config.Dependency_Kind := Makefile;
+                           end if;
 
-            --  There are sources of languages other than Ada in this project
+                           List := Element.Value.Values;
 
-            Data.Other_Sources_Present := True;
+                           if List /= Nil_String then
+                              Put (Into_List =>
+                                     Lang_Index.Config.Compute_Dependency,
+                                   From_List => List,
+                                   In_Tree   => In_Tree);
+                           end if;
 
-            --  And there are sources of this language in this project
+                        when Name_Include_Switches =>
 
-            Set (Language, True, Data, In_Tree);
+                           --  Attribute Include_Switches (<language>)
 
-            --  Add this source to the list of sources of languages other than
-            --  Ada of the project.
+                           List := Element.Value.Values;
 
-            if Data.First_Other_Source = No_Other_Source then
-               Data.First_Other_Source :=
-                 Other_Source_Table.Last (In_Tree.Other_Sources);
+                           if List = Nil_String then
+                              Error_Msg
+                                (Project,
+                                 In_Tree,
+                                 "include option cannot be null",
+                                 Element.Value.Location);
+                           end if;
 
-            else
-               In_Tree.Other_Sources.Table (Data.Last_Other_Source).Next :=
-                 Other_Source_Table.Last (In_Tree.Other_Sources);
-            end if;
+                           Put (Into_List =>
+                                  Lang_Index.Config.Include_Option,
+                                From_List => List,
+                                In_Tree   => In_Tree);
 
-            Data.Last_Other_Source :=
-              Other_Source_Table.Last (In_Tree.Other_Sources);
-         end;
-      end if;
-   end Check_For_Source;
+                        when Name_Include_Path =>
 
-   -------------------------------
-   -- Check_If_Externally_Built --
-   -------------------------------
+                           --  Attribute Include_Path (<language>)
 
-   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);
+                           Lang_Index.Config.Include_Path :=
+                             Element.Value.Value;
 
-   begin
-      if not Externally_Built.Default then
-         Get_Name_String (Externally_Built.Value);
-         To_Lower (Name_Buffer (1 .. Name_Len));
+                        when Name_Include_Path_File =>
 
-         if Name_Buffer (1 .. Name_Len) = "true" then
-            Data.Externally_Built := True;
+                           --  Attribute Include_Path_File (<language>)
 
-         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;
+                           Lang_Index.Config.Include_Path_File :=
+                               Element.Value.Value;
 
-      if Current_Verbosity = High then
-         Write_Str ("Project is ");
+                        when Name_Driver =>
 
-         if not Data.Externally_Built then
-            Write_Str ("not ");
-         end if;
+                           --  Attribute Driver (<language>)
 
-         Write_Line ("externally built.");
-      end if;
-   end Check_If_Externally_Built;
+                           Get_Name_String (Element.Value.Value);
 
-   -----------------------------
-   -- Check_Naming_Scheme --
-   -----------------------------
+                           Lang_Index.Config.Compiler_Driver :=
+                               File_Name_Type (Element.Value.Value);
 
-   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);
+                        when Name_Required_Switches =>
+                           Put (Into_List =>
+                                  Lang_Index.Config.Compiler_Required_Switches,
+                                From_List => Element.Value.Values,
+                                In_Tree   => In_Tree);
 
-      Naming : Package_Element;
+                        when Name_Path_Syntax =>
+                           begin
+                              Lang_Index.Config.Path_Syntax :=
+                                  Path_Syntax_Kind'Value
+                                    (Get_Name_String (Element.Value.Value));
 
-      procedure Check_Unit_Names (List : Array_Element_Id);
-      --  Check that a list of unit names contains only valid names
+                           exception
+                              when Constraint_Error =>
+                                 Error_Msg
+                                   (Project,
+                                    In_Tree,
+                                    "invalid value for Path_Syntax",
+                                    Element.Value.Location);
+                           end;
+
+                        when Name_Object_File_Suffix =>
+                           if Get_Name_String (Element.Value.Value) = "" then
+                              Error_Msg
+                                (Project, In_Tree,
+                                 "object file suffix cannot be empty",
+                                 Element.Value.Location);
 
-      ----------------------
-      -- Check_Unit_Names --
-      ----------------------
+                           else
+                              Lang_Index.Config.Object_File_Suffix :=
+                                Element.Value.Value;
+                           end if;
 
-      procedure Check_Unit_Names (List : Array_Element_Id) is
-         Current   : Array_Element_Id := List;
-         Element   : Array_Element;
-         Unit_Name : Name_Id;
+                        when Name_Pic_Option =>
 
-      begin
-         --  Loop through elements of the string list
+                           --  Attribute Compiler_Pic_Option (<language>)
 
-         while Current /= No_Array_Element loop
-            Element := In_Tree.Array_Elements.Table (Current);
+                           List := Element.Value.Values;
 
-            --  Put file name in canonical case
+                           if List = Nil_String then
+                              Error_Msg
+                                (Project,
+                                 In_Tree,
+                                 "compiler PIC option cannot be null",
+                                 Element.Value.Location);
+                           end if;
 
-            Get_Name_String (Element.Value.Value);
-            Canonical_Case_File_Name (Name_Buffer (1 .. Name_Len));
-            Element.Value.Value := Name_Find;
+                           Put (Into_List =>
+                                  Lang_Index.Config.Compilation_PIC_Option,
+                                From_List => List,
+                                In_Tree   => In_Tree);
 
-            --  Check that it contains a valid unit name
+                        when Name_Mapping_File_Switches =>
 
-            Get_Name_String (Element.Index);
-            Check_Ada_Name (Name_Buffer (1 .. Name_Len), Unit_Name);
+                           --  Attribute Mapping_File_Switches (<language>)
 
-            if Unit_Name = No_Name then
-               Err_Vars.Error_Msg_Name_1 := Element.Index;
-               Error_Msg
-                 (Project, In_Tree,
-                  "{ is not a valid unit name.",
-                  Element.Value.Location);
+                           List := Element.Value.Values;
 
-            else
-               if Current_Verbosity = High then
-                  Write_Str ("    Unit (""");
-                  Write_Str (Get_Name_String (Unit_Name));
-                  Write_Line (""")");
-               end if;
+                           if List = Nil_String then
+                              Error_Msg
+                                (Project,
+                                 In_Tree,
+                                 "mapping file switches cannot be null",
+                                 Element.Value.Location);
+                           end if;
 
-               Element.Index := Unit_Name;
-               In_Tree.Array_Elements.Table (Current) := Element;
-            end if;
+                           Put (Into_List =>
+                                  Lang_Index.Config.Mapping_File_Switches,
+                                From_List => List,
+                                In_Tree   => In_Tree);
 
-            Current := Element.Next;
-         end loop;
-      end Check_Unit_Names;
+                        when Name_Mapping_Spec_Suffix =>
 
-   --  Start of processing for Check_Naming_Scheme
+                           --  Attribute Mapping_Spec_Suffix (<language>)
 
-   begin
-      --  If there is a package Naming, we will put in Data.Naming what is in
-      --  this package Naming.
+                           Lang_Index.Config.Mapping_Spec_Suffix :=
+                             File_Name_Type (Element.Value.Value);
 
-      if Naming_Id /= No_Package then
-         Naming := In_Tree.Packages.Table (Naming_Id);
+                        when Name_Mapping_Body_Suffix =>
 
-         if Current_Verbosity = High then
-            Write_Line ("Checking ""Naming"" for Ada.");
-         end if;
+                           --  Attribute Mapping_Body_Suffix (<language>)
 
-         declare
-            Bodies : constant Array_Element_Id :=
-                       Util.Value_Of (Name_Body, Naming.Decl.Arrays, In_Tree);
+                           Lang_Index.Config.Mapping_Body_Suffix :=
+                             File_Name_Type (Element.Value.Value);
 
-            Specs : constant Array_Element_Id :=
-                      Util.Value_Of (Name_Spec, Naming.Decl.Arrays, In_Tree);
+                        when Name_Config_File_Switches =>
 
-         begin
-            if Bodies /= No_Array_Element then
+                           --  Attribute Config_File_Switches (<language>)
 
-               --  We have elements in the array Body_Part
+                           List := Element.Value.Values;
 
-               if Current_Verbosity = High then
-                  Write_Line ("Found Bodies.");
-               end if;
+                           if List = Nil_String then
+                              Error_Msg
+                                (Project,
+                                 In_Tree,
+                                 "config file switches cannot be null",
+                                 Element.Value.Location);
+                           end if;
 
-               Data.Naming.Bodies := Bodies;
-               Check_Unit_Names (Bodies);
+                           Put (Into_List =>
+                                  Lang_Index.Config.Config_File_Switches,
+                                From_List => List,
+                                In_Tree   => In_Tree);
 
-            else
-               if Current_Verbosity = High then
-                  Write_Line ("No Bodies.");
-               end if;
-            end if;
+                        when Name_Objects_Path =>
 
-            if Specs /= No_Array_Element then
+                           --  Attribute Objects_Path (<language>)
 
-               --  We have elements in the array Specs
+                           Lang_Index.Config.Objects_Path :=
+                             Element.Value.Value;
 
-               if Current_Verbosity = High then
-                  Write_Line ("Found Specs.");
-               end if;
+                        when Name_Objects_Path_File =>
 
-               Data.Naming.Specs := Specs;
-               Check_Unit_Names (Specs);
+                           --  Attribute Objects_Path_File (<language>)
 
-            else
-               if Current_Verbosity = High then
-                  Write_Line ("No Specs.");
-               end if;
-            end if;
-         end;
+                           Lang_Index.Config.Objects_Path_File :=
+                             Element.Value.Value;
 
-         --  We are now checking if variables Dot_Replacement, Casing,
-         --  Spec_Suffix, Body_Suffix and/or Separate_Suffix
-         --  exist.
+                        when Name_Config_Body_File_Name =>
 
-         --  For each variable, if it does not exist, we do nothing,
-         --  because we already have the default.
+                           --  Attribute Config_Body_File_Name (<language>)
 
-         --  Check Dot_Replacement
+                           Lang_Index.Config.Config_Body :=
+                             Element.Value.Value;
 
-         declare
-            Dot_Replacement : constant Variable_Value :=
-                                Util.Value_Of
-                                  (Name_Dot_Replacement,
-                                   Naming.Decl.Attributes, In_Tree);
+                        when Name_Config_Body_File_Name_Pattern =>
 
-         begin
-            pragma Assert (Dot_Replacement.Kind = Single,
-                           "Dot_Replacement is not a single string");
+                           --  Attribute Config_Body_File_Name_Pattern
+                           --  (<language>)
 
-            if not Dot_Replacement.Default then
-               Get_Name_String (Dot_Replacement.Value);
+                           Lang_Index.Config.Config_Body_Pattern :=
+                             Element.Value.Value;
 
-               if Name_Len = 0 then
-                  Error_Msg
-                    (Project, In_Tree,
-                     "Dot_Replacement cannot be empty",
-                     Dot_Replacement.Location);
+                        when Name_Config_Spec_File_Name =>
 
-               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;
+                           --  Attribute Config_Spec_File_Name (<language>)
 
-         if Current_Verbosity = High then
-            Write_Str  ("  Dot_Replacement = """);
-            Write_Str  (Get_Name_String (Data.Naming.Dot_Replacement));
-            Write_Char ('"');
-            Write_Eol;
-         end if;
+                           Lang_Index.Config.Config_Spec :=
+                             Element.Value.Value;
 
-         --  Check Casing
+                        when Name_Config_Spec_File_Name_Pattern =>
 
-         declare
-            Casing_String : constant Variable_Value :=
-                              Util.Value_Of
-                                (Name_Casing, Naming.Decl.Attributes, In_Tree);
+                           --  Attribute Config_Spec_File_Name_Pattern
+                           --  (<language>)
 
-         begin
-            pragma Assert (Casing_String.Kind = Single,
-                           "Casing is not a single string");
+                           Lang_Index.Config.Config_Spec_Pattern :=
+                             Element.Value.Value;
 
-            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;
+                        when Name_Config_File_Unique =>
 
-               exception
-                  when Constraint_Error =>
-                     if Casing_Image'Length = 0 then
-                        Error_Msg
-                          (Project, In_Tree,
-                           "Casing cannot be an empty string",
-                           Casing_String.Location);
+                           --  Attribute Config_File_Unique (<language>)
 
-                     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);
+                           begin
+                              Lang_Index.Config.Config_File_Unique :=
+                                Boolean'Value
+                                  (Get_Name_String (Element.Value.Value));
+                           exception
+                              when Constraint_Error =>
+                                 Error_Msg
+                                   (Project,
+                                    In_Tree,
+                                    "illegal value for Config_File_Unique",
+                                    Element.Value.Location);
+                           end;
+
+                        when others =>
+                           null;
+                        end case;
                      end if;
-               end;
-            end if;
-         end;
+                  end if;
 
-         if Current_Verbosity = High then
-            Write_Str  ("  Casing = ");
-            Write_Str  (Image (Data.Naming.Casing));
-            Write_Char ('.');
-            Write_Eol;
-         end if;
+                  Element_Id := Element.Next;
+               end loop;
 
-         --  Check Spec_Suffix
+               Current_Array_Id := Current_Array.Next;
+            end loop;
+         end Process_Compiler;
 
-         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);
+         --------------------
+         -- Process_Naming --
+         --------------------
 
-         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 Process_Naming (Attributes : Variable_Id) is
+            Attribute_Id : Variable_Id;
+            Attribute    : Variable;
 
-            else
-               Data.Naming.Ada_Spec_Suffix := Default_Ada_Spec_Suffix;
-            end if;
-         end;
+         begin
+            --  Process non associated array attribute from package Naming
 
-         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;
+            Attribute_Id := Attributes;
+            while Attribute_Id /= No_Variable loop
+               Attribute := In_Tree.Variable_Elements.Table (Attribute_Id);
 
-         --  Check Body_Suffix
+               if not Attribute.Value.Default then
+                  if Attribute.Name = Name_Separate_Suffix then
 
-         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);
+                     --  Attribute Separate_Suffix
 
-         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;
+                     Separate_Suffix := File_Name_Type (Attribute.Value.Value);
 
-            else
-               Data.Naming.Ada_Body_Suffix := Default_Ada_Body_Suffix;
-            end if;
-         end;
+                  elsif Attribute.Name = Name_Casing then
 
-         if Current_Verbosity = High then
-            Write_Str  ("  Body_Suffix = """);
-            Write_Str  (Get_Name_String (Data.Naming.Ada_Body_Suffix));
-            Write_Char ('"');
-            Write_Eol;
-         end if;
+                     --  Attribute Casing
 
-         --  Check Separate_Suffix
+                     begin
+                        Casing :=
+                          Value (Get_Name_String (Attribute.Value.Value));
 
-         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);
+                     exception
+                        when Constraint_Error =>
+                           Error_Msg
+                             (Project,
+                              In_Tree,
+                              "invalid value for Casing",
+                              Attribute.Value.Location);
+                     end;
 
-         begin
-            if Ada_Sep_Suffix.Default then
-               Data.Naming.Separate_Suffix :=
-                 Data.Naming.Ada_Body_Suffix;
+                  elsif Attribute.Name = Name_Dot_Replacement then
 
-            else
-               Get_Name_String (Ada_Sep_Suffix.Value);
+                     --  Attribute Dot_Replacement
 
-               if Name_Len = 0 then
-                  Error_Msg
-                    (Project, In_Tree,
-                     "Separate_Suffix cannot be empty",
-                     Ada_Sep_Suffix.Location);
+                     Dot_Replacement := File_Name_Type (Attribute.Value.Value);
 
-               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 if;
-         end;
 
-         if Current_Verbosity = High then
-            Write_Str  ("  Separate_Suffix = """);
-            Write_Str  (Get_Name_String (Data.Naming.Separate_Suffix));
-            Write_Char ('"');
-            Write_Eol;
-         end if;
-
-         --  Check if Data.Naming is valid
+               Attribute_Id := Attribute.Next;
+            end loop;
+         end Process_Naming;
 
-         Check_Ada_Naming_Scheme_Validity (Project, In_Tree, Data.Naming);
+         procedure Process_Naming (Arrays : Array_Id) is
+            Current_Array_Id : Array_Id;
+            Current_Array    : Array_Data;
+            Element_Id       : Array_Element_Id;
+            Element          : Array_Element;
+         begin
+            --  Process the associative array attribute of package Naming
 
-      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;
+            Current_Array_Id := Arrays;
+            while Current_Array_Id /= No_Array loop
+               Current_Array := In_Tree.Arrays.Table (Current_Array_Id);
 
-   ------------------------------
-   -- Check_Library_Attributes --
-   ------------------------------
+               Element_Id := Current_Array.Value;
+               while Element_Id /= No_Array_Element loop
+                  Element := In_Tree.Array_Elements.Table (Element_Id);
 
-   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;
+                  --  Get the name of the language
 
-      Lib_Dir : constant Prj.Variable_Value :=
-                  Prj.Util.Value_Of
-                    (Snames.Name_Library_Dir, Attributes, In_Tree);
+                  Get_Language_Index_Of (Element.Index);
 
-      Lib_Name : constant Prj.Variable_Value :=
-                   Prj.Util.Value_Of
-                    (Snames.Name_Library_Name, Attributes, In_Tree);
+                  if Lang_Index /= No_Language_Index then
+                     case Current_Array.Name is
+                        when Name_Specification_Suffix | Name_Spec_Suffix =>
 
-      Lib_Version : constant Prj.Variable_Value :=
-                      Prj.Util.Value_Of
-                        (Snames.Name_Library_Version, Attributes, In_Tree);
+                           --  Attribute Spec_Suffix (<language>)
 
-      The_Lib_Kind : constant Prj.Variable_Value :=
-                       Prj.Util.Value_Of
-                         (Snames.Name_Library_Kind, Attributes, In_Tree);
+                           Lang_Index.Config.Naming_Data.Spec_Suffix :=
+                             File_Name_Type (Element.Value.Value);
 
-   begin
-      --  Special case of extending project
+                        when Name_Implementation_Suffix | Name_Body_Suffix =>
 
-      if Data.Extends /= No_Project then
-         declare
-            Extended_Data : constant Project_Data :=
-                           In_Tree.Projects.Table (Data.Extends);
+                           --  Attribute Body_Suffix (<language>)
 
-         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.
+                           Lang_Index.Config.Naming_Data.Body_Suffix :=
+                             File_Name_Type (Element.Value.Value);
 
-            if Extended_Data.Library then
-               if Lib_Name.Default then
-                  Data.Library_Name := Extended_Data.Library_Name;
-               end if;
+                           Lang_Index.Config.Naming_Data.Separate_Suffix :=
+                             File_Name_Type (Element.Value.Value);
 
-               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);
+                        when others =>
+                           null;
+                     end case;
                   end if;
-               end if;
 
-               In_Tree.Projects.Table (Data.Extends).Library :=
-                 False;
-            end if;
-         end;
-      end if;
+                  Element_Id := Element.Next;
+               end loop;
 
-      pragma Assert (Lib_Dir.Kind = Single);
+               Current_Array_Id := Current_Array.Next;
+            end loop;
+         end Process_Naming;
 
-      if Lib_Dir.Value = Empty_String then
-         if Current_Verbosity = High then
-            Write_Line ("No library directory");
-         end if;
+         --------------------
+         -- Process_Linker --
+         --------------------
 
-      else
-         --  Find path name, check that it is a directory
+         procedure Process_Linker (Attributes : Variable_Id) is
+            Attribute_Id : Variable_Id;
+            Attribute    : Variable;
 
-         Locate_Directory
-           (Lib_Dir.Value, Data.Display_Directory,
-            Data.Library_Dir, Data.Display_Library_Dir);
+         begin
+            --  Process non associated array attribute from package Linker
 
-         if Data.Library_Dir = No_Name then
+            Attribute_Id := Attributes;
+            while Attribute_Id /= No_Variable loop
+               Attribute :=
+                 In_Tree.Variable_Elements.Table (Attribute_Id);
 
-            --  Get the absolute name of the library directory that
-            --  does not exist, to report an error.
+               if not Attribute.Value.Default then
+                  if Attribute.Name = Name_Driver then
 
-            declare
-               Dir_Name : constant String := Get_Name_String (Lib_Dir.Value);
+                     --  Attribute Linker'Driver: the default linker to use
 
-            begin
-               if Is_Absolute_Path (Dir_Name) then
-                  Err_Vars.Error_Msg_Name_1 := Lib_Dir.Value;
+                     Data.Config.Linker :=
+                       Path_Name_Type (Attribute.Value.Value);
 
-               else
-                  Get_Name_String (Data.Display_Directory);
+                     --  Linker'Driver is also used to link shared libraries
+                     --  if the obsolescent attribute Library_GCC has not been
+                     --  specified.
 
-                  if Name_Buffer (Name_Len) /= Directory_Separator then
-                     Name_Len := Name_Len + 1;
-                     Name_Buffer (Name_Len) := Directory_Separator;
-                  end if;
+                     if Data.Config.Shared_Lib_Driver = No_File then
+                        Data.Config.Shared_Lib_Driver :=
+                          File_Name_Type (Attribute.Value.Value);
+                     end if;
 
-                  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;
+                  elsif Attribute.Name = Name_Required_Switches then
+
+                     --  Attribute Required_Switches: the minimum
+                     --  options to use when invoking the linker
+
+                     Put (Into_List =>
+                            Data.Config.Minimum_Linker_Options,
+                          From_List => Attribute.Value.Values,
+                          In_Tree   => In_Tree);
+
+                  elsif Attribute.Name = Name_Map_File_Option then
+                     Data.Config.Map_File_Option := Attribute.Value.Value;
+
+                  elsif Attribute.Name = Name_Max_Command_Line_Length then
+                     begin
+                        Data.Config.Max_Command_Line_Length :=
+                          Natural'Value (Get_Name_String
+                                         (Attribute.Value.Value));
+
+                     exception
+                        when Constraint_Error =>
+                           Error_Msg
+                             (Project,
+                              In_Tree,
+                              "value must be positive or equal to 0",
+                              Attribute.Value.Location);
+                     end;
+
+                  elsif Attribute.Name = Name_Response_File_Format then
+                     declare
+                        Name  : Name_Id;
+
+                     begin
+                        Get_Name_String (Attribute.Value.Value);
+                        To_Lower (Name_Buffer (1 .. Name_Len));
+                        Name := Name_Find;
+
+                        if Name = Name_None then
+                           Data.Config.Resp_File_Format := None;
+
+                        elsif Name = Name_Gnu then
+                           Data.Config.Resp_File_Format := GNU;
+
+                        elsif Name = Name_Object_List then
+                           Data.Config.Resp_File_Format := Object_List;
+
+                        elsif Name = Name_Option_List then
+                           Data.Config.Resp_File_Format := Option_List;
+
+                        else
+                           Error_Msg
+                             (Project,
+                              In_Tree,
+                              "illegal response file format",
+                              Attribute.Value.Location);
+                        end if;
+                     end;
+
+                  elsif Attribute.Name = Name_Response_File_Switches then
+                     Put (Into_List =>
+                            Data.Config.Resp_File_Options,
+                          From_List => Attribute.Value.Values,
+                          In_Tree   => In_Tree);
+                  end if;
+               end if;
+
+               Attribute_Id := Attribute.Next;
+            end loop;
+         end Process_Linker;
+
+      --  Start of processing for Process_Packages
+
+      begin
+         Packages := Data.Decl.Packages;
+         while Packages /= No_Package loop
+            Element := In_Tree.Packages.Table (Packages);
+
+            case Element.Name is
+               when Name_Binder =>
+
+                  --  Process attributes of package Binder
+
+                  Process_Binder (Element.Decl.Arrays);
+
+               when Name_Builder =>
+
+                  --  Process attributes of package Builder
+
+                  Process_Builder (Element.Decl.Attributes);
+
+               when Name_Compiler =>
+
+                  --  Process attributes of package Compiler
+
+                  Process_Compiler (Element.Decl.Arrays);
+
+               when Name_Linker =>
+
+                  --  Process attributes of package Linker
+
+                  Process_Linker (Element.Decl.Attributes);
+
+               when Name_Naming =>
+
+                  --  Process attributes of package Naming
+
+                  Process_Naming (Element.Decl.Attributes);
+                  Process_Naming (Element.Decl.Arrays);
+
+               when others =>
+                  null;
+            end case;
+
+            Packages := Element.Next;
+         end loop;
+      end Process_Packages;
+
+      ---------------------------------------------
+      -- Process_Project_Level_Simple_Attributes --
+      ---------------------------------------------
+
+      procedure Process_Project_Level_Simple_Attributes is
+         Attribute_Id : Variable_Id;
+         Attribute    : Variable;
+         List         : String_List_Id;
+
+      begin
+         --  Process non associated array attribute at project level
+
+         Attribute_Id := Data.Decl.Attributes;
+         while Attribute_Id /= No_Variable loop
+            Attribute :=
+              In_Tree.Variable_Elements.Table (Attribute_Id);
+
+            if not Attribute.Value.Default then
+               if Attribute.Name = Name_Target then
+
+                  --  Attribute Target: the target specified
+
+                  Data.Config.Target := Attribute.Value.Value;
+
+               elsif Attribute.Name = Name_Library_Builder then
+
+                  --  Attribute Library_Builder: the application to invoke
+                  --  to build libraries.
+
+                  Data.Config.Library_Builder :=
+                    Path_Name_Type (Attribute.Value.Value);
+
+               elsif Attribute.Name = Name_Archive_Builder then
+
+                  --  Attribute Archive_Builder: the archive builder
+                  --  (usually "ar") and its minimum options (usually "cr").
+
+                  List := Attribute.Value.Values;
+
+                  if List = Nil_String then
+                     Error_Msg
+                       (Project,
+                        In_Tree,
+                        "archive builder cannot be null",
+                        Attribute.Value.Location);
+                  end if;
+
+                  Put (Into_List => Data.Config.Archive_Builder,
+                       From_List => List,
+                       In_Tree   => In_Tree);
+
+               elsif Attribute.Name = Name_Archive_Builder_Append_Option then
+
+                  --  Attribute Archive_Builder: the archive builder
+                  --  (usually "ar") and its minimum options (usually "cr").
+
+                  List := Attribute.Value.Values;
+
+                  if List /= Nil_String then
+                     Put
+                       (Into_List => Data.Config.Archive_Builder_Append_Option,
+                        From_List => List,
+                        In_Tree   => In_Tree);
+                  end if;
+
+               elsif Attribute.Name = Name_Archive_Indexer then
+
+                  --  Attribute Archive_Indexer: the optional archive
+                  --  indexer (usually "ranlib") with its minimum options
+                  --  (usually none).
+
+                  List := Attribute.Value.Values;
+
+                  if List = Nil_String then
+                     Error_Msg
+                       (Project,
+                        In_Tree,
+                        "archive indexer cannot be null",
+                        Attribute.Value.Location);
+                  end if;
+
+                  Put (Into_List => Data.Config.Archive_Indexer,
+                       From_List => List,
+                       In_Tree   => In_Tree);
+
+               elsif Attribute.Name = Name_Library_Partial_Linker then
+
+                  --  Attribute Library_Partial_Linker: the optional linker
+                  --  driver with its minimum options, to partially link
+                  --  archives.
+
+                  List := Attribute.Value.Values;
+
+                  if List = Nil_String then
+                     Error_Msg
+                       (Project,
+                        In_Tree,
+                        "partial linker cannot be null",
+                        Attribute.Value.Location);
+                  end if;
+
+                  Put (Into_List => Data.Config.Lib_Partial_Linker,
+                       From_List => List,
+                       In_Tree   => In_Tree);
+
+               elsif Attribute.Name = Name_Library_GCC then
+                  Data.Config.Shared_Lib_Driver :=
+                    File_Name_Type (Attribute.Value.Value);
+                  Error_Msg
+                    (Project,
+                     In_Tree,
+                     "?Library_'G'C'C is an obsolescent attribute, " &
+                     "use Linker''Driver instead",
+                     Attribute.Value.Location);
+
+               elsif Attribute.Name = Name_Archive_Suffix then
+                  Data.Config.Archive_Suffix :=
+                    File_Name_Type (Attribute.Value.Value);
+
+               elsif Attribute.Name = Name_Linker_Executable_Option then
+
+                  --  Attribute Linker_Executable_Option: optional options
+                  --  to specify an executable name. Defaults to "-o".
+
+                  List := Attribute.Value.Values;
+
+                  if List = Nil_String then
+                     Error_Msg
+                       (Project,
+                        In_Tree,
+                        "linker executable option cannot be null",
+                        Attribute.Value.Location);
+                  end if;
+
+                  Put (Into_List => Data.Config.Linker_Executable_Option,
+                       From_List => List,
+                       In_Tree   => In_Tree);
+
+               elsif Attribute.Name = Name_Linker_Lib_Dir_Option then
+
+                  --  Attribute Linker_Lib_Dir_Option: optional options
+                  --  to specify a library search directory. Defaults to
+                  --  "-L".
+
+                  Get_Name_String (Attribute.Value.Value);
+
+                  if Name_Len = 0 then
+                     Error_Msg
+                       (Project,
+                        In_Tree,
+                        "linker library directory option cannot be empty",
+                        Attribute.Value.Location);
+                  end if;
+
+                  Data.Config.Linker_Lib_Dir_Option := Attribute.Value.Value;
+
+               elsif Attribute.Name = Name_Linker_Lib_Name_Option then
+
+                  --  Attribute Linker_Lib_Name_Option: optional options
+                  --  to specify the name of a library to be linked in.
+                  --  Defaults to "-l".
+
+                  Get_Name_String (Attribute.Value.Value);
+
+                  if Name_Len = 0 then
+                     Error_Msg
+                       (Project,
+                        In_Tree,
+                        "linker library name option cannot be empty",
+                        Attribute.Value.Location);
+                  end if;
+
+                  Data.Config.Linker_Lib_Name_Option := Attribute.Value.Value;
+
+               elsif Attribute.Name = Name_Run_Path_Option then
+
+                  --  Attribute Run_Path_Option: optional options to
+                  --  specify a path for libraries.
+
+                  List := Attribute.Value.Values;
+
+                  if List /= Nil_String then
+                     Put (Into_List => Data.Config.Run_Path_Option,
+                          From_List => List,
+                          In_Tree   => In_Tree);
+                  end if;
+
+               elsif Attribute.Name = Name_Separate_Run_Path_Options then
+                  declare
+                     pragma Unsuppress (All_Checks);
+                  begin
+                     Data.Config.Separate_Run_Path_Options :=
+                       Boolean'Value (Get_Name_String (Attribute.Value.Value));
+                  exception
+                     when Constraint_Error =>
+                        Error_Msg
+                          (Project,
+                           In_Tree,
+                           "invalid value """ &
+                           Get_Name_String (Attribute.Value.Value) &
+                           """ for Separate_Run_Path_Options",
+                           Attribute.Value.Location);
+                  end;
+
+               elsif Attribute.Name = Name_Library_Support then
+                  declare
+                     pragma Unsuppress (All_Checks);
+                  begin
+                     Data.Config.Lib_Support :=
+                       Library_Support'Value (Get_Name_String
+                                              (Attribute.Value.Value));
+                  exception
+                     when Constraint_Error =>
+                        Error_Msg
+                          (Project,
+                           In_Tree,
+                           "invalid value """ &
+                           Get_Name_String (Attribute.Value.Value) &
+                           """ for Library_Support",
+                           Attribute.Value.Location);
+                  end;
+
+               elsif Attribute.Name = Name_Shared_Library_Prefix then
+                  Data.Config.Shared_Lib_Prefix :=
+                    File_Name_Type (Attribute.Value.Value);
+
+               elsif Attribute.Name = Name_Shared_Library_Suffix then
+                  Data.Config.Shared_Lib_Suffix :=
+                    File_Name_Type (Attribute.Value.Value);
+
+               elsif Attribute.Name = Name_Symbolic_Link_Supported then
+                  declare
+                     pragma Unsuppress (All_Checks);
+                  begin
+                     Data.Config.Symbolic_Link_Supported :=
+                       Boolean'Value (Get_Name_String
+                                      (Attribute.Value.Value));
+                  exception
+                     when Constraint_Error =>
+                        Error_Msg
+                          (Project,
+                           In_Tree,
+                           "invalid value """
+                             & Get_Name_String (Attribute.Value.Value)
+                             & """ for Symbolic_Link_Supported",
+                           Attribute.Value.Location);
+                  end;
+
+               elsif
+                 Attribute.Name = Name_Library_Major_Minor_Id_Supported
+               then
+                  declare
+                     pragma Unsuppress (All_Checks);
+                  begin
+                     Data.Config.Lib_Maj_Min_Id_Supported :=
+                       Boolean'Value (Get_Name_String
+                                      (Attribute.Value.Value));
+                  exception
+                     when Constraint_Error =>
+                        Error_Msg
+                          (Project,
+                           In_Tree,
+                           "invalid value """ &
+                           Get_Name_String (Attribute.Value.Value) &
+                           """ for Library_Major_Minor_Id_Supported",
+                           Attribute.Value.Location);
+                  end;
+
+               elsif Attribute.Name = Name_Library_Auto_Init_Supported then
+                  declare
+                     pragma Unsuppress (All_Checks);
+                  begin
+                     Data.Config.Auto_Init_Supported :=
+                       Boolean'Value (Get_Name_String (Attribute.Value.Value));
+                  exception
+                     when Constraint_Error =>
+                        Error_Msg
+                          (Project,
+                           In_Tree,
+                           "invalid value """
+                             & Get_Name_String (Attribute.Value.Value)
+                             & """ for Library_Auto_Init_Supported",
+                           Attribute.Value.Location);
+                  end;
+
+               elsif Attribute.Name = Name_Shared_Library_Minimum_Switches then
+                  List := Attribute.Value.Values;
+
+                  if List /= Nil_String then
+                     Put (Into_List => Data.Config.Shared_Lib_Min_Options,
+                          From_List => List,
+                          In_Tree   => In_Tree);
+                  end if;
+
+               elsif Attribute.Name = Name_Library_Version_Switches then
+                  List := Attribute.Value.Values;
+
+                  if List /= Nil_String then
+                     Put (Into_List => Data.Config.Lib_Version_Options,
+                          From_List => List,
+                          In_Tree   => In_Tree);
+                  end if;
+               end if;
+            end if;
+
+            Attribute_Id := Attribute.Next;
+         end loop;
+      end Process_Project_Level_Simple_Attributes;
+
+      --------------------------------------------
+      -- Process_Project_Level_Array_Attributes --
+      --------------------------------------------
+
+      procedure Process_Project_Level_Array_Attributes is
+         Current_Array_Id : Array_Id;
+         Current_Array    : Array_Data;
+         Element_Id       : Array_Element_Id;
+         Element          : Array_Element;
+         List             : String_List_Id;
+
+      begin
+         --  Process the associative array attributes at project level
+
+         Current_Array_Id := Data.Decl.Arrays;
+         while Current_Array_Id /= No_Array loop
+            Current_Array := In_Tree.Arrays.Table (Current_Array_Id);
+
+            Element_Id := Current_Array.Value;
+            while Element_Id /= No_Array_Element loop
+               Element := In_Tree.Array_Elements.Table (Element_Id);
+
+               --  Get the name of the language
+
+               Get_Language_Index_Of (Element.Index);
+
+               if Lang_Index /= No_Language_Index then
+                  case Current_Array.Name is
+                     when Name_Inherit_Source_Path =>
+                        List := Element.Value.Values;
+
+                        if List /= Nil_String then
+                           Put
+                             (Into_List  =>
+                                Lang_Index.Config.Include_Compatible_Languages,
+                              From_List  => List,
+                              In_Tree    => In_Tree,
+                              Lower_Case => True);
+                        end if;
+
+                     when Name_Toolchain_Description =>
+
+                        --  Attribute Toolchain_Description (<language>)
+
+                        Lang_Index.Config.Toolchain_Description :=
+                          Element.Value.Value;
+
+                     when Name_Toolchain_Version =>
+
+                        --  Attribute Toolchain_Version (<language>)
+
+                        Lang_Index.Config.Toolchain_Version :=
+                          Element.Value.Value;
+
+                     when Name_Runtime_Library_Dir =>
+
+                        --  Attribute Runtime_Library_Dir (<language>)
+
+                        Lang_Index.Config.Runtime_Library_Dir :=
+                          Element.Value.Value;
+
+                     when Name_Runtime_Source_Dir =>
+
+                        --  Attribute Runtime_Library_Dir (<language>)
+
+                        Lang_Index.Config.Runtime_Source_Dir :=
+                          Element.Value.Value;
+
+                     when Name_Object_Generated =>
+                        declare
+                           pragma Unsuppress (All_Checks);
+                           Value : Boolean;
+
+                        begin
+                           Value :=
+                             Boolean'Value
+                               (Get_Name_String (Element.Value.Value));
+
+                           Lang_Index.Config.Object_Generated := Value;
+
+                           --  If no object is generated, no object may be
+                           --  linked.
+
+                           if not Value then
+                              Lang_Index.Config.Objects_Linked := False;
+                           end if;
+
+                        exception
+                           when Constraint_Error =>
+                              Error_Msg
+                                (Project,
+                                 In_Tree,
+                                 "invalid value """
+                                 & Get_Name_String (Element.Value.Value)
+                                 & """ for Object_Generated",
+                                 Element.Value.Location);
+                        end;
+
+                     when Name_Objects_Linked =>
+                        declare
+                           pragma Unsuppress (All_Checks);
+                           Value : Boolean;
+
+                        begin
+                           Value :=
+                             Boolean'Value
+                               (Get_Name_String (Element.Value.Value));
+
+                           --  No change if Object_Generated is False, as this
+                           --  forces Objects_Linked to be False too.
+
+                           if Lang_Index.Config.Object_Generated then
+                              Lang_Index.Config.Objects_Linked := Value;
+                           end if;
+
+                        exception
+                           when Constraint_Error =>
+                              Error_Msg
+                                (Project,
+                                 In_Tree,
+                                 "invalid value """
+                                 & Get_Name_String (Element.Value.Value)
+                                 & """ for Objects_Linked",
+                                 Element.Value.Location);
+                        end;
+                     when others =>
+                        null;
+                  end case;
+               end if;
+
+               Element_Id := Element.Next;
+            end loop;
+
+            Current_Array_Id := Current_Array.Next;
+         end loop;
+      end Process_Project_Level_Array_Attributes;
+
+   begin
+      Process_Project_Level_Simple_Attributes;
+      Process_Project_Level_Array_Attributes;
+      Process_Packages;
+
+      --  For unit based languages, set Casing, Dot_Replacement and
+      --  Separate_Suffix in Naming_Data.
+
+      Lang_Index := Data.Languages;
+      while Lang_Index /= No_Language_Index loop
+         if Lang_Index.Name = Name_Ada then
+            Lang_Index.Config.Naming_Data.Casing := Casing;
+            Lang_Index.Config.Naming_Data.Dot_Replacement := Dot_Replacement;
+
+            if Separate_Suffix /= No_File then
+               Lang_Index.Config.Naming_Data.Separate_Suffix :=
+                 Separate_Suffix;
+            end if;
+
+            exit;
+         end if;
+
+         Lang_Index := Lang_Index.Next;
+      end loop;
+
+      --  Give empty names to various prefixes/suffixes, if they have not
+      --  been specified in the configuration.
+
+      if Data.Config.Archive_Suffix = No_File then
+         Data.Config.Archive_Suffix := Empty_File;
+      end if;
+
+      if Data.Config.Shared_Lib_Prefix = No_File then
+         Data.Config.Shared_Lib_Prefix := Empty_File;
+      end if;
+
+      if Data.Config.Shared_Lib_Suffix = No_File then
+         Data.Config.Shared_Lib_Suffix := Empty_File;
+      end if;
+
+      Lang_Index := Data.Languages;
+      while Lang_Index /= No_Language_Index loop
+         Current_Language := Lang_Index.Display_Name;
+
+         --  For all languages, Compiler_Driver needs to be specified
+
+         if Lang_Index.Config.Compiler_Driver = No_File then
+            Error_Msg_Name_1 := Current_Language;
+            Error_Msg
+              (Project,
+               In_Tree,
+               "?no compiler specified for language %%" &
+               ", ignoring all its sources",
+               No_Location);
+
+            if Lang_Index = Data.Languages then
+               Data.Languages := Lang_Index.Next;
+            else
+               Prev_Index.Next := Lang_Index.Next;
+            end if;
+
+         elsif Lang_Index.Name = Name_Ada then
+            Prev_Index := Lang_Index;
+
+            --  For unit based languages, Dot_Replacement, Spec_Suffix and
+            --  Body_Suffix need to be specified.
+
+            if Lang_Index.Config.Naming_Data.Dot_Replacement = No_File then
+               Error_Msg
+                 (Project,
+                  In_Tree,
+                  "Dot_Replacement not specified for Ada",
+                  No_Location);
+            end if;
+
+            if Lang_Index.Config.Naming_Data.Spec_Suffix = No_File then
+               Error_Msg
+                 (Project,
+                  In_Tree,
+                  "Spec_Suffix not specified for Ada",
+                  No_Location);
+            end if;
+
+            if Lang_Index.Config.Naming_Data.Body_Suffix = No_File then
+               Error_Msg
+                 (Project,
+                  In_Tree,
+                  "Body_Suffix not specified for Ada",
+                  No_Location);
+            end if;
+
+         else
+            Prev_Index := Lang_Index;
+
+            --  For file based languages, either Spec_Suffix or Body_Suffix
+            --  need to be specified.
+
+            if Lang_Index.Config.Naming_Data.Spec_Suffix = No_File and then
+              Lang_Index.Config.Naming_Data.Body_Suffix = No_File
+            then
+               Error_Msg_Name_1 := Current_Language;
+               Error_Msg
+                 (Project,
+                  In_Tree,
+                  "no suffixes specified for %%",
+                  No_Location);
+            end if;
+         end if;
+
+         Lang_Index := Lang_Index.Next;
+      end loop;
+   end Check_Configuration;
+
+   -------------------------------
+   -- Check_If_Externally_Built --
+   -------------------------------
+
+   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);
+
+   begin
+      if not Externally_Built.Default then
+         Get_Name_String (Externally_Built.Value);
+         To_Lower (Name_Buffer (1 .. Name_Len));
+
+         if Name_Buffer (1 .. Name_Len) = "true" then
+            Data.Externally_Built := True;
+
+         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;
+
+      --  A virtual project extending an externally built project is itself
+      --  externally built.
+
+      if Data.Virtual and then Data.Extends /= No_Project then
+         Data.Externally_Built :=
+           In_Tree.Projects.Table (Data.Extends).Externally_Built;
+      end if;
+
+      if Current_Verbosity = High then
+         Write_Str ("Project is ");
+
+         if not Data.Externally_Built then
+            Write_Str ("not ");
+         end if;
+
+         Write_Line ("externally built.");
+      end if;
+   end Check_If_Externally_Built;
+
+   ----------------------
+   -- Check_Interfaces --
+   ----------------------
+
+   procedure Check_Interfaces
+     (Project : Project_Id;
+      In_Tree : Project_Tree_Ref;
+      Data    : in out Project_Data)
+   is
+      Interfaces : constant Prj.Variable_Value :=
+                     Prj.Util.Value_Of
+                       (Snames.Name_Interfaces,
+                        Data.Decl.Attributes,
+                        In_Tree);
+
+      List      : String_List_Id;
+      Element   : String_Element;
+      Name      : File_Name_Type;
+      Iter      : Source_Iterator;
+      Source    : Source_Id;
+      Project_2 : Project_Id;
+
+   begin
+      if not Interfaces.Default then
+
+         --  Set In_Interfaces to False for all sources. It will be set to True
+         --  later for the sources in the Interfaces list.
+
+         Project_2 := Project;
+         while Project_2 /= No_Project loop
+            Iter := For_Each_Source (In_Tree, Project_2);
+
+            loop
+               Source := Prj.Element (Iter);
+               exit when Source = No_Source;
+               Source.In_Interfaces := False;
+               Next (Iter);
+            end loop;
+
+            Project_2 := In_Tree.Projects.Table (Project_2).Extends;
+         end loop;
+
+         List := Interfaces.Values;
+         while List /= Nil_String loop
+            Element := In_Tree.String_Elements.Table (List);
+            Name := Canonical_Case_File_Name (Element.Value);
+
+            Project_2 := Project;
+            Big_Loop :
+            while Project_2 /= No_Project loop
+               Iter := For_Each_Source (In_Tree, Project_2);
+
+               loop
+                  Source := Prj.Element (Iter);
+                  exit when Source = No_Source;
+
+                  if Source.File = Name then
+                     if not Source.Locally_Removed then
+                        Source.In_Interfaces := True;
+                        Source.Declared_In_Interfaces := True;
+
+                        if Source.Other_Part /= No_Source then
+                           Source.Other_Part.In_Interfaces := True;
+                           Source.Other_Part.Declared_In_Interfaces := True;
+                        end if;
+
+                        if Current_Verbosity = High then
+                           Write_Str ("   interface: ");
+                           Write_Line (Get_Name_String (Source.Path.Name));
+                        end if;
+                     end if;
+
+                     exit Big_Loop;
+                  end if;
+
+                  Next (Iter);
+               end loop;
+
+               Project_2 := In_Tree.Projects.Table (Project_2).Extends;
+            end loop Big_Loop;
+
+            if Source = No_Source then
+               Error_Msg_File_1 := File_Name_Type (Element.Value);
+               Error_Msg_Name_1 := Data.Name;
+
+               Error_Msg
+                 (Project,
+                  In_Tree,
+                  "{ cannot be an interface of project %% "
+                  & "as it is not one of its sources",
+                  Element.Location);
+            end if;
+
+            List := Element.Next;
+         end loop;
+
+         Data.Interfaces_Defined := True;
+
+      elsif Data.Extends /= No_Project then
+         Data.Interfaces_Defined :=
+           In_Tree.Projects.Table (Data.Extends).Interfaces_Defined;
+
+         if Data.Interfaces_Defined then
+            Iter := For_Each_Source (In_Tree, Project);
+            loop
+               Source := Prj.Element (Iter);
+               exit when Source = No_Source;
+
+               if not Source.Declared_In_Interfaces then
+                  Source.In_Interfaces := False;
+               end if;
+
+               Next (Iter);
+            end loop;
+         end if;
+      end if;
+   end Check_Interfaces;
+
+   ------------------------------------
+   -- Check_And_Normalize_Unit_Names --
+   ------------------------------------
+
+   procedure Check_And_Normalize_Unit_Names
+     (Project    : Project_Id;
+      In_Tree    : Project_Tree_Ref;
+      List       : Array_Element_Id;
+      Debug_Name : String)
+   is
+      Current   : Array_Element_Id;
+      Element   : Array_Element;
+      Unit_Name : Name_Id;
+
+   begin
+      if Current_Verbosity = High then
+         Write_Line ("  Checking unit names in " & Debug_Name);
+      end if;
+
+      Current := List;
+      while Current /= No_Array_Element loop
+         Element := In_Tree.Array_Elements.Table (Current);
+         Element.Value.Value :=
+           Name_Id (Canonical_Case_File_Name (Element.Value.Value));
+
+         --  Check that it contains a valid unit name
+
+         Get_Name_String (Element.Index);
+         Check_Ada_Name (Name_Buffer (1 .. Name_Len), Unit_Name);
+
+         if Unit_Name = No_Name then
+            Err_Vars.Error_Msg_Name_1 := Element.Index;
+            Error_Msg
+              (Project, In_Tree,
+               "%% is not a valid unit name.",
+               Element.Value.Location);
+
+         else
+            if Current_Verbosity = High then
+               Write_Str ("    for unit: ");
+               Write_Line (Get_Name_String (Unit_Name));
+            end if;
+
+            Element.Index := Unit_Name;
+            In_Tree.Array_Elements.Table (Current) := Element;
+         end if;
+
+         Current := Element.Next;
+      end loop;
+   end Check_And_Normalize_Unit_Names;
+
+   --------------------------
+   -- Check_Naming_Schemes --
+   --------------------------
+
+   procedure Check_Naming_Schemes
+     (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);
+      Naming    : Package_Element;
+
+      procedure Check_Naming_Ada_Only;
+      --  Does Check_Naming_Schemes processing in Ada_Only mode.
+      --  If there is a package Naming, puts in Data.Naming the contents of
+      --  this package.
+
+      procedure Check_Naming_Multi_Lang;
+      --  Does Check_Naming_Schemes processing for Multi_Language mode
+
+      procedure Check_Common
+        (Dot_Replacement : in out File_Name_Type;
+         Casing          : in out Casing_Type;
+         Casing_Defined  : out Boolean;
+         Separate_Suffix : in out File_Name_Type;
+         Sep_Suffix_Loc  : out Source_Ptr);
+      --  Check attributes common to Ada_Only and Multi_Lang modes
+
+      procedure Process_Exceptions_File_Based
+        (Lang_Id : Language_Ptr;
+         Kind    : Source_Kind);
+      procedure Process_Exceptions_Unit_Based
+        (Lang_Id : Language_Ptr;
+         Kind    : Source_Kind);
+      --  In Multi_Lang mode, process the naming exceptions for the two types
+      --  of languages we can have.
+
+      ------------------
+      -- Check_Common --
+      ------------------
+
+      procedure Check_Common
+        (Dot_Replacement : in out File_Name_Type;
+         Casing          : in out Casing_Type;
+         Casing_Defined  : out Boolean;
+         Separate_Suffix : in out File_Name_Type;
+         Sep_Suffix_Loc  : out Source_Ptr)
+      is
+         Dot_Repl      : constant Variable_Value :=
+                           Util.Value_Of
+                             (Name_Dot_Replacement,
+                              Naming.Decl.Attributes,
+                              In_Tree);
+         Casing_String : constant Variable_Value :=
+                           Util.Value_Of
+                             (Name_Casing,
+                              Naming.Decl.Attributes,
+                              In_Tree);
+         Sep_Suffix    : constant Variable_Value :=
+                           Util.Value_Of
+                             (Name_Separate_Suffix,
+                              Naming.Decl.Attributes,
+                              In_Tree);
+         Dot_Repl_Loc  : Source_Ptr;
+
+      begin
+         Sep_Suffix_Loc := No_Location;
+
+         if not Dot_Repl.Default then
+            pragma Assert
+              (Dot_Repl.Kind = Single, "Dot_Replacement is not a string");
+
+            if Length_Of_Name (Dot_Repl.Value) = 0 then
+               Error_Msg
+                 (Project, In_Tree,
+                  "Dot_Replacement cannot be empty",
+                  Dot_Repl.Location);
+            end if;
+
+            Dot_Replacement := Canonical_Case_File_Name (Dot_Repl.Value);
+            Dot_Repl_Loc    := Dot_Repl.Location;
+
+            declare
+               Repl : constant String := Get_Name_String (Dot_Replacement);
+
+            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 Repl'Length = 0
+                 or else Is_Alphanumeric (Repl (Repl'First))
+                 or else Is_Alphanumeric (Repl (Repl'Last))
+                 or else (Repl (Repl'First) = '_'
+                           and then
+                             (Repl'Length = 1
+                               or else
+                                 Is_Alphanumeric (Repl (Repl'First + 1))))
+                 or else (Repl'Length > 1
+                           and then
+                             Index (Source => Repl, Pattern => ".") /= 0)
+               then
+                  Error_Msg
+                    (Project, In_Tree,
+                     '"' & Repl &
+                     """ is illegal for Dot_Replacement.",
+                     Dot_Repl_Loc);
+               end if;
+            end;
+         end if;
+
+         if Dot_Replacement /= No_File then
+            Write_Attr
+              ("Dot_Replacement", Get_Name_String (Dot_Replacement));
+         end if;
+
+         Casing_Defined := False;
+
+         if not Casing_String.Default then
+            pragma Assert
+              (Casing_String.Kind = Single, "Casing is not a string");
+
+            declare
+               Casing_Image : constant String :=
+                                Get_Name_String (Casing_String.Value);
+            begin
+               if Casing_Image'Length = 0 then
+                  Error_Msg
+                    (Project, In_Tree,
+                     "Casing cannot be an empty string",
+                     Casing_String.Location);
+               end if;
+
+               Casing := Value (Casing_Image);
+               Casing_Defined := True;
+
+            exception
+               when Constraint_Error =>
+                  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;
+         end if;
+
+         Write_Attr ("Casing", Image (Casing));
+
+         if not Sep_Suffix.Default then
+            if Length_Of_Name (Sep_Suffix.Value) = 0 then
+               Error_Msg
+                 (Project, In_Tree,
+                  "Separate_Suffix cannot be empty",
+                  Sep_Suffix.Location);
+
+            else
+               Separate_Suffix := Canonical_Case_File_Name (Sep_Suffix.Value);
+               Sep_Suffix_Loc  := Sep_Suffix.Location;
+
+               if Is_Illegal_Suffix (Separate_Suffix, Dot_Replacement) then
+                  Err_Vars.Error_Msg_File_1 := Separate_Suffix;
+                  Error_Msg
+                    (Project, In_Tree,
+                     "{ is illegal for Separate_Suffix",
+                     Sep_Suffix.Location);
+               end if;
+            end if;
+         end if;
+
+         if Separate_Suffix /= No_File then
+            Write_Attr
+              ("Separate_Suffix", Get_Name_String (Separate_Suffix));
+         end if;
+      end Check_Common;
+
+      -----------------------------------
+      -- Process_Exceptions_File_Based --
+      -----------------------------------
+
+      procedure Process_Exceptions_File_Based
+        (Lang_Id : Language_Ptr;
+         Kind    : Source_Kind)
+      is
+         Lang           : constant Name_Id := Lang_Id.Name;
+         Exceptions     : Array_Element_Id;
+         Exception_List : Variable_Value;
+         Element_Id     : String_List_Id;
+         Element        : String_Element;
+         File_Name      : File_Name_Type;
+         Source         : Source_Id;
+         Iter           : Source_Iterator;
+
+      begin
+         case Kind is
+            when Impl | Sep =>
+               Exceptions :=
+                 Value_Of
+                   (Name_Implementation_Exceptions,
+                    In_Arrays => Naming.Decl.Arrays,
+                    In_Tree   => In_Tree);
+
+            when Spec =>
+               Exceptions :=
+                 Value_Of
+                   (Name_Specification_Exceptions,
+                    In_Arrays => Naming.Decl.Arrays,
+                    In_Tree   => In_Tree);
+         end case;
+
+         Exception_List := Value_Of
+           (Index    => Lang,
+            In_Array => Exceptions,
+            In_Tree  => In_Tree);
+
+         if Exception_List /= Nil_Variable_Value then
+            Element_Id := Exception_List.Values;
+            while Element_Id /= Nil_String loop
+               Element   := In_Tree.String_Elements.Table (Element_Id);
+               File_Name := Canonical_Case_File_Name (Element.Value);
+
+               Iter := For_Each_Source (In_Tree, Project);
+               loop
+                  Source := Prj.Element (Iter);
+                  exit when Source = No_Source or else Source.File = File_Name;
+                  Next (Iter);
+               end loop;
+
+               if Source = No_Source then
+                  Add_Source
+                    (Id               => Source,
+                     In_Tree          => In_Tree,
+                     Project          => Project,
+                     Lang_Id          => Lang_Id,
+                     Kind             => Kind,
+                     File_Name        => File_Name,
+                     Display_File     => File_Name_Type (Element.Value),
+                     Naming_Exception => True,
+                     Lang_Kind        => File_Based);
+
+               else
+                  --  Check if the file name is already recorded for another
+                  --  language or another kind.
+
+                  if Source.Language /= Lang_Id then
+                     Error_Msg
+                       (Project,
+                        In_Tree,
+                        "the same file cannot be a source of two languages",
+                        Element.Location);
+
+                  elsif Source.Kind /= Kind then
+                     Error_Msg
+                       (Project,
+                        In_Tree,
+                        "the same file cannot be a source and a template",
+                        Element.Location);
+                  end if;
+
+                  --  If the file is already recorded for the same
+                  --  language and the same kind, it means that the file
+                  --  name appears several times in the *_Exceptions
+                  --  attribute; so there is nothing to do.
+               end if;
+
+               Element_Id := Element.Next;
+            end loop;
+         end if;
+      end Process_Exceptions_File_Based;
+
+      -----------------------------------
+      -- Process_Exceptions_Unit_Based --
+      -----------------------------------
+
+      procedure Process_Exceptions_Unit_Based
+        (Lang_Id : Language_Ptr;
+         Kind    : Source_Kind)
+      is
+         Lang              : constant Name_Id := Lang_Id.Name;
+         Exceptions        : Array_Element_Id;
+         Element           : Array_Element;
+         Unit              : Name_Id;
+         Index             : Int;
+         File_Name         : File_Name_Type;
+         Source            : Source_Id;
+         Source_To_Replace : Source_Id := No_Source;
+         Other_Project     : Project_Id;
+         Other_Part        : Source_Id := No_Source;
+         Iter              : Source_Iterator;
+
+      begin
+         case Kind is
+            when Impl | Sep =>
+               Exceptions := Value_Of
+                 (Name_Body,
+                  In_Arrays => Naming.Decl.Arrays,
+                  In_Tree   => In_Tree);
+
+               if Exceptions = No_Array_Element then
+                  Exceptions :=
+                    Value_Of
+                      (Name_Implementation,
+                       In_Arrays => Naming.Decl.Arrays,
+                       In_Tree   => In_Tree);
+               end if;
+
+            when Spec =>
+               Exceptions :=
+                 Value_Of
+                   (Name_Spec,
+                    In_Arrays => Naming.Decl.Arrays,
+                    In_Tree   => In_Tree);
+
+               if Exceptions = No_Array_Element then
+                  Exceptions := Value_Of
+                    (Name_Specification,
+                     In_Arrays => Naming.Decl.Arrays,
+                     In_Tree   => In_Tree);
+               end if;
+         end case;
+
+         while Exceptions /= No_Array_Element loop
+            Element   := In_Tree.Array_Elements.Table (Exceptions);
+            File_Name := Canonical_Case_File_Name (Element.Value.Value);
+
+            Get_Name_String (Element.Index);
+            To_Lower (Name_Buffer (1 .. Name_Len));
+            Unit  := Name_Find;
+            Index := Element.Value.Index;
+
+            --  For Ada, check if it is a valid unit name
+
+            if Lang = Name_Ada then
+               Get_Name_String (Element.Index);
+               Check_Ada_Name (Name_Buffer (1 .. Name_Len), Unit);
+
+               if Unit = No_Name then
+                  Err_Vars.Error_Msg_Name_1 := Element.Index;
+                  Error_Msg
+                    (Project, In_Tree,
+                     "%% is not a valid unit name.",
+                     Element.Value.Location);
+               end if;
+            end if;
+
+            if Unit /= No_Name then
+
+               --  Check if the source already exists
+
+               Source_To_Replace := No_Source;
+               Iter := For_Each_Source (In_Tree);
+
+               loop
+                  Source := Prj.Element (Iter);
+                  exit when Source = No_Source
+                    or else (Source.Unit = Unit and then Source.Index = Index);
+                  Next (Iter);
+               end loop;
+
+               if Source /= No_Source then
+                  if Source.Kind /= Kind then
+                     Other_Part := Source;
+
+                     loop
+                        Next (Iter);
+                        Source := Prj.Element (Iter);
+
+                        exit when Source = No_Source or else
+                          (Source.Unit = Unit and then Source.Index = Index);
+                     end loop;
+                  end if;
+
+                  if Source /= No_Source then
+                     Other_Project := Source.Project;
+
+                     if Is_Extending (Project, Other_Project, In_Tree) then
+                        Other_Part := Source.Other_Part;
+
+                        --  Record the source to be removed
+
+                        Source_To_Replace := Source;
+                        Source := No_Source;
+
+                     else
+                        Error_Msg_Name_1 := Unit;
+                        Error_Msg_Name_2 :=
+                          In_Tree.Projects.Table (Other_Project).Name;
+                        Error_Msg
+                          (Project,
+                           In_Tree,
+                           "%% is already a source of project %%",
+                           Element.Value.Location);
+                     end if;
+                  end if;
+               end if;
+
+               if Source = No_Source then
+                  Add_Source
+                    (Id           => Source,
+                     In_Tree      => In_Tree,
+                     Project      => Project,
+                     Lang_Id      => Lang_Id,
+                     Kind         => Kind,
+                     File_Name    => File_Name,
+                     Display_File => File_Name_Type (Element.Value.Value),
+                     Lang_Kind    => Unit_Based,
+                     Other_Part   => Other_Part,
+                     Unit         => Unit,
+                     Index        => Index,
+                     Naming_Exception => True,
+                     Source_To_Replace => Source_To_Replace);
+               end if;
+            end if;
+
+            Exceptions := Element.Next;
+         end loop;
+      end Process_Exceptions_Unit_Based;
+
+      ---------------------------
+      -- Check_Naming_Ada_Only --
+      ---------------------------
+
+      procedure Check_Naming_Ada_Only is
+         Casing_Defined : Boolean;
+         Spec_Suffix    : File_Name_Type;
+         Body_Suffix    : File_Name_Type;
+         Sep_Suffix_Loc : Source_Ptr;
+
+         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);
+
+         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);
+
+      begin
+         --  The default value of separate suffix should be the same as the
+         --  body suffix, so we need to compute that first.
+
+         if Ada_Body_Suffix.Kind = Single
+           and then Length_Of_Name (Ada_Body_Suffix.Value) /= 0
+         then
+            Body_Suffix := Canonical_Case_File_Name (Ada_Body_Suffix.Value);
+            Data.Naming.Separate_Suffix := Body_Suffix;
+            Set_Body_Suffix (In_Tree, "ada", Data.Naming, Body_Suffix);
+
+         else
+            Body_Suffix := Default_Ada_Body_Suffix;
+            Data.Naming.Separate_Suffix := Body_Suffix;
+            Set_Body_Suffix (In_Tree, "ada", Data.Naming, Body_Suffix);
+         end if;
+
+         Write_Attr ("Body_Suffix", Get_Name_String (Body_Suffix));
+
+         --  We'll need the dot replacement below, so compute it now
+
+         Check_Common
+           (Dot_Replacement => Data.Naming.Dot_Replacement,
+            Casing          => Data.Naming.Casing,
+            Casing_Defined  => Casing_Defined,
+            Separate_Suffix => Data.Naming.Separate_Suffix,
+            Sep_Suffix_Loc  => Sep_Suffix_Loc);
+
+         Data.Naming.Bodies :=
+           Util.Value_Of (Name_Body, Naming.Decl.Arrays, In_Tree);
+
+         if Data.Naming.Bodies /= No_Array_Element then
+            Check_And_Normalize_Unit_Names
+              (Project, In_Tree, Data.Naming.Bodies, "Naming.Bodies");
+         end if;
+
+         Data.Naming.Specs :=
+           Util.Value_Of (Name_Spec, Naming.Decl.Arrays, In_Tree);
+
+         if Data.Naming.Specs /= No_Array_Element then
+            Check_And_Normalize_Unit_Names
+              (Project, In_Tree, Data.Naming.Specs, "Naming.Specs");
+         end if;
+
+         --  Check Spec_Suffix
+
+         if Ada_Spec_Suffix.Kind = Single
+           and then Length_Of_Name (Ada_Spec_Suffix.Value) /= 0
+         then
+            Spec_Suffix := Canonical_Case_File_Name (Ada_Spec_Suffix.Value);
+            Set_Spec_Suffix (In_Tree, "ada", Data.Naming, Spec_Suffix);
+
+            if Is_Illegal_Suffix
+                 (Spec_Suffix, Data.Naming.Dot_Replacement)
+            then
+               Err_Vars.Error_Msg_File_1 := Spec_Suffix;
+               Error_Msg
+                 (Project, In_Tree,
+                  "{ is illegal for Spec_Suffix",
+                  Ada_Spec_Suffix.Location);
+            end if;
+
+         else
+            Spec_Suffix := Default_Ada_Spec_Suffix;
+            Set_Spec_Suffix (In_Tree, "ada", Data.Naming, Spec_Suffix);
+         end if;
+
+         Write_Attr ("Spec_Suffix", Get_Name_String (Spec_Suffix));
+
+         --  Check Body_Suffix
+
+         if Is_Illegal_Suffix (Body_Suffix, Data.Naming.Dot_Replacement) then
+            Err_Vars.Error_Msg_File_1 := Body_Suffix;
+            Error_Msg
+              (Project, In_Tree,
+               "{ is illegal for Body_Suffix",
+               Ada_Body_Suffix.Location);
+         end if;
+
+         --  Spec_Suffix cannot be equal to Body_Suffix or Separate_Suffix,
+         --  since that would cause a clear ambiguity. Note that we do allow a
+         --  Spec_Suffix to have the same termination as one of these, which
+         --  causes a potential ambiguity, but we resolve that my matching the
+         --  longest possible suffix.
+
+         if Spec_Suffix = Body_Suffix then
+            Error_Msg
+              (Project, In_Tree,
+               "Body_Suffix (""" &
+               Get_Name_String (Body_Suffix) &
+               """) cannot be the same as Spec_Suffix.",
+               Ada_Body_Suffix.Location);
+         end if;
+
+         if Body_Suffix /= Data.Naming.Separate_Suffix
+           and then Spec_Suffix = Data.Naming.Separate_Suffix
+         then
+            Error_Msg
+              (Project, In_Tree,
+               "Separate_Suffix (""" &
+               Get_Name_String (Data.Naming.Separate_Suffix) &
+               """) cannot be the same as Spec_Suffix.",
+               Sep_Suffix_Loc);
+         end if;
+      end Check_Naming_Ada_Only;
+
+      -----------------------------
+      -- Check_Naming_Multi_Lang --
+      -----------------------------
+
+      procedure Check_Naming_Multi_Lang is
+         Dot_Replacement : File_Name_Type := No_File;
+         Separate_Suffix : File_Name_Type := No_File;
+         Casing          : Casing_Type    := All_Lower_Case;
+         Casing_Defined  : Boolean;
+         Lang_Id         : Language_Ptr;
+         Sep_Suffix_Loc  : Source_Ptr;
+         Suffix          : Variable_Value;
+         Lang            : Name_Id;
+
+      begin
+         Check_Common
+           (Dot_Replacement => Dot_Replacement,
+            Casing          => Casing,
+            Casing_Defined  => Casing_Defined,
+            Separate_Suffix => Separate_Suffix,
+            Sep_Suffix_Loc  => Sep_Suffix_Loc);
+
+         --  For all unit based languages, if any, set the specified
+         --  value of Dot_Replacement, Casing and/or Separate_Suffix. Do not
+         --  systematically overwrite, since the defaults come from the
+         --  configuration file
+
+         if Dot_Replacement /= No_File
+           or else Casing_Defined
+           or else Separate_Suffix /= No_File
+         then
+            Lang_Id := Data.Languages;
+            while Lang_Id /= No_Language_Index loop
+               if Lang_Id.Config.Kind = Unit_Based then
+                  if Dot_Replacement /= No_File then
+                     Lang_Id.Config.Naming_Data.Dot_Replacement :=
+                         Dot_Replacement;
+                  end if;
+
+                  if Casing_Defined then
+                     Lang_Id.Config.Naming_Data.Casing := Casing;
+                  end if;
+
+                  if Separate_Suffix /= No_File then
+                     Lang_Id.Config.Naming_Data.Separate_Suffix :=
+                         Separate_Suffix;
+                  end if;
+               end if;
+
+               Lang_Id := Lang_Id.Next;
+            end loop;
+         end if;
+
+         --  Next, get the spec and body suffixes
+
+         Lang_Id := Data.Languages;
+         while Lang_Id /= No_Language_Index loop
+            Lang := Lang_Id.Name;
+
+            --  Spec_Suffix
+
+            Suffix := Value_Of
+              (Name                    => Lang,
+               Attribute_Or_Array_Name => Name_Spec_Suffix,
+               In_Package              => Naming_Id,
+               In_Tree                 => In_Tree);
+
+            if Suffix = Nil_Variable_Value then
+               Suffix := Value_Of
+                 (Name                    => Lang,
+                  Attribute_Or_Array_Name => Name_Specification_Suffix,
+                  In_Package              => Naming_Id,
+                  In_Tree                 => In_Tree);
+            end if;
+
+            if Suffix /= Nil_Variable_Value then
+               Lang_Id.Config.Naming_Data.Spec_Suffix :=
+                   File_Name_Type (Suffix.Value);
+            end if;
+
+            --  Body_Suffix
+
+            Suffix := Value_Of
+              (Name                    => Lang,
+               Attribute_Or_Array_Name => Name_Body_Suffix,
+               In_Package              => Naming_Id,
+               In_Tree                 => In_Tree);
+
+            if Suffix = Nil_Variable_Value then
+               Suffix := Value_Of
+                 (Name                    => Lang,
+                  Attribute_Or_Array_Name => Name_Implementation_Suffix,
+                  In_Package              => Naming_Id,
+                  In_Tree                 => In_Tree);
+            end if;
+
+            if Suffix /= Nil_Variable_Value then
+               Lang_Id.Config.Naming_Data.Body_Suffix :=
+                   File_Name_Type (Suffix.Value);
+            end if;
+
+            --  ??? As opposed to what is done in Check_Naming_Ada_Only,
+            --  we do not check whether spec_suffix=body_suffix, which
+            --  should be illegal. Best would be to share this code into
+            --  Check_Common, but we access the attributes from the project
+            --  files slightly differently apparently.
+
+            Lang_Id := Lang_Id.Next;
+         end loop;
+
+         --  Get the naming exceptions for all languages
+
+         for Kind in Spec .. Impl loop
+            Lang_Id := Data.Languages;
+            while Lang_Id /= No_Language_Index loop
+               case Lang_Id.Config.Kind is
+               when File_Based =>
+                  Process_Exceptions_File_Based (Lang_Id, Kind);
+
+               when Unit_Based =>
+                  Process_Exceptions_Unit_Based (Lang_Id, Kind);
+               end case;
+
+               Lang_Id := Lang_Id.Next;
+            end loop;
+         end loop;
+      end Check_Naming_Multi_Lang;
+
+   --  Start of processing for Check_Naming_Schemes
+
+   begin
+      --  No Naming package or parsing a configuration file? nothing to do
+
+      if Naming_Id /= No_Package and not In_Configuration then
+         Naming := In_Tree.Packages.Table (Naming_Id);
+
+         if Current_Verbosity = High then
+            Write_Line ("Checking package Naming.");
+         end if;
+
+         case Get_Mode is
+            when Ada_Only =>
+               Check_Naming_Ada_Only;
+            when Multi_Language =>
+               Check_Naming_Multi_Lang;
+         end case;
+      end if;
+   end Check_Naming_Schemes;
+
+   ------------------------------
+   -- Check_Library_Attributes --
+   ------------------------------
+
+   procedure Check_Library_Attributes
+     (Project     : Project_Id;
+      In_Tree     : Project_Tree_Ref;
+      Current_Dir : String;
+      Data        : in out Project_Data)
+   is
+      Attributes   : constant Prj.Variable_Id := Data.Decl.Attributes;
+
+      Lib_Dir      : constant Prj.Variable_Value :=
+                       Prj.Util.Value_Of
+                         (Snames.Name_Library_Dir, Attributes, In_Tree);
+
+      Lib_Name     : constant Prj.Variable_Value :=
+                       Prj.Util.Value_Of
+                         (Snames.Name_Library_Name, Attributes, In_Tree);
+
+      Lib_Version  : constant Prj.Variable_Value :=
+                       Prj.Util.Value_Of
+                         (Snames.Name_Library_Version, Attributes, In_Tree);
+
+      Lib_ALI_Dir  : constant Prj.Variable_Value :=
+                       Prj.Util.Value_Of
+                         (Snames.Name_Library_Ali_Dir, Attributes, In_Tree);
+
+      Lib_GCC      : constant Prj.Variable_Value :=
+                       Prj.Util.Value_Of
+                         (Snames.Name_Library_GCC, Attributes, In_Tree);
+
+      The_Lib_Kind : constant Prj.Variable_Value :=
+                       Prj.Util.Value_Of
+                         (Snames.Name_Library_Kind, Attributes, In_Tree);
+
+      Imported_Project_List : Project_List := Empty_Project_List;
+
+      Continuation : String_Access := No_Continuation_String'Access;
+
+      Support_For_Libraries : Library_Support;
+
+      Library_Directory_Present : Boolean;
+
+      procedure Check_Library (Proj : Project_Id; Extends : Boolean);
+      --  Check if an imported or extended project if also a library project
+
+      -------------------
+      -- Check_Library --
+      -------------------
+
+      procedure Check_Library (Proj : Project_Id; Extends : Boolean) is
+         Proj_Data : Project_Data;
+         Src_Id    : Source_Id;
+         Iter      : Source_Iterator;
+
+      begin
+         if Proj /= No_Project then
+            Proj_Data := In_Tree.Projects.Table (Proj);
+
+            if not Proj_Data.Library then
+
+               --  The only not library projects that are OK are those that
+               --  have no sources. However, header files from non-Ada
+               --  languages are OK, as there is nothing to compile.
+
+               Iter := For_Each_Source (In_Tree, Proj);
+               loop
+                  Src_Id := Prj.Element (Iter);
+                  exit when Src_Id = No_Source
+                    or else Src_Id.Lang_Kind /= File_Based
+                    or else Src_Id.Kind /= Spec;
+                  Next (Iter);
+               end loop;
+
+               if Src_Id /= No_Source then
+                  Error_Msg_Name_1 := Data.Name;
+                  Error_Msg_Name_2 := Proj_Data.Name;
+
+                  if Extends then
+                     if Data.Library_Kind /= Static then
+                        Error_Msg
+                          (Project, In_Tree,
+                           Continuation.all &
+                           "shared library project %% cannot extend " &
+                           "project %% that is not a library project",
+                           Data.Location);
+                        Continuation := Continuation_String'Access;
+                     end if;
+
+                  elsif (not Unchecked_Shared_Lib_Imports)
+                        and then Data.Library_Kind /= Static
+                  then
+                     Error_Msg
+                       (Project, In_Tree,
+                        Continuation.all &
+                        "shared library project %% cannot import project %% " &
+                        "that is not a shared library project",
+                        Data.Location);
+                     Continuation := Continuation_String'Access;
+                  end if;
+               end if;
+
+            elsif Data.Library_Kind /= Static and then
+                  Proj_Data.Library_Kind = Static
+            then
+               Error_Msg_Name_1 := Data.Name;
+               Error_Msg_Name_2 := Proj_Data.Name;
+
+               if Extends then
+                  Error_Msg
+                    (Project, In_Tree,
+                     Continuation.all &
+                     "shared library project %% cannot extend static " &
+                     "library project %%",
+                     Data.Location);
+                  Continuation := Continuation_String'Access;
+
+               elsif not Unchecked_Shared_Lib_Imports then
+                  Error_Msg
+                    (Project, In_Tree,
+                     Continuation.all &
+                     "shared library project %% cannot import static " &
+                     "library project %%",
+                     Data.Location);
+                  Continuation := Continuation_String'Access;
                end if;
 
-               --  Report the error
+            end if;
+         end if;
+      end Check_Library;
 
-               Error_Msg
-                 (Project, In_Tree,
-                  "library directory { does not exist",
-                  Lib_Dir.Location);
-            end;
+   --  Start of processing for Check_Library_Attributes
 
-         --  The library directory cannot be the same as the Object directory
+   begin
+      Library_Directory_Present := Lib_Dir.Value /= Empty_String;
 
-         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_Name;
-            Data.Display_Library_Dir := No_Name;
+      --  Special case of extending project
+
+      if Data.Extends /= No_Project then
+         declare
+            Extended_Data : constant Project_Data :=
+                              In_Tree.Projects.Table (Data.Extends);
 
-         --  Display the Library directory in high verbosity
+         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.
 
-         else
-            if Current_Verbosity = High then
-               Write_Str ("Library directory =""");
-               Write_Str (Get_Name_String (Data.Display_Library_Dir));
-               Write_Line ("""");
+            if Extended_Data.Library then
+               if Data.Qualifier = Standard then
+                  Error_Msg
+                    (Project, In_Tree,
+                     "a standard project cannot extend a library project",
+                     Data.Location);
+
+               else
+                  if Lib_Name.Default then
+                     Data.Library_Name := Extended_Data.Library_Name;
+                  end if;
+
+                  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);
+
+                     else
+                        --  For a virtual project extending a library project,
+                        --  inherit library directory.
+
+                        Data.Library_Dir := Extended_Data.Library_Dir;
+                        Library_Directory_Present := True;
+                     end if;
+                  end if;
+               end if;
             end if;
-         end if;
+         end;
       end if;
 
       pragma Assert (Lib_Name.Kind = Single);
@@ -1515,21 +3570,213 @@ package body Prj.Nmsc is
          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 ("""");
+      if Data.Library_Name /= No_Name then
+         if Current_Verbosity = High then
+            Write_Attr ("Library name", Get_Name_String (Data.Library_Name));
+         end if;
+
+         pragma Assert (Lib_Dir.Kind = Single);
+
+         if not Library_Directory_Present then
+            if Current_Verbosity = High then
+               Write_Line ("No library directory");
+            end if;
+
+         else
+            --  Find path name (unless inherited), check that it is a directory
+
+            if Data.Library_Dir = No_Path_Information then
+               Locate_Directory
+                 (Project,
+                  In_Tree,
+                  File_Name_Type (Lib_Dir.Value),
+                  Data.Directory.Display_Name,
+                  Data.Library_Dir.Name,
+                  Data.Library_Dir.Display_Name,
+                  Create           => "library",
+                  Current_Dir      => Current_Dir,
+                  Location         => Lib_Dir.Location,
+                  Externally_Built => Data.Externally_Built);
+            end if;
+
+            if Data.Library_Dir = No_Path_Information then
+
+               --  Get the absolute name of the library directory that
+               --  does not exist, to report an error.
+
+               declare
+                  Dir_Name : constant String :=
+                               Get_Name_String (Lib_Dir.Value);
+
+               begin
+                  if Is_Absolute_Path (Dir_Name) then
+                     Err_Vars.Error_Msg_File_1 :=
+                       File_Name_Type (Lib_Dir.Value);
+
+                  else
+                     Get_Name_String (Data.Directory.Display_Name);
+
+                     if Name_Buffer (Name_Len) /= Directory_Separator then
+                        Name_Len := Name_Len + 1;
+                        Name_Buffer (Name_Len) := Directory_Separator;
+                     end if;
+
+                     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;
+
+                  --  Report the error
+
+                  Error_Msg
+                    (Project, In_Tree,
+                     "library directory { does not exist",
+                     Lib_Dir.Location);
+               end;
+
+               --  The library directory cannot be the same as the Object
+               --  directory.
+
+            elsif Data.Library_Dir.Name = Data.Object_Directory.Name then
+               Error_Msg
+                 (Project, In_Tree,
+                  "library directory cannot be the same " &
+                  "as object directory",
+                  Lib_Dir.Location);
+               Data.Library_Dir := No_Path_Information;
+
+            else
+               declare
+                  OK       : Boolean := True;
+                  Dirs_Id  : String_List_Id;
+                  Dir_Elem : String_Element;
+
+               begin
+                  --  The library 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_Dir.Name = 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;
+
+                  if OK then
+
+                     --  The library directory cannot be the same as a source
+                     --  directory of another project either.
+
+                     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;
+
+                           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_Dir.Name =
+                                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 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;
+
+                  if not OK then
+                     Data.Library_Dir := No_Path_Information;
+
+                  elsif Current_Verbosity = High then
+
+                     --  Display the Library directory in high verbosity
+
+                     Write_Attr
+                       ("Library directory",
+                        Get_Name_String (Data.Library_Dir.Display_Name));
+                  end if;
+               end;
+            end if;
+         end if;
+
       end if;
 
       Data.Library :=
-        Data.Library_Dir /= No_Name
+        Data.Library_Dir /= No_Path_Information
         and then
       Data.Library_Name /= No_Name;
 
+      if Data.Extends = No_Project then
+         case Data.Qualifier is
+            when Standard =>
+               if Data.Library then
+                  Error_Msg
+                    (Project, In_Tree,
+                     "a standard project cannot be a library project",
+                     Lib_Name.Location);
+               end if;
+
+            when Library =>
+               if not Data.Library then
+                  if Data.Library_Dir = No_Path_Information then
+                     Error_Msg
+                       (Project, In_Tree,
+                        "\attribute Library_Dir not declared",
+                        Data.Location);
+                  end if;
+
+                  if Data.Library_Name = No_Name then
+                     Error_Msg
+                       (Project, In_Tree,
+                        "\attribute Library_Name not declared",
+                        Data.Location);
+                  end if;
+               end if;
+
+            when others =>
+               null;
+
+         end case;
+      end if;
+
       if Data.Library then
-         if MLib.Tgt.Support_For_Libraries = MLib.Tgt.None then
+         if Get_Mode = Multi_Language then
+            Support_For_Libraries := Data.Config.Lib_Support;
+
+         else
+            Support_For_Libraries := MLib.Tgt.Support_For_Libraries;
+         end if;
+
+         if Support_For_Libraries = Prj.None then
             Error_Msg
               (Project, In_Tree,
                "?libraries are not supported on this platform",
@@ -1537,6 +3784,167 @@ package body Prj.Nmsc is
             Data.Library := False;
 
          else
+            if Lib_ALI_Dir.Value = Empty_String then
+               if Current_Verbosity = High then
+                  Write_Line ("No library ALI directory specified");
+               end if;
+               Data.Library_ALI_Dir := Data.Library_Dir;
+
+            else
+               --  Find path name, check that it is a directory
+
+               Locate_Directory
+                 (Project,
+                  In_Tree,
+                  File_Name_Type (Lib_ALI_Dir.Value),
+                  Data.Directory.Display_Name,
+                  Data.Library_ALI_Dir.Name,
+                  Data.Library_ALI_Dir.Display_Name,
+                  Create           => "library ALI",
+                  Current_Dir      => Current_Dir,
+                  Location         => Lib_ALI_Dir.Location,
+                  Externally_Built => Data.Externally_Built);
+
+               if Data.Library_ALI_Dir = No_Path_Information then
+
+                  --  Get the absolute name of the library ALI directory that
+                  --  does not exist, to report an error.
+
+                  declare
+                     Dir_Name : constant String :=
+                                  Get_Name_String (Lib_ALI_Dir.Value);
+
+                  begin
+                     if Is_Absolute_Path (Dir_Name) then
+                        Err_Vars.Error_Msg_File_1 :=
+                          File_Name_Type (Lib_Dir.Value);
+
+                     else
+                        Get_Name_String (Data.Directory.Display_Name);
+
+                        if Name_Buffer (Name_Len) /= Directory_Separator then
+                           Name_Len := Name_Len + 1;
+                           Name_Buffer (Name_Len) := Directory_Separator;
+                        end if;
+
+                        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;
+
+                     --  Report the error
+
+                     Error_Msg
+                       (Project, In_Tree,
+                        "library 'A'L'I directory { does not exist",
+                        Lib_ALI_Dir.Location);
+                  end;
+               end if;
+
+               if Data.Library_ALI_Dir /= Data.Library_Dir then
+
+                  --  The library ALI directory cannot be the same as the
+                  --  Object directory.
+
+                  if Data.Library_ALI_Dir = Data.Object_Directory then
+                     Error_Msg
+                       (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_Information;
+
+                  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.Name =
+                             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.Name =
+                                        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_Information;
+
+                        elsif Current_Verbosity = High then
+
+                           --  Display the Library ALI directory in high
+                           --  verbosity.
+
+                           Write_Attr
+                             ("Library ALI dir",
+                              Get_Name_String
+                                (Data.Library_ALI_Dir.Display_Name));
+                        end if;
+                     end;
+                  end if;
+               end if;
+            end if;
+
             pragma Assert (Lib_Version.Kind = Single);
 
             if Lib_Version.Value = Empty_String then
@@ -1583,29 +3991,130 @@ package body Prj.Nmsc is
                   end if;
 
                   if Current_Verbosity = High and then OK then
-                     Write_Str ("Library kind = ");
-                     Write_Line (Kind_Name);
+                     Write_Attr ("Library kind", 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;
+                  if Data.Library_Kind /= Static then
+                     if Support_For_Libraries = Prj.Static_Only then
+                        Error_Msg
+                          (Project, In_Tree,
+                           "only static libraries are supported " &
+                           "on this platform",
+                           The_Lib_Kind.Location);
+                        Data.Library := False;
+
+                     else
+                        --  Check if (obsolescent) attribute Library_GCC or
+                        --  Linker'Driver is declared.
+
+                        if Lib_GCC.Value /= Empty_String then
+                           Error_Msg
+                             (Project,
+                              In_Tree,
+                              "?Library_'G'C'C is an obsolescent attribute, " &
+                              "use Linker''Driver instead",
+                              Lib_GCC.Location);
+                           Data.Config.Shared_Lib_Driver :=
+                             File_Name_Type (Lib_GCC.Value);
+
+                        else
+                           declare
+                              Linker : constant Package_Id :=
+                                         Value_Of
+                                           (Name_Linker,
+                                            Data.Decl.Packages,
+                                            In_Tree);
+                              Driver : constant Variable_Value :=
+                                         Value_Of
+                                           (Name                    => No_Name,
+                                            Attribute_Or_Array_Name =>
+                                              Name_Driver,
+                                            In_Package              => Linker,
+                                            In_Tree                 =>
+                                              In_Tree);
+
+                           begin
+                              if Driver /= Nil_Variable_Value
+                                 and then Driver.Value /= Empty_String
+                              then
+                                 Data.Config.Shared_Lib_Driver :=
+                                   File_Name_Type (Driver.Value);
+                              end if;
+                           end;
+                        end if;
+                     end if;
                   end if;
                end;
             end if;
 
-            if Data.Library and then Current_Verbosity = High then
-               Write_Line ("This is a library project file");
+            if Data.Library then
+               if Current_Verbosity = High then
+                  Write_Line ("This is a library project file");
+               end if;
+
+               if Get_Mode = Multi_Language then
+                  Check_Library (Data.Extends, Extends => True);
+
+                  Imported_Project_List := Data.Imported_Projects;
+                  while Imported_Project_List /= Empty_Project_List loop
+                     Check_Library
+                       (In_Tree.Project_Lists.Table
+                          (Imported_Project_List).Project,
+                        Extends => False);
+                     Imported_Project_List :=
+                       In_Tree.Project_Lists.Table
+                         (Imported_Project_List).Next;
+                  end loop;
+               end if;
             end if;
 
          end if;
       end if;
+
+      --  Check if Linker'Switches or Linker'Default_Switches are declared.
+      --  Warn if they are declared, as it is a common error to think that
+      --  library are "linked" with Linker switches.
+
+      if Data.Library then
+         declare
+            Linker_Package_Id : constant Package_Id :=
+                                  Util.Value_Of
+                                    (Name_Linker, Data.Decl.Packages, In_Tree);
+            Linker_Package    : Package_Element;
+            Switches          : Array_Element_Id := No_Array_Element;
+
+         begin
+            if Linker_Package_Id /= No_Package then
+               Linker_Package := In_Tree.Packages.Table (Linker_Package_Id);
+
+               Switches :=
+                 Value_Of
+                   (Name      => Name_Switches,
+                    In_Arrays => Linker_Package.Decl.Arrays,
+                    In_Tree   => In_Tree);
+
+               if Switches = No_Array_Element then
+                  Switches :=
+                    Value_Of
+                      (Name      => Name_Default_Switches,
+                       In_Arrays => Linker_Package.Decl.Arrays,
+                       In_Tree   => In_Tree);
+               end if;
+
+               if Switches /= No_Array_Element then
+                  Error_Msg
+                    (Project, In_Tree,
+                     "?Linker switches not taken into account in library " &
+                     "projects",
+                     No_Location);
+               end if;
+            end if;
+         end;
+      end if;
+
+      if Data.Extends /= No_Project then
+         In_Tree.Projects.Table (Data.Extends).Library := False;
+      end if;
    end Check_Library_Attributes;
 
    --------------------------
@@ -1620,7 +4129,7 @@ package body Prj.Nmsc is
       Naming_Id : constant Package_Id :=
                     Util.Value_Of (Name_Naming, Data.Decl.Packages, In_Tree);
 
-      Naming : Package_Element;
+      Naming    : Package_Element;
 
    begin
       --  If there is a package Naming, we will put in Data.Naming
@@ -1647,7 +4156,7 @@ package body Prj.Nmsc is
             Suffix2 : Array_Element_Id;
 
          begin
-            --  If some suffixs have been specified, we make sure that
+            --  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 none, the default.
@@ -1689,17 +4198,18 @@ package body Prj.Nmsc is
                   Suffix := Element.Next;
                end loop;
 
-               --  Put the resulting array as the specification suffixs
+               --  Put the resulting array as the specification suffixes
 
                Data.Naming.Spec_Suffix := Spec_Suffixs;
             end if;
          end;
 
          declare
-            Current : Array_Element_Id := Data.Naming.Spec_Suffix;
+            Current : Array_Element_Id;
             Element : Array_Element;
 
          begin
+            Current := Data.Naming.Spec_Suffix;
             while Current /= No_Array_Element loop
                Element := In_Tree.Array_Elements.Table (Current);
                Get_Name_String (Element.Value.Value);
@@ -1720,29 +4230,28 @@ package body Prj.Nmsc is
 
          declare
             Impl_Suffixs : Array_Element_Id :=
-              Util.Value_Of
-                (Name_Body_Suffix,
-                 Naming.Decl.Arrays,
-                 In_Tree);
+                             Util.Value_Of
+                               (Name_Body_Suffix,
+                                Naming.Decl.Arrays,
+                                In_Tree);
 
-            Suffix       : Array_Element_Id;
-            Element      : Array_Element;
-            Suffix2      : Array_Element_Id;
+            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.
+            --  in the project file or if there were none, 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;
 
+                  Suffix2 := Impl_Suffixs;
                   while Suffix2 /= No_Array_Element loop
                      exit when In_Tree.Array_Elements.Table
                                 (Suffix2).Index = Element.Index;
@@ -1751,8 +4260,7 @@ package body Prj.Nmsc is
                   end loop;
 
                   --  There is a registered default suffix, but no suffix was
-                  --  specified in the project file. Add the default to the
-                  --  array.
+                  --  specified in the project file. Add default to the array.
 
                   if Suffix2 = No_Array_Element then
                      Array_Element_Table.Increment_Last
@@ -1772,17 +4280,18 @@ package body Prj.Nmsc is
                   Suffix := Element.Next;
                end loop;
 
-               --  Put the resulting array as the implementation suffixs
+               --  Put the resulting array as the implementation suffixes
 
                Data.Naming.Body_Suffix := Impl_Suffixs;
             end if;
          end;
 
          declare
-            Current : Array_Element_Id := Data.Naming.Body_Suffix;
+            Current : Array_Element_Id;
             Element : Array_Element;
 
          begin
+            Current := Data.Naming.Body_Suffix;
             while Current /= No_Array_Element loop
                Element := In_Tree.Array_Elements.Table (Current);
                Get_Name_String (Element.Value.Value);
@@ -1821,15 +4330,23 @@ package body Prj.Nmsc is
 
    procedure Check_Programming_Languages
      (In_Tree : Project_Tree_Ref;
+      Project : Project_Id;
       Data    : in out Project_Data)
    is
-      Languages : Variable_Value := Nil_Variable_Value;
+      Languages   : Variable_Value := Nil_Variable_Value;
+      Def_Lang    : Variable_Value := Nil_Variable_Value;
+      Def_Lang_Id : Name_Id;
 
    begin
+      Data.Languages := No_Language_Index;
       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;
+      Def_Lang :=
+        Prj.Util.Value_Of
+          (Name_Default_Language, Data.Decl.Attributes, In_Tree);
+
+      --  Shouldn't these be set to False by default, and only set to True when
+      --  we actually find some source file???
 
       if Data.Source_Dirs /= Nil_String then
 
@@ -1837,59 +4354,112 @@ package body Prj.Nmsc is
 
          if Languages.Default then
 
-            --  Attribute Languages is not specified. So, it defaults to
-            --  a project of language Ada only.
+            --  In Ada_Only mode, the default language is Ada
 
-            Data.Languages (Ada_Language_Index) := True;
+            if Get_Mode = Ada_Only then
+               Def_Lang_Id := Name_Ada;
 
-            --  No sources of languages other than Ada
+            else
+               --  Fail if there is no default language defined
+
+               if Def_Lang.Default then
+                  if not Default_Language_Is_Ada then
+                     Error_Msg
+                       (Project,
+                        In_Tree,
+                        "no languages defined for this project",
+                        Data.Location);
+                     Def_Lang_Id := No_Name;
+                  else
+                     Def_Lang_Id := Name_Ada;
+                  end if;
+
+               else
+                  Get_Name_String (Def_Lang.Value);
+                  To_Lower (Name_Buffer (1 .. Name_Len));
+                  Def_Lang_Id := Name_Find;
+               end if;
+            end if;
 
-            Data.Other_Sources_Present := False;
+            if Def_Lang_Id /= No_Name then
+               Data.Languages :=
+                 new Language_Data'(No_Language_Data);
+               Data.Languages.Name := Def_Lang_Id;
+               Get_Name_String (Def_Lang_Id);
+               Name_Buffer (1) := GNAT.Case_Util.To_Upper (Name_Buffer (1));
+               Data.Languages.Display_Name := Name_Find;
+
+               if Def_Lang_Id = Name_Ada then
+                  Data.Languages.Config.Kind := Unit_Based;
+                  Data.Languages.Config.Dependency_Kind :=
+                    ALI_File;
+               else
+                  Data.Languages.Config.Kind := File_Based;
+               end if;
+            end if;
 
          else
             declare
-               Current   : String_List_Id := Languages.Values;
-               Element   : String_Element;
-               Lang_Name : Name_Id;
-               Index     : Language_Index;
+               Current           : String_List_Id := Languages.Values;
+               Element           : String_Element;
+               Lang_Name         : Name_Id;
+               Index             : Language_Ptr;
+               NL_Id             : Language_Ptr;
 
             begin
-               --  Assume that there is no language specified yet
+               --  If there are no languages declared, there are no sources
 
-               Data.Other_Sources_Present := False;
-               Data.Ada_Sources_Present   := False;
+               if Current = Nil_String then
+                  Data.Source_Dirs := Nil_String;
 
-               --  Look through all the languages specified in attribute
-               --  Languages, if any
+                  if Data.Qualifier = Standard then
+                     Error_Msg
+                       (Project,
+                        In_Tree,
+                        "a standard project cannot have no language declared",
+                        Languages.Location);
+                  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);
+               else
+                  --  Look through all the languages specified in attribute
+                  --  Languages.
 
-                  if Index = No_Language_Index then
-                     Add_Language_Name (Lang_Name);
-                     Index := Last_Language_Index;
-                  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;
 
-                  Set (Index, True, Data, In_Tree);
-                  Set (Language_Processing => Default_Language_Processing_Data,
-                       For_Language        => Index,
-                       In_Project          => Data,
-                       In_Tree             => In_Tree);
+                     --  If the language was not already specified (duplicates
+                     --  are simply ignored).
 
-                  if Index = Ada_Language_Index then
-                     Data.Ada_Sources_Present := True;
+                     NL_Id := Data.Languages;
+                     while NL_Id /= No_Language_Index loop
+                        exit when Lang_Name = NL_Id.Name;
+                        NL_Id := NL_Id.Next;
+                     end loop;
 
-                  else
-                     Data.Other_Sources_Present := True;
-                  end if;
+                     if NL_Id = No_Language_Index then
+                        Index := new Language_Data'(No_Language_Data);
+                        Index.Name := Lang_Name;
+                        Index.Display_Name := Element.Value;
+                        Index.Next := Data.Languages;
 
-                  Current := Element.Next;
-               end loop;
+                        if Lang_Name = Name_Ada then
+                           Index.Config.Kind := Unit_Based;
+                           Index.Config.Dependency_Kind := ALI_File;
+
+                        else
+                           Index.Config.Kind := File_Based;
+                           Index.Config.Dependency_Kind := None;
+                        end if;
+
+                        Data.Languages := Index;
+                     end if;
+
+                     Current := Element.Next;
+                  end loop;
+               end if;
             end;
          end if;
       end if;
@@ -1911,9 +4481,10 @@ package body Prj.Nmsc is
 
       elsif Extending then
          declare
-            Data : Project_Data := In_Tree.Projects.Table (Root_Project);
+            Data : Project_Data;
 
          begin
+            Data := In_Tree.Projects.Table (Root_Project);
             while Data.Extends /= No_Project loop
                if P = Data.Extends then
                   return True;
@@ -1932,10 +4503,11 @@ package body Prj.Nmsc is
    -------------------------------
 
    procedure Check_Stand_Alone_Library
-     (Project   : Project_Id;
-      In_Tree   : Project_Tree_Ref;
-      Data      : in out Project_Data;
-      Extending : Boolean)
+     (Project     : Project_Id;
+      In_Tree     : Project_Tree_Ref;
+      Data        : in out Project_Data;
+      Current_Dir : String;
+      Extending   : Boolean)
    is
       Lib_Interfaces      : constant Prj.Variable_Value :=
                               Prj.Util.Value_Of
@@ -1973,13 +4545,20 @@ package body Prj.Nmsc is
                                  Data.Decl.Attributes,
                                  In_Tree);
 
-      Auto_Init_Supported : constant Boolean :=
-                              MLib.Tgt.
-                                Standalone_Library_Auto_Init_Is_Supported;
-
-      OK : Boolean := True;
+      Auto_Init_Supported : Boolean;
+      OK                  : Boolean := True;
+      Source              : Source_Id;
+      Next_Proj           : Project_Id;
+      Iter                : Source_Iterator;
 
    begin
+      if Get_Mode = Multi_Language then
+         Auto_Init_Supported := Data.Config.Auto_Init_Supported;
+      else
+         Auto_Init_Supported :=
+           MLib.Tgt.Standalone_Library_Auto_Init_Is_Supported;
+      end if;
+
       pragma Assert (Lib_Interfaces.Kind = List);
 
       --  It is a stand-alone library project file if attribute
@@ -1990,24 +4569,25 @@ package body Prj.Nmsc is
             Interfaces     : String_List_Id := Lib_Interfaces.Values;
             Interface_ALIs : String_List_Id := Nil_String;
             Unit           : Name_Id;
-            The_Unit_Id    : Unit_Id;
+            The_Unit_Id    : Unit_Index;
             The_Unit_Data  : Unit_Data;
 
-            procedure Add_ALI_For (Source : Name_Id);
+            procedure Add_ALI_For (Source : File_Name_Type);
             --  Add an ALI file name to the list of Interface ALIs
 
             -----------------
             -- Add_ALI_For --
             -----------------
 
-            procedure Add_ALI_For (Source : Name_Id) is
+            procedure Add_ALI_For (Source : File_Name_Type) is
             begin
                Get_Name_String (Source);
 
                declare
                   ALI         : constant String :=
-                    ALI_File_Name (Name_Buffer (1 .. Name_Len));
+                                  ALI_File_Name (Name_Buffer (1 .. Name_Len));
                   ALI_Name_Id : Name_Id;
+
                begin
                   Name_Len := ALI'Length;
                   Name_Buffer (1 .. Name_Len) := ALI;
@@ -2050,113 +4630,188 @@ package body Prj.Nmsc is
 
             while Interfaces /= Nil_String loop
                Get_Name_String
-                 (In_Tree.String_Elements.Table
-                                                     (Interfaces).Value);
+                 (In_Tree.String_Elements.Table (Interfaces).Value);
                To_Lower (Name_Buffer (1 .. Name_Len));
 
                if Name_Len = 0 then
                   Error_Msg
                     (Project, In_Tree,
                      "an interface cannot be an empty string",
-                     In_Tree.String_Elements.Table
-                                                   (Interfaces).Location);
+                     In_Tree.String_Elements.Table (Interfaces).Location);
 
                else
                   Unit := Name_Find;
                   Error_Msg_Name_1 := Unit;
-                  The_Unit_Id :=
-                    Units_Htable.Get (In_Tree.Units_HT, Unit);
 
-                  if The_Unit_Id = No_Unit then
-                     Error_Msg
-                       (Project, In_Tree,
-                        "unknown unit {",
-                        In_Tree.String_Elements.Table
-                          (Interfaces).Location);
+                  if Get_Mode = Ada_Only then
+                     The_Unit_Id :=
+                       Units_Htable.Get (In_Tree.Units_HT, Unit);
 
-                  else
-                     --  Check that the unit is part of the project
+                     if The_Unit_Id = No_Unit_Index then
+                        Error_Msg
+                          (Project, In_Tree,
+                           "unknown unit %%",
+                           In_Tree.String_Elements.Table
+                             (Interfaces).Location);
 
-                     The_Unit_Data :=
-                       In_Tree.Units.Table (The_Unit_Id);
+                     else
+                        --  Check that the unit is part of the project
 
-                     if The_Unit_Data.File_Names (Body_Part).Name /= No_Name
-                       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.
+                        The_Unit_Data :=
+                          In_Tree.Units.Table (The_Unit_Id);
 
-                           if The_Unit_Data.File_Names
-                             (Specification).Name = No_Name
+                        if The_Unit_Data.File_Names (Body_Part).Name /= No_File
+                          and then The_Unit_Data.File_Names
+                                     (Body_Part).Path.Name /= Slash
+                        then
+                           if Check_Project
+                             (The_Unit_Data.File_Names (Body_Part).Project,
+                              Project, In_Tree, Extending)
                            then
-                              declare
-                                 Src_Ind : Source_File_Index;
+                              --  There is a body for this unit.
+                              --  If there is no spec, we need to check that it
+                              --  is not a subunit.
 
-                              begin
-                                 Src_Ind := Sinput.P.Load_Project_File
-                                   (Get_Name_String
-                                      (The_Unit_Data.File_Names
-                                         (Body_Part).Path));
+                              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.Name));
+
+                                    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 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;
+                              --  The unit is not a subunit, so we add the
+                              --  ALI file for its body to the Interface ALIs.
+
+                              Add_ALI_For
+                                (The_Unit_Data.File_Names (Body_Part).Name);
+
+                           else
+                              Error_Msg
+                                (Project, In_Tree,
+                                 "%% is not an unit of this project",
+                                 In_Tree.String_Elements.Table
+                                   (Interfaces).Location);
                            end if;
 
-                           --  The unit is not a subunit, so we add
-                           --  to the Interface ALIs the ALI file
-                           --  corresponding to the body.
+                        elsif The_Unit_Data.File_Names
+                                (Specification).Name /= No_File
+                          and then The_Unit_Data.File_Names
+                                     (Specification).Path.Name /= 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 the ALI for its spec to the
+                           --  Interface ALIs.
 
                            Add_ALI_For
-                             (The_Unit_Data.File_Names (Body_Part).Name);
+                             (The_Unit_Data.File_Names (Specification).Name);
 
                         else
                            Error_Msg
                              (Project, In_Tree,
-                              "{ is not an unit of this project",
+                              "%% is not an unit of this project",
                               In_Tree.String_Elements.Table
                                 (Interfaces).Location);
                         end if;
+                     end if;
+
+                  else
+                     --  Multi_Language mode
 
-                     elsif The_Unit_Data.File_Names
-                       (Specification).Name /= No_Name
-                       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)
+                     Next_Proj := Data.Extends;
 
-                     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.
+                     Iter := For_Each_Source (In_Tree, Project);
 
-                        Add_ALI_For
-                          (The_Unit_Data.File_Names (Specification).Name);
+                     loop
+                        while Prj.Element (Iter) /= No_Source and then
+                           Prj.Element (Iter).Unit /= Unit
+                        loop
+                           Next (Iter);
+                        end loop;
+
+                        Source := Prj.Element (Iter);
+                        exit when Source /= No_Source or else
+                                  Next_Proj = No_Project;
+
+                        Iter := For_Each_Source (In_Tree, Next_Proj);
+                        Next_Proj :=
+                          In_Tree.Projects.Table (Next_Proj).Extends;
+                     end loop;
+
+                     if Source /= No_Source then
+                        if Source.Kind = Sep then
+                           Source := No_Source;
+
+                        elsif Source.Kind = Spec
+                          and then Source.Other_Part /= No_Source
+                        then
+                           Source := Source.Other_Part;
+                        end if;
+                     end if;
+
+                     if Source /= No_Source then
+                        if Source.Project /= Project
+                          and then
+                            not Is_Extending (Project, Source.Project, In_Tree)
+                        then
+                           Source := No_Source;
+                        end if;
+                     end if;
+
+                     if Source = No_Source then
+                           Error_Msg
+                             (Project, In_Tree,
+                              "%% is not an unit of this project",
+                              In_Tree.String_Elements.Table
+                                (Interfaces).Location);
 
                      else
-                        Error_Msg
-                          (Project, In_Tree,
-                           "{ is not an unit of this project",
-                           In_Tree.String_Elements.Table
-                                                    (Interfaces).Location);
+                        if Source.Kind = Spec and then
+                          Source.Other_Part /= No_Source
+                        then
+                           Source := Source.Other_Part;
+                        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 (Source.Dep_Name),
+                           Index         => 0,
+                           Display_Value => Name_Id (Source.Dep_Name),
+                           Location      =>
+                             In_Tree.String_Elements.Table
+                               (Interfaces).Location,
+                           Flag          => False,
+                           Next          => Interface_ALIs);
+                        Interface_ALIs := String_Element_Table.Last
+                          (In_Tree.String_Elements);
                      end if;
+
                   end if;
 
                end if;
@@ -2174,8 +4829,8 @@ package body Prj.Nmsc is
 
             if Lib_Auto_Init.Default then
 
-               --  If no attribute Library_Auto_Init is declared, then
-               --  set auto init only if it is supported.
+               --  If no attribute Library_Auto_Init is declared, then set auto
+               --  init only if it is supported.
 
                Data.Lib_Auto_Init := Auto_Init_Supported;
 
@@ -2191,8 +4846,8 @@ package body Prj.Nmsc is
                      Data.Lib_Auto_Init := True;
 
                   else
-                     --  Library_Auto_Init cannot be "true" if auto init
-                     --  is not supported
+                     --  Library_Auto_Init cannot be "true" if auto init is not
+                     --  supported.
 
                      Error_Msg
                        (Project, In_Tree,
@@ -2210,40 +4865,47 @@ package body Prj.Nmsc is
             end if;
          end SAL_Library;
 
-         --  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 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 Lib_Src_Dir.Value /= Empty_String then
             declare
-               Dir_Id : constant Name_Id := Lib_Src_Dir.Value;
+               Dir_Id : constant File_Name_Type :=
+                          File_Name_Type (Lib_Src_Dir.Value);
 
             begin
                Locate_Directory
-                 (Dir_Id, Data.Display_Directory,
-                  Data.Library_Src_Dir,
-                  Data.Display_Library_Src_Dir);
+                 (Project,
+                  In_Tree,
+                  Dir_Id,
+                  Data.Directory.Display_Name,
+                  Data.Library_Src_Dir.Name,
+                  Data.Library_Src_Dir.Display_Name,
+                  Create           => "library source copy",
+                  Current_Dir      => Current_Dir,
+                  Location         => Lib_Src_Dir.Location,
+                  Externally_Built => Data.Externally_Built);
 
                --  If directory does not exist, report an error
 
-               if Data.Library_Src_Dir = No_Name then
+               if Data.Library_Src_Dir = No_Path_Information then
 
-                  --  Get the absolute name of the library directory
-                  --  that does not exist, to report an error.
+                  --  Get the absolute name of the library directory that does
+                  --  not exist, to report an error.
 
                   declare
                      Dir_Name : constant String :=
-                       Get_Name_String (Dir_Id);
+                                  Get_Name_String (Dir_Id);
 
                   begin
                      if Is_Absolute_Path (Dir_Name) then
-                        Err_Vars.Error_Msg_Name_1 := Dir_Id;
+                        Err_Vars.Error_Msg_File_1 := Dir_Id;
 
                      else
-                        Get_Name_String (Data.Directory);
+                        Get_Name_String (Data.Directory.Name);
 
                         if Name_Buffer (Name_Len) /=
                           Directory_Separator
@@ -2263,14 +4925,14 @@ package body Prj.Nmsc is
 
                      --  Report the error
 
+                     Error_Msg_File_1 := Dir_Id;
                      Error_Msg
                        (Project, In_Tree,
                         "Directory { does not exist",
                         Lib_Src_Dir.Location);
                   end;
 
-                  --  Report an error if it is the same as the object
-                  --  directory.
+                  --  Report error if it is the same as the object directory
 
                elsif Data.Library_Src_Dir = Data.Object_Directory then
                   Error_Msg
@@ -2278,44 +4940,87 @@ package body Prj.Nmsc is
                      "directory to copy interfaces cannot be " &
                      "the object directory",
                      Lib_Src_Dir.Location);
-                  Data.Library_Src_Dir := No_Name;
-
-                  --  Check if it is same as one of the source directories
+                  Data.Library_Src_Dir := No_Path_Information;
 
                else
                   declare
-                     Src_Dirs : String_List_Id := Data.Source_Dirs;
+                     Src_Dirs : String_List_Id;
                      Src_Dir  : String_Element;
 
                   begin
+                     --  Interface copy directory cannot be one of the source
+                     --  directory of the current project.
+
+                     Src_Dirs := Data.Source_Dirs;
                      while Src_Dirs /= Nil_String loop
-                        Src_Dir := In_Tree.String_Elements.Table
-                                                          (Src_Dirs);
-                        Src_Dirs := Src_Dir.Next;
+                        Src_Dir := In_Tree.String_Elements.Table (Src_Dirs);
 
                         --  Report error if it is one of the source directories
 
-                        if Data.Library_Src_Dir = Src_Dir.Value then
+                        if Data.Library_Src_Dir.Name =
+                          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_Name;
+                           Data.Library_Src_Dir := No_Path_Information;
                            exit;
                         end if;
+
+                        Src_Dirs := Src_Dir.Next;
                      end loop;
+
+                     if Data.Library_Src_Dir /= No_Path_Information then
+
+                        --  It cannot be a source directory of any other
+                        --  project either.
+
+                        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);
+
+                              --  Report error if it is one of the source
+                              --  directories
+
+                              if Data.Library_Src_Dir.Name =
+                                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_Information;
+                                 exit Project_Loop;
+                              end if;
+
+                              Src_Dirs := Src_Dir.Next;
+                           end loop Dir_Loop;
+                        end loop Project_Loop;
+                     end if;
                   end;
 
                   --  In high verbosity, if there is a valid Library_Src_Dir,
                   --  display its path name.
 
-                  if Data.Library_Src_Dir /= No_Name
+                  if Data.Library_Src_Dir /= No_Path_Information
                     and then Current_Verbosity = High
                   then
-                     Write_Str ("Directory to copy interfaces =""");
-                     Write_Str (Get_Name_String (Data.Library_Src_Dir));
-                     Write_Line ("""");
+                     Write_Attr
+                       ("Directory to copy interfaces",
+                        Get_Name_String (Data.Library_Src_Dir.Name));
                   end if;
                end if;
             end;
@@ -2346,6 +5051,9 @@ package body Prj.Nmsc is
                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,
@@ -2368,9 +5076,10 @@ package body Prj.Nmsc is
             end if;
 
          else
-            --  Library_Symbol_File is defined. Check that the file exists.
+            --  Library_Symbol_File is defined
 
-            Data.Symbol_Data.Symbol_File := Lib_Symbol_File.Value;
+            Data.Symbol_Data.Symbol_File :=
+              Path_Name_Type (Lib_Symbol_File.Value);
 
             Get_Name_String (Lib_Symbol_File.Value);
 
@@ -2395,18 +5104,18 @@ package body Prj.Nmsc is
                end if;
 
                if not OK then
-                  Error_Msg_Name_1 := Lib_Symbol_File.Value;
+                  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.",
+                     "Name cannot include directory info.",
                      Lib_Symbol_File.Location);
                end if;
             end if;
          end if;
 
          --  If attribute Library_Reference_Symbol_File is not defined,
-         --  symbol policy cannot be Compilant or Controlled.
+         --  symbol policy cannot be Compliant or Controlled.
 
          if Lib_Ref_Symbol_File.Default then
             if Data.Symbol_Data.Symbol_Policy = Compliant
@@ -2414,14 +5123,15 @@ package body Prj.Nmsc is
             then
                Error_Msg
                  (Project, In_Tree,
-                  "a reference symbol file need to be defined",
+                  "a reference symbol file needs 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;
+            Data.Symbol_Data.Reference :=
+              Path_Name_Type (Lib_Ref_Symbol_File.Value);
 
             Get_Name_String (Lib_Ref_Symbol_File.Value);
 
@@ -2432,40 +5142,82 @@ package body Prj.Nmsc is
                   Lib_Symbol_File.Location);
 
             else
-               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_Name_1 := Lib_Ref_Symbol_File.Value;
-                  Error_Msg
-                    (Project, In_Tree,
-                     "reference symbol file { name is illegal. " &
-                     "Name canot include directory info.",
-                     Lib_Ref_Symbol_File.Location);
+               if not Is_Absolute_Path (Name_Buffer (1 .. Name_Len)) then
+                  Name_Len := 0;
+                  Add_Str_To_Name_Buffer
+                    (Get_Name_String (Data.Directory.Name));
+                  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.Object_Directory) &
-                  Directory_Separator &
-                  Get_Name_String (Lib_Ref_Symbol_File.Value))
+                 (Get_Name_String (Data.Symbol_Data.Reference))
                then
-                  Error_Msg_Name_1 := Lib_Ref_Symbol_File.Value;
+                  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",
+                     "<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.
+
+               if Data.Symbol_Data.Symbol_File /= No_Path then
+                  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.Name) &
+                                         Directory_Separator &
+                                         Name_Buffer (1 .. Name_Len),
+                                         Directory     => Current_Dir,
+                                         Resolve_Links =>
+                                           Opt.Follow_Links_For_Files);
+                        Ref_Path  : constant String :=
+                                      Normalize_Pathname
+                                        (Get_Name_String
+                                           (Data.Symbol_Data.Reference),
+                                         Directory     => Current_Dir,
+                                         Resolve_Links =>
+                                           Opt.Follow_Links_For_Files);
+                     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 if;
@@ -2487,25 +5239,6 @@ package body Prj.Nmsc is
       end if;
    end Compute_Directory_Last;
 
-   --------------------
-   -- Body_Suffix_Of --
-   --------------------
-
-   function Body_Suffix_Of
-     (Language   : Language_Index;
-      In_Project : Project_Data;
-      In_Tree    : Project_Tree_Ref) return String
-   is
-      Suffix_Id : constant Name_Id :=
-                    Suffix_Of (Language, In_Project, In_Tree);
-   begin
-      if Suffix_Id /= No_Name then
-         return Get_Name_String (Suffix_Id);
-      else
-         return "." & Get_Name_String (Language_Names.Table (Language));
-      end if;
-   end Body_Suffix_Of;
-
    ---------------
    -- Error_Msg --
    ---------------
@@ -2516,10 +5249,13 @@ package body Prj.Nmsc is
       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;
+      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;
 
       procedure Add (C : Character);
       --  Add a character to the buffer
@@ -2527,9 +5263,12 @@ package body Prj.Nmsc is
       procedure Add (S : String);
       --  Add a string to the buffer
 
-      procedure Add (Id : Name_Id);
+      procedure Add_Name;
       --  Add a name to the buffer
 
+      procedure Add_File;
+      --  Add a file name to the buffer
+
       ---------
       -- Add --
       ---------
@@ -2546,17 +5285,71 @@ package body Prj.Nmsc is
          Error_Last := Error_Last + S'Length;
       end Add;
 
-      procedure Add (Id : Name_Id) is
+      --------------
+      -- 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
-         Get_Name_String (Id);
+         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));
-      end Add;
+         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, Flag_Location);
+         Prj.Err.Error_Msg (Msg, Real_Location);
          return;
       end if;
 
@@ -2564,51 +5357,53 @@ package body Prj.Nmsc is
 
       if Msg (First) = '\' then
          First := First + 1;
+      end if;
 
-      --  Warniung character is always the first one in this package
+      --  Warning character is always the first one in this package
+      --  this is an undocumented kludge???
 
-      elsif Msg (First) = '?' then
+      if Msg (First) = '?' then
          First := First + 1;
          Add ("Warning: ");
-      end if;
-
-      for Index in First .. Msg'Last loop
-         if Msg (Index) = '{' or else Msg (Index) = '%' then
 
-            --  Include a name between double quotes
-
-            Msg_Name := Msg_Name + 1;
-            Add ('"');
+      elsif Msg (First) = '<' then
+         First := First + 1;
 
-            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);
+         if Err_Vars.Error_Msg_Warn then
+            Add ("Warning: ");
+         end if;
+      end if;
 
-               when others => null;
-            end case;
+      Index := First;
+      while Index <= Msg'Last loop
+         if Msg (Index) = '{' then
+            Add_File;
 
-            Add ('"');
+         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, In_Tree);
    end Error_Msg;
 
-   ------------------
-   -- Find_Sources --
-   ------------------
+   ----------------------
+   -- Find_Ada_Sources --
+   ----------------------
 
-   procedure Find_Sources
+   procedure Find_Ada_Sources
      (Project      : Project_Id;
       In_Tree      : Project_Tree_Ref;
       Data         : in out Project_Data;
-      For_Language : Language_Index;
-      Follow_Links : Boolean := False)
+      Current_Dir  : String)
    is
       Source_Dir      : String_List_Id := Data.Source_Dirs;
       Element         : String_Element;
@@ -2638,14 +5433,13 @@ package body Prj.Nmsc is
 
                begin
                   if Current_Verbosity = High then
-                     Write_Str ("Source_Dir = ");
-                     Write_Line (Source_Directory);
+                     Write_Attr ("Source_Dir", Source_Directory);
                   end if;
 
-                  --  We look to every entry in the source directory
+                  --  We look at every entry in the source directory
 
-                  Open (Dir, Source_Directory
-                               (Source_Directory'First .. Dir_Last));
+                  Open (Dir,
+                        Source_Directory (Source_Directory'First .. Dir_Last));
 
                   loop
                      Read (Dir, Name_Buffer, Name_Len);
@@ -2658,52 +5452,48 @@ package body Prj.Nmsc is
                      exit when Name_Len = 0;
 
                      declare
-                        File_Name : constant Name_Id := Name_Find;
-                        Path      : constant String :=
-                          Normalize_Pathname
-                            (Name      => Name_Buffer (1 .. Name_Len),
-                             Directory => Source_Directory
-                               (Source_Directory'First .. Dir_Last),
-                             Resolve_Links => Follow_Links,
-                             Case_Sensitive => True);
-                        Path_Name : Name_Id;
+                        File_Name : constant File_Name_Type := Name_Find;
+
+                        --  ??? We could probably optimize the following call:
+                        --  we need to resolve links only once for the
+                        --  directory itself, and then do a single call to
+                        --  readlink() for each file. Unfortunately that would
+                        --  require a change in Normalize_Pathname so that it
+                        --  has the option of not resolving links for its
+                        --  Directory parameter, only for Name.
+
+                        Path : constant String :=
+                                 Normalize_Pathname
+                                   (Name      => Name_Buffer (1 .. Name_Len),
+                                    Directory =>
+                                      Source_Directory
+                                        (Source_Directory'First .. Dir_Last),
+                                    Resolve_Links =>
+                                      Opt.Follow_Links_For_Files,
+                                    Case_Sensitive => True);
+
+                        Path_Name : Path_Name_Type;
 
                      begin
                         Name_Len := Path'Length;
                         Name_Buffer (1 .. Name_Len) := Path;
                         Path_Name := Name_Find;
 
-                        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
-                           --  a 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,
-                              Source_Recorded => Source_Recorded,
-                              Follow_Links    => Follow_Links);
-
-                        else
-                           Check_For_Source
-                             (File_Name        => File_Name,
-                              Path_Name        => Path_Name,
-                              Project          => Project,
-                              In_Tree          => In_Tree,
-                              Data             => Data,
-                              Location         => No_Location,
-                              Language         => For_Language,
-                              Suffix           =>
-                                Body_Suffix_Of (For_Language, Data, In_Tree),
-                              Naming_Exception => False);
-                        end if;
+                        --  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.
+
+                        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,
+                           Source_Recorded => Source_Recorded,
+                           Current_Dir     => Current_Dir);
                      end;
                   end loop;
 
@@ -2728,24 +5518,7 @@ package body Prj.Nmsc is
          Write_Line ("end Looking for sources.");
       end if;
 
-      if For_Language = Ada_Language_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.
-
-         if Current_Source /= Nil_String then
-            Data.Ada_Sources_Present := True;
-
-         elsif Data.Extends = No_Project then
-            Error_Msg
-              (Project, In_Tree,
-               "there are no Ada sources in this project",
-               Data.Location);
-         end if;
-      end if;
-   end Find_Sources;
+   end Find_Ada_Sources;
 
    --------------------------------
    -- Free_Ada_Naming_Exceptions --
@@ -2763,33 +5536,55 @@ package body Prj.Nmsc is
    ---------------------
 
    procedure Get_Directories
-     (Project : Project_Id;
-      In_Tree : Project_Tree_Ref;
-      Data    : in out Project_Data)
+     (Project     : Project_Id;
+      In_Tree     : Project_Tree_Ref;
+      Current_Dir : String;
+      Data        : in out Project_Data)
    is
-      Object_Dir : constant Variable_Value :=
-                     Util.Value_Of
-                       (Name_Object_Dir, Data.Decl.Attributes, In_Tree);
+      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);
+      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);
 
+      Excluded_Source_Dirs : constant Variable_Value :=
+                              Util.Value_Of
+                                (Name_Excluded_Source_Dirs,
+                                 Data.Decl.Attributes,
+                                 In_Tree);
+
+      Source_Files : constant Variable_Value :=
+                      Util.Value_Of
+                        (Name_Source_Files, Data.Decl.Attributes, In_Tree);
+
       Last_Source_Dir : String_List_Id  := Nil_String;
 
-      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.
+      Languages : constant Variable_Value :=
+                      Prj.Util.Value_Of
+                        (Name_Languages, Data.Decl.Attributes, In_Tree);
+
+      procedure Find_Source_Dirs
+        (From     : File_Name_Type;
+         Location : Source_Ptr;
+         Removed  : Boolean := False);
+      --  Find one or several source directories, and add (or remove, if
+      --  Removed is True) them to list of source directories of the project.
 
       ----------------------
       -- 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;
+         Removed  : Boolean := False)
+      is
          Directory : constant String := Get_Name_String (From);
          Element   : String_Element;
 
@@ -2802,18 +5597,22 @@ package body Prj.Nmsc is
          -------------------------
 
          procedure Recursive_Find_Dirs (Path : Name_Id) is
-            Dir      : Dir_Type;
-            Name     : String (1 .. 250);
-            Last     : Natural;
-            List     : String_List_Id := Data.Source_Dirs;
-            Element  : String_Element;
-            Found    : Boolean := False;
+            Dir     : Dir_Type;
+            Name    : String (1 .. 250);
+            Last    : Natural;
+            List    : String_List_Id;
+            Prev    : String_List_Id;
+            Element : String_Element;
+            Found   : Boolean := False;
 
             Non_Canonical_Path : Name_Id := No_Name;
             Canonical_Path     : Name_Id := No_Name;
 
             The_Path : constant String :=
-                         Normalize_Pathname (Get_Name_String (Path)) &
+                         Normalize_Pathname
+                           (Get_Name_String (Path),
+                            Directory     => Current_Dir,
+                            Resolve_Links => Opt.Follow_Links_For_Dirs) &
                          Directory_Separator;
 
             The_Path_Last : constant Natural :=
@@ -2824,24 +5623,26 @@ package body Prj.Nmsc is
             Name_Buffer (1 .. Name_Len) :=
               The_Path (The_Path'First .. The_Path_Last);
             Non_Canonical_Path := Name_Find;
-            Get_Name_String (Non_Canonical_Path);
-            Canonical_Case_File_Name (Name_Buffer (1 .. Name_Len));
-            Canonical_Path := Name_Find;
+            Canonical_Path :=
+              Name_Id (Canonical_Case_File_Name (Non_Canonical_Path));
 
             --  To avoid processing the same directory several times, check
-            --  if the directory is already in Recursive_Dirs. If it is,
-            --  then there is nothing to do, just return. If it is not, put
-            --  it there and continue recursive processing.
-
-            if Recursive_Dirs.Get (Canonical_Path) then
-               return;
+            --  if the directory is already in Recursive_Dirs. If it is, then
+            --  there is nothing to do, just return. If it is not, put it there
+            --  and continue recursive processing.
 
-            else
-               Recursive_Dirs.Set (Canonical_Path, True);
+            if not Removed then
+               if Recursive_Dirs.Get (Canonical_Path) then
+                  return;
+               else
+                  Recursive_Dirs.Set (Canonical_Path, True);
+               end if;
             end if;
 
             --  Check if directory is already in list
 
+            List := Data.Source_Dirs;
+            Prev := Nil_String;
             while List /= Nil_String loop
                Element := In_Tree.String_Elements.Table (List);
 
@@ -2850,12 +5651,13 @@ package body Prj.Nmsc is
                   exit when Found;
                end if;
 
+               Prev := List;
                List := Element.Next;
             end loop;
 
             --  If directory is not already in list, put it there
 
-            if not Found then
+            if (not Removed) and (not Found) then
                if Current_Verbosity = High then
                   Write_Str  ("   ");
                   Write_Line (The_Path (The_Path'First .. The_Path_Last));
@@ -2864,12 +5666,12 @@ package body Prj.Nmsc is
                String_Element_Table.Increment_Last
                  (In_Tree.String_Elements);
                Element :=
-                 (Value    => Canonical_Path,
+                 (Value         => Canonical_Path,
                   Display_Value => Non_Canonical_Path,
-                  Location => No_Location,
-                  Flag     => False,
-                  Next     => Nil_String,
-                  Index    => 0);
+                  Location      => No_Location,
+                  Flag          => False,
+                  Next          => Nil_String,
+                  Index         => 0);
 
                --  Case of first source directory
 
@@ -2894,6 +5696,15 @@ package body Prj.Nmsc is
                  (In_Tree.String_Elements);
                In_Tree.String_Elements.Table (Last_Source_Dir) :=
                  Element;
+
+            elsif Removed and Found then
+               if Prev = Nil_String then
+                  Data.Source_Dirs :=
+                    In_Tree.String_Elements.Table (List).Next;
+               else
+                  In_Tree.String_Elements.Table (Prev).Next :=
+                    In_Tree.String_Elements.Table (List).Next;
+               end if;
             end if;
 
             --  Now look for subdirectories. We do that even when this
@@ -2918,17 +5729,15 @@ package body Prj.Nmsc is
 
                   declare
                      Path_Name : constant String :=
-                                   Normalize_Pathname
-                                     (Name      => Name (1 .. Last),
-                                      Directory =>
-                                        The_Path
-                                          (The_Path'First .. The_Path_Last),
-                                      Resolve_Links  => False,
-                                      Case_Sensitive => True);
+                       Normalize_Pathname
+                         (Name      => Name (1 .. Last),
+                          Directory =>
+                            The_Path (The_Path'First .. The_Path_Last),
+                          Resolve_Links  => Opt.Follow_Links_For_Dirs,
+                          Case_Sensitive => True);
 
                   begin
                      if Is_Directory (Path_Name) then
-
                         --  We have found a new subdirectory, call self
 
                         Name_Len := Path_Name'Length;
@@ -2949,14 +5758,14 @@ package body Prj.Nmsc is
       --  Start of processing for Find_Source_Dirs
 
       begin
-         if Current_Verbosity = High then
+         if Current_Verbosity = High and then not Removed then
             Write_Str ("Find_Source_Dirs (""");
             Write_Str (Directory);
             Write_Line (""")");
          end if;
 
-         --  First, check if we are looking for a directory tree,
-         --  indicated by "/**" at the end.
+         --  First, check if we are looking for a directory tree, indicated
+         --  by "/**" at the end.
 
          if Directory'Length >= 3
            and then Directory (Directory'Last - 1 .. Directory'Last) = "**"
@@ -2964,14 +5773,15 @@ package body Prj.Nmsc is
                        or else
                      Directory (Directory'Last - 2) = Directory_Separator)
          then
-            Data.Known_Order_Of_Source_Dirs := False;
+            if not Removed then
+               Data.Known_Order_Of_Source_Dirs := False;
+            end if;
 
             Name_Len := Directory'Length - 3;
 
             if Name_Len = 0 then
 
-               --  This is the case of "/**": all directories
-               --  in the file system.
+               --  Case of "/**": all directories in file system
 
                Name_Len := 1;
                Name_Buffer (1) := Directory (Directory'First);
@@ -2988,18 +5798,18 @@ 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 =>
-                                 Get_Name_String (Data.Display_Directory),
+                                 Get_Name_String (Data.Directory.Display_Name),
                                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
@@ -3014,8 +5824,8 @@ package body Prj.Nmsc is
                   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:");
@@ -3035,15 +5845,23 @@ package body Prj.Nmsc is
 
          else
             declare
-               Path_Name         : Name_Id;
-               Display_Path_Name : Name_Id;
+               Path_Name         : Path_Name_Type;
+               Display_Path_Name : Path_Name_Type;
+               List              : String_List_Id;
+               Prev              : String_List_Id;
 
             begin
                Locate_Directory
-                 (From, Data.Display_Directory, Path_Name, Display_Path_Name);
+                 (Project     => Project,
+                  In_Tree     => In_Tree,
+                  Name        => From,
+                  Parent      => Data.Directory.Display_Name,
+                  Dir         => Path_Name,
+                  Display     => Display_Path_Name,
+                  Current_Dir => Current_Dir);
 
-               if Path_Name = No_Name then
-                  Err_Vars.Error_Msg_Name_1 := From;
+               if Path_Name = No_Path then
+                  Err_Vars.Error_Msg_File_1 := From;
 
                   if Location = No_Location then
                      Error_Msg
@@ -3058,37 +5876,100 @@ package body Prj.Nmsc is
                   end if;
 
                else
-                  --  As it is an existing directory, we add it to
-                  --  the list of directories.
+                  declare
+                     Path              : constant String :=
+                                           Get_Name_String (Path_Name) &
+                                           Directory_Separator;
+                     Last_Path         : constant Natural :=
+                                           Compute_Directory_Last (Path);
+                     Path_Id           : Name_Id;
+                     Display_Path      : constant String :=
+                                           Get_Name_String
+                                             (Display_Path_Name) &
+                                           Directory_Separator;
+                     Last_Display_Path : constant Natural :=
+                                           Compute_Directory_Last
+                                             (Display_Path);
+                     Display_Path_Id   : Name_Id;
 
-                  String_Element_Table.Increment_Last
-                    (In_Tree.String_Elements);
-                  Element.Value := Path_Name;
-                  Element.Display_Value := Display_Path_Name;
+                  begin
+                     Name_Len := 0;
+                     Add_Str_To_Name_Buffer (Path (Path'First .. Last_Path));
+                     Path_Id := Name_Find;
+                     Name_Len := 0;
+                     Add_Str_To_Name_Buffer
+                       (Display_Path
+                          (Display_Path'First .. Last_Display_Path));
+                     Display_Path_Id := Name_Find;
+
+                     if not Removed then
+
+                        --  As it is an existing directory, we add it to the
+                        --  list of directories.
 
-                  if Last_Source_Dir = Nil_String then
+                        String_Element_Table.Increment_Last
+                          (In_Tree.String_Elements);
+                        Element :=
+                          (Value         => Path_Id,
+                           Index         => 0,
+                           Display_Value => Display_Path_Id,
+                           Location      => No_Location,
+                           Flag          => False,
+                           Next          => Nil_String);
+
+                        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;
+
+                     else
+                        --  Remove source dir, if present
 
-                     --  This is the first source directory
+                        List := Data.Source_Dirs;
+                        Prev := Nil_String;
 
-                     Data.Source_Dirs := String_Element_Table.Last
-                                        (In_Tree.String_Elements);
+                        --  Look for source dir in current list
 
-                  else
-                     --  We already have source directories,
-                     --  link the previous last to the new one.
+                        while List /= Nil_String loop
+                           Element := In_Tree.String_Elements.Table (List);
+                           exit when Element.Value = Path_Id;
+                           Prev := List;
+                           List := Element.Next;
+                        end loop;
 
-                     In_Tree.String_Elements.Table
-                       (Last_Source_Dir).Next :=
-                         String_Element_Table.Last
-                           (In_Tree.String_Elements);
-                  end if;
+                        if List /= Nil_String then
+                           --  Source dir was found, remove it from the list
 
-                  --  And register this source directory as the new last
+                           if Prev = Nil_String then
+                              Data.Source_Dirs :=
+                                In_Tree.String_Elements.Table (List).Next;
 
-                  Last_Source_Dir := String_Element_Table.Last
-                    (In_Tree.String_Elements);
-                  In_Tree.String_Elements.Table
-                    (Last_Source_Dir) := Element;
+                           else
+                              In_Tree.String_Elements.Table (Prev).Next :=
+                                In_Tree.String_Elements.Table (List).Next;
+                           end if;
+                        end if;
+                     end if;
+                  end;
                end if;
             end;
          end if;
@@ -3101,15 +5982,24 @@ package body Prj.Nmsc is
          Write_Line ("Starting to look for directories");
       end if;
 
-      --  Check the object directory
+      --  Set the object directory to its default which may be nil, if there
+      --  is no sources in the project.
 
-      pragma Assert (Object_Dir.Kind = Single,
-                     "Object_Dir is not a single string");
+      if (((not Source_Files.Default)
+           and then Source_Files.Values = Nil_String)
+          or else
+          ((not Source_Dirs.Default) and then Source_Dirs.Values = Nil_String)
+           or else
+          ((not Languages.Default) and then Languages.Values = Nil_String))
+        and then Data.Extends = No_Project
+      then
+         Data.Object_Directory := No_Path_Information;
 
-      --  We set the object directory to its default
+      else
+         Data.Object_Directory := Data.Directory;
+      end if;
 
-      Data.Object_Directory   := Data.Directory;
-      Data.Display_Object_Dir := Data.Display_Directory;
+      --  Check the object directory
 
       if Object_Dir.Value /= Empty_String then
          Get_Name_String (Object_Dir.Value);
@@ -3124,51 +6014,76 @@ package body Prj.Nmsc is
             --  We check that the specified object directory does exist
 
             Locate_Directory
-              (Object_Dir.Value, Data.Display_Directory,
-               Data.Object_Directory, Data.Display_Object_Dir);
-
-            if 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, In_Tree,
-                  "the object directory { cannot be found",
-                  Data.Location);
+              (Project,
+               In_Tree,
+               File_Name_Type (Object_Dir.Value),
+               Data.Directory.Display_Name,
+               Data.Object_Directory.Name,
+               Data.Object_Directory.Display_Name,
+               Create           => "object",
+               Location         => Object_Dir.Location,
+               Current_Dir      => Current_Dir,
+               Externally_Built => Data.Externally_Built);
+
+            if Data.Object_Directory = No_Path_Information then
+
+               --  The object directory does not exist, report an error if the
+               --  project is not externally built.
+
+               if not Data.Externally_Built then
+                  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);
+               end if;
 
                --  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;
+               Data.Object_Directory.Display_Name :=
+                 Path_Name_Type (Object_Dir.Value);
+               Data.Object_Directory.Name :=
+                 Path_Name_Type (Canonical_Case_File_Name (Object_Dir.Value));
             end if;
          end if;
+
+      elsif Data.Object_Directory /= No_Path_Information and then
+        Subdirs /= null
+      then
+         Name_Len := 1;
+         Name_Buffer (1) := '.';
+         Locate_Directory
+           (Project,
+            In_Tree,
+            Name_Find,
+            Data.Directory.Display_Name,
+            Data.Object_Directory.Name,
+            Data.Object_Directory.Display_Name,
+            Create           => "object",
+            Location         => Object_Dir.Location,
+            Current_Dir      => Current_Dir,
+            Externally_Built => Data.Externally_Built);
       end if;
 
       if Current_Verbosity = High then
-         if Data.Object_Directory = No_Name then
+         if Data.Object_Directory = No_Path_Information then
             Write_Line ("No object directory");
          else
-            Write_Str ("Object directory: """);
-            Write_Str (Get_Name_String (Data.Display_Object_Dir));
-            Write_Line ("""");
+            Write_Attr
+              ("Object directory",
+               Get_Name_String (Data.Object_Directory.Display_Name));
          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);
@@ -3180,15 +6095,22 @@ package body Prj.Nmsc is
                Exec_Dir.Location);
 
          else
-            --  We check that the specified object directory
-            --  does exist.
+            --  We check that the specified exec directory does exist
 
             Locate_Directory
-              (Exec_Dir.Value, Data.Directory,
-               Data.Exec_Directory, Data.Display_Exec_Dir);
-
-            if Data.Exec_Directory = No_Name then
-               Err_Vars.Error_Msg_Name_1 := Exec_Dir.Value;
+              (Project,
+               In_Tree,
+               File_Name_Type (Exec_Dir.Value),
+               Data.Directory.Display_Name,
+               Data.Exec_Directory.Name,
+               Data.Exec_Directory.Display_Name,
+               Create           => "exec",
+               Location         => Exec_Dir.Location,
+               Current_Dir      => Current_Dir,
+               Externally_Built => Data.Externally_Built);
+
+            if Data.Exec_Directory = No_Path_Information then
+               Err_Vars.Error_Msg_File_1 := File_Name_Type (Exec_Dir.Value);
                Error_Msg
                  (Project, In_Tree,
                   "the exec directory { cannot be found",
@@ -3198,11 +6120,11 @@ package body Prj.Nmsc is
       end if;
 
       if Current_Verbosity = High then
-         if Data.Exec_Directory = No_Name then
+         if Data.Exec_Directory = No_Path_Information then
             Write_Line ("No exec directory");
          else
             Write_Str ("Exec directory: """);
-            Write_Str (Get_Name_String (Data.Display_Exec_Dir));
+            Write_Str (Get_Name_String (Data.Exec_Directory.Display_Name));
             Write_Line ("""");
          end if;
       end if;
@@ -3215,60 +6137,88 @@ package body Prj.Nmsc is
 
       pragma Assert (Source_Dirs.Kind = List, "Source_Dirs is not a list");
 
-      if Source_Dirs.Default then
+      if (not Source_Files.Default) and then
+        Source_Files.Values = Nil_String
+      then
+         Data.Source_Dirs := Nil_String;
+
+         if Data.Qualifier = Standard then
+            Error_Msg
+              (Project,
+               In_Tree,
+               "a standard project cannot have no sources",
+               Source_Files.Location);
+         end if;
+
+      elsif Source_Dirs.Default then
 
-         --  No Source_Dirs specified: the single source directory
-         --  is the one containing the project file
+         --  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         => Data.Directory,
-            Display_Value => Data.Display_Directory,
+           (Value         => Name_Id (Data.Directory.Name),
+            Display_Value => Name_Id (Data.Directory.Display_Name),
             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 ("""");
+            Write_Attr
+              ("Single source directory",
+               Get_Name_String (Data.Directory.Display_Name));
          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_Name;
+         if Data.Qualifier = Standard then
+            Error_Msg
+              (Project,
+               In_Tree,
+               "a standard project cannot have no source directories",
+               Source_Dirs.Location);
          end if;
 
-         Data.Source_Dirs           := Nil_String;
-         Data.Ada_Sources_Present   := False;
-         Data.Other_Sources_Present := False;
+         Data.Source_Dirs := Nil_String;
 
       else
          declare
-            Source_Dir : String_List_Id := Source_Dirs.Values;
+            Source_Dir : String_List_Id;
             Element    : String_Element;
 
          begin
-            --  We will find the source directories for each
-            --  element of the list
+            --  Process the source directories for each element of the list
 
+            Source_Dir := Source_Dirs.Values;
             while Source_Dir /= Nil_String loop
-               Element :=
-                 In_Tree.String_Elements.Table (Source_Dir);
-               Find_Source_Dirs (Element.Value, Element.Location);
+               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 not Excluded_Source_Dirs.Default
+        and then Excluded_Source_Dirs.Values /= Nil_String
+      then
+         declare
+            Source_Dir : String_List_Id;
+            Element    : String_Element;
+
+         begin
+            --  Process the source directories for each element of the list
+
+            Source_Dir := Excluded_Source_Dirs.Values;
+            while Source_Dir /= Nil_String loop
+               Element := In_Tree.String_Elements.Table (Source_Dir);
+               Find_Source_Dirs
+                 (File_Name_Type (Element.Value),
+                  Element.Location,
+                  Removed => True);
                Source_Dir := Element.Next;
             end loop;
          end;
@@ -3286,16 +6236,14 @@ package body Prj.Nmsc is
          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;
+               Element.Value :=
+                 Name_Id (Canonical_Case_File_Name (Name_Id (Element.Value)));
                In_Tree.String_Elements.Table (Current) := Element;
             end if;
 
             Current := Element.Next;
          end loop;
       end;
-
    end Get_Directories;
 
    ---------------
@@ -3305,18 +6253,21 @@ package body Prj.Nmsc is
    procedure Get_Mains
      (Project : Project_Id;
       In_Tree : Project_Tree_Ref;
-      Data    : in out Project_Data) is
+      Data    : in out Project_Data)
+   is
       Mains : constant Variable_Value :=
                 Prj.Util.Value_Of (Name_Main, Data.Decl.Attributes, In_Tree);
+      List  : String_List_Id;
+      Elem  : String_Element;
 
    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 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
+         if not Data.Library and then Data.Extends /= No_Project then
             Data.Mains :=
               In_Tree.Projects.Table (Data.Extends).Mains;
          end if;
@@ -3328,6 +6279,22 @@ package body Prj.Nmsc is
            (Project, In_Tree,
             "a library project file cannot have Main specified",
             Mains.Location);
+
+      else
+         List := Mains.Values;
+         while List /= Nil_String loop
+            Elem := In_Tree.String_Elements.Table (List);
+
+            if Length_Of_Name (Elem.Value) = 0 then
+               Error_Msg
+                 (Project, In_Tree,
+                  "?a main cannot have an empty name",
+                  Elem.Location);
+               exit;
+            end if;
+
+            List := Elem.Next;
+         end loop;
       end if;
    end Get_Mains;
 
@@ -3344,10 +6311,13 @@ package body Prj.Nmsc is
       File        : Prj.Util.Text_File;
       Line        : String (1 .. 250);
       Last        : Natural;
-      Source_Name : Name_Id;
+      Source_Name : File_Name_Type;
+      Name_Loc    : Name_Location;
 
    begin
-      Source_Names.Reset;
+      if Get_Mode = Ada_Only then
+         Source_Names.Reset;
+      end if;
 
       if Current_Verbosity = High then
          Write_Str  ("Opening """);
@@ -3361,6 +6331,7 @@ package body Prj.Nmsc is
 
       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
 
@@ -3372,18 +6343,37 @@ package body Prj.Nmsc is
             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 =>
+
+               --  Check that there is no directory information
+
+               for J in 1 .. Last loop
+                  if Line (J) = '/' or else Line (J) = Directory_Separator then
+                     Error_Msg_File_1 := Source_Name;
+                     Error_Msg
+                       (Project,
+                        In_Tree,
+                        "file name cannot include directory information ({)",
+                        Location);
+                     exit;
+                  end if;
+               end loop;
+
+               Name_Loc := Source_Names.Get (Source_Name);
+
+               if Name_Loc = No_Name_Location then
+                  Name_Loc :=
                     (Name     => Source_Name,
                      Location => Location,
-                     Found    => False));
+                     Source   => No_Source,
+                     Except   => False,
+                     Found    => False);
+               end if;
+
+               Source_Names.Set (Source_Name, Name_Loc);
             end if;
          end loop;
 
@@ -3392,36 +6382,266 @@ package body Prj.Nmsc is
       end if;
    end Get_Sources_From_File;
 
+   -----------------------
+   -- Compute_Unit_Name --
+   -----------------------
+
+   procedure Compute_Unit_Name
+     (File_Name       : File_Name_Type;
+      Dot_Replacement : File_Name_Type;
+      Separate_Suffix : File_Name_Type;
+      Body_Suffix     : File_Name_Type;
+      Spec_Suffix     : File_Name_Type;
+      Casing          : Casing_Type;
+      Kind            : out Source_Kind;
+      Unit            : out Name_Id;
+      In_Tree         : Project_Tree_Ref)
+   is
+      Filename : constant String := Get_Name_String (File_Name);
+      Last     : Integer := Filename'Last;
+      Sep_Len  : constant Integer :=
+                   Integer (Length_Of_Name (Separate_Suffix));
+      Body_Len : constant Integer :=
+                   Integer (Length_Of_Name (Body_Suffix));
+      Spec_Len : constant Integer :=
+                   Integer (Length_Of_Name (Spec_Suffix));
+
+      Standard_GNAT : constant Boolean :=
+                        Spec_Suffix = Default_Ada_Spec_Suffix
+                          and then
+                        Body_Suffix = Default_Ada_Body_Suffix;
+
+      Unit_Except : Unit_Exception;
+      Masked      : Boolean  := False;
+   begin
+      Unit := No_Name;
+      Kind := Spec;
+
+      if Dot_Replacement = No_File then
+         if Current_Verbosity = High then
+            Write_Line ("  No dot_replacement specified");
+         end if;
+         return;
+      end if;
+
+      --  Choose the longest suffix that matches. If there are several matches,
+      --  give priority to specs, then bodies, then separates.
+
+      if Separate_Suffix /= Body_Suffix
+        and then Suffix_Matches (Filename, Separate_Suffix)
+      then
+         Last := Filename'Last - Sep_Len;
+         Kind := Sep;
+      end if;
+
+      if Filename'Last - Body_Len <= Last
+        and then Suffix_Matches (Filename, Body_Suffix)
+      then
+         Last := Natural'Min (Last, Filename'Last - Body_Len);
+         Kind := Impl;
+      end if;
+
+      if Filename'Last - Spec_Len <= Last
+        and then Suffix_Matches (Filename, Spec_Suffix)
+      then
+         Last := Natural'Min (Last, Filename'Last - Spec_Len);
+         Kind := Spec;
+      end if;
+
+      if Last = Filename'Last then
+         if Current_Verbosity = High then
+            Write_Line ("  No matching suffix");
+         end if;
+         return;
+      end if;
+
+      --  Check that the casing matches
+
+      if File_Names_Case_Sensitive then
+         case Casing is
+            when All_Lower_Case =>
+               for J in Filename'First .. Last loop
+                  if Is_Letter (Filename (J))
+                    and then not Is_Lower (Filename (J))
+                  then
+                     if Current_Verbosity = High then
+                        Write_Line ("  Invalid casing");
+                     end if;
+                     return;
+                  end if;
+               end loop;
+
+            when All_Upper_Case =>
+               for J in Filename'First .. Last loop
+                  if Is_Letter (Filename (J))
+                    and then not Is_Upper (Filename (J))
+                  then
+                     if Current_Verbosity = High then
+                        Write_Line ("  Invalid casing");
+                     end if;
+                     return;
+                  end if;
+               end loop;
+
+            when Mixed_Case | Unknown =>
+               null;
+         end case;
+      end if;
+
+      --  If Dot_Replacement is not a single dot, then there should not
+      --  be any dot in the name.
+
+      declare
+         Dot_Repl : constant String := Get_Name_String (Dot_Replacement);
+
+      begin
+         if Dot_Repl /= "." then
+            for Index in Filename'First .. Last loop
+               if Filename (Index) = '.' then
+                  if Current_Verbosity = High then
+                     Write_Line ("   Invalid name, contains dot");
+                  end if;
+                  return;
+               end if;
+            end loop;
+
+            Replace_Into_Name_Buffer
+              (Filename (Filename'First .. Last), Dot_Repl, '.');
+         else
+            Name_Len := Last - Filename'First + 1;
+            Name_Buffer (1 .. Name_Len) := Filename (Filename'First .. Last);
+            Fixed.Translate
+              (Source  => Name_Buffer (1 .. Name_Len),
+               Mapping => Lower_Case_Map);
+         end if;
+      end;
+
+      --  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 Name_Len >= 3 then
+         declare
+            S1 : constant Character := Name_Buffer (1);
+            S2 : constant Character := Name_Buffer (2);
+            S3 : constant Character := Name_Buffer (3);
+
+         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.
+
+               if S2 = '_' and then S3 = '_' then
+                  Name_Buffer (2) := '.';
+                  Name_Buffer (3 .. Name_Len - 1) :=
+                    Name_Buffer (4 .. Name_Len);
+                  Name_Len := Name_Len - 1;
+
+               elsif S2 = '~' then
+                  Name_Buffer (2) := '.';
+
+               elsif S2 = '.' then
+
+                  --  If it is potentially a run time source, disable filling
+                  --  of the mapping file to avoid warnings.
+
+                  Set_Mapping_File_Initial_State_To_Empty (In_Tree);
+               end if;
+            end if;
+         end;
+      end if;
+
+      --  Name_Buffer contains the name of the the unit in lower-cases. Check
+      --  that this is a valid unit name
+
+      Check_Ada_Name (Name_Buffer (1 .. Name_Len), Unit);
+
+      --  If there is a naming exception for the same unit, the file is not
+      --  a source for the unit. Currently, this only applies in multi_lang
+      --  mode, since Unit_Exceptions is no set in ada_only mode.
+
+      if Unit /= No_Name then
+         Unit_Except := Unit_Exceptions.Get (Unit);
+
+         if Kind = Spec then
+            Masked := Unit_Except.Spec /= No_File
+                        and then
+                      Unit_Except.Spec /= File_Name;
+         else
+            Masked := Unit_Except.Impl /= No_File
+                        and then
+                      Unit_Except.Impl /= File_Name;
+         end if;
+
+         if Masked then
+            if Current_Verbosity = High then
+               Write_Str ("   """ & Filename & """ contains the ");
+
+               if Kind = Spec then
+                  Write_Str ("spec of a unit found in """);
+                  Write_Str (Get_Name_String (Unit_Except.Spec));
+               else
+                  Write_Str ("body of a unit found in """);
+                  Write_Str (Get_Name_String (Unit_Except.Impl));
+               end if;
+
+               Write_Line (""" (ignored)");
+            end if;
+
+            Unit := No_Name;
+         end if;
+      end if;
+
+      if Unit /= No_Name
+        and then Current_Verbosity = High
+      then
+         case Kind is
+            when Spec => Write_Str ("     spec of ");
+            when Impl => Write_Str ("     body of ");
+            when Sep  => Write_Str ("     sep of ");
+         end case;
+
+         Write_Line (Get_Name_String (Unit));
+      end if;
+   end Compute_Unit_Name;
+
    --------------
    -- Get_Unit --
    --------------
 
    procedure Get_Unit
-     (Canonical_File_Name : Name_Id;
+     (In_Tree             : Project_Tree_Ref;
+      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 : Name_Id;
+      Info_Id  : Ada_Naming_Exception_Id :=
+                   Ada_Naming_Exceptions.Get (Canonical_File_Name);
+      VMS_Name : File_Name_Type;
+      Kind     : Source_Kind;
 
    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;
+      if Info_Id = No_Ada_Naming_Exception
+        and then Hostparm.OpenVMS
+      then
+         VMS_Name := Canonical_File_Name;
+         Get_Name_String (VMS_Name);
 
-            Info_Id := Ada_Naming_Exceptions.Get (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;
 
       if Info_Id /= No_Ada_Naming_Exception then
@@ -3429,1031 +6649,1593 @@ package body Prj.Nmsc is
          Unit_Name := No_Name;
          Unit_Kind := Specification;
          Needs_Pragma := True;
-         return;
+      else
+         Needs_Pragma := False;
+         Exception_Id := No_Ada_Naming_Exception;
+         Compute_Unit_Name
+           (File_Name       => Canonical_File_Name,
+            Dot_Replacement => Naming.Dot_Replacement,
+            Separate_Suffix => Naming.Separate_Suffix,
+            Body_Suffix     => Body_Suffix_Id_Of (In_Tree, Name_Ada, Naming),
+            Spec_Suffix     => Spec_Suffix_Id_Of (In_Tree, Name_Ada, Naming),
+            Casing          => Naming.Casing,
+            Kind            => Kind,
+            Unit            => Unit_Name,
+            In_Tree         => In_Tree);
+
+         case Kind is
+            when Spec       => Unit_Kind := Specification;
+            when Impl | Sep => Unit_Kind := Body_Part;
+         end case;
+      end if;
+   end Get_Unit;
+
+   ----------
+   -- Hash --
+   ----------
+
+   function Hash (Unit : Unit_Info) return Header_Num is
+   begin
+      return Header_Num (Unit.Unit mod 2048);
+   end Hash;
+
+   -----------------------
+   -- Is_Illegal_Suffix --
+   -----------------------
+
+   function Is_Illegal_Suffix
+     (Suffix          : File_Name_Type;
+      Dot_Replacement : File_Name_Type) return Boolean
+   is
+      Suffix_Str : constant String := Get_Name_String (Suffix);
+
+   begin
+      if Suffix_Str'Length = 0 or else Index (Suffix_Str, ".") = 0 then
+         return True;
+      end if;
+
+      --  If dot replacement is a single dot, and first character of suffix is
+      --  also a dot
+
+      if Get_Name_String (Dot_Replacement) = "."
+        and then Suffix_Str (Suffix_Str'First) = '.'
+      then
+         for Index in Suffix_Str'First + 1 .. Suffix_Str'Last loop
+
+            --  If there is another dot
+
+            if Suffix_Str (Index) = '.' then
+
+               --  It is illegal to have a letter following the initial dot
+
+               return Is_Letter (Suffix_Str (Suffix_Str'First + 1));
+            end if;
+         end loop;
+      end if;
+
+      return False;
+   end Is_Illegal_Suffix;
+
+   ----------------------
+   -- Locate_Directory --
+   ----------------------
+
+   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 := "";
+      Current_Dir      : String;
+      Location         : Source_Ptr := No_Location;
+      Externally_Built : Boolean := False)
+   is
+      The_Parent      : constant String :=
+                          Get_Name_String (Parent) & Directory_Separator;
+
+      The_Parent_Last : constant Natural :=
+                          Compute_Directory_Last (The_Parent);
+
+      Full_Name       : File_Name_Type;
+
+      The_Name        : File_Name_Type;
+
+   begin
+      Get_Name_String (Name);
+
+      --  Add Subdirs.all if it is a directory that may be created and
+      --  Subdirs is not null;
+
+      if Create /= "" and then Subdirs /= null then
+         if Name_Buffer (Name_Len) /= Directory_Separator then
+            Add_Char_To_Name_Buffer (Directory_Separator);
+         end if;
+
+         Add_Str_To_Name_Buffer (Subdirs.all);
+      end if;
+
+      --  Convert '/' to directory separator (for Windows)
+
+      for J in 1 .. Name_Len loop
+         if Name_Buffer (J) = '/' then
+            Name_Buffer (J) := Directory_Separator;
+         end if;
+      end loop;
+
+      The_Name := Name_Find;
+
+      if Current_Verbosity = High then
+         Write_Str ("Locate_Directory (""");
+         Write_Str (Get_Name_String (The_Name));
+         Write_Str (""", """);
+         Write_Str (The_Parent);
+         Write_Line (""")");
       end if;
 
-      Needs_Pragma := False;
-      Exception_Id := No_Ada_Naming_Exception;
+      Dir     := No_Path;
+      Display := No_Path;
+
+      if Is_Absolute_Path (Get_Name_String (The_Name)) then
+         Full_Name := The_Name;
 
-      Get_Name_String (Canonical_File_Name);
+      else
+         Name_Len := 0;
+         Add_Str_To_Name_Buffer
+           (The_Parent (The_Parent'First .. The_Parent_Last));
+         Add_Str_To_Name_Buffer (Get_Name_String (The_Name));
+         Full_Name := Name_Find;
+      end if;
 
       declare
-         File          : String := Name_Buffer (1 .. Name_Len);
-         First         : constant Positive := File'First;
-         Last          : Natural           := File'Last;
-         Standard_GNAT : Boolean;
+         Full_Path_Name : String_Access :=
+                            new String'(Get_Name_String (Full_Name));
 
       begin
-         Standard_GNAT :=
-           Naming.Ada_Spec_Suffix = Default_Ada_Spec_Suffix
-             and then Naming.Ada_Body_Suffix = Default_Ada_Body_Suffix;
+         if (Setup_Projects or else Subdirs /= null)
+           and then Create'Length > 0
+         then
+            if not Is_Directory (Full_Path_Name.all) then
+               --  If project is externally built, do not create a subdir,
+               --  use the specified directory, without the subdir.
 
-         --  Check if the end of the file name is Specification_Append
+               if Externally_Built then
+                  if Is_Absolute_Path (Get_Name_String (Name)) then
+                     Get_Name_String (Name);
+
+                  else
+                     Name_Len := 0;
+                     Add_Str_To_Name_Buffer
+                       (The_Parent (The_Parent'First .. The_Parent_Last));
+                     Add_Str_To_Name_Buffer (Get_Name_String (Name));
+                  end if;
 
-         Get_Name_String (Naming.Ada_Spec_Suffix);
+                  Full_Path_Name := new String'(Name_Buffer (1 .. Name_Len));
 
-         if File'Length > Name_Len
-           and then File (Last - Name_Len + 1 .. Last) =
-                                                Name_Buffer (1 .. Name_Len)
-         then
-            --  We have a spec
+               else
+                  begin
+                     Create_Path (Full_Path_Name.all);
 
-            Unit_Kind := Specification;
-            Last := Last - Name_Len;
+                     if not Quiet_Output then
+                        Write_Str (Create);
+                        Write_Str (" directory """);
+                        Write_Str (Full_Path_Name.all);
+                        Write_Line (""" created");
+                     end if;
 
-            if Current_Verbosity = High then
-               Write_Str  ("   Specification: ");
-               Write_Line (File (First .. Last));
+                  exception
+                     when Use_Error =>
+                        Error_Msg
+                          (Project, In_Tree,
+                           "could not create " & Create &
+                           " directory " & Full_Path_Name.all,
+                           Location);
+                  end;
+               end if;
             end if;
+         end if;
 
-         else
-            Get_Name_String (Naming.Ada_Body_Suffix);
+         if Is_Directory (Full_Path_Name.all) then
+            declare
+               Normed : constant String :=
+                          Normalize_Pathname
+                            (Full_Path_Name.all,
+                             Directory      => Current_Dir,
+                             Resolve_Links  => False,
+                             Case_Sensitive => True);
 
-            --  Check if the end of the file name is Body_Append
+               Canonical_Path : constant String :=
+                                  Normalize_Pathname
+                                    (Normed,
+                                     Directory      => Current_Dir,
+                                     Resolve_Links  =>
+                                        Opt.Follow_Links_For_Dirs,
+                                     Case_Sensitive => False);
 
-            if File'Length > Name_Len
-              and then File (Last - Name_Len + 1 .. Last) =
-                                                Name_Buffer (1 .. Name_Len)
-            then
-               --  We have a body
+            begin
+               Name_Len := Normed'Length;
+               Name_Buffer (1 .. Name_Len) := Normed;
+               Display := Name_Find;
 
-               Unit_Kind := Body_Part;
-               Last := Last - Name_Len;
+               Name_Len := Canonical_Path'Length;
+               Name_Buffer (1 .. Name_Len) := Canonical_Path;
+               Dir := Name_Find;
+            end;
+         end if;
 
-               if Current_Verbosity = High then
-                  Write_Str  ("   Body: ");
-                  Write_Line (File (First .. Last));
-               end if;
+         Free (Full_Path_Name);
+      end;
+   end Locate_Directory;
 
-            elsif Naming.Separate_Suffix /= Naming.Ada_Spec_Suffix then
-               Get_Name_String (Naming.Separate_Suffix);
+   ---------------------------
+   -- Find_Excluded_Sources --
+   ---------------------------
 
-               --  Check if the end of the file name is Separate_Append
+   procedure Find_Excluded_Sources
+     (Project : Project_Id;
+      In_Tree : Project_Tree_Ref;
+      Data    : Project_Data)
+   is
+      Excluded_Source_List_File : constant Variable_Value :=
+                                    Util.Value_Of
+                                      (Name_Excluded_Source_List_File,
+                                       Data.Decl.Attributes,
+                                       In_Tree);
+
+      Excluded_Sources          : Variable_Value := Util.Value_Of
+                                    (Name_Excluded_Source_Files,
+                                     Data.Decl.Attributes,
+                                     In_Tree);
+
+      Current         : String_List_Id;
+      Element         : String_Element;
+      Location        : Source_Ptr;
+      Name            : File_Name_Type;
+      File            : Prj.Util.Text_File;
+      Line            : String (1 .. 300);
+      Last            : Natural;
+      Locally_Removed : Boolean := False;
 
-               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)
+   begin
+      --  If Excluded_Source_Files is not declared, check
+      --  Locally_Removed_Files.
 
-                  Unit_Kind := Body_Part;
-                  Last := Last - Name_Len;
+      if Excluded_Sources.Default then
+         Locally_Removed := True;
+         Excluded_Sources :=
+           Util.Value_Of
+             (Name_Locally_Removed_Files, Data.Decl.Attributes, In_Tree);
+      end if;
 
-                  if Current_Verbosity = High then
-                     Write_Str  ("   Separate: ");
-                     Write_Line (File (First .. Last));
-                  end if;
+      Excluded_Sources_Htable.Reset;
 
-               else
-                  Last := 0;
-               end if;
+      --  If there are excluded sources, put them in the table
 
+      if not Excluded_Sources.Default then
+         if not Excluded_Source_List_File.Default then
+            if Locally_Removed then
+               Error_Msg
+                 (Project, In_Tree,
+                  "?both attributes Locally_Removed_Files and " &
+                  "Excluded_Source_List_File are present",
+                  Excluded_Source_List_File.Location);
             else
-               Last := 0;
+               Error_Msg
+                 (Project, In_Tree,
+                  "?both attributes Excluded_Source_Files and " &
+                  "Excluded_Source_List_File are present",
+                  Excluded_Source_List_File.Location);
             end if;
          end if;
 
-         if Last = 0 then
-
-            --  This is not a source file
+         Current := Excluded_Sources.Values;
+         while Current /= Nil_String loop
+            Element := In_Tree.String_Elements.Table (Current);
+            Name := Canonical_Case_File_Name (Element.Value);
 
-            Unit_Name := No_Name;
-            Unit_Kind := Specification;
+            --  If the element has no location, then use the location
+            --  of Excluded_Sources to report possible errors.
 
-            if Current_Verbosity = High then
-               Write_Line ("   Not a valid file name.");
+            if Element.Location = No_Location then
+               Location := Excluded_Sources.Location;
+            else
+               Location := Element.Location;
             end if;
 
-            return;
-         end if;
+            Excluded_Sources_Htable.Set (Name, (Name, False, Location));
+            Current := Element.Next;
+         end loop;
 
-         Get_Name_String (Naming.Dot_Replacement);
-         Standard_GNAT :=
-           Standard_GNAT and then Name_Buffer (1 .. Name_Len) = "-";
+      elsif not Excluded_Source_List_File.Default then
+         Location := Excluded_Source_List_File.Location;
 
-         if Name_Buffer (1 .. Name_Len) /= "." then
+         declare
+            Source_File_Path_Name : constant String :=
+                                      Path_Name_Of
+                                        (File_Name_Type
+                                           (Excluded_Source_List_File.Value),
+                                         Data.Directory.Name);
 
-            --  If Dot_Replacement is not a single dot, then there should
-            --  not be any dot in the name.
+         begin
+            if Source_File_Path_Name'Length = 0 then
+               Err_Vars.Error_Msg_File_1 :=
+                 File_Name_Type (Excluded_Source_List_File.Value);
+               Error_Msg
+                 (Project, In_Tree,
+                  "file with excluded sources { does not exist",
+                  Excluded_Source_List_File.Location);
 
-            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;
+            else
+               --  Open the file
 
-                  Unit_Name := No_Name;
-                  return;
+               Prj.Util.Open (File, Source_File_Path_Name);
 
-               end if;
-            end loop;
+               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
 
-            --  Replace the substring Dot_Replacement with dots
+                  while not Prj.Util.End_Of_File (File) loop
+                     Prj.Util.Get_Line (File, Line, Last);
 
-            declare
-               Index : Positive := First;
+                     --  A non empty, non comment line should contain a file
+                     --  name
 
-            begin
-               while Index <= Last - Name_Len + 1 loop
+                     if Last /= 0
+                       and then (Last = 1 or else Line (1 .. 2) /= "--")
+                     then
+                        Name_Len := Last;
+                        Name_Buffer (1 .. Name_Len) := Line (1 .. Last);
+                        Canonical_Case_File_Name
+                          (Name_Buffer (1 .. Name_Len));
+                        Name := Name_Find;
 
-                  if File (Index .. Index + Name_Len - 1) =
-                    Name_Buffer (1 .. Name_Len)
-                  then
-                     File (Index) := '.';
+                        --  Check that there is no directory information
+
+                        for J in 1 .. Last loop
+                           if Line (J) = '/'
+                             or else Line (J) = Directory_Separator
+                           then
+                              Error_Msg_File_1 := Name;
+                              Error_Msg
+                                (Project,
+                                 In_Tree,
+                                 "file name cannot include " &
+                                 "directory information ({)",
+                                 Location);
+                              exit;
+                           end if;
+                        end loop;
 
-                     if Name_Len > 1 and then Index < Last then
-                        File (Index + 1 .. Last - Name_Len + 1) :=
-                          File (Index + Name_Len .. Last);
+                        Excluded_Sources_Htable.Set
+                          (Name, (Name, False, Location));
                      end if;
+                  end loop;
 
-                     Last := Last - Name_Len + 1;
-                  end if;
+                  Prj.Util.Close (File);
+               end if;
+            end if;
+         end;
+      end if;
+   end Find_Excluded_Sources;
 
-                  Index := Index + 1;
-               end loop;
-            end;
+   ---------------------------
+   -- Find_Explicit_Sources --
+   ---------------------------
+
+   procedure Find_Explicit_Sources
+     (Current_Dir : String;
+      Project     : Project_Id;
+      In_Tree     : Project_Tree_Ref;
+      Data        : in out Project_Data)
+   is
+      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);
+      Name_Loc         : Name_Location;
+
+   begin
+      pragma Assert (Sources.Kind = List, "Source_Files is not a list");
+      pragma Assert
+        (Source_List_File.Kind = Single,
+         "Source_List_File is not a single string");
+
+      --  If the user has specified a Sources attribute
+
+      if not Sources.Default then
+         if not Source_List_File.Default then
+            Error_Msg
+              (Project, In_Tree,
+               "?both attributes source_files and " &
+               "source_list_file are present",
+               Source_List_File.Location);
          end if;
 
-         --  Check if the casing is right
+         --  Sources is a list of file names
 
          declare
-            Src : String := File (First .. Last);
+            Current  : String_List_Id := Sources.Values;
+            Element  : String_Element;
+            Location : Source_Ptr;
+            Name     : File_Name_Type;
 
          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 Get_Mode = Multi_Language then
+               if Current = Nil_String then
+                  Data.Languages := No_Language_Index;
 
-            if Src /= File (First .. Last) then
-               if Current_Verbosity = High then
-                  Write_Line ("   Not a valid file name (casing).");
-               end if;
+                  --  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_Path_Information;
+                  end if;
+               end if;
             end if;
 
-            --  We put the name in lower case
+            while Current /= Nil_String loop
+               Element := In_Tree.String_Elements.Table (Current);
+               Name := Canonical_Case_File_Name (Element.Value);
+               Get_Name_String (Element.Value);
 
-            Fixed.Translate
-              (Source  => Src,
-               Mapping => Lower_Case_Map);
+               --  If the element has no location, then use the
+               --  location of Sources to report possible errors.
 
-            --  In the standard GNAT naming scheme, check for special cases:
-            --  children or separates of A, G, I or S, and run time sources.
+               if Element.Location = No_Location then
+                  Location := Sources.Location;
+               else
+                  Location := Element.Location;
+               end if;
 
-            if Standard_GNAT and then Src'Length >= 3 then
-               declare
-                  S1 : constant Character := Src (Src'First);
-                  S2 : constant Character := Src (Src'First + 1);
+               --  Check that there is no directory information
 
-               begin
-                  if S1 = 'a' or else S1 = 'g'
-                    or else S1 = 'i' or else S1 = 's'
+               for J in 1 .. Name_Len loop
+                  if Name_Buffer (J) = '/'
+                    or else Name_Buffer (J) = Directory_Separator
                   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) := '.';
+                     Error_Msg_File_1 := Name;
+                     Error_Msg
+                       (Project,
+                        In_Tree,
+                        "file name cannot include directory " &
+                        "information ({)",
+                        Location);
+                     exit;
+                  end if;
+               end loop;
 
-                     --  If it is potentially a run time source, disable
-                     --  filling of the mapping file to avoid warnings.
+               --  In Multi_Language mode, check whether the file is
+               --  already there: the same file name may be in the list; if
+               --  the source is missing, the error will be on the first
+               --  mention of the source file name.
+
+               case Get_Mode is
+                  when Ada_Only =>
+                     Name_Loc := No_Name_Location;
+                  when Multi_Language =>
+                     Name_Loc := Source_Names.Get (Name);
+               end case;
+
+               if Name_Loc = No_Name_Location then
+                  Name_Loc :=
+                    (Name     => Name,
+                     Location => Location,
+                     Source   => No_Source,
+                     Except   => False,
+                     Found    => False);
+                  Source_Names.Set (Name, Name_Loc);
+               end if;
 
-                     elsif S2 = '.' then
-                        Set_Mapping_File_Initial_State_To_Empty;
-                     end if;
+               Current := Element.Next;
+            end loop;
 
-                  end if;
-               end;
+            if Get_Mode = Ada_Only then
+               Get_Path_Names_And_Record_Ada_Sources
+                 (Project, In_Tree, Data, Current_Dir);
             end if;
+         end;
 
-            if Current_Verbosity = High then
-               Write_Str  ("      ");
-               Write_Line (Src);
-            end if;
+         --  If we have no Source_Files attribute, check the Source_List_File
+         --  attribute
 
-            --  Now, we check if this name is a valid unit name
+      elsif not Source_List_File.Default then
 
-            Check_Ada_Name (Name => Src, Unit => Unit_Name);
-         end;
+         --  Source_List_File is the name of the file
+         --  that contains the source file names
 
-      end;
-   end Get_Unit;
+         declare
+            Source_File_Path_Name : constant String :=
+              Path_Name_Of
+                (File_Name_Type (Source_List_File.Value), Data.Directory.Name);
 
-   ----------
-   -- Hash --
-   ----------
+         begin
+            if Source_File_Path_Name'Length = 0 then
+               Err_Vars.Error_Msg_File_1 :=
+                 File_Name_Type (Source_List_File.Value);
+               Error_Msg
+                 (Project, In_Tree,
+                  "file with sources { does not exist",
+                  Source_List_File.Location);
 
-   function Hash (Unit : Unit_Info) return Header_Num is
-   begin
-      return Header_Num (Unit.Unit mod 2048);
-   end Hash;
+            else
+               Get_Sources_From_File
+                 (Source_File_Path_Name, Source_List_File.Location,
+                  Project, In_Tree);
 
-   -----------------------
-   -- Is_Illegal_Suffix --
-   -----------------------
+               if Get_Mode = Ada_Only then
+                  --  Look in the source directories to find those sources
 
-   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;
+                  Get_Path_Names_And_Record_Ada_Sources
+                    (Project, In_Tree, Data, Current_Dir);
+               end if;
+            end if;
+         end;
+
+      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 Get_Mode = Ada_Only then
+            Find_Ada_Sources (Project, In_Tree, Data, Current_Dir);
+         end if;
       end if;
 
-      --  If dot replacement is a single dot, and first character of
-      --  suffix is also a dot
+      if Get_Mode = Multi_Language then
+         Search_Directories
+           (Project, In_Tree, Data,
+            For_All_Sources =>
+              Sources.Default and then Source_List_File.Default);
 
-      if Dot_Replacement_Is_A_Single_Dot
-        and then Suffix (Suffix'First) = '.'
-      then
-         for Index in Suffix'First + 1 .. Suffix'Last loop
+         --  Check if all exceptions have been found.
+         --  For Ada, it is an error if an exception is not found.
+         --  For other language, the source is simply removed.
 
-            --  If there is another dot
+         declare
+            Source : Source_Id;
+            Iter   : Source_Iterator;
 
-            if Suffix (Index) = '.' then
+         begin
+            Iter := For_Each_Source (In_Tree, Project);
+            loop
+               Source := Prj.Element (Iter);
+               exit when Source = No_Source;
 
-               --  It is illegal to have a letter following the initial dot
+               if Source.Naming_Exception
+                 and then Source.Path = No_Path_Information
+               then
+                  if Source.Unit /= No_Name then
+                     Error_Msg_Name_1 := Name_Id (Source.Display_File);
+                     Error_Msg_Name_2 := Name_Id (Source.Unit);
+                     Error_Msg
+                       (Project, In_Tree,
+                        "source file %% for unit %% not found",
+                        No_Location);
+                  end if;
 
-               return Is_Letter (Suffix (Suffix'First + 1));
-            end if;
-         end loop;
+                  Remove_Source (Source, No_Source);
+               end if;
+
+               Next (Iter);
+            end loop;
+         end;
+
+         --  Check that all sources in Source_Files or the file
+         --  Source_List_File has been found.
+
+         declare
+            Name_Loc : Name_Location;
+
+         begin
+            Name_Loc := Source_Names.Get_First;
+            while Name_Loc /= No_Name_Location loop
+               if (not Name_Loc.Except) and then (not Name_Loc.Found) then
+                  Error_Msg_Name_1 := Name_Id (Name_Loc.Name);
+                  Error_Msg
+                    (Project,
+                     In_Tree,
+                     "file %% not found",
+                     Name_Loc.Location);
+               end if;
+
+               Name_Loc := Source_Names.Get_Next;
+            end loop;
+         end;
       end if;
 
-      --  Everything is OK
+      if Get_Mode = Ada_Only
+        and then Data.Extends = No_Project
+      then
+         --  We should have found at least one source, if not report an error
 
-      return False;
-   end Is_Illegal_Suffix;
+         if not Has_Ada_Sources (Data) then
+            Report_No_Sources
+              (Project, "Ada", In_Tree, Source_List_File.Location);
+         end if;
+      end if;
 
-   ----------------------
-   -- Locate_Directory --
-   ----------------------
+   end Find_Explicit_Sources;
 
-   procedure Locate_Directory
-     (Name    : Name_Id;
-      Parent  : Name_Id;
-      Dir     : out Name_Id;
-      Display : out Name_Id)
+   -------------------------------------------
+   -- Get_Path_Names_And_Record_Ada_Sources --
+   -------------------------------------------
+
+   procedure Get_Path_Names_And_Record_Ada_Sources
+     (Project     : Project_Id;
+      In_Tree     : Project_Tree_Ref;
+      Data        : in out Project_Data;
+      Current_Dir : String)
    is
-      The_Name   : constant String := Get_Name_String (Name);
+      Source_Dir      : String_List_Id;
+      Element         : String_Element;
+      Path            : Path_Name_Type;
+      Dir             : Dir_Type;
+      Name            : File_Name_Type;
+      Canonical_Name  : File_Name_Type;
+      Name_Str        : String (1 .. 1_024);
+      Last            : Natural := 0;
+      NL              : Name_Location;
+      Current_Source  : String_List_Id := Nil_String;
+      First_Error     : Boolean := True;
+      Source_Recorded : Boolean := False;
 
-      The_Parent : constant String :=
-                     Get_Name_String (Parent) & Directory_Separator;
+   begin
+      --  We look in all source directories for the file names in the hash
+      --  table Source_Names.
 
-      The_Parent_Last : constant Natural :=
-                     Compute_Directory_Last (The_Parent);
+      Source_Dir := Data.Source_Dirs;
+      while Source_Dir /= Nil_String loop
+         Source_Recorded := False;
+         Element := In_Tree.String_Elements.Table (Source_Dir);
 
-   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
+            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;
 
-      Dir     := No_Name;
-      Display := No_Name;
+            Open (Dir, Dir_Path);
 
-      if Is_Absolute_Path (The_Name) then
-         if Is_Directory (The_Name) then
-            declare
-               Normed : constant String :=
-                          Normalize_Pathname
-                            (The_Name,
-                             Resolve_Links  => False,
-                             Case_Sensitive => True);
+            loop
+               Read (Dir, Name_Str, Last);
+               exit when Last = 0;
 
-               Canonical_Path : constant String :=
-                                  Normalize_Pathname
-                                    (Normed,
-                                     Resolve_Links  => True,
-                                     Case_Sensitive => False);
+               Name_Len := Last;
+               Name_Buffer (1 .. Name_Len) := Name_Str (1 .. Last);
+               Name := Name_Find;
+
+               if Osint.File_Names_Case_Sensitive then
+                  Canonical_Name := Name;
+               else
+                  Canonical_Case_File_Name (Name_Str (1 .. Last));
+                  Name_Buffer (1 .. Name_Len) := Name_Str (1 .. Last);
+                  Canonical_Name := Name_Find;
+               end if;
 
-            begin
-               Name_Len := Normed'Length;
-               Name_Buffer (1 .. Name_Len) := Normed;
-               Display := Name_Find;
+               NL := Source_Names.Get (Canonical_Name);
 
-               Name_Len := Canonical_Path'Length;
-               Name_Buffer (1 .. Name_Len) := Canonical_Path;
-               Dir := Name_Find;
-            end;
-         end if;
+               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;
 
-      else
-         declare
-            Full_Path : constant String :=
-                          The_Parent (The_Parent'First .. The_Parent_Last) &
-                          The_Name;
+                  if Name_Buffer (Name_Len) /= Directory_Separator then
+                     Add_Char_To_Name_Buffer (Directory_Separator);
+                  end if;
 
-         begin
-            if Is_Directory (Full_Path) then
-               declare
-                  Normed : constant String :=
-                             Normalize_Pathname
-                               (Full_Path,
-                                Resolve_Links  => False,
-                                Case_Sensitive => True);
-
-                  Canonical_Path : constant String :=
-                                     Normalize_Pathname
-                                       (Normed,
-                                        Resolve_Links  => True,
-                                        Case_Sensitive => False);
+                  Add_Str_To_Name_Buffer (Name_Str (1 .. Last));
+                  Path := Name_Find;
 
-               begin
-                  Name_Len := Normed'Length;
-                  Name_Buffer (1 .. Name_Len) := Normed;
-                  Display := Name_Find;
+                  if Current_Verbosity = High then
+                     Write_Str  ("  found ");
+                     Write_Line (Get_Name_String (Name));
+                  end if;
 
-                  Name_Len := Canonical_Path'Length;
-                  Name_Buffer (1 .. Name_Len) := Canonical_Path;
-                  Dir := Name_Find;
-               end;
-            end if;
+                  --  Register the source if it is an Ada compilation unit
+
+                  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,
+                     Current_Dir     => Current_Dir);
+               end if;
+            end loop;
+
+            Close (Dir);
          end;
-      end if;
-   end Locate_Directory;
 
-   ----------------------
-   -- Look_For_Sources --
-   ----------------------
+         if Source_Recorded then
+            In_Tree.String_Elements.Table (Source_Dir).Flag :=
+              True;
+         end if;
 
-   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.
+         Source_Dir := Element.Next;
+      end loop;
 
-      procedure Get_Sources_From_File
-        (Path     : String;
-         Location : Source_Ptr);
-      --  Get the sources of a project from a text file
+      --  It is an error if a source file name in a source list or
+      --  in a source list file is not found.
 
-      ---------------------------------------
-      -- Get_Path_Names_And_Record_Sources --
-      ---------------------------------------
+      NL := Source_Names.Get_First;
+      while NL /= No_Name_Location loop
+         if not NL.Found then
+            Err_Vars.Error_Msg_File_1 := NL.Name;
 
-      procedure Get_Path_Names_And_Record_Sources (Follow_Links : Boolean) is
-         Source_Dir : String_List_Id := Data.Source_Dirs;
-         Element    : String_Element;
-         Path       : Name_Id;
+            if First_Error then
+               Error_Msg
+                 (Project, In_Tree,
+                  "source file { cannot be found",
+                  NL.Location);
+               First_Error := False;
+
+            else
+               Error_Msg
+                 (Project, In_Tree,
+                  "\source file { cannot be found",
+                  NL.Location);
+            end if;
+         end if;
 
-         Dir      : Dir_Type;
-         Name     : Name_Id;
-         Canonical_Name : Name_Id;
-         Name_Str : String (1 .. 1_024);
-         Last     : Natural := 0;
-         NL       : Name_Location;
+         NL := Source_Names.Get_Next;
+      end loop;
+   end Get_Path_Names_And_Record_Ada_Sources;
 
-         Current_Source : String_List_Id := Nil_String;
+   -------------------------------
+   -- Check_File_Naming_Schemes --
+   -------------------------------
 
-         First_Error : Boolean := True;
+   procedure Check_File_Naming_Schemes
+     (In_Tree               : Project_Tree_Ref;
+      Data                  : in out Project_Data;
+      File_Name             : File_Name_Type;
+      Alternate_Languages   : out Alternate_Language_Id;
+      Language              : out Language_Ptr;
+      Language_Name         : out Name_Id;
+      Display_Language_Name : out Name_Id;
+      Unit                  : out Name_Id;
+      Lang_Kind             : out Language_Kind;
+      Kind                  : out Source_Kind)
+   is
+      Filename : constant String := Get_Name_String (File_Name);
+      Config   : Language_Config;
+      Tmp_Lang : Language_Ptr;
+
+      Header_File : Boolean := False;
+      --  True if we found at least one language for which the file is a header
+      --  In such a case, we search for all possible languages where this is
+      --  also a header (C and C++ for instance), since the file might be used
+      --  for several such languages.
+
+      procedure Check_File_Based_Lang;
+      --  Does the naming scheme test for file-based languages. For those,
+      --  there is no Unit. Just check if the file name has the implementation
+      --  or, if it is specified, the template suffix of the language.
+      --
+      --  Returns True if the file belongs to the current language and we
+      --  should stop searching for matching languages. Not that a given header
+      --  file could belong to several languages (C and C++ for instance). Thus
+      --  if we found a header we'll check whether it matches other languages
 
-         Source_Recorded : Boolean := False;
+      ---------------------------
+      -- Check_File_Based_Lang --
+      ---------------------------
 
+      procedure Check_File_Based_Lang is
       begin
-         --  We look in all source directories for the file names in the
-         --  hash table Source_Names
+         if not Header_File
+           and then Suffix_Matches (Filename, Config.Naming_Data.Body_Suffix)
+         then
+            Unit     := No_Name;
+            Kind     := Impl;
+            Language := Tmp_Lang;
 
-         while Source_Dir /= Nil_String loop
-            Source_Recorded := False;
-            Element := In_Tree.String_Elements.Table (Source_Dir);
+            if Current_Verbosity = High then
+               Write_Str ("     implementation of language ");
+               Write_Line (Get_Name_String (Display_Language_Name));
+            end if;
 
-            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;
+         elsif Suffix_Matches (Filename, Config.Naming_Data.Spec_Suffix) then
+            if Current_Verbosity = High then
+               Write_Str ("     header of language ");
+               Write_Line (Get_Name_String (Display_Language_Name));
+            end if;
 
-               Open (Dir, Dir_Path);
+            if Header_File then
+               Alternate_Language_Table.Increment_Last (In_Tree.Alt_Langs);
+               In_Tree.Alt_Langs.Table
+                 (Alternate_Language_Table.Last (In_Tree.Alt_Langs)) :=
+                 (Language => Language,
+                  Next     => Alternate_Languages);
+               Alternate_Languages :=
+                 Alternate_Language_Table.Last (In_Tree.Alt_Langs);
 
-               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);
+            else
+               Header_File := True;
+               Kind        := Spec;
+               Unit        := No_Name;
+               Language    := Tmp_Lang;
+            end if;
+         end if;
+      end Check_File_Based_Lang;
 
-                  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;
+   --  Start of processing for Check_File_Naming_Schemes
 
-                     if Name_Buffer (Name_Len) /= Directory_Separator then
-                        Add_Char_To_Name_Buffer (Directory_Separator);
-                     end if;
+   begin
+      Language              := No_Language_Index;
+      Alternate_Languages   := No_Alternate_Language;
+      Display_Language_Name := No_Name;
+      Unit                  := No_Name;
+      Lang_Kind             := File_Based;
+      Kind                  := Spec;
 
-                     Add_Str_To_Name_Buffer (Name_Str (1 .. Last));
-                     Path := Name_Find;
+      Tmp_Lang := Data.Languages;
+      while Tmp_Lang /= No_Language_Index loop
+         Language_Name := Tmp_Lang.Name;
 
-                     if Current_Verbosity = High then
-                        Write_Str  ("  found ");
-                        Write_Line (Get_Name_String (Name));
-                     end if;
+         if Current_Verbosity = High then
+            Write_Line
+              ("     Testing language "
+               & Get_Name_String (Language_Name)
+               & " Header_File=" & Header_File'Img);
+         end if;
 
-                     --  Register the source if it is an Ada compilation unit
-
-                     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);
+         Display_Language_Name := Tmp_Lang.Display_Name;
+         Config := Tmp_Lang.Config;
+         Lang_Kind := Config.Kind;
+
+         case Config.Kind is
+            when File_Based =>
+               Check_File_Based_Lang;
+               exit when Kind = Impl;
+
+            when Unit_Based =>
+
+               --  We know it belongs to a least a file_based language, no
+               --  need to check unit-based ones.
+
+               if not Header_File then
+                  Compute_Unit_Name
+                    (File_Name       => File_Name,
+                     Dot_Replacement => Config.Naming_Data.Dot_Replacement,
+                     Separate_Suffix => Config.Naming_Data.Separate_Suffix,
+                     Body_Suffix     => Config.Naming_Data.Body_Suffix,
+                     Spec_Suffix     => Config.Naming_Data.Spec_Suffix,
+                     Casing          => Config.Naming_Data.Casing,
+                     Kind            => Kind,
+                     Unit            => Unit,
+                     In_Tree         => In_Tree);
+
+                  if Unit /= No_Name then
+                     Language    := Tmp_Lang;
+                     exit;
                   end if;
-               end loop;
+               end if;
+         end case;
 
-               Close (Dir);
-            end;
+         Tmp_Lang := Tmp_Lang.Next;
+      end loop;
 
-            if Source_Recorded then
-               In_Tree.String_Elements.Table (Source_Dir).Flag :=
-                 True;
-            end if;
+      if Language = No_Language_Index
+        and then Current_Verbosity = High
+      then
+         Write_Line ("     not a source of any language");
+      end if;
+   end Check_File_Naming_Schemes;
 
-            Source_Dir := Element.Next;
-         end loop;
+   ----------------
+   -- Check_File --
+   ----------------
+
+   procedure Check_File
+     (Project           : Project_Id;
+      In_Tree           : Project_Tree_Ref;
+      Data              : in out Project_Data;
+      Name              : String;
+      File_Name         : File_Name_Type;
+      Display_File_Name : File_Name_Type;
+      Source_Directory  : String;
+      For_All_Sources   : Boolean)
+   is
+      Display_Path    : constant String :=
+        Normalize_Pathname
+          (Name           => Name,
+           Directory      => Source_Directory,
+           Resolve_Links  => Opt.Follow_Links_For_Files,
+           Case_Sensitive => True);
+
+      Name_Loc          : Name_Location := Source_Names.Get (File_Name);
+      Path_Id           : Path_Name_Type;
+      Display_Path_Id   : Path_Name_Type;
+      Check_Name        : Boolean := False;
+      Alternate_Languages : Alternate_Language_Id := No_Alternate_Language;
+      Language          : Language_Ptr;
+      Source            : Source_Id;
+      Other_Part        : Source_Id;
+      Add_Src           : Boolean;
+      Src_Ind           : Source_File_Index;
+      Unit              : Name_Id;
+      Source_To_Replace : Source_Id := No_Source;
+
+      Language_Name         : Name_Id;
+      Display_Language_Name : Name_Id;
+      Lang_Kind             : Language_Kind;
+      Kind                  : Source_Kind := Spec;
+      Iter                  : Source_Iterator;
 
-         --  It is an error if a source file name in a source list or
-         --  in a source list file is not found.
+   begin
+      Name_Len := Display_Path'Length;
+      Name_Buffer (1 .. Name_Len) := Display_Path;
+      Display_Path_Id := Name_Find;
 
-         NL := Source_Names.Get_First;
+      if Osint.File_Names_Case_Sensitive then
+         Path_Id := Display_Path_Id;
+      else
+         Canonical_Case_File_Name (Name_Buffer (1 .. Name_Len));
+         Path_Id := Name_Find;
+      end if;
 
-         while NL /= No_Name_Location loop
-            if not NL.Found then
-               Err_Vars.Error_Msg_Name_1 := NL.Name;
+      if Name_Loc = No_Name_Location then
+         Check_Name := For_All_Sources;
 
-               if First_Error then
-                  Error_Msg
-                    (Project, In_Tree,
-                     "source file { cannot be found",
-                     NL.Location);
-                  First_Error := False;
+      else
+         if Name_Loc.Found then
 
-               else
-                  Error_Msg
-                    (Project, In_Tree,
-                     "\source file { cannot be found",
-                     NL.Location);
-               end if;
+            --  Check if it is OK to have the same file name in several
+            --  source directories.
+
+            if not Data.Known_Order_Of_Source_Dirs then
+               Error_Msg_File_1 := File_Name;
+               Error_Msg
+                 (Project, In_Tree,
+                  "{ is found in several source directories",
+                  Name_Loc.Location);
             end if;
 
-            NL := Source_Names.Get_Next;
-         end loop;
-      end Get_Path_Names_And_Record_Sources;
+         else
+            Name_Loc.Found := True;
 
-      ---------------------------
-      -- Get_Sources_From_File --
-      ---------------------------
+            Source_Names.Set (File_Name, Name_Loc);
 
-      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.
+            if Name_Loc.Source = No_Source then
+               Check_Name := True;
 
-         Get_Sources_From_File (Path, Location, Project, In_Tree);
+            else
+               Name_Loc.Source.Path := (Path_Id, Display_Path_Id);
 
-         --  Look in the source directories to find those sources
+               Source_Paths_Htable.Set
+                 (In_Tree.Source_Paths_HT,
+                  Path_Id,
+                  Name_Loc.Source);
 
-         Get_Path_Names_And_Record_Sources (Follow_Links);
+               --  Check if this is a subunit
 
-         --  We should have found at least one source.
-         --  If not, report an error.
+               if Name_Loc.Source.Unit /= No_Name
+                 and then Name_Loc.Source.Kind = Impl
+               then
+                  Src_Ind := Sinput.P.Load_Project_File
+                    (Get_Name_String (Path_Id));
 
-         if Data.Sources = Nil_String then
-            Error_Msg (Project, In_Tree,
-                       "there are no Ada sources in this project",
-                       Location);
+                  if Sinput.P.Source_File_Is_Subunit (Src_Ind) then
+                     Name_Loc.Source.Kind := Sep;
+                  end if;
+               end if;
+            end if;
          end if;
-      end Get_Sources_From_File;
-
-   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);
+      end if;
 
-         begin
-            pragma Assert
-              (Sources.Kind = List,
-               "Source_Files is not a list");
+      if Check_Name then
+         Other_Part := No_Source;
 
-            pragma Assert
-              (Source_List_File.Kind = Single,
-               "Source_List_File is not a single string");
+         Check_File_Naming_Schemes
+           (In_Tree               => In_Tree,
+            Data                  => Data,
+            File_Name             => File_Name,
+            Alternate_Languages   => Alternate_Languages,
+            Language              => Language,
+            Language_Name         => Language_Name,
+            Display_Language_Name => Display_Language_Name,
+            Unit                  => Unit,
+            Lang_Kind             => Lang_Kind,
+            Kind                  => Kind);
 
-            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;
+         if Language = No_Language_Index then
 
-               --  Sources is a list of file names
+            --  A file name in a list must be a source of a language
 
-               declare
-                  Current  : String_List_Id := Sources.Values;
-                  Element  : String_Element;
-                  Location : Source_Ptr;
-                  Name     : Name_Id;
+            if Name_Loc.Found then
+               Error_Msg_File_1 := File_Name;
+               Error_Msg
+                 (Project,
+                  In_Tree,
+                  "language unknown for {",
+                  Name_Loc.Location);
+            end if;
 
-               begin
-                  Source_Names.Reset;
+         else
+            --  Check if the same file name or unit is used in the prj tree
 
-                  Data.Ada_Sources_Present := Current /= Nil_String;
+            Iter := For_Each_Source (In_Tree);
+            Add_Src := True;
+            loop
+               Source := Prj.Element (Iter);
+               exit when Source = No_Source;
+
+               if Unit /= No_Name
+                 and then Source.Unit = Unit
+                 and then
+                   ((Source.Kind = Spec and then Kind = Impl)
+                    or else
+                      (Source.Kind = Impl and then Kind = Spec))
+               then
+                  Other_Part := Source;
+
+               elsif (Unit /= No_Name
+                      and then Source.Unit = Unit
+                      and then
+                        (Source.Kind = Kind
+                         or else
+                           (Source.Kind = Sep  and then Kind = Impl)
+                         or else
+                           (Source.Kind = Impl and then Kind = Sep)))
+                 or else
+                   (Unit = No_Name and then Source.File = File_Name)
+               then
+                  --  Duplication of file/unit in same project is only
+                  --  allowed if order of source directories is known.
 
-                  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 Project = Source.Project then
+                     if Data.Known_Order_Of_Source_Dirs then
+                        Add_Src := False;
 
-                     --  If the element has no location, then use the
-                     --  location of Sources to report possible errors.
+                     elsif Unit /= No_Name then
+                        Error_Msg_Name_1 := Unit;
+                        Error_Msg
+                          (Project, In_Tree, "duplicate unit %%",
+                           No_Location);
+                        Add_Src := False;
 
-                     if Element.Location = No_Location then
-                        Location := Sources.Location;
                      else
-                        Location := Element.Location;
+                        Error_Msg_File_1 := File_Name;
+                        Error_Msg
+                          (Project, In_Tree, "duplicate source file name {",
+                           No_Location);
+                        Add_Src := False;
                      end if;
 
-                     Source_Names.Set
-                       (K => Name,
-                        E =>
-                          (Name     => Name,
-                           Location => Location,
-                           Found    => False));
+                     --  Do not allow the same unit name in different
+                     --  projects, except if one is extending the other.
 
-                     Current := Element.Next;
-                  end loop;
-
-                  Get_Path_Names_And_Record_Sources (Follow_Links);
-               end;
+                     --  For a file based language, the same file name
+                     --  replaces a file in a project being extended, but
+                     --  it is allowed to have the same file name in
+                     --  unrelated projects.
 
-               --  No source_files specified
-
-               --  We check Source_List_File has been specified
-
-            elsif not Source_List_File.Default then
+                  elsif Is_Extending
+                    (Project, Source.Project, In_Tree)
+                  then
+                     Source_To_Replace := Source;
 
-               --  Source_List_File is the name of the file
-               --  that contains the source file names
+                  elsif Unit /= No_Name
+                    and then not Source.Locally_Removed
+                  then
+                     Error_Msg_Name_1 := Unit;
+                     Error_Msg
+                       (Project, In_Tree,
+                        "unit %% cannot belong to several projects",
+                        No_Location);
 
-               declare
-                  Source_File_Path_Name : constant String :=
-                                            Path_Name_Of
-                                              (Source_List_File.Value,
-                                               Data.Directory);
+                     Error_Msg_Name_1 :=
+                       In_Tree.Projects.Table (Project).Name;
+                     Error_Msg_Name_2 := Name_Id (Display_Path_Id);
+                     Error_Msg
+                       (Project, In_Tree, "\  project %%, %%", No_Location);
 
-               begin
-                  if Source_File_Path_Name'Length = 0 then
-                     Err_Vars.Error_Msg_Name_1 := Source_List_File.Value;
+                     Error_Msg_Name_1 :=
+                       In_Tree.Projects.Table (Source.Project).Name;
+                     Error_Msg_Name_2 := Name_Id (Source.Path.Display_Name);
                      Error_Msg
-                       (Project, In_Tree,
-                        "file with sources { does not exist",
-                        Source_List_File.Location);
+                       (Project, In_Tree, "\  project %%, %%", No_Location);
 
-                  else
-                     Get_Sources_From_File
-                       (Source_File_Path_Name,
-                        Source_List_File.Location);
+                     Add_Src := False;
                   end if;
-               end;
+               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.
+               Next (Iter);
+            end loop;
 
-               Find_Sources
-                 (Project, In_Tree, Data, Ada_Language_Index, Follow_Links);
+            if Add_Src then
+               Add_Source
+                 (Id                  => Source,
+                  In_Tree             => In_Tree,
+                  Project             => Project,
+                  Lang_Id             => Language,
+                  Lang_Kind           => Lang_Kind,
+                  Kind                => Kind,
+                  Alternate_Languages => Alternate_Languages,
+                  File_Name           => File_Name,
+                  Display_File        => Display_File_Name,
+                  Other_Part          => Other_Part,
+                  Unit                => Unit,
+                  Path                => Path_Id,
+                  Display_Path        => Display_Path_Id,
+                  Source_To_Replace   => Source_To_Replace);
             end if;
+         end if;
+      end if;
+   end Check_File;
 
-            --  If there are sources that are locally removed, mark them as
-            --  such in the Units table.
+   ------------------------
+   -- Search_Directories --
+   ------------------------
 
-            if not Locally_Removed.Default then
+   procedure Search_Directories
+     (Project         : Project_Id;
+      In_Tree         : Project_Tree_Ref;
+      Data            : in out Project_Data;
+      For_All_Sources : Boolean)
+   is
+      Source_Dir        : String_List_Id;
+      Element           : String_Element;
+      Dir               : Dir_Type;
+      Name              : String (1 .. 1_000);
+      Last              : Natural;
+      File_Name         : File_Name_Type;
+      Display_File_Name : File_Name_Type;
 
-               --  Sources can be locally removed only in extending
-               --  project files.
+   begin
+      if Current_Verbosity = High then
+         Write_Line ("Looking for sources:");
+      end if;
 
-               if Data.Extends = No_Project then
-                  Error_Msg
-                    (Project, In_Tree,
-                     "Locally_Removed_Files can only be used " &
-                     "in an extending project file",
-                     Locally_Removed.Location);
+      --  Loop through subdirectories
 
-               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;
+      Source_Dir := Data.Source_Dirs;
+      while Source_Dir /= Nil_String loop
+         begin
+            Element := In_Tree.String_Elements.Table (Source_Dir);
+            if Element.Value /= No_Name then
+               Get_Name_String (Element.Display_Value);
 
-                  begin
-                     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;
+               declare
+                  Source_Directory : constant String :=
+                                       Name_Buffer (1 .. Name_Len) &
+                                         Directory_Separator;
+
+                  Dir_Last : constant Natural :=
+                                       Compute_Directory_Last
+                                         (Source_Directory);
+
+               begin
+                  if Current_Verbosity = High then
+                     Write_Attr ("Source_Dir", Source_Directory);
+                  end if;
 
-                        --  If the element has no location, then use the
-                        --  location of Locally_Removed to report
-                        --  possible errors.
+                  --  We look to every entry in the source directory
+
+                  Open (Dir, Source_Directory);
+
+                  loop
+                     Read (Dir, Name, Last);
+
+                     exit when Last = 0;
+
+                     --  ??? Duplicate system call here, we just did a
+                     --  a similar one. Maybe Ada.Directories would be more
+                     --  appropriate here
+
+                     if Is_Regular_File
+                       (Source_Directory & Name (1 .. Last))
+                     then
+                        if Current_Verbosity = High then
+                           Write_Str  ("   Checking ");
+                           Write_Line (Name (1 .. Last));
+                        end if;
+
+                        Name_Len := Last;
+                        Name_Buffer (1 .. Name_Len) := Name (1 .. Last);
+                        Display_File_Name := Name_Find;
 
-                        if Element.Location = No_Location then
-                           Location := Locally_Removed.Location;
+                        if Osint.File_Names_Case_Sensitive then
+                           File_Name := Display_File_Name;
                         else
-                           Location := Element.Location;
+                           Canonical_Case_File_Name
+                             (Name_Buffer (1 .. Name_Len));
+                           File_Name := Name_Find;
                         end if;
 
-                        OK := False;
+                        declare
+                           FF : File_Found :=
+                                  Excluded_Sources_Htable.Get (File_Name);
+
+                        begin
+                           if FF /= No_File_Found then
+                              if not FF.Found then
+                                 FF.Found := True;
+                                 Excluded_Sources_Htable.Set
+                                   (File_Name, FF);
+
+                                 if Current_Verbosity = High then
+                                    Write_Str ("     excluded source """);
+                                    Write_Str (Get_Name_String (File_Name));
+                                    Write_Line ("""");
+                                 end if;
+                              end if;
 
-                        for Index in Unit_Table.First ..
-                                  Unit_Table.Last (In_Tree.Units)
-                        loop
-                           Unit := In_Tree.Units.Table (Index);
+                           else
+                              Check_File
+                                (Project           => Project,
+                                 In_Tree           => In_Tree,
+                                 Data              => Data,
+                                 Name              => Name (1 .. Last),
+                                 File_Name         => File_Name,
+                                 Display_File_Name => Display_File_Name,
+                                 Source_Directory  => Source_Directory
+                                   (Source_Directory'First .. Dir_Last),
+                                 For_All_Sources   => For_All_Sources);
+                           end if;
+                        end;
+                     end if;
+                  end loop;
 
-                           if Unit.File_Names (Specification).Name = Name then
-                              OK := True;
+                  Close (Dir);
+               end;
+            end if;
 
-                              --  Check that this is from a project that
-                              --  the current project extends, but not the
-                              --  current project.
+         exception
+            when Directory_Error =>
+               null;
+         end;
 
-                              Extended := Unit.File_Names
-                                (Specification).Project;
+         Source_Dir := Element.Next;
+      end loop;
 
-                              if Extended = Project then
-                                 Error_Msg
-                                   (Project, In_Tree,
-                                    "cannot remove a source " &
-                                    "of the same project",
-                                    Location);
+      if Current_Verbosity = High then
+         Write_Line ("end Looking for sources.");
+      end if;
+   end Search_Directories;
 
-                              elsif
-                                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;
-
-                              else
-                                 Error_Msg
-                                   (Project, In_Tree,
-                                    "cannot remove a source from " &
-                                    "another project",
-                                    Location);
-                              end if;
+   ----------------------------
+   -- Load_Naming_Exceptions --
+   ----------------------------
 
-                           elsif
-                             Unit.File_Names (Body_Part).Name = Name
-                           then
-                              OK := True;
+   procedure Load_Naming_Exceptions
+     (Project : Project_Id;
+      In_Tree : Project_Tree_Ref)
+   is
+      Source : Source_Id;
+      Iter   : Source_Iterator;
 
-                              --  Check that this is from a project that
-                              --  the current project extends, but not the
-                              --  current project.
+   begin
+      Unit_Exceptions.Reset;
 
-                              Extended := Unit.File_Names
-                                (Body_Part).Project;
+      Iter := For_Each_Source (In_Tree, Project);
+      loop
+         Source := Prj.Element (Iter);
+         exit when Source = No_Source;
 
-                              if Extended = Project then
-                                 Error_Msg
-                                   (Project, In_Tree,
-                                    "cannot remove a source " &
-                                    "of the same project",
-                                    Location);
+         --  An excluded file cannot also be an exception file name
 
-                              elsif
-                                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 Excluded_Sources_Htable.Get (Source.File) /= No_File_Found then
+            Error_Msg_File_1 := Source.File;
+            Error_Msg
+              (Project, In_Tree,
+               "{ cannot be both excluded and an exception file name",
+               No_Location);
+         end if;
 
-                           end if;
-                        end loop;
+         if Current_Verbosity = High then
+            Write_Str ("Naming exception: Putting source file ");
+            Write_Str (Get_Name_String (Source.File));
+            Write_Line (" in Source_Names");
+         end if;
 
-                        if not OK then
-                           Err_Vars.Error_Msg_Name_1 := Name;
-                           Error_Msg
-                             (Project, In_Tree, "unknown file {", Location);
-                        end if;
+         Source_Names.Set
+           (K => Source.File,
+            E => Name_Location'
+              (Name     => Source.File,
+               Location => No_Location,
+               Source   => Source,
+               Except   => Source.Unit /= No_Name,
+               Found    => False));
+
+         --  If this is an Ada exception, record in table Unit_Exceptions
+
+         if Source.Unit /= No_Name then
+            declare
+               Unit_Except : Unit_Exception :=
+                                Unit_Exceptions.Get (Source.Unit);
+
+            begin
+               Unit_Except.Name := Source.Unit;
 
-                        Current := Element.Next;
-                     end loop;
-                  end;
+               if Source.Kind = Spec then
+                  Unit_Except.Spec := Source.File;
+               else
+                  Unit_Except.Impl := Source.File;
                end if;
-            end if;
-         end;
-      end if;
-
-      if Data.Other_Sources_Present then
 
-         --  Set Source_Present to False. It will be set back to True
-         --  whenever a source is found.
+               Unit_Exceptions.Set (Source.Unit, Unit_Except);
+            end;
+         end if;
 
-         Data.Other_Sources_Present := False;
-         for Lang in Ada_Language_Index + 1 .. Last_Language_Index loop
+         Next (Iter);
+      end loop;
+   end Load_Naming_Exceptions;
 
-            --  For each language (other than Ada) in the project file
+   ----------------------
+   -- Look_For_Sources --
+   ----------------------
 
-            if Is_Present (Lang, Data, In_Tree) then
+   procedure Look_For_Sources
+     (Project     : Project_Id;
+      In_Tree     : Project_Tree_Ref;
+      Data        : in out Project_Data;
+      Current_Dir : String)
+   is
+      Iter : Source_Iterator;
 
-               --  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.
+      procedure Process_Sources_In_Multi_Language_Mode;
+      --  Find all source files when in multi language mode
 
-               Set (Lang, False, Data, In_Tree);
+      procedure Mark_Excluded_Sources;
+      --  Mark as such the sources that are declared as excluded
 
-               --  First, get the source suffix for the language
+      ---------------------------
+      -- Mark_Excluded_Sources --
+      ---------------------------
 
-               Set (Suffix       => Suffix_For (Lang, Data.Naming, In_Tree),
-                    For_Language => Lang,
-                    In_Project   => Data,
-                    In_Tree      => In_Tree);
+      procedure Mark_Excluded_Sources is
+         Source   : Source_Id := No_Source;
+         OK       : Boolean;
+         Unit     : Unit_Data;
+         Excluded : File_Found := Excluded_Sources_Htable.Get_First;
+
+         procedure Exclude
+           (Extended : Project_Id;
+            Index    : Unit_Index;
+            Kind     : Spec_Or_Body);
+         --  If the current file (Excluded) belongs to the current project or
+         --  one that the current project extends, then mark this file/unit as
+         --  excluded. It is an error to locally remove a file from another
+         --  project.
+
+         -------------
+         -- Exclude --
+         -------------
+
+         procedure Exclude
+           (Extended : Project_Id;
+            Index    : Unit_Index;
+            Kind     : Spec_Or_Body)
+         is
+         begin
+            if Extended = Project
+              or else Is_Extending (Project, Extended, In_Tree)
+            then
+               OK := True;
 
-               --  Then, deal with the naming exceptions, if any
+               if Index /= No_Unit_Index then
+                  Unit.File_Names (Kind).Path.Name    := Slash;
+                  Unit.File_Names (Kind).Needs_Pragma := False;
+                  In_Tree.Units.Table (Index) := Unit;
+               end if;
 
-               Source_Names.Reset;
+               if Source /= No_Source then
+                  Source.Locally_Removed := True;
+                  Source.In_Interfaces := False;
+               end if;
 
-               declare
-                  Naming_Exceptions : constant Variable_Value :=
-                    Value_Of
-                      (Index     => Language_Names.Table (Lang),
-                       Src_Index => 0,
-                       In_Array  => Data.Naming.Implementation_Exceptions,
-                       In_Tree   => In_Tree);
-                  Element_Id        : String_List_Id;
-                  Element           : String_Element;
-                  File_Id           : Name_Id;
-                  Source_Found      : Boolean := False;
+               if Current_Verbosity = High then
+                  Write_Str ("Removing file ");
+                  Write_Line (Get_Name_String (Excluded.File));
+               end if;
 
-               begin
-                  --  If there are naming exceptions, look through them one
-                  --  by one.
+               Add_Forbidden_File_Name (Excluded.File);
 
-                  if Naming_Exceptions /= Nil_Variable_Value then
-                     Element_Id := Naming_Exceptions.Values;
+            else
+               Error_Msg
+                 (Project, In_Tree,
+                  "cannot remove a source from another project",
+                  Excluded.Location);
+            end if;
+         end Exclude;
 
-                     while Element_Id /= Nil_String loop
-                        Element := In_Tree.String_Elements.Table
-                                                          (Element_Id);
-                        Get_Name_String (Element.Value);
-                        Canonical_Case_File_Name
-                          (Name_Buffer (1 .. Name_Len));
-                        File_Id := Name_Find;
+      --  Start of processing for Mark_Excluded_Sources
 
-                        --  Put each naming exception in the Source_Names
-                        --  hash table, but if there are repetition, don't
-                        --  bother after the first instance.
+      begin
+         while Excluded /= No_File_Found loop
+            OK     := False;
 
-                        if
-                          Source_Names.Get (File_Id) = No_Name_Location
-                        then
-                           Source_Found := True;
-                           Source_Names.Set
-                             (File_Id,
-                              (Name     => File_Id,
-                               Location => Element.Location,
-                               Found    => False));
-                        end if;
+            case Get_Mode is
+            when Ada_Only =>
 
-                        Element_Id := Element.Next;
-                     end loop;
+               --  ??? This loop could be the same as for Multi_Language if
+               --  we were setting In_Tree.First_Source when we search for
+               --  Ada sources (basically once we have removed the use of
+               --  Data.Ada_Sources).
 
-                     --  If there is at least one naming exception, record
-                     --  those that are found in the source directories.
+               For_Each_Unit :
+               for Index in Unit_Table.First ..
+                 Unit_Table.Last (In_Tree.Units)
+               loop
+                  Unit := In_Tree.Units.Table (Index);
 
-                     if Source_Found then
-                        Record_Other_Sources
-                          (Project           => Project,
-                           In_Tree           => In_Tree,
-                           Data              => Data,
-                           Language          => Lang,
-                           Naming_Exceptions => True);
+                  for Kind in Spec_Or_Body'Range loop
+                     if Unit.File_Names (Kind).Name = Excluded.File then
+                        Exclude (Unit.File_Names (Kind).Project, Index, Kind);
+                        exit For_Each_Unit;
                      end if;
+                  end loop;
+               end loop For_Each_Unit;
+
+            when Multi_Language =>
+               Iter := For_Each_Source (In_Tree);
+               loop
+                  Source := Prj.Element (Iter);
+                  exit when Source = No_Source;
 
+                  if Source.File = Excluded.File then
+                     Exclude (Source.Project, No_Unit_Index, Specification);
+                     exit;
                   end if;
-               end;
 
-               --  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.
+                  Next (Iter);
+               end loop;
 
-               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);
+               OK := OK or Excluded.Found;
+            end case;
 
-               begin
-                  pragma Assert
-                    (Sources.Kind = List,
-                     "Source_Files is not a list");
+            if not OK then
+               Err_Vars.Error_Msg_File_1 := Excluded.File;
+               Error_Msg
+                 (Project, In_Tree, "unknown file {", Excluded.Location);
+            end if;
 
-                  pragma Assert
-                    (Source_List_File.Kind = Single,
-                     "Source_List_File is not a single string");
+            Excluded := Excluded_Sources_Htable.Get_Next;
+         end loop;
+      end Mark_Excluded_Sources;
 
-                  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;
+      --------------------------------------------
+      -- Process_Sources_In_Multi_Language_Mode --
+      --------------------------------------------
 
-                     --  Sources is a list of file names
+      procedure Process_Sources_In_Multi_Language_Mode is
+         Iter : Source_Iterator;
+      begin
+         --  Check that two sources of this project do not have the same object
+         --  file name.
 
-                     declare
-                        Current  : String_List_Id := Sources.Values;
-                        Element  : String_Element;
-                        Location : Source_Ptr;
-                        Name     : Name_Id;
+         Check_Object_File_Names : declare
+            Src_Id      : Source_Id;
+            Source_Name : File_Name_Type;
 
-                     begin
-                        Source_Names.Reset;
+            procedure Check_Object (Src : Source_Id);
+            --  Check if object file name of the current source is already in
+            --  hash table Object_File_Names. If it is, report an error. If it
+            --  is not, put it there with the file name of the current source.
 
-                        --  Put all the sources in the Source_Names hash table
+            ------------------
+            -- Check_Object --
+            ------------------
 
-                        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;
+            procedure Check_Object (Src : Source_Id) is
+            begin
+               Source_Name := Object_File_Names.Get (Src.Object);
 
-                           --  If the element has no location, then use the
-                           --  location of Sources to report possible errors.
+               if Source_Name /= No_File then
+                  Error_Msg_File_1 := Src.File;
+                  Error_Msg_File_2 := Source_Name;
+                  Error_Msg
+                    (Project,
+                     In_Tree,
+                     "{ and { have the same object file name",
+                     No_Location);
 
-                           if Element.Location = No_Location then
-                              Location := Sources.Location;
-                           else
-                              Location := Element.Location;
-                           end if;
+               else
+                  Object_File_Names.Set (Src.Object, Src.File);
+               end if;
+            end Check_Object;
 
-                           Source_Names.Set
-                             (K => Name,
-                              E =>
-                                (Name     => Name,
-                                 Location => Location,
-                                 Found    => False));
+         --  Start of processing for Check_Object_File_Names
 
-                           Current := Element.Next;
-                        end loop;
+         begin
+            Object_File_Names.Reset;
+            Iter := For_Each_Source (In_Tree);
+            loop
+               Src_Id := Prj.Element (Iter);
+               exit when Src_Id = No_Source;
 
-                        --  And look for their directories
+               if Src_Id.Compiled and then Src_Id.Object_Exists
+                 and then Is_Extending (Project, Src_Id.Project, In_Tree)
+               then
+                  if Src_Id.Unit = No_Name then
+                     if Src_Id.Kind = Impl then
+                        Check_Object (Src_Id);
+                     end if;
 
-                        Record_Other_Sources
-                          (Project           => Project,
-                           In_Tree           => In_Tree,
-                           Data              => Data,
-                           Language          => Lang,
-                           Naming_Exceptions => False);
-                     end;
+                  else
+                     case Src_Id.Kind is
+                        when Spec =>
+                           if Src_Id.Other_Part = No_Source then
+                              Check_Object (Src_Id);
+                           end if;
 
-                     --  No source_files specified
+                        when Sep =>
+                           null;
 
-                     --  We check if Source_List_File has been specified
+                        when Impl =>
+                           if Src_Id.Other_Part /= No_Source then
+                              Check_Object (Src_Id);
 
-                  elsif not Source_List_File.Default then
+                           else
+                              --  Check if it is a subunit
 
-                     --  Source_List_File is the name of the file
-                     --  that contains the source file names
+                              declare
+                                 Src_Ind : constant Source_File_Index :=
+                                   Sinput.P.Load_Project_File
+                                     (Get_Name_String
+                                          (Src_Id.Path.Name));
+                              begin
+                                 if Sinput.P.Source_File_Is_Subunit
+                                   (Src_Ind)
+                                 then
+                                    Src_Id.Kind := Sep;
+                                 else
+                                    Check_Object (Src_Id);
+                                 end if;
+                              end;
+                           end if;
+                     end case;
+                  end if;
+               end if;
 
-                     declare
-                        Source_File_Path_Name : constant String :=
-                          Path_Name_Of
-                            (Source_List_File.Value,
-                             Data.Directory);
+               Next (Iter);
+            end loop;
+         end Check_Object_File_Names;
+      end Process_Sources_In_Multi_Language_Mode;
 
-                     begin
-                        if Source_File_Path_Name'Length = 0 then
-                           Err_Vars.Error_Msg_Name_1 :=
-                             Source_List_File.Value;
-                           Error_Msg
-                             (Project, In_Tree,
-                              "file with sources { does not exist",
-                              Source_List_File.Location);
+   --  Start of processing for Look_For_Sources
 
-                        else
-                           --  Read the file, putting each source in the
-                           --  Source_Names hash table.
-
-                           Get_Sources_From_File
-                             (Source_File_Path_Name,
-                              Source_List_File.Location,
-                              Project, In_Tree);
-
-                           --  And look for their directories
-
-                           Record_Other_Sources
-                             (Project           => Project,
-                              In_Tree           => In_Tree,
-                              Data              => Data,
-                              Language          => Lang,
-                              Naming_Exceptions => False);
-                        end if;
-                     end;
+   begin
+      Source_Names.Reset;
+      Find_Excluded_Sources (Project, In_Tree, Data);
 
-                  --  Neither Source_Files nor Source_List_File was specified
+      if (Get_Mode = Ada_Only and then Is_A_Language (Data, Name_Ada))
+        or else (Get_Mode = Multi_Language
+                  and then Data.Languages /= No_Language_Index)
+      then
+         if Get_Mode = Multi_Language then
+            Load_Naming_Exceptions (Project, In_Tree);
+         end if;
 
-                  else
-                     --  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_Explicit_Sources (Current_Dir, Project, In_Tree, Data);
+         Mark_Excluded_Sources;
 
-                     Find_Sources (Project, In_Tree, Data, Lang);
-                  end if;
-               end;
-            end if;
-         end loop;
+         if Get_Mode = Multi_Language then
+            Process_Sources_In_Multi_Language_Mode;
+         end if;
       end if;
    end Look_For_Sources;
 
@@ -4462,44 +8244,49 @@ package body Prj.Nmsc is
    ------------------
 
    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;
-
+      Result        : String_Access;
       The_Directory : constant String := Get_Name_String (Directory);
 
    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 "";
       else
-         Canonical_Case_File_Name (Result.all);
-         return Result.all;
+         declare
+            R : String := Result.all;
+         begin
+            Free (Result);
+            Canonical_Case_File_Name (R);
+            return R;
+         end;
       end if;
    end Path_Name_Of;
 
-   -------------------------------
+   -----------------------------------
    -- Prepare_Ada_Naming_Exceptions --
-   -------------------------------
+   -----------------------------------
 
    procedure Prepare_Ada_Naming_Exceptions
      (List    : Array_Element_Id;
       In_Tree : Project_Tree_Ref;
       Kind    : Spec_Or_Body)
    is
-      Current : Array_Element_Id := List;
+      Current : Array_Element_Id;
       Element : Array_Element;
-
-      Unit : Unit_Info;
+      Unit    : Unit_Info;
 
    begin
       --  Traverse the list
 
+      Current := List;
       while Current /= No_Array_Element loop
          Element := In_Tree.Array_Elements.Table (Current);
 
@@ -4510,63 +8297,42 @@ package body Prj.Nmsc is
                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;
       end loop;
    end Prepare_Ada_Naming_Exceptions;
 
-   ---------------------
-   -- Project_Extends --
-   ---------------------
-
-   function Project_Extends
-     (Extending : Project_Id;
-      Extended  : Project_Id;
-      In_Tree   : Project_Tree_Ref) return Boolean
-   is
-      Current : Project_Id := Extending;
-   begin
-      loop
-         if Current = No_Project then
-            return False;
-
-         elsif Current = Extended then
-            return True;
-         end if;
-
-         Current := In_Tree.Projects.Table (Current).Extends;
-      end loop;
-   end Project_Extends;
-
    -----------------------
    -- Record_Ada_Source --
    -----------------------
 
    procedure Record_Ada_Source
-     (File_Name       : Name_Id;
-      Path_Name       : Name_Id;
+     (File_Name       : File_Name_Type;
+      Path_Name       : Path_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)
+      Current_Dir     : String)
    is
-      Canonical_File_Name : Name_Id;
-      Canonical_Path_Name : Name_Id;
+      Canonical_File_Name : File_Name_Type;
+      Canonical_Path_Name : Path_Name_Type;
 
       Exception_Id : Ada_Naming_Exception_Id;
       Unit_Name    : Name_Id;
       Unit_Kind    : Spec_Or_Body;
-      Unit_Index   : Int := 0;
+      Unit_Ind     : Int := 0;
       Info         : Unit_Info;
       Name_Index   : Name_And_Index;
       Needs_Pragma : Boolean;
@@ -4580,35 +8346,39 @@ package body Prj.Nmsc is
       File_Name_Recorded : Boolean := False;
 
    begin
-      Get_Name_String (File_Name);
-      Canonical_Case_File_Name (Name_Buffer (1 .. Name_Len));
-      Canonical_File_Name := Name_Find;
+      Canonical_File_Name := Canonical_Case_File_Name (Name_Id (File_Name));
 
-      declare
-         Canonical_Path : constant String :=
-                            Normalize_Pathname
-                              (Get_Name_String (Path_Name),
-                               Resolve_Links => Follow_Links,
-                               Case_Sensitive => False);
-      begin
-         Name_Len := 0;
-         Add_Str_To_Name_Buffer (Canonical_Path);
-         Canonical_Path_Name := Name_Find;
-      end;
+      if Osint.File_Names_Case_Sensitive then
+         Canonical_Path_Name := Path_Name;
+      else
+         declare
+            Canonical_Path : constant String :=
+                               Normalize_Pathname
+                                 (Get_Name_String (Path_Name),
+                                  Directory      => Current_Dir,
+                                  Resolve_Links  => Opt.Follow_Links_For_Files,
+                                  Case_Sensitive => False);
+         begin
+            Name_Len := 0;
+            Add_Str_To_Name_Buffer (Canonical_Path);
+            Canonical_Path_Name := Name_Find;
+         end;
+      end if;
 
       --  Find out the unit name, the unit kind and if it needs
       --  a specific SFN pragma.
 
       Get_Unit
-        (Canonical_File_Name => Canonical_File_Name,
+        (In_Tree             => In_Tree,
+         Canonical_File_Name => Canonical_File_Name,
          Naming              => Data.Naming,
          Exception_Id        => Exception_Id,
          Unit_Name           => Unit_Name,
          Unit_Kind           => Unit_Kind,
          Needs_Pragma        => Needs_Pragma);
 
-      if Exception_Id = No_Ada_Naming_Exception and then
-        Unit_Name = No_Name
+      if Exception_Id = No_Ada_Naming_Exception
+        and then Unit_Name = No_Name
       then
          if Current_Verbosity = High then
             Write_Str  ("   """);
@@ -4634,9 +8404,8 @@ package body Prj.Nmsc is
                   Write_Line (""" (ignored).");
                end if;
 
-               --  The file is not included in the source of the project,
-               --  because it is hidden by the exception.
-               --  So, there is nothing else to do.
+               --  The file is not included in the source of the project since
+               --  it is hidden by the exception. So, nothing else to do.
 
                return;
             end if;
@@ -4649,45 +8418,40 @@ package body Prj.Nmsc is
                Info.Next := No_Ada_Naming_Exception;
                Name_Index := Reverse_Ada_Naming_Exceptions.Get (Info);
 
-               Unit_Name  := Info.Unit;
-               Unit_Index := Name_Index.Index;
-               Unit_Kind  := Info.Kind;
+               Unit_Name := Info.Unit;
+               Unit_Ind  := 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_Element_Table.Increment_Last
-                 (In_Tree.String_Elements);
-               In_Tree.String_Elements.Table
-                 (String_Element_Table.Last
-                   (In_Tree.String_Elements)) :=
-                 (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_Ind);
 
             if Current_Source = Nil_String then
-               Data.Sources := String_Element_Table.Last
-                                 (In_Tree.String_Elements);
+               Data.Ada_Sources :=
+                 String_Element_Table.Last (In_Tree.String_Elements);
             else
-               In_Tree.String_Elements.Table
-                 (Current_Source).Next :=
-                 String_Element_Table.Last
-                   (In_Tree.String_Elements);
+               In_Tree.String_Elements.Table (Current_Source).Next :=
+                 String_Element_Table.Last (In_Tree.String_Elements);
             end if;
 
-            Current_Source := String_Element_Table.Last
-                                (In_Tree.String_Elements);
+            Current_Source :=
+              String_Element_Table.Last (In_Tree.String_Elements);
 
             --  Put the unit in unit list
 
             declare
-               The_Unit      : Unit_Id :=
-                 Units_Htable.Get (In_Tree.Units_HT, Unit_Name);
+               The_Unit : Unit_Index :=
+                            Units_Htable.Get (In_Tree.Units_HT, Unit_Name);
+
                The_Unit_Data : Unit_Data;
 
             begin
@@ -4701,16 +8465,23 @@ 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 /= No_Unit then
+               if The_Unit /= No_Unit_Index then
                   The_Unit_Data := In_Tree.Units.Table (The_Unit);
 
-                  if The_Unit_Data.File_Names (Unit_Kind).Name = No_Name
-                    or else Project_Extends
+                  if (The_Unit_Data.File_Names (Unit_Kind).Name =
+                                                          Canonical_File_Name
+                        and then
+                        The_Unit_Data.File_Names
+                          (Unit_Kind).Path.Name = Slash)
+                    or else The_Unit_Data.File_Names (Unit_Kind).Name = No_File
+                    or else Is_Extending
                       (Data.Extends,
                        The_Unit_Data.File_Names (Unit_Kind).Project,
                        In_Tree)
                   then
-                     if The_Unit_Data.File_Names (Unit_Kind).Path = Slash then
+                     if
+                       The_Unit_Data.File_Names (Unit_Kind).Path.Name = Slash
+                     then
                         Remove_Forbidden_File_Name
                           (The_Unit_Data.File_Names (Unit_Kind).Name);
                      end if;
@@ -4725,26 +8496,25 @@ package body Prj.Nmsc is
 
                      The_Unit_Data.File_Names (Unit_Kind) :=
                        (Name         => Canonical_File_Name,
-                        Index        => Unit_Index,
+                        Index        => Unit_Ind,
                         Display_Name => File_Name,
-                        Path         => Canonical_Path_Name,
-                        Display_Path => Path_Name,
+                        Path         => (Canonical_Path_Name, Path_Name),
                         Project      => Project,
                         Needs_Pragma => Needs_Pragma);
-                     In_Tree.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
-                    and then (Data.Known_Order_Of_Source_Dirs or else
-                              The_Unit_Data.File_Names (Unit_Kind).Path =
-                                Canonical_Path_Name)
+                    and then (Data.Known_Order_Of_Source_Dirs
+                                or else
+                                The_Unit_Data.File_Names
+                                  (Unit_Kind).Path.Name = Canonical_Path_Name)
                   then
                      if Previous_Source = Nil_String then
-                        Data.Sources := Nil_String;
+                        Data.Ada_Sources := Nil_String;
                      else
-                        In_Tree.String_Elements.Table
-                          (Previous_Source).Next := Nil_String;
+                        In_Tree.String_Elements.Table (Previous_Source).Next :=
+                          Nil_String;
                         String_Element_Table.Decrement_Last
                           (In_Tree.String_Elements);
                      end if;
@@ -4757,52 +8527,51 @@ package body Prj.Nmsc is
 
                      if The_Location = No_Location then
                         The_Location :=
-                          In_Tree.Projects.Table
-                            (Project).Location;
+                          In_Tree.Projects.Table (Project).Location;
                      end if;
 
                      Err_Vars.Error_Msg_Name_1 := Unit_Name;
                      Error_Msg
-                       (Project, In_Tree, "duplicate source {", The_Location);
+                       (Project, In_Tree, "duplicate unit %%", The_Location);
 
                      Err_Vars.Error_Msg_Name_1 :=
                        In_Tree.Projects.Table
                          (The_Unit_Data.File_Names (Unit_Kind).Project).Name;
-                     Err_Vars.Error_Msg_Name_2 :=
-                       The_Unit_Data.File_Names (Unit_Kind).Path;
+                     Err_Vars.Error_Msg_File_1 :=
+                       File_Name_Type
+                         (The_Unit_Data.File_Names (Unit_Kind).Path.Name);
                      Error_Msg
                        (Project, In_Tree,
-                        "\   project file {, {", The_Location);
+                        "\   project file %%, {", The_Location);
 
                      Err_Vars.Error_Msg_Name_1 :=
                        In_Tree.Projects.Table (Project).Name;
-                     Err_Vars.Error_Msg_Name_2 := Canonical_Path_Name;
+                     Err_Vars.Error_Msg_File_1 :=
+                       File_Name_Type (Canonical_Path_Name);
                      Error_Msg
                        (Project, In_Tree,
-                        "\   project file {, {", The_Location);
+                        "\   project file %%, {", The_Location);
                   end if;
 
                --  It is a new unit, create a new record
 
                else
                   --  First, check if there is no other unit with this file
-                  --  name in another project. If it is, report an error.
-                  --  Of course, we do that only for the first unit in the
-                  --  source file.
+                  --  name in another project. If it is, report error but note
+                  --  we do that only for the first unit in the source file.
 
-                  Unit_Prj := Files_Htable.Get
-                    (In_Tree.Files_HT, 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 :=
-                       In_Tree.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, In_Tree,
-                        "{ is already a source of project {",
+                        "{ is already a source of project %%",
                         Location);
 
                   else
@@ -4818,14 +8587,12 @@ package body Prj.Nmsc is
                      The_Unit_Data.Name := Unit_Name;
                      The_Unit_Data.File_Names (Unit_Kind) :=
                        (Name         => Canonical_File_Name,
-                        Index        => Unit_Index,
+                        Index        => Unit_Ind,
                         Display_Name => File_Name,
-                        Path         => Canonical_Path_Name,
-                        Display_Path => Path_Name,
+                        Path         => (Canonical_Path_Name, Path_Name),
                         Project      => Project,
                         Needs_Pragma => Needs_Pragma);
-                     In_Tree.Units.Table (The_Unit) :=
-                       The_Unit_Data;
+                     In_Tree.Units.Table (The_Unit) := The_Unit_Data;
                      Source_Recorded := True;
                   end if;
                end if;
@@ -4837,190 +8604,85 @@ package body Prj.Nmsc is
       end if;
    end Record_Ada_Source;
 
-   --------------------------
-   -- Record_Other_Sources --
-   --------------------------
+   -------------------
+   -- Remove_Source --
+   -------------------
 
-   procedure Record_Other_Sources
-     (Project           : Project_Id;
-      In_Tree           : Project_Tree_Ref;
-      Data              : in out Project_Data;
-      Language          : Language_Index;
-      Naming_Exceptions : Boolean)
+   procedure Remove_Source
+     (Id          : Source_Id;
+      Replaced_By : Source_Id)
    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 := Body_Suffix_Of (Language, Data, In_Tree);
+      Source   : Source_Id;
 
    begin
-      while Source_Dir /= Nil_String loop
-         Element := In_Tree.String_Elements.Table (Source_Dir);
-
-         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_Str (""" for ");
-
-               if Naming_Exceptions then
-                  Write_Str ("naming exceptions");
-
-               else
-                  Write_Str ("sources");
-               end if;
-
-               Write_Str (" of Language ");
-               Display_Language_Name (Language);
-            end if;
-
-            Open (Dir, Dir_Path);
+      if Current_Verbosity = High then
+         Write_Str ("Removing source ");
+         Write_Line (Get_Name_String (Id.File));
+      end if;
 
-            loop
-               Read (Dir, Name_Str, Last);
-               exit when Last = 0;
+      if Replaced_By /= No_Source then
+         Id.Replaced_By := Replaced_By;
+         Replaced_By.Declared_In_Interfaces := Id.Declared_In_Interfaces;
+      end if;
 
-               if Is_Regular_File
-                 (Dir_Path & Directory_Separator & Name_Str (1 .. Last))
-               then
-                  Name_Len := Last;
-                  Name_Buffer (1 .. Name_Len) := Name_Str (1 .. Last);
-                  Canonical_Case_File_Name (Name_Buffer (1 .. Name_Len));
-                  Canonical_Name := Name_Find;
-                  NL := Source_Names.Get (Canonical_Name);
+      Source := Id.Language.First_Source;
 
-                  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
-                             (Project, In_Tree,
-                              "{ is found in several source directories",
-                              NL.Location);
-                        end if;
+      if Source = Id then
+         Id.Language.First_Source := Id.Next_In_Lang;
 
-                     else
-                        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;
-
-                        Check_For_Source
-                          (File_Name        => Canonical_Name,
-                           Path_Name        => Path,
-                           Project          => Project,
-                           In_Tree          => In_Tree,
-                           Data             => Data,
-                           Location         => NL.Location,
-                           Language         => Language,
-                           Suffix           => Suffix,
-                           Naming_Exception => Naming_Exceptions);
-                     end if;
-                  end if;
-               end if;
-            end loop;
+      else
+         while Source.Next_In_Lang /= Id loop
+            Source := Source.Next_In_Lang;
+         end loop;
 
-            Close (Dir);
-         end;
+         Source.Next_In_Lang := Id.Next_In_Lang;
+      end if;
+   end Remove_Source;
 
-         Source_Dir := Element.Next;
-      end loop;
+   -----------------------
+   -- Report_No_Sources --
+   -----------------------
 
-      if not Naming_Exceptions then
-         NL := Source_Names.Get_First;
+   procedure Report_No_Sources
+     (Project      : Project_Id;
+      Lang_Name    : String;
+      In_Tree      : Project_Tree_Ref;
+      Location     : Source_Ptr;
+      Continuation : Boolean := False)
+   is
+   begin
+      case When_No_Sources is
+         when Silent =>
+            null;
 
-         --  It is an error if a source file name in a source list or
-         --  in a source list file is not found.
+         when Warning | Error =>
+            declare
+               Msg : constant String :=
+                       "<there are no " &
+                       Lang_Name &
+                       " sources in this project";
 
-         while NL /= No_Name_Location loop
-            if not NL.Found then
-               Err_Vars.Error_Msg_Name_1 := NL.Name;
+            begin
+               Error_Msg_Warn := When_No_Sources = Warning;
 
-               if First_Error then
+               if Continuation then
                   Error_Msg
-                    (Project, In_Tree,
-                     "source file { cannot be found",
-                     NL.Location);
-                  First_Error := False;
+                    (Project, In_Tree, "\" & Msg, Location);
 
                else
                   Error_Msg
-                    (Project, In_Tree,
-                     "\source file { cannot be found",
-                     NL.Location);
-               end if;
-            end if;
-
-            NL := Source_Names.Get_Next;
-         end loop;
-
-         --  Any naming exception of this language that is not in a list
-         --  of sources must be removed.
-
-         declare
-            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 := In_Tree.Other_Sources.Table (Source_Id);
-
-               if Source.Language = Language
-                 and then Source.Naming_Exception
-               then
-                  if Current_Verbosity = High then
-                     Write_Str ("Naming exception """);
-                     Write_Str (Get_Name_String (Source.File_Name));
-                     Write_Str (""" is not in the list of sources,");
-                     Write_Line (" so it is removed.");
-                  end if;
-
-                  if Prev_Id = No_Other_Source then
-                     Data.First_Other_Source := Source.Next;
-
-                  else
-                     In_Tree.Other_Sources.Table
-                       (Prev_Id).Next := Source.Next;
-                  end if;
-
-                  Source_Id := Source.Next;
-
-                  if Source_Id = No_Other_Source then
-                     Data.Last_Other_Source := Prev_Id;
-                  end if;
-
-               else
-                  Prev_Id := Source_Id;
-                  Source_Id := Source.Next;
+                    (Project, In_Tree, Msg, Location);
                end if;
-            end loop;
-         end;
-      end if;
-   end Record_Other_Sources;
+            end;
+      end case;
+   end Report_No_Sources;
 
    ----------------------
    -- Show_Source_Dirs --
    ----------------------
 
    procedure Show_Source_Dirs
-     (Project : Project_Id;
+     (Data    : Project_Data;
       In_Tree : Project_Tree_Ref)
    is
       Current : String_List_Id;
@@ -5029,7 +8691,7 @@ package body Prj.Nmsc is
    begin
       Write_Line ("Source_Dirs:");
 
-      Current := In_Tree.Projects.Table (Project).Source_Dirs;
+      Current := Data.Source_Dirs;
       while Current /= Nil_String loop
          Element := In_Tree.String_Elements.Table (Current);
          Write_Str  ("   ");
@@ -5040,51 +8702,6 @@ package body Prj.Nmsc is
       Write_Line ("end Source_Dirs.");
    end Show_Source_Dirs;
 
-   ----------------
-   -- Suffix_For --
-   ----------------
-
-   function Suffix_For
-     (Language : Language_Index;
-      Naming   : Naming_Data;
-      In_Tree  : Project_Tree_Ref) return Name_Id
-   is
-      Suffix : constant Variable_Value :=
-        Value_Of
-          (Index     => Language_Names.Table (Language),
-           Src_Index => 0,
-           In_Array  => Naming.Body_Suffix,
-           In_Tree   => In_Tree);
-   begin
-      --  If no suffix for this language in package Naming, use the default
-
-      if Suffix = Nil_Variable_Value then
-         Name_Len := 0;
-
-         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 (".cc");
-
-            when others =>
-               return No_Name;
-         end case;
-
-      --  Otherwise use the one specified
-
-      else
-         Get_Name_String (Suffix.Value);
-      end if;
-
-      Canonical_Case_File_Name (Name_Buffer (1 .. Name_Len));
-      return Name_Find;
-   end Suffix_For;
-
    -------------------------
    -- Warn_If_Not_Sources --
    -------------------------
@@ -5098,32 +8715,30 @@ package body Prj.Nmsc is
       Specs       : Boolean;
       Extending   : Boolean)
    is
-      Conv          : Array_Element_Id := Conventions;
+      Conv          : Array_Element_Id;
       Unit          : Name_Id;
-      The_Unit_Id   : Unit_Id;
+      The_Unit_Id   : Unit_Index;
       The_Unit_Data : Unit_Data;
       Location      : Source_Ptr;
 
    begin
+      Conv := Conventions;
       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;
+         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);
+         if The_Unit_Id = No_Unit_Index 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
@@ -5132,7 +8747,8 @@ package body Prj.Nmsc is
                then
                   Error_Msg
                     (Project, In_Tree,
-                     "?unit{ has no spec in this project",
+                     "?source of spec of unit %% (%%)" &
+                     " cannot be found in this project",
                      Location);
                end if;
 
@@ -5143,7 +8759,8 @@ package body Prj.Nmsc is
                then
                   Error_Msg
                     (Project, In_Tree,
-                     "?unit{ has no body in this project",
+                     "?source of body of unit %% (%%)" &
+                     " cannot be found in this project",
                      Location);
                end if;
             end if;