OSDN Git Service

2004-10-04 Ed Schonberg <schonberg@gnat.com>
[pf3gnuchains/gcc-fork.git] / gcc / ada / prj-nmsc.adb
index e12fe08..c3193b8 100644 (file)
@@ -6,9 +6,7 @@
 --                                                                          --
 --                                 B o d y                                  --
 --                                                                          --
---                            $Revision$
---                                                                          --
---          Copyright (C) 2000-2001 Free Software Foundation, Inc.          --
+--          Copyright (C) 2000-2004 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- --
 -- MA 02111-1307, USA.                                                      --
 --                                                                          --
 -- GNAT was originally developed  by the GNAT team at  New York University. --
--- It is now maintained by Ada Core Technologies Inc (http://www.gnat.com). --
+-- Extensive contributions were provided by Ada Core Technologies Inc.      --
 --                                                                          --
 ------------------------------------------------------------------------------
 
+with Err_Vars; use Err_Vars;
+with Fmap;     use Fmap;
+with Hostparm;
+with MLib.Tgt;
+with Namet;    use Namet;
+with Osint;    use Osint;
+with Output;   use Output;
+with MLib.Tgt; use MLib.Tgt;
+with Prj.Com;  use Prj.Com;
+with Prj.Env;  use Prj.Env;
+with Prj.Err;
+with Prj.Util; use Prj.Util;
+with Sinput.P;
+with Snames;   use Snames;
+with Table;    use Table;
+with Types;    use Types;
+
 with Ada.Characters.Handling;    use Ada.Characters.Handling;
 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 Errout;                     use Errout;
+
 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 MLib.Tgt;
-with Namet;                      use Namet;
-with Osint;                      use Osint;
-with Output;                     use Output;
-with Prj.Com;                    use Prj.Com;
-with Prj.Util;                   use Prj.Util;
-with Snames;                     use Snames;
-with Stringt;                    use Stringt;
-with Types;                      use Types;
+with GNAT.HTable;
 
 package body Prj.Nmsc is
 
-   Dir_Sep      : Character renames GNAT.OS_Lib.Directory_Separator;
-
    Error_Report : Put_Line_Access := null;
-
-   procedure Check_Ada_Naming_Scheme (Naming : Naming_Data);
-   --  Check that the package Naming is correct.
+   --  Set to point to error reporting procedure
+
+   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;
+      Location : Source_Ptr;
+      Found    : Boolean := False;
+   end record;
+   --  Information about file names found in string list attribute
+   --  Source_Files or in a source list file, stored in hash table
+   --  Source_Names, used by procedure
+   --  Ada_Check.Get_Path_Names_And_Record_Sources.
+
+   No_Name_Location : constant Name_Location :=
+     (Name => No_Name, Location => No_Location, Found => False);
+
+   package Source_Names is new GNAT.HTable.Simple_HTable
+     (Header_Num => Header_Num,
+      Element    => Name_Location,
+      No_Element => No_Name_Location,
+      Key        => Name_Id,
+      Hash       => Hash,
+      Equal      => "=");
+   --  Hash table to store file names found in string list attribute
+   --  Source_Files or in a source list file, stored in hash table
+   --  Source_Names, used by procedure
+   --  Ada_Check.Get_Path_Names_And_Record_Sources.
+
+   package Recursive_Dirs is new GNAT.HTable.Simple_HTable
+     (Header_Num => Header_Num,
+      Element    => Boolean,
+      No_Element => False,
+      Key        => Name_Id,
+      Hash       => Hash,
+      Equal      => "=");
+   --  Hash table to store recursive source directories, to avoid looking
+   --  several times, and to avoid cycles that may be introduced by symbolic
+   --  links.
+
+   type Ada_Naming_Exception_Id is new Nat;
+   No_Ada_Naming_Exception : constant Ada_Naming_Exception_Id := 0;
+
+   type Unit_Info is record
+      Kind : Spec_Or_Body;
+      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);
+
+   package Ada_Naming_Exception_Table is new Table.Table
+     (Table_Component_Type => Unit_Info,
+      Table_Index_Type     => Ada_Naming_Exception_Id,
+      Table_Low_Bound      => 1,
+      Table_Initial        => 20,
+      Table_Increment      => 100,
+      Table_Name           => "Prj.Nmsc.Ada_Naming_Exception_Table");
+
+   package Ada_Naming_Exceptions is new GNAT.HTable.Simple_HTable
+     (Header_Num => Header_Num,
+      Element    => Ada_Naming_Exception_Id,
+      No_Element => No_Ada_Naming_Exception,
+      Key        => Name_Id,
+      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.
+
+   function Hash (Unit : Unit_Info) return Header_Num;
+
+   type Name_And_Index is record
+      Name  : Name_Id := No_Name;
+      Index : Int     := 0;
+   end record;
+   No_Name_And_Index : constant Name_And_Index :=
+                         (Name => No_Name, Index => 0);
+
+   package Reverse_Ada_Naming_Exceptions is new GNAT.HTable.Simple_HTable
+     (Header_Num => Header_Num,
+      Element    => Name_And_Index,
+      No_Element => No_Name_And_Index,
+      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.
+
+   function ALI_File_Name (Source : String) return String;
+   --  Return the ALI file name corresponding to a source.
 
    procedure Check_Ada_Name
-     (Name : Name_Id;
+     (Name : String;
       Unit : out Name_Id);
    --  Check that a name is a valid Ada unit name.
 
-   procedure Error_Msg (Msg : String; Flag_Location : Source_Ptr);
+   procedure Check_Ada_Naming_Scheme
+     (Data    : in out Project_Data;
+      Project : Project_Id);
+   --  Check the naming scheme part of Data
+
+   procedure Check_Ada_Naming_Scheme_Validity
+     (Project : Project_Id;
+      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;
+      Data             : in out Project_Data;
+      Location         : Source_Ptr;
+      Language         : Other_Programming_Language;
+      Suffix           : String;
+      Naming_Exception : Boolean);
+   --  Check if a file in a source directory is a source for a specific
+   --  language other than Ada.
+
+   function Check_Project
+     (P            : Project_Id;
+      Root_Project : Project_Id;
+      Extending    : Boolean) return Boolean;
+   --  Returns True if P is Root_Project or, if Extending is True, a project
+   --  extended by Root_Project.
+
+   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
+
+   procedure Error_Msg
+     (Project       : Project_Id;
+      Msg           : String;
+      Flag_Location : Source_Ptr);
    --  Output an error message. If Error_Report is null, simply call
-   --  Errout.Error_Msg. Otherwise, disregard Flag_Location and use
+   --  Prj.Err.Error_Msg. Otherwise, disregard Flag_Location and use
    --  Error_Report.
 
-   function Get_Name_String (S : String_Id) return String;
-   --  Get the string from a String_Id
+   procedure Find_Sources
+     (Project      : Project_Id;
+      Data         : in out Project_Data;
+      For_Language : Programming_Language;
+      Follow_Links : Boolean := False);
+   --  Find all the sources in all of the source directories of a project for
+   --  a specified language.
+
+   procedure Free_Ada_Naming_Exceptions;
+   --  Free the internal hash tables used for checking naming exceptions
+
+   procedure Get_Mains (Project : Project_Id; Data : in out Project_Data);
+   --  Get the mains of a project from attribute Main, if it exists, and put
+   --  them in the project data.
+
+   procedure Get_Sources_From_File
+     (Path     : String;
+      Location : Source_Ptr;
+      Project  : Project_Id);
+   --  Get the list of sources from a text file and put them in hash table
+   --  Source_Names.
 
    procedure Get_Unit
-     (File_Name    : Name_Id;
-      Naming       : Naming_Data;
-      Unit_Name    : out Name_Id;
-      Unit_Kind    : out Spec_Or_Body;
-      Needs_Pragma : out Boolean);
+     (Canonical_File_Name : Name_Id;
+      Naming              : Naming_Data;
+      Exception_Id        : out Ada_Naming_Exception_Id;
+      Unit_Name           : out Name_Id;
+      Unit_Kind           : out Spec_Or_Body;
+      Needs_Pragma        : out Boolean);
    --  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.
+   --  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.
+
+   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.
 
-   function Is_Illegal_Append (This : String) return Boolean;
-   --  Returns True if the string This cannot be used as
-   --  a Specification_Append, a Body_Append or a Separate_Append.
+   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.
 
-   procedure Record_Source
-     (File_Name        : Name_Id;
-      Path_Name        : Name_Id;
-      Project          : Project_Id;
-      Data             : in out Project_Data;
-      Location         : Source_Ptr;
-      Current_Source   : in out String_List_Id);
+   procedure Prepare_Ada_Naming_Exceptions
+     (List : Array_Element_Id;
+      Kind : Spec_Or_Body);
+   --  Prepare the internal hash tables used for checking naming exceptions
+   --  for Ada. Insert all elements of List in the tables.
+
+   function Project_Extends
+     (Extending : Project_Id;
+      Extended  : Project_Id) return Boolean;
+   --  Returns True if Extending is extending directly or indirectly Extended.
+
+   procedure Record_Ada_Source
+     (File_Name       : Name_Id;
+      Path_Name       : Name_Id;
+      Project         : Project_Id;
+      Data            : in out Project_Data;
+      Location        : Source_Ptr;
+      Current_Source  : in out String_List_Id;
+      Source_Recorded : in out Boolean;
+      Follow_Links    : Boolean);
    --  Put a unit in the list of units of a project, if the file name
    --  corresponds to a valid unit name.
 
+   procedure Record_Other_Sources
+     (Project           : Project_Id;
+      Data              : in out Project_Data;
+      Language          : Programming_Language;
+      Naming_Exceptions : Boolean);
+   --  Record the sources of a language in a project.
+   --  When Naming_Exceptions is True, mark the found sources as such, to
+   --  later remove those that are not named in a list of sources.
+
    procedure Show_Source_Dirs (Project : Project_Id);
    --  List all the source directories of a project.
 
-   function Locate_Directory
-     (Name   : Name_Id;
-      Parent : Name_Id)
-      return   Name_Id;
-   --  Locate a directory.
-   --  Returns No_Name if directory does not exist.
-
-   function Path_Name_Of
-     (File_Name : String_Id;
-      Directory : Name_Id)
-      return      String;
-   --  Returns the path name of a (non project) file.
-   --  Returns an empty string if file cannot be found.
-
-   function Path_Name_Of
-     (File_Name : String_Id;
-      Directory : String_Id)
-      return      String;
-   --  Same as above except that Directory is a String_Id instead
-   --  of a Name_Id.
+   function Suffix_For
+     (Language : Programming_Language;
+      Naming   : Naming_Data) 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.
 
    ---------------
    -- Ada_Check --
@@ -120,255 +300,151 @@ package body Prj.Nmsc is
 
    procedure Ada_Check
      (Project      : Project_Id;
-      Report_Error : Put_Line_Access)
+      Report_Error : Put_Line_Access;
+      Follow_Links : Boolean)
    is
       Data         : Project_Data;
       Languages    : Variable_Value := Nil_Variable_Value;
 
-      procedure Check_Unit_Names (List : Array_Element_Id);
-      --  Check that a list of unit names contains only valid names.
-
-      procedure Find_Sources;
-      --  Find all the sources in all of the source directories
-      --  of a project.
+      Extending    : Boolean := False;
 
-      procedure Get_Path_Name_And_Record_Source
-        (File_Name        : String;
-         Location         : Source_Ptr;
-         Current_Source   : in out String_List_Id);
-      --  Find the path name of a source in the source directories and
-      --  record the source, if found.
+      procedure Get_Path_Names_And_Record_Sources;
+      --  Find the path names of the source files in the Source_Names table
+      --  in the source directories and record those that are Ada sources.
 
       procedure Get_Sources_From_File
         (Path     : String;
          Location : Source_Ptr);
       --  Get the sources of a project from a text file
 
-      ----------------------
-      -- Check_Unit_Names --
-      ----------------------
-
-      procedure Check_Unit_Names (List : Array_Element_Id) is
-         Current   : Array_Element_Id := List;
-         Element   : Array_Element;
-         Unit_Name : Name_Id;
-
-      begin
-         --  Loop through elements of the string list
-
-         while Current /= No_Array_Element loop
-            Element := Array_Elements.Table (Current);
-
-            --  Check that it contains a valid unit name
+      procedure Warn_If_Not_Sources
+        (Conventions : Array_Element_Id;
+         Specs       : Boolean);
+      --  Check that individual naming conventions apply to immediate
+      --  sources of the project; if not, issue a warning.
 
-            Check_Ada_Name (Element.Index, Unit_Name);
-
-            if Unit_Name = No_Name then
-               Error_Msg_Name_1 := Element.Index;
-               Error_Msg
-                 ("{ is not a valid unit name.",
-                  Element.Value.Location);
+      ---------------------------------------
+      -- Get_Path_Names_And_Record_Sources --
+      ---------------------------------------
 
-            else
-               if Current_Verbosity = High then
-                  Write_Str ("   Body_Part (""");
-                  Write_Str (Get_Name_String (Unit_Name));
-                  Write_Line (""")");
-               end if;
+      procedure Get_Path_Names_And_Record_Sources is
+         Source_Dir : String_List_Id := Data.Source_Dirs;
+         Element    : String_Element;
+         Path       : Name_Id;
 
-               Element.Index := Unit_Name;
-               Array_Elements.Table (Current) := Element;
-            end if;
+         Dir      : Dir_Type;
+         Name     : Name_Id;
+         Canonical_Name : Name_Id;
+         Name_Str : String (1 .. 1_024);
+         Last     : Natural := 0;
+         NL       : Name_Location;
 
-            Current := Element.Next;
-         end loop;
-      end Check_Unit_Names;
+         Current_Source : String_List_Id := Nil_String;
 
-      ------------------
-      -- Find_Sources --
-      ------------------
+         First_Error : Boolean := True;
 
-      procedure Find_Sources is
-         Source_Dir     : String_List_Id := Data.Source_Dirs;
-         Element        : String_Element;
-         Dir            : Dir_Type;
-         Current_Source : String_List_Id := Nil_String;
+         Source_Recorded : Boolean := False;
 
       begin
-         if Current_Verbosity = High then
-            Write_Line ("Looking for sources:");
-         end if;
-
-         --  For each subdirectory
+         --  We look in all source directories for the file names in the
+         --  hash table Source_Names
 
          while Source_Dir /= Nil_String loop
-            begin
-               Element := String_Elements.Table (Source_Dir);
-               if Element.Value /= No_String then
-                  declare
-                     Source_Directory : String
-                       (1 .. Integer (String_Length (Element.Value)));
-                  begin
-                     String_To_Name_Buffer (Element.Value);
-                     Source_Directory := Name_Buffer (1 .. Name_Len);
-                     if Current_Verbosity = High then
-                        Write_Str ("Source_Dir = ");
-                        Write_Line (Source_Directory);
-                     end if;
-
-                     --  We look to every entry in the source directory
-
-                     Open (Dir, Source_Directory);
-
-                     loop
-                        Read (Dir, Name_Buffer, Name_Len);
-
-                        if Current_Verbosity = High then
-                           Write_Str  ("   Checking ");
-                           Write_Line (Name_Buffer (1 .. Name_Len));
-                        end if;
-
-                        exit when Name_Len = 0;
+            Source_Recorded := False;
+            Element := String_Elements.Table (Source_Dir);
 
-                        declare
-                           Path_Access : constant GNAT.OS_Lib.String_Access :=
-                                           Locate_Regular_File
-                                             (Name_Buffer (1 .. Name_Len),
-                                              Source_Directory);
+            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;
 
-                           File_Name : Name_Id;
-                           Path_Name : Name_Id;
+               Open (Dir, Dir_Path);
+
+               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);
+
+                  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;
+
+                     if Name_Buffer (Name_Len) /= Directory_Separator then
+                        Add_Char_To_Name_Buffer (Directory_Separator);
+                     end if;
 
-                        begin
-                           --  If it is a regular file
-
-                           if Path_Access /= null then
-                              File_Name := Name_Find;
-                              Name_Len := Path_Access'Length;
-                              Name_Buffer (1 .. Name_Len) := Path_Access.all;
-                              Path_Name := Name_Find;
-
-                              --  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_Source
-                                (File_Name        => File_Name,
-                                 Path_Name        => Path_Name,
-                                 Project          => Project,
-                                 Data             => Data,
-                                 Location         => No_Location,
-                                 Current_Source   => Current_Source);
+                     Add_Str_To_Name_Buffer (Name_Str (1 .. Last));
+                     Path := Name_Find;
 
-                           else
-                              if Current_Verbosity = High then
-                                 Write_Line
-                                   ("      Not a regular file.");
-                              end if;
-                           end if;
-                        end;
-                     end loop;
+                     if Current_Verbosity = High then
+                        Write_Str  ("  found ");
+                        Write_Line (Get_Name_String (Name));
+                     end if;
 
-                     Close (Dir);
-                  end;
-               end if;
+                     --  Register the source if it is an Ada compilation unit.
+
+                     Record_Ada_Source
+                       (File_Name       => Name,
+                        Path_Name       => Path,
+                        Project         => Project,
+                        Data            => Data,
+                        Location        => NL.Location,
+                        Current_Source  => Current_Source,
+                        Source_Recorded => Source_Recorded,
+                        Follow_Links    => Follow_Links);
+                  end if;
+               end loop;
 
-            exception
-               when Directory_Error =>
-                  null;
+               Close (Dir);
             end;
 
+            if Source_Recorded then
+               String_Elements.Table (Source_Dir).Flag := True;
+            end if;
+
             Source_Dir := Element.Next;
          end loop;
 
-         if Current_Verbosity = High then
-            Write_Line ("end Looking for sources.");
-         end if;
-
-         --  If we have looked for sources and found none, then
-         --  it is an error. If a project is not supposed to contain
-         --  any source, then we never call Find_Sources.
-
-         if Current_Source = Nil_String then
-            Error_Msg ("there are no sources in this project",
-                       Data.Location);
-         end if;
-      end Find_Sources;
-
-      -------------------------------------
-      -- Get_Path_Name_And_Record_Source --
-      -------------------------------------
-
-      procedure Get_Path_Name_And_Record_Source
-        (File_Name        : String;
-         Location         : Source_Ptr;
-         Current_Source   : in out String_List_Id)
-      is
-         Source_Dir : String_List_Id := Data.Source_Dirs;
-         Element    : String_Element;
-         Path_Name  : GNAT.OS_Lib.String_Access;
-         Found      : Boolean := False;
-         File       : Name_Id;
-
-      begin
-         if Current_Verbosity = High then
-            Write_Str  ("   Checking """);
-            Write_Str  (File_Name);
-            Write_Line (""".");
-         end if;
-
-         --  We look in all source directories for this file name
-
-         while Source_Dir /= Nil_String loop
-            Element := String_Elements.Table (Source_Dir);
-
-            if Current_Verbosity = High then
-               Write_Str ("      """);
-               Write_Str (Get_Name_String (Element.Value));
-               Write_Str (""": ");
-            end if;
+         --  It is an error if a source file name in a source list or
+         --  in a source list file is not found.
 
-            Path_Name :=
-              Locate_Regular_File
-              (File_Name,
-               Get_Name_String (Element.Value));
+         NL := Source_Names.Get_First;
 
-            if Path_Name /= null then
-               if Current_Verbosity = High then
-                  Write_Line ("OK");
-               end if;
+         while NL /= No_Name_Location loop
+            if not NL.Found then
+               Err_Vars.Error_Msg_Name_1 := NL.Name;
 
-               Name_Len := File_Name'Length;
-               Name_Buffer (1 .. Name_Len) := File_Name;
-               File := Name_Find;
-               Name_Len := Path_Name'Length;
-               Name_Buffer (1 .. Name_Len) := Path_Name.all;
-
-               --  Register the source. Report an error if the file does not
-               --  correspond to a source.
-
-               Record_Source
-                 (File_Name        => File,
-                  Path_Name        => Name_Find,
-                  Project          => Project,
-                  Data             => Data,
-                  Location         => Location,
-                  Current_Source   => Current_Source);
-               Found := True;
-               exit;
+               if First_Error then
+                  Error_Msg
+                    (Project,
+                     "source file { cannot be found",
+                     NL.Location);
+                  First_Error := False;
 
-            else
-               if Current_Verbosity = High then
-                  Write_Line ("No");
+               else
+                  Error_Msg
+                    (Project,
+                     "\source file { cannot be found",
+                     NL.Location);
                end if;
-
-               Source_Dir := Element.Next;
             end if;
-         end loop;
 
-      end Get_Path_Name_And_Record_Source;
+            NL := Source_Names.Get_Next;
+         end loop;
+      end Get_Path_Names_And_Record_Sources;
 
       ---------------------------
       -- Get_Sources_From_File --
@@ -378,68 +454,100 @@ package body Prj.Nmsc is
         (Path     : String;
          Location : Source_Ptr)
       is
-         File           : Prj.Util.Text_File;
-         Line           : String (1 .. 250);
-         Last           : Natural;
-         Current_Source : String_List_Id := Nil_String;
+      begin
+         --  Get the list of sources from the file and put them in hash table
+         --  Source_Names.
 
-         Nmb_Errors : constant Nat := Errors_Detected;
+         Get_Sources_From_File (Path, Location, Project);
 
-      begin
-         if Current_Verbosity = High then
-            Write_Str  ("Opening """);
-            Write_Str  (Path);
-            Write_Line (""".");
-         end if;
+         --  Look in the source directories to find those sources
 
-         --  We open the file
+         Get_Path_Names_And_Record_Sources;
 
-         Prj.Util.Open (File, Path);
+         --  We should have found at least one source.
+         --  If not, report an error.
 
-         if not Prj.Util.Is_Valid (File) then
-            Error_Msg ("file does not exist", Location);
-         else
-            while not Prj.Util.End_Of_File (File) loop
-               Prj.Util.Get_Line (File, Line, Last);
+         if Data.Sources = Nil_String then
+            Error_Msg (Project,
+                       "there are no Ada sources in this project",
+                       Location);
+         end if;
+      end Get_Sources_From_File;
 
-               --  If the line is not empty and does not start with "--",
-               --  then it must contains a file name.
+      -------------------------
+      -- Warn_If_Not_Sources --
+      -------------------------
 
-               if Last /= 0
-                 and then (Last = 1 or else Line (1 .. 2) /= "--")
-               then
-                  Get_Path_Name_And_Record_Source
-                    (File_Name => Line (1 .. Last),
-                     Location => Location,
-                     Current_Source => Current_Source);
-                  exit when Nmb_Errors /= Errors_Detected;
-               end if;
-            end loop;
+      procedure Warn_If_Not_Sources
+        (Conventions : Array_Element_Id;
+         Specs       : Boolean)
+      is
+         Conv          : Array_Element_Id := Conventions;
+         Unit          : Name_Id;
+         The_Unit_Id   : Unit_Id;
+         The_Unit_Data : Unit_Data;
+         Location      : Source_Ptr;
 
-            Prj.Util.Close (File);
+      begin
+         while Conv /= No_Array_Element loop
+            Unit := Array_Elements.Table (Conv).Index;
+            Error_Msg_Name_1 := Unit;
+            Get_Name_String (Unit);
+            To_Lower (Name_Buffer (1 .. Name_Len));
+            Unit := Name_Find;
+            The_Unit_Id := Units_Htable.Get (Unit);
+            Location := Array_Elements.Table (Conv).Value.Location;
+
+            if The_Unit_Id = Prj.Com.No_Unit then
+               Error_Msg
+                 (Project,
+                  "?unknown unit {",
+                  Location);
 
-         end if;
+            else
+               The_Unit_Data := Units.Table (The_Unit_Id);
 
-         --  We should have found at least one source.
-         --  If not, report an error.
+               if Specs then
+                  if not Check_Project
+                    (The_Unit_Data.File_Names (Specification).Project,
+                     Project, Extending)
+                  then
+                     Error_Msg
+                       (Project,
+                        "?unit{ has no spec in this project",
+                        Location);
+                  end if;
 
-         if Current_Source = Nil_String then
-            Error_Msg ("this project has no source", Location);
-         end if;
-      end Get_Sources_From_File;
+               else
+                  if not Check_Project
+                    (The_Unit_Data.File_Names (Com.Body_Part).Project,
+                     Project, Extending)
+                  then
+                     Error_Msg
+                       (Project,
+                        "?unit{ has no body in this project",
+                        Location);
+                  end if;
+               end if;
+            end if;
+
+            Conv := Array_Elements.Table (Conv).Next;
+         end loop;
+      end Warn_If_Not_Sources;
 
-      --  Start of processing for Ada_Check
+   --  Start of processing for Ada_Check
 
    begin
       Language_Independent_Check (Project, Report_Error);
 
-      Error_Report := Report_Error;
+      Error_Report    := Report_Error;
 
       Data      := Projects.Table (Project);
+      Extending := Data.Extends /= No_Project;
       Languages := Prj.Util.Value_Of (Name_Languages, Data.Decl.Attributes);
 
       Data.Naming.Current_Language := Name_Ada;
-      Data.Sources_Present         := Data.Source_Dirs /= Nil_String;
+      Data.Ada_Sources_Present     := Data.Source_Dirs /= Nil_String;
 
       if not Languages.Default then
          declare
@@ -450,7 +558,7 @@ package body Prj.Nmsc is
          begin
             Look_For_Ada : while Current /= Nil_String loop
                Element := String_Elements.Table (Current);
-               String_To_Name_Buffer (Element.Value);
+               Get_Name_String (Element.Value);
                To_Lower (Name_Buffer (1 .. Name_Len));
 
                if Name_Buffer (1 .. Name_Len) = "ada" then
@@ -465,380 +573,875 @@ package body Prj.Nmsc is
 
                --  Mark the project file as having no sources for Ada
 
-               Data.Sources_Present := False;
+               Data.Ada_Sources_Present := False;
             end if;
          end;
       end if;
 
-      declare
-         Naming_Id : constant Package_Id :=
-                       Util.Value_Of (Name_Naming, Data.Decl.Packages);
-
-         Naming : Package_Element;
+      Check_Ada_Naming_Scheme (Data, Project);
 
-      begin
-         --  If there is a package Naming, we will put in Data.Naming
-         --  what is in this package Naming.
+      Prepare_Ada_Naming_Exceptions (Data.Naming.Bodies, Body_Part);
+      Prepare_Ada_Naming_Exceptions (Data.Naming.Specs,  Specification);
 
-         if Naming_Id /= No_Package then
-            Naming := Packages.Table (Naming_Id);
+      --  If we have source directories, then find the sources
 
-            if Current_Verbosity = High then
-               Write_Line ("Checking ""Naming"" for Ada.");
-            end if;
+      if Data.Ada_Sources_Present then
+         if Data.Source_Dirs = Nil_String then
+            Data.Ada_Sources_Present := False;
 
+         else
             declare
-               Bodies : constant Array_Element_Id :=
-                                  Util.Value_Of
-                                    (Name_Implementation, Naming.Decl.Arrays);
-
-               Specifications : constant Array_Element_Id :=
-                                  Util.Value_Of
-                                    (Name_Specification, Naming.Decl.Arrays);
-
-            begin
-               if Bodies /= No_Array_Element then
-
-                  --  We have elements in the array Body_Part
-
-                  if Current_Verbosity = High then
-                     Write_Line ("Found Bodies.");
-                  end if;
-
-                  Data.Naming.Bodies := Bodies;
-                  Check_Unit_Names (Bodies);
-
-               else
-                  if Current_Verbosity = High then
-                     Write_Line ("No Bodies.");
-                  end if;
-               end if;
+               Sources : constant Variable_Value :=
+                           Util.Value_Of
+                             (Name_Source_Files,
+                              Data.Decl.Attributes);
 
-               if Specifications /= No_Array_Element then
+               Source_List_File : constant Variable_Value :=
+                                    Util.Value_Of
+                                      (Name_Source_List_File,
+                                       Data.Decl.Attributes);
 
-                  --  We have elements in the array Specification
+               Locally_Removed : constant Variable_Value :=
+                           Util.Value_Of
+                             (Name_Locally_Removed_Files,
+                              Data.Decl.Attributes);
 
-                  if Current_Verbosity = High then
-                     Write_Line ("Found Specifications.");
-                  end if;
+            begin
+               pragma Assert
+                 (Sources.Kind = List,
+                    "Source_Files is not a list");
 
-                  Data.Naming.Specifications := Specifications;
-                  Check_Unit_Names (Specifications);
+               pragma Assert
+                 (Source_List_File.Kind = Single,
+                    "Source_List_File is not a single string");
 
-               else
-                  if Current_Verbosity = High then
-                     Write_Line ("No Specifications.");
+               if not Sources.Default then
+                  if not Source_List_File.Default then
+                     Error_Msg
+                       (Project,
+                        "?both variables source_files and " &
+                        "source_list_file are present",
+                        Source_List_File.Location);
                   end if;
-               end if;
-            end;
 
-            --  We are now checking if variables Dot_Replacement, Casing,
-            --  Specification_Append, Body_Append and/or Separate_Append
-            --  exist.
+                  --  Sources is a list of file names
 
-            --  For each variable, if it does not exist, we do nothing,
-            --  because we already have the default.
+                  declare
+                     Current        : String_List_Id := Sources.Values;
+                     Element        : String_Element;
+                     Location       : Source_Ptr;
+                     Name           : Name_Id;
 
-            --  Check Dot_Replacement
+                  begin
+                     Source_Names.Reset;
 
-            declare
-               Dot_Replacement : constant Variable_Value :=
-                                   Util.Value_Of
-                                     (Name_Dot_Replacement,
-                                      Naming.Decl.Attributes);
+                     Data.Ada_Sources_Present := Current /= Nil_String;
 
-            begin
-               pragma Assert (Dot_Replacement.Kind = Single,
-                              "Dot_Replacement is not a single string");
+                     while Current /= Nil_String loop
+                        Element := String_Elements.Table (Current);
+                        Get_Name_String (Element.Value);
+                        Canonical_Case_File_Name
+                          (Name_Buffer (1 .. Name_Len));
+                        Name := Name_Find;
 
-               if not Dot_Replacement.Default then
+                        --  If the element has no location, then use the
+                        --  location of Sources to report possible errors.
 
-                  String_To_Name_Buffer (Dot_Replacement.Value);
+                        if Element.Location = No_Location then
+                           Location := Sources.Location;
 
-                  if Name_Len = 0 then
-                     Error_Msg ("Dot_Replacement cannot be empty",
-                                Dot_Replacement.Location);
+                        else
+                           Location := Element.Location;
+                        end if;
 
-                  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;
+                        Source_Names.Set
+                          (K => Name,
+                           E =>
+                             (Name     => Name,
+                              Location => Location,
+                              Found    => False));
 
-               end if;
+                        Current := Element.Next;
+                     end loop;
 
-            end;
+                     Get_Path_Names_And_Record_Sources;
+                  end;
 
-            if Current_Verbosity = High then
-               Write_Str  ("  Dot_Replacement = """);
-               Write_Str  (Get_Name_String (Data.Naming.Dot_Replacement));
-               Write_Char ('"');
-               Write_Eol;
-            end if;
+                  --  No source_files specified
 
-            --  Check Casing
+                  --  We check Source_List_File has been specified.
 
-            declare
-               Casing_String : constant Variable_Value :=
-                 Util.Value_Of (Name_Casing, Naming.Decl.Attributes);
+               elsif not Source_List_File.Default then
 
-            begin
-               pragma Assert (Casing_String.Kind = Single,
-                              "Casing is not a single string");
+                  --  Source_List_File is the name of the file
+                  --  that contains the source file names
 
-               if not Casing_String.Default then
                   declare
-                     Casing_Image : constant String :=
-                                      Get_Name_String (Casing_String.Value);
+                     Source_File_Path_Name : constant String :=
+                       Path_Name_Of
+                       (Source_List_File.Value,
+                        Data.Directory);
 
                   begin
-                     declare
-                        Casing : constant Casing_Type :=
-                          Value (Casing_Image);
-
-                     begin
-                        Data.Naming.Casing := Casing;
-                     end;
-
-                  exception
-                     when Constraint_Error =>
-                        if Casing_Image'Length = 0 then
-                           Error_Msg ("Casing cannot be an empty string",
-                                      Casing_String.Location);
+                     if Source_File_Path_Name'Length = 0 then
+                        Err_Vars.Error_Msg_Name_1 := Source_List_File.Value;
+                        Error_Msg
+                          (Project,
+                           "file with sources { does not exist",
+                           Source_List_File.Location);
 
-                        else
-                           Name_Len := Casing_Image'Length;
-                           Name_Buffer (1 .. Name_Len) := Casing_Image;
-                           Error_Msg_Name_1 := Name_Find;
-                           Error_Msg
-                             ("{ is not a correct Casing",
-                              Casing_String.Location);
-                        end if;
+                     else
+                        Get_Sources_From_File
+                          (Source_File_Path_Name,
+                           Source_List_File.Location);
+                     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.
+
+                  Find_Sources (Project, Data, Lang_Ada, Follow_Links);
                end if;
-            end;
 
-            if Current_Verbosity = High then
-               Write_Str  ("  Casing = ");
-               Write_Str  (Image (Data.Naming.Casing));
-               Write_Char ('.');
-               Write_Eol;
-            end if;
+               --  If there are sources that are locally removed, mark them as
+               --  such in the Units table.
 
-            --  Check Specification_Suffix
+               if not Locally_Removed.Default then
 
-            declare
-               Ada_Spec_Suffix : constant Name_Id :=
-                 Prj.Util.Value_Of
-                   (Index => Name_Ada,
-                    In_Array => Data.Naming.Specification_Suffix);
+                  --  Sources can be locally removed only in extending
+                  --  project files.
 
-            begin
-               if Ada_Spec_Suffix /= No_Name then
-                  Data.Naming.Current_Spec_Suffix := Ada_Spec_Suffix;
+                  if Data.Extends = No_Project then
+                     Error_Msg
+                       (Project,
+                        "Locally_Removed_Files can only be used " &
+                        "in an extending project file",
+                        Locally_Removed.Location);
 
-               else
-                  Data.Naming.Current_Spec_Suffix := Ada_Default_Spec_Suffix;
-               end if;
-            end;
+                  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;
 
-            if Current_Verbosity = High then
-               Write_Str  ("  Specification_Suffix = """);
-               Write_Str  (Get_Name_String (Data.Naming.Current_Spec_Suffix));
-               Write_Char ('"');
-               Write_Eol;
-            end if;
+                     begin
+                        while Current /= Nil_String loop
+                           Element := String_Elements.Table (Current);
+                           Get_Name_String (Element.Value);
+                           Canonical_Case_File_Name
+                             (Name_Buffer (1 .. Name_Len));
+                           Name := Name_Find;
 
-            --  Check Implementation_Suffix
+                           --  If the element has no location, then use the
+                           --  location of Locally_Removed to report
+                           --  possible errors.
 
-            declare
-               Ada_Impl_Suffix : constant Name_Id :=
-                 Prj.Util.Value_Of
-                   (Index => Name_Ada,
-                    In_Array => Data.Naming.Implementation_Suffix);
+                           if Element.Location = No_Location then
+                              Location := Locally_Removed.Location;
 
-            begin
-               if Ada_Impl_Suffix /= No_Name then
-                  Data.Naming.Current_Impl_Suffix := Ada_Impl_Suffix;
+                           else
+                              Location := Element.Location;
+                           end if;
 
-               else
-                  Data.Naming.Current_Impl_Suffix := Ada_Default_Impl_Suffix;
+                           OK := False;
+
+                           for Index in 1 .. Units.Last loop
+                              Unit := Units.Table (Index);
+
+                              if
+                                Unit.File_Names (Specification).Name = Name
+                              then
+                                 OK := True;
+
+                                 --  Check that this is from a project that
+                                 --  the current project extends, but not the
+                                 --  current project.
+
+                                 Extended := Unit.File_Names
+                                                    (Specification).Project;
+
+                                 if Extended = Project then
+                                    Error_Msg
+                                      (Project,
+                                       "cannot remove a source " &
+                                       "of the same project",
+                                       Location);
+
+                                 elsif
+                                   Project_Extends (Project, Extended)
+                                 then
+                                    Unit.File_Names
+                                      (Specification).Path := Slash;
+                                    Unit.File_Names
+                                      (Specification).Needs_Pragma := False;
+                                    Units.Table (Index) := Unit;
+                                    Add_Forbidden_File_Name
+                                      (Unit.File_Names (Specification).Name);
+                                    exit;
+
+                                 else
+                                    Error_Msg
+                                      (Project,
+                                       "cannot remove a source from " &
+                                       "another project",
+                                       Location);
+                                 end if;
+
+                              elsif
+                                Unit.File_Names (Body_Part).Name = Name
+                              then
+                                 OK := True;
+
+                                 --  Check that this is from a project that
+                                 --  the current project extends, but not the
+                                 --  current project.
+
+                                 Extended := Unit.File_Names
+                                                    (Body_Part).Project;
+
+                                 if Extended = Project then
+                                    Error_Msg
+                                      (Project,
+                                       "cannot remove a source " &
+                                       "of the same project",
+                                       Location);
+
+                                 elsif
+                                   Project_Extends (Project, Extended)
+                                 then
+                                    Unit.File_Names (Body_Part).Path := Slash;
+                                    Unit.File_Names (Body_Part).Needs_Pragma
+                                      := False;
+                                    Units.Table (Index) := Unit;
+                                    Add_Forbidden_File_Name
+                                      (Unit.File_Names (Body_Part).Name);
+                                    exit;
+                                 end if;
+
+                              end if;
+                           end loop;
+
+                           if not OK then
+                              Err_Vars.Error_Msg_Name_1 := Name;
+                              Error_Msg (Project, "unknown file {", Location);
+                           end if;
+
+                           Current := Element.Next;
+                        end loop;
+                     end;
+                  end if;
                end if;
             end;
+         end if;
+      end if;
 
-            if Current_Verbosity = High then
-               Write_Str  ("  Implementation_Suffix = """);
-               Write_Str  (Get_Name_String (Data.Naming.Current_Impl_Suffix));
-               Write_Char ('"');
-               Write_Eol;
-            end if;
+      if Data.Ada_Sources_Present then
 
-            --  Check Separate_Suffix
+         --  Check that all individual naming conventions apply to
+         --  sources of this project file.
 
-            declare
-               Ada_Sep_Suffix : constant Variable_Value :=
-                 Prj.Util.Value_Of
-                 (Variable_Name => Name_Separate_Suffix,
-                  In_Variables  => Naming.Decl.Attributes);
-            begin
-               if Ada_Sep_Suffix.Default then
-                  Data.Naming.Separate_Suffix :=
-                    Data.Naming.Current_Impl_Suffix;
+         Warn_If_Not_Sources (Data.Naming.Bodies, Specs => False);
+         Warn_If_Not_Sources (Data.Naming.Specs,  Specs => True);
+      end if;
 
-               else
-                  String_To_Name_Buffer (Ada_Sep_Suffix.Value);
+      --  If it is a library project file, check if it is a standalone library
+
+      if Data.Library then
+         Standalone_Library : declare
+            Lib_Interfaces : constant Prj.Variable_Value :=
+                               Prj.Util.Value_Of
+                                 (Snames.Name_Library_Interface,
+                                  Data.Decl.Attributes);
+            Lib_Auto_Init  : constant Prj.Variable_Value :=
+                               Prj.Util.Value_Of
+                                 (Snames.Name_Library_Auto_Init,
+                                  Data.Decl.Attributes);
+
+            Lib_Src_Dir : constant Prj.Variable_Value :=
+                            Prj.Util.Value_Of
+                              (Snames.Name_Library_Src_Dir,
+                               Data.Decl.Attributes);
+
+            Lib_Symbol_File : constant Prj.Variable_Value :=
+                                Prj.Util.Value_Of
+                                  (Snames.Name_Library_Symbol_File,
+                                   Data.Decl.Attributes);
+
+            Lib_Symbol_Policy : constant Prj.Variable_Value :=
+                                  Prj.Util.Value_Of
+                                    (Snames.Name_Library_Symbol_Policy,
+                                     Data.Decl.Attributes);
+
+            Lib_Ref_Symbol_File : constant Prj.Variable_Value :=
+                                  Prj.Util.Value_Of
+                                    (Snames.Name_Library_Reference_Symbol_File,
+                                     Data.Decl.Attributes);
+
+            Auto_Init_Supported : constant Boolean :=
+                                    MLib.Tgt.
+                                     Standalone_Library_Auto_Init_Is_Supported;
+
+            OK : Boolean := True;
 
-                  if Name_Len = 0 then
-                     Error_Msg ("Separate_Suffix cannot be empty",
-                                Ada_Sep_Suffix.Location);
+         begin
+            pragma Assert (Lib_Interfaces.Kind = List);
 
-                  else
-                     Data.Naming.Separate_Suffix := Name_Find;
-                     Data.Naming.Sep_Suffix_Loc  := Ada_Sep_Suffix.Location;
+            --  It is a stand-alone library project file if attribute
+            --  Library_Interface is defined.
+
+            if not Lib_Interfaces.Default then
+               declare
+                  Interfaces : String_List_Id := Lib_Interfaces.Values;
+                  Interface_ALIs : String_List_Id := Nil_String;
+                  Unit : Name_Id;
+                  The_Unit_Id : Unit_Id;
+                  The_Unit_Data : Unit_Data;
+
+                  procedure Add_ALI_For (Source : Name_Id);
+                  --  Add an ALI file name to the list of Interface ALIs
+
+                  -----------------
+                  -- Add_ALI_For --
+                  -----------------
+
+                  procedure Add_ALI_For (Source : Name_Id) is
+                  begin
+                     Get_Name_String (Source);
+
+                     declare
+                        ALI : constant String :=
+                                ALI_File_Name (Name_Buffer (1 .. Name_Len));
+                        ALI_Name_Id : Name_Id;
+                     begin
+                        Name_Len := ALI'Length;
+                        Name_Buffer (1 .. Name_Len) := ALI;
+                        ALI_Name_Id := Name_Find;
+
+                        String_Elements.Increment_Last;
+                        String_Elements.Table (String_Elements.Last) :=
+                          (Value    => ALI_Name_Id,
+                           Index    => 0,
+                           Display_Value => ALI_Name_Id,
+                           Location => String_Elements.Table
+                                                         (Interfaces).Location,
+                           Flag     => False,
+                           Next     => Interface_ALIs);
+                        Interface_ALIs := String_Elements.Last;
+                     end;
+                  end Add_ALI_For;
+
+               begin
+                  Data.Standalone_Library := True;
+
+                  --  Library_Interface cannot be an empty list
+
+                  if Interfaces = Nil_String then
+                     Error_Msg
+                       (Project,
+                        "Library_Interface cannot be an empty list",
+                        Lib_Interfaces.Location);
                   end if;
 
-               end if;
+                  --  Process each unit name specified in the attribute
+                  --  Library_Interface.
 
-            end;
+                  while Interfaces /= Nil_String loop
+                     Get_Name_String
+                       (String_Elements.Table (Interfaces).Value);
+                     To_Lower (Name_Buffer (1 .. Name_Len));
 
-            if Current_Verbosity = High then
-               Write_Str  ("  Separate_Suffix = """);
-               Write_Str  (Get_Name_String (Data.Naming.Separate_Suffix));
-               Write_Char ('"');
-               Write_Eol;
-            end if;
+                     if Name_Len = 0 then
+                        Error_Msg
+                          (Project,
+                           "an interface cannot be an empty string",
+                           String_Elements.Table (Interfaces).Location);
 
-            --  Check if Data.Naming is valid
+                     else
+                        Unit := Name_Find;
+                        Error_Msg_Name_1 := Unit;
+                        The_Unit_Id := Units_Htable.Get (Unit);
 
-            Check_Ada_Naming_Scheme (Data.Naming);
+                        if The_Unit_Id = Prj.Com.No_Unit then
+                           Error_Msg
+                             (Project,
+                              "unknown unit {",
+                              String_Elements.Table (Interfaces).Location);
 
-         else
-            Data.Naming.Current_Spec_Suffix := Ada_Default_Spec_Suffix;
-            Data.Naming.Current_Impl_Suffix := Ada_Default_Impl_Suffix;
-            Data.Naming.Separate_Suffix     := Ada_Default_Impl_Suffix;
-         end if;
-      end;
+                        else
+                           --  Check that the unit is part of the project
+
+                           The_Unit_Data := Units.Table (The_Unit_Id);
+
+                           if The_Unit_Data.File_Names
+                                (Com.Body_Part).Name /= No_Name
+                             and then The_Unit_Data.File_Names
+                                        (Com.Body_Part).Path /= Slash
+                           then
+                              if Check_Project
+                                (The_Unit_Data.File_Names (Body_Part).Project,
+                                 Project, Extending)
+                              then
+                                 --  There is a body for this unit.
+                                 --  If there is no spec, we need to check
+                                 --  that it is not a subunit.
+
+                                 if The_Unit_Data.File_Names
+                                      (Specification).Name = No_Name
+                                 then
+                                    declare
+                                       Src_Ind : Source_File_Index;
+
+                                    begin
+                                       Src_Ind := Sinput.P.Load_Project_File
+                                                   (Get_Name_String
+                                                      (The_Unit_Data.File_Names
+                                                         (Body_Part).Path));
+
+                                       if Sinput.P.Source_File_Is_Subunit
+                                                     (Src_Ind)
+                                       then
+                                          Error_Msg
+                                            (Project,
+                                             "{ is a subunit; " &
+                                             "it cannot be an interface",
+                                             String_Elements.Table
+                                               (Interfaces).Location);
+                                       end if;
+                                    end;
+                                 end if;
+
+                                 --  The unit is not a subunit, so we add
+                                 --  to the Interface ALIs the ALI file
+                                 --  corresponding to the body.
+
+                                 Add_ALI_For
+                                   (The_Unit_Data.File_Names (Body_Part).Name);
+
+                              else
+                                 Error_Msg
+                                   (Project,
+                                    "{ is not an unit of this project",
+                                    String_Elements.Table
+                                      (Interfaces).Location);
+                              end if;
 
-      --  If we have source directories, then find the sources
+                           elsif The_Unit_Data.File_Names
+                                   (Com.Specification).Name /= No_Name
+                              and then The_Unit_Data.File_Names
+                                         (Com.Specification).Path /= Slash
+                              and then Check_Project
+                                         (The_Unit_Data.File_Names
+                                              (Specification).Project,
+                                          Project, Extending)
 
-      if Data.Sources_Present then
-         if Data.Source_Dirs = Nil_String then
-            Data.Sources_Present := False;
+                           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.
 
-         else
-            declare
-               Sources : constant Variable_Value :=
-                 Util.Value_Of
-                 (Name_Source_Files,
-                  Data.Decl.Attributes);
+                              Add_ALI_For
+                               (The_Unit_Data.File_Names (Specification).Name);
 
-               Source_List_File : constant Variable_Value :=
-                 Util.Value_Of
-                 (Name_Source_List_File,
-                  Data.Decl.Attributes);
+                           else
+                              Error_Msg
+                                (Project,
+                                 "{ is not an unit of this project",
+                                 String_Elements.Table (Interfaces).Location);
+                           end if;
+                        end if;
 
-            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");
+                     end if;
 
-               if not Sources.Default then
-                  if not Source_List_File.Default then
-                     Error_Msg
-                       ("?both variables source_files and " &
-                        "source_list_file are present",
-                        Source_List_File.Location);
+                     Interfaces := String_Elements.Table (Interfaces).Next;
+                  end loop;
+
+                  --  Put the list of Interface ALIs in the project data
+
+                  Data.Lib_Interface_ALIs := Interface_ALIs;
+
+                  --  Check value of attribute Library_Auto_Init and set
+                  --  Lib_Auto_Init accordingly.
+
+                  if Lib_Auto_Init.Default then
+
+                     --  If no attribute Library_Auto_Init is declared, then
+                     --  set auto init only if it is supported.
+
+                     Data.Lib_Auto_Init := Auto_Init_Supported;
+
+                  else
+                     Get_Name_String (Lib_Auto_Init.Value);
+                     To_Lower (Name_Buffer (1 .. Name_Len));
+
+                     if Name_Buffer (1 .. Name_Len) = "false" then
+                        Data.Lib_Auto_Init := False;
+
+                     elsif Name_Buffer (1 .. Name_Len) = "true" then
+                        if Auto_Init_Supported then
+                           Data.Lib_Auto_Init := True;
+
+                        else
+                           --  Library_Auto_Init cannot be "true" if auto init
+                           --  is not supported
+
+                           Error_Msg
+                             (Project,
+                              "library auto init not supported " &
+                              "on this platform",
+                              Lib_Auto_Init.Location);
+                        end if;
+
+                     else
+                        Error_Msg
+                          (Project,
+                           "invalid value for attribute Library_Auto_Init",
+                           Lib_Auto_Init.Location);
+                     end if;
                   end if;
+               end;
 
-                  --  Sources is a list of file names
+               --  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
-                     Current_Source : String_List_Id := Nil_String;
-                     Current        : String_List_Id := Sources.Values;
-                     Element        : String_Element;
+                     Dir_Id : constant Name_Id := Lib_Src_Dir.Value;
 
                   begin
-                     Data.Sources_Present := Current /= Nil_String;
+                     Locate_Directory
+                       (Dir_Id, Data.Display_Directory,
+                        Data.Library_Src_Dir,
+                        Data.Display_Library_Src_Dir);
 
-                     while Current /= Nil_String loop
-                        Element := String_Elements.Table (Current);
-                        String_To_Name_Buffer (Element.Value);
+                     --  If directory does not exist, report an error
+
+                     if Data.Library_Src_Dir = No_Name then
+
+                        --  Get the absolute name of the library directory
+                        --  that does not exist, to report an error.
 
                         declare
-                           File_Name : constant String :=
-                             Name_Buffer (1 .. Name_Len);
+                           Dir_Name : constant String :=
+                                        Get_Name_String (Dir_Id);
 
                         begin
-                           Get_Path_Name_And_Record_Source
-                             (File_Name        => File_Name,
-                              Location         => Element.Location,
-                              Current_Source   => Current_Source);
-                           Current := Element.Next;
+                           if Is_Absolute_Path (Dir_Name) then
+                              Err_Vars.Error_Msg_Name_1 := Dir_Id;
+
+                           else
+                              Get_Name_String (Data.Directory);
+
+                              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_Name_1 := Name_Find;
+                           end if;
+
+                           --  Report the error
+
+                           Error_Msg
+                             (Project,
+                              "Directory { does not exist",
+                              Lib_Src_Dir.Location);
                         end;
-                     end loop;
-                  end;
 
-                  --  No source_files specified.
-                  --  We check Source_List_File has been specified.
+                     --  Report an error if it is the same as the object
+                     --  directory.
 
-               elsif not Source_List_File.Default then
+                     elsif Data.Library_Src_Dir = Data.Object_Directory then
+                        Error_Msg
+                          (Project,
+                           "directory to copy interfaces cannot be " &
+                           "the object directory",
+                           Lib_Src_Dir.Location);
+                        Data.Library_Src_Dir := No_Name;
 
-                  --  Source_List_File is the name of the file
-                  --  that contains the source file names
+                     --  Check if it is the same as one of the source
+                     --  directories.
+
+                     else
+                        declare
+                           Src_Dirs : String_List_Id := Data.Source_Dirs;
+                           Src_Dir  : String_Element;
+
+                        begin
+                           while Src_Dirs /= Nil_String loop
+                              Src_Dir := String_Elements.Table (Src_Dirs);
+                              Src_Dirs := Src_Dir.Next;
+
+                              --  Report an error if it is one of the
+                              --  source directories.
+
+                              if Data.Library_Src_Dir = Src_Dir.Value then
+                                 Error_Msg
+                                   (Project,
+                                    "directory to copy interfaces cannot " &
+                                    "be one of the source directories",
+                                    Lib_Src_Dir.Location);
+                                 Data.Library_Src_Dir := No_Name;
+                                 exit;
+                              end if;
+                           end loop;
+                        end;
+
+                        if Data.Library_Src_Dir /= No_Name
+                          and then Current_Verbosity = High
+                        then
+                           Write_Str ("Directory to copy interfaces =""");
+                           Write_Str (Get_Name_String (Data.Library_Dir));
+                           Write_Line ("""");
+                        end if;
+                     end if;
+                  end;
+               end if;
 
+               if not Lib_Symbol_Policy.Default then
                   declare
-                     Source_File_Path_Name : constant String :=
-                       Path_Name_Of
-                       (Source_List_File.Value,
-                        Data.Directory);
+                     Value : constant String :=
+                               To_Lower
+                                 (Get_Name_String (Lib_Symbol_Policy.Value));
 
                   begin
-                     if Source_File_Path_Name'Length = 0 then
-                        String_To_Name_Buffer (Source_List_File.Value);
-                        Error_Msg_Name_1 := Name_Find;
-                        Error_Msg
-                          ("file with sources { does not exist",
-                           Source_List_File.Location);
+                     if Value = "autonomous" or else Value = "default" then
+                        Data.Symbol_Data.Symbol_Policy := Autonomous;
+
+                     elsif Value = "compliant" then
+                        Data.Symbol_Data.Symbol_Policy := Compliant;
+
+                     elsif Value = "controlled" then
+                        Data.Symbol_Data.Symbol_Policy := Controlled;
+
+                     elsif Value = "restricted" then
+                        Data.Symbol_Data.Symbol_Policy := Restricted;
 
                      else
-                        Get_Sources_From_File
-                          (Source_File_Path_Name,
-                           Source_List_File.Location);
+                        Error_Msg
+                          (Project,
+                           "illegal value for Library_Symbol_Policy",
+                           Lib_Symbol_Policy.Location);
                      end if;
                   end;
+               end if;
+
+               if Lib_Symbol_File.Default then
+                  if Data.Symbol_Data.Symbol_Policy = Restricted then
+                     Error_Msg
+                       (Project,
+                        "Library_Symbol_File needs to be defined when " &
+                        "symbol policy is Restricted",
+                        Lib_Symbol_Policy.Location);
+                  end if;
 
                else
-                  --  Neither Source_Files nor Source_List_File has been
-                  --  specified.
-                  --  Find all the files that satisfy
-                  --  the naming scheme in all the source directories.
+                  Data.Symbol_Data.Symbol_File := Lib_Symbol_File.Value;
+
+                  Get_Name_String (Lib_Symbol_File.Value);
+
+                  if Name_Len = 0 then
+                     Error_Msg
+                       (Project,
+                        "symbol file name cannot be an empty string",
+                        Lib_Symbol_File.Location);
 
-                  Find_Sources;
+                  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_Symbol_File.Value;
+                        Error_Msg
+                          (Project,
+                           "symbol file name { is illegal. " &
+                           "Name canot include directory info.",
+                           Lib_Symbol_File.Location);
+                     end if;
+                  end if;
                end if;
-            end;
-         end if;
+
+               if Lib_Ref_Symbol_File.Default then
+                  if Data.Symbol_Data.Symbol_Policy = Compliant
+                    or else Data.Symbol_Data.Symbol_Policy = Controlled
+                  then
+                     Error_Msg
+                       (Project,
+                        "a reference symbol file need to be defined",
+                        Lib_Symbol_Policy.Location);
+                  end if;
+
+               else
+                  Data.Symbol_Data.Reference := Lib_Ref_Symbol_File.Value;
+
+                  Get_Name_String (Lib_Ref_Symbol_File.Value);
+
+                  if Name_Len = 0 then
+                     Error_Msg
+                       (Project,
+                        "reference symbol file name cannot be an empty string",
+                        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,
+                           "reference symbol file { name is illegal. " &
+                           "Name canot include directory info.",
+                           Lib_Ref_Symbol_File.Location);
+                     end if;
+
+                     if not Is_Regular_File
+                       (Get_Name_String (Data.Object_Directory) &
+                        Directory_Separator &
+                        Get_Name_String (Lib_Ref_Symbol_File.Value))
+                     then
+                        Error_Msg_Name_1 := Lib_Ref_Symbol_File.Value;
+                        Error_Msg
+                          (Project,
+                           "library reference symbol file { does not exist",
+                           Lib_Ref_Symbol_File.Location);
+                     end if;
+
+                     if Data.Symbol_Data.Symbol_File /= No_Name then
+                        declare
+                           Symbol : String :=
+                                      Get_Name_String
+                                        (Data.Symbol_Data.Symbol_File);
+
+                           Reference : String :=
+                                         Get_Name_String
+                                           (Data.Symbol_Data.Reference);
+
+                        begin
+                           Canonical_Case_File_Name (Symbol);
+                           Canonical_Case_File_Name (Reference);
+
+                           if Symbol = Reference then
+                              Error_Msg
+                                (Project,
+                                 "reference symbol file and symbol file " &
+                                 "cannot be the same file",
+                                 Lib_Ref_Symbol_File.Location);
+                           end if;
+                        end;
+                     end if;
+                  end if;
+               end if;
+            end if;
+         end Standalone_Library;
       end if;
 
+      --  Put the list of Mains, if any, in the project data
+
+      Get_Mains (Project, Data);
+
       Projects.Table (Project) := Data;
+
+      Free_Ada_Naming_Exceptions;
    end Ada_Check;
 
+   -------------------
+   -- ALI_File_Name --
+   -------------------
+
+   function ALI_File_Name (Source : String) return String is
+   begin
+      --  If the source name has an extension, then replace it with
+      --  the ALI suffix.
+
+      for Index in reverse Source'First + 1 .. Source'Last loop
+         if Source (Index) = '.' then
+            return Source (Source'First .. Index - 1) & ALI_Suffix;
+         end if;
+      end loop;
+
+      --  If there is no dot, or if it is the first character, just add the
+      --  ALI suffix.
+
+      return Source & ALI_Suffix;
+   end ALI_File_Name;
+
    --------------------
    -- Check_Ada_Name --
    --------------------
 
    procedure Check_Ada_Name
-     (Name : Name_Id;
+     (Name : String;
       Unit : out Name_Id)
    is
-      The_Name        : String := Get_Name_String (Name);
+      The_Name        : String := Name;
+      Real_Name       : Name_Id;
       Need_Letter     : Boolean := True;
       Last_Underscore : Boolean := False;
       OK              : Boolean := The_Name'Length > 0;
 
    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
+
+      if Get_Name_Table_Byte (Real_Name) /= 0
+        and then Real_Name /= Name_Project
+        and then Real_Name /= Name_Extends
+        and then Real_Name /= Name_External
+      then
+         Unit := No_Name;
+
+         if Current_Verbosity = High then
+            Write_Str (The_Name);
+            Write_Line (" is an Ada reserved word.");
+         end if;
+
+         return;
+      end if;
+
       for Index in The_Name'Range loop
          if Need_Letter then
 
@@ -912,7 +1515,8 @@ package body Prj.Nmsc is
       OK := OK and then not Need_Letter and then not Last_Underscore;
 
       if OK then
-         Unit := Name;
+         Unit := Real_Name;
+
       else
          --  Signal a problem with No_Name
 
@@ -920,27 +1524,290 @@ package body Prj.Nmsc is
       end if;
    end Check_Ada_Name;
 
-   -------------------------
-   -- Check_Naming_Scheme --
-   -------------------------
-
-   procedure Check_Ada_Naming_Scheme (Naming : Naming_Data) is
-   begin
-      --  Only check if we are not using the standard naming scheme
+   ----------------------
+   -- Check_For_Source --
+   ----------------------
 
-      if Naming /= Standard_Naming_Data then
+   procedure Check_For_Source
+     (File_Name        : Name_Id;
+      Path_Name        : Name_Id;
+      Project          : Project_Id;
+      Data             : in out Project_Data;
+      Location         : Source_Ptr;
+      Language         : Other_Programming_Language;
+      Suffix           : String;
+      Naming_Exception : Boolean)
+   is
+      Name : String := Get_Name_String (File_Name);
+      Real_Location : Source_Ptr := Location;
+
+   begin
+      Canonical_Case_File_Name (Name);
+
+      --  A file is a source of a language if Naming_Exception is True (case
+      --  of naming exceptions) or if its file name ends with the suffix.
+
+      if 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;
+
+         declare
+            Path : String := Get_Name_String (Path_Name);
+
+            Path_Id     : Name_Id;
+            --  The path name id (in canonical case)
+
+            File_Id     : Name_Id;
+            --  The file name id (in canonical case)
+
+            Obj_Id      : Name_Id;
+            --  The object file name
+
+            Obj_Path_Id : Name_Id;
+            --  The object path name
+
+            Dep_Id      : Name_Id;
+            --  The dependency file name
+
+            Dep_Path_Id : Name_Id;
+            --  The dependency path name
+
+            Dot_Pos     : Natural := 0;
+            --  Position of the last dot in Name
+
+            Source      : Other_Source;
+            Source_Id   : Other_Source_Id := Data.First_Other_Source;
+
+         begin
+            Canonical_Case_File_Name (Path);
+
+            --  Get the file name id
+
+            Name_Len := Name'Length;
+            Name_Buffer (1 .. Name_Len) := Name;
+            File_Id := Name_Find;
+
+            --  Get the path name id
+
+            Name_Len := Path'Length;
+            Name_Buffer (1 .. Name_Len) := Path;
+            Path_Id := Name_Find;
+
+            --  Find the position of the last dot
+
+            for J in reverse Name'Range loop
+               if Name (J) = '.' then
+                  Dot_Pos := J;
+                  exit;
+               end if;
+            end loop;
+
+            if Dot_Pos <= Name'First then
+               Dot_Pos := Name'Last + 1;
+            end if;
+
+            --  Compute the object file name
+
+            Get_Name_String (File_Id);
+            Name_Len := Dot_Pos - Name'First;
+
+            for J in Object_Suffix'Range loop
+               Name_Len := Name_Len + 1;
+               Name_Buffer (Name_Len) := Object_Suffix (J);
+            end loop;
+
+            Obj_Id := Name_Find;
+
+            --  Compute the object path name
+
+            Get_Name_String (Data.Object_Directory);
+
+            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;
+
+            Add_Str_To_Name_Buffer (Get_Name_String (Obj_Id));
+            Obj_Path_Id := Name_Find;
+
+            --  Compute the dependency file name
+
+            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;
+
+            --  Compute the dependency path name
+
+            Get_Name_String (Data.Object_Directory);
+
+            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;
+
+            Add_Str_To_Name_Buffer (Get_Name_String (Dep_Id));
+            Dep_Path_Id := Name_Find;
+
+            --  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.
+
+            while Source_Id /= No_Other_Source loop
+               Source := Other_Sources.Table (Source_Id);
+               Source_Id := Source.Next;
+
+               if Source.File_Name = File_Id then
+                  --  Two sources of different languages cannot have the same
+                  --  file name.
+
+                  if Source.Language /= Language then
+                     Error_Msg_Name_1 := File_Name;
+                     Error_Msg
+                       (Project,
+                        "{ cannot be a source of several languages",
+                        Real_Location);
+                     return;
+
+                  --  No problem if a file has already been specified as
+                  --  a naming exception of this language.
+
+                  elsif Source.Path_Name = Path_Id then
+                     --  Reset the naming exception flag, if this is not a
+                     --  naming exception.
+
+                     if not Naming_Exception then
+                        Other_Sources.Table (Source_Id).Naming_Exception :=
+                          False;
+                     end if;
+
+                     return;
+
+                  --  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.
+
+                  elsif Data.Known_Order_Of_Source_Dirs then
+                     return;
+
+                  --  But it is an error if the order of the source directories
+                  --  is not known.
+
+                  else
+                     Error_Msg_Name_1 := File_Name;
+                     Error_Msg
+                       (Project,
+                        "{ is found in several source directories",
+                        Real_Location);
+                     return;
+                  end if;
+
+               --  Two sources with different file names cannot have the same
+               --  object file name.
+
+               elsif Source.Object_Name = Obj_Id then
+                  Error_Msg_Name_1 := File_Id;
+                  Error_Msg_Name_2 := Source.File_Name;
+                  Error_Msg_Name_3 := Obj_Id;
+                  Error_Msg
+                       (Project,
+                        "{ and { have the same object file {",
+                        Real_Location);
+                     return;
+               end if;
+            end loop;
+
+            if Current_Verbosity = High then
+               Write_Str ("      found ");
+               Write_Str (Lang_Display_Names (Language).all);
+               Write_Str (" source """);
+               Write_Str (Get_Name_String (File_Name));
+               Write_Line ("""");
+               Write_Str ("      object path = ");
+               Write_Line (Get_Name_String (Obj_Path_Id));
+            end if;
+
+            --  Create the Other_Source record
+            Source :=
+              (Language         => Language,
+               File_Name        => File_Id,
+               Path_Name        => Path_Id,
+               Source_TS        => File_Stamp (Path_Id),
+               Object_Name      => Obj_Id,
+               Object_Path      => Obj_Path_Id,
+               Object_TS        => File_Stamp (Obj_Path_Id),
+               Dep_Name         => Dep_Id,
+               Dep_Path         => Dep_Path_Id,
+               Dep_TS           => File_Stamp (Dep_Path_Id),
+               Naming_Exception => Naming_Exception,
+               Next             => No_Other_Source);
+
+            --  And add it to the Other_Sources table
+
+            Other_Sources.Increment_Last;
+            Other_Sources.Table (Other_Sources.Last) := Source;
+
+            --  There are sources of languages other than Ada in this project
+
+            Data.Other_Sources_Present := True;
+
+            --  And there are sources of this language in this project
+
+            Data.Languages (Language) := True;
+
+            --  Add this source to the list of sources of languages other than
+            --  Ada of the project.
+
+            if Data.First_Other_Source = No_Other_Source then
+               Data.First_Other_Source := Other_Sources.Last;
+
+            else
+               Other_Sources.Table (Data.Last_Other_Source).Next :=
+                 Other_Sources.Last;
+            end if;
+
+            Data.Last_Other_Source  := Other_Sources.Last;
+         end;
+      end if;
+   end Check_For_Source;
+
+   --------------------------------------
+   -- Check_Ada_Naming_Scheme_Validity --
+   --------------------------------------
+
+   procedure Check_Ada_Naming_Scheme_Validity
+     (Project : Project_Id;
+      Naming  : Naming_Data)
+   is
+   begin
+      --  Only check if we are not using the standard naming scheme
+
+      if Naming /= Standard_Naming_Data then
          declare
             Dot_Replacement       : constant String :=
                                      Get_Name_String
                                        (Naming.Dot_Replacement);
 
-            Specification_Suffix : constant String :=
+            Spec_Suffix : constant String :=
                                      Get_Name_String
                                        (Naming.Current_Spec_Suffix);
 
-            Implementation_Suffix : constant String :=
+            Body_Suffix : constant String :=
                                      Get_Name_String
-                                       (Naming.Current_Impl_Suffix);
+                                       (Naming.Current_Body_Suffix);
 
             Separate_Suffix       : constant String :=
                                      Get_Name_String
@@ -971,279 +1838,858 @@ package body Prj.Nmsc is
                                   Pattern => ".") /= 0)
             then
                Error_Msg
-                 ('"' & Dot_Replacement &
+                 (Project,
+                  '"' & Dot_Replacement &
                   """ is illegal for Dot_Replacement.",
                   Naming.Dot_Repl_Loc);
             end if;
 
             --  Suffixes cannot
             --   - be empty
-            --   - start with an alphanumeric
-            --   - start with an '_' followed by an alphanumeric
 
-            if Is_Illegal_Append (Specification_Suffix) then
+            if Is_Illegal_Suffix
+                 (Spec_Suffix, Dot_Replacement = ".")
+            then
+               Err_Vars.Error_Msg_Name_1 := Naming.Current_Spec_Suffix;
                Error_Msg
-                 ('"' & Specification_Suffix &
-                  """ is illegal for Specification_Suffix.",
+                 (Project,
+                  "{ is illegal for Spec_Suffix",
                   Naming.Spec_Suffix_Loc);
             end if;
 
-            if Is_Illegal_Append (Implementation_Suffix) then
+            if Is_Illegal_Suffix
+                 (Body_Suffix, Dot_Replacement = ".")
+            then
+               Err_Vars.Error_Msg_Name_1 := Naming.Current_Body_Suffix;
                Error_Msg
-                 ('"' & Implementation_Suffix &
-                  """ is illegal for Implementation_Suffix.",
-                  Naming.Impl_Suffix_Loc);
+                 (Project,
+                  "{ is illegal for Body_Suffix",
+                  Naming.Body_Suffix_Loc);
             end if;
 
-            if Implementation_Suffix /= Separate_Suffix then
-               if Is_Illegal_Append (Separate_Suffix) then
+            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
-                    ('"' & Separate_Suffix &
-                     """ is illegal for Separate_Append.",
+                    (Project,
+                     "{ is illegal for Separate_Suffix",
                      Naming.Sep_Suffix_Loc);
                end if;
             end if;
 
-            --  Specification_Suffix cannot have the same termination as
-            --  Implementation_Suffix or Separate_Suffix
+            --  Spec_Suffix cannot have the same termination as
+            --  Body_Suffix or Separate_Suffix
 
-            if Specification_Suffix'Length <= Implementation_Suffix'Length
+            if Spec_Suffix'Length <= Body_Suffix'Length
               and then
-                Implementation_Suffix (Implementation_Suffix'Last -
-                             Specification_Suffix'Length + 1 ..
-                             Implementation_Suffix'Last) = Specification_Suffix
+                Body_Suffix (Body_Suffix'Last -
+                             Spec_Suffix'Length + 1 ..
+                             Body_Suffix'Last) = Spec_Suffix
             then
                Error_Msg
-                 ("Implementation_Suffix (""" &
-                  Implementation_Suffix &
+                 (Project,
+                  "Body_Suffix (""" &
+                  Body_Suffix &
                   """) cannot end with" &
-                  "Specification_Suffix  (""" &
-                   Specification_Suffix & """).",
-                  Naming.Impl_Suffix_Loc);
+                  " Spec_Suffix  (""" &
+                  Spec_Suffix & """).",
+                  Naming.Body_Suffix_Loc);
             end if;
 
-            if Specification_Suffix'Length <= Separate_Suffix'Length
+            if Body_Suffix /= Separate_Suffix
+              and then Spec_Suffix'Length <= Separate_Suffix'Length
               and then
                 Separate_Suffix
-                  (Separate_Suffix'Last - Specification_Suffix'Length + 1
+                  (Separate_Suffix'Last - Spec_Suffix'Length + 1
                     ..
-                   Separate_Suffix'Last) = Specification_Suffix
+                   Separate_Suffix'Last) = Spec_Suffix
             then
                Error_Msg
-                 ("Separate_Suffix (""" &
+                 (Project,
+                  "Separate_Suffix (""" &
                   Separate_Suffix &
                   """) cannot end with" &
-                  " Specification_Suffix (""" &
-                  Specification_Suffix & """).",
+                  " Spec_Suffix (""" &
+                  Spec_Suffix & """).",
                   Naming.Sep_Suffix_Loc);
             end if;
          end;
       end if;
-   end Check_Ada_Naming_Scheme;
-
-   ---------------
-   -- Error_Msg --
-   ---------------
+   end Check_Ada_Naming_Scheme_Validity;
 
-   procedure Error_Msg (Msg : String; Flag_Location : Source_Ptr) is
+   -----------------------------
+   -- Check_Ada_Naming_Scheme --
+   -----------------------------
 
-      Error_Buffer : String (1 .. 5_000);
-      Error_Last   : Natural := 0;
-      Msg_Name     : Natural := 0;
-      First        : Positive := Msg'First;
+   procedure Check_Ada_Naming_Scheme
+     (Data    : in out Project_Data;
+      Project : Project_Id)
+   is
+      Naming_Id : constant Package_Id :=
+                    Util.Value_Of (Name_Naming, Data.Decl.Packages);
 
-      procedure Add (C : Character);
-      --  Add a character to the buffer
+      Naming : Package_Element;
 
-      procedure Add (S : String);
-      --  Add a string to the buffer
+      procedure Check_Unit_Names (List : Array_Element_Id);
+      --  Check that a list of unit names contains only valid names.
 
-      procedure Add (Id : Name_Id);
-      --  Add a name to the buffer
+      ----------------------
+      -- Check_Unit_Names --
+      ----------------------
 
-      ---------
-      -- Add --
-      ---------
+      procedure Check_Unit_Names (List : Array_Element_Id) is
+         Current   : Array_Element_Id := List;
+         Element   : Array_Element;
+         Unit_Name : Name_Id;
 
-      procedure Add (C : Character) is
       begin
-         Error_Last := Error_Last + 1;
-         Error_Buffer (Error_Last) := C;
-      end Add;
+         --  Loop through elements of the string list
 
-      procedure Add (S : String) is
-      begin
-         Error_Buffer (Error_Last + 1 .. Error_Last + S'Length) := S;
-         Error_Last := Error_Last + S'Length;
-      end Add;
+         while Current /= No_Array_Element loop
+            Element := Array_Elements.Table (Current);
 
-      procedure Add (Id : Name_Id) is
-      begin
-         Get_Name_String (Id);
-         Add (Name_Buffer (1 .. Name_Len));
-      end Add;
+            --  Put file name in canonical case
 
-   --  Start of processing for Error_Msg
+            Get_Name_String (Element.Value.Value);
+            Canonical_Case_File_Name (Name_Buffer (1 .. Name_Len));
+            Element.Value.Value := Name_Find;
 
-   begin
-      if Error_Report = null then
-         Errout.Error_Msg (Msg, Flag_Location);
-         return;
-      end if;
+            --  Check that it contains a valid unit name
 
-      if Msg (First) = '\' then
+            Get_Name_String (Element.Index);
+            Check_Ada_Name (Name_Buffer (1 .. Name_Len), Unit_Name);
 
-         --  Continuation character, ignore.
+            if Unit_Name = No_Name then
+               Err_Vars.Error_Msg_Name_1 := Element.Index;
+               Error_Msg
+                 (Project,
+                  "{ is not a valid unit name.",
+                  Element.Value.Location);
 
-         First := First + 1;
+            else
+               if Current_Verbosity = High then
+                  Write_Str ("    Unit (""");
+                  Write_Str (Get_Name_String (Unit_Name));
+                  Write_Line (""")");
+               end if;
 
-      elsif Msg (First) = '?' then
+               Element.Index := Unit_Name;
+               Array_Elements.Table (Current) := Element;
+            end if;
 
-         --  Warning character. It is always the first one,
-         --  in this package.
+            Current := Element.Next;
+         end loop;
+      end Check_Unit_Names;
 
-         First := First + 1;
-         Add ("Warning: ");
-      end if;
+   --  Start of processing for Check_Ada_Naming_Scheme
 
-      for Index in First .. Msg'Last loop
-         if Msg (Index) = '{' or else Msg (Index) = '%' then
+   begin
+      --  If there is a package Naming, we will put in Data.Naming what is in
+      --  this package Naming.
 
-            --  Include a name between double quotes.
+      if Naming_Id /= No_Package then
+         Naming := Packages.Table (Naming_Id);
 
-            Msg_Name := Msg_Name + 1;
-            Add ('"');
+         if Current_Verbosity = High then
+            Write_Line ("Checking ""Naming"" for Ada.");
+         end if;
 
-            case Msg_Name is
-               when 1 => Add (Error_Msg_Name_1);
+         declare
+            Bodies : constant Array_Element_Id :=
+                       Util.Value_Of (Name_Body, Naming.Decl.Arrays);
 
-               when 2 => Add (Error_Msg_Name_2);
+            Specs : constant Array_Element_Id :=
+                      Util.Value_Of (Name_Spec, Naming.Decl.Arrays);
 
-               when 3 => Add (Error_Msg_Name_3);
+         begin
+            if Bodies /= No_Array_Element then
 
-               when others => null;
-            end case;
+               --  We have elements in the array Body_Part
 
-            Add ('"');
+               if Current_Verbosity = High then
+                  Write_Line ("Found Bodies.");
+               end if;
 
-         else
-            Add (Msg (Index));
-         end if;
+               Data.Naming.Bodies := Bodies;
+               Check_Unit_Names (Bodies);
 
-      end loop;
+            else
+               if Current_Verbosity = High then
+                  Write_Line ("No Bodies.");
+               end if;
+            end if;
 
-      Error_Report (Error_Buffer (1 .. Error_Last));
-   end Error_Msg;
+            if Specs /= No_Array_Element then
 
-   ---------------------
-   -- Get_Name_String --
-   ---------------------
+               --  We have elements in the array Specs
 
-   function Get_Name_String (S : String_Id) return String is
-   begin
-      if S = No_String then
-         return "";
-      else
-         String_To_Name_Buffer (S);
-         return Name_Buffer (1 .. Name_Len);
-      end if;
-   end Get_Name_String;
+               if Current_Verbosity = High then
+                  Write_Line ("Found Specs.");
+               end if;
 
-   --------------
-   -- Get_Unit --
-   --------------
+               Data.Naming.Specs := Specs;
+               Check_Unit_Names (Specs);
 
-   procedure Get_Unit
-     (File_Name    : Name_Id;
-      Naming       : Naming_Data;
-      Unit_Name    : out Name_Id;
-      Unit_Kind    : out Spec_Or_Body;
-      Needs_Pragma : out Boolean)
-   is
-      Canonical_Case_Name : Name_Id;
+            else
+               if Current_Verbosity = High then
+                  Write_Line ("No Specs.");
+               end if;
+            end if;
+         end;
 
-   begin
-      Needs_Pragma := False;
-      Get_Name_String (File_Name);
-      Canonical_Case_File_Name (Name_Buffer (1 .. Name_Len));
-      Canonical_Case_Name := Name_Find;
+         --  We are now checking if variables Dot_Replacement, Casing,
+         --  Spec_Suffix, Body_Suffix and/or Separate_Suffix
+         --  exist.
 
-      if Naming.Bodies /= No_Array_Element then
+         --  For each variable, if it does not exist, we do nothing,
+         --  because we already have the default.
 
-         --  There are some specified file names for some bodies
-         --  of this project. Find out if File_Name is one of these bodies.
+         --  Check Dot_Replacement
 
          declare
-            Current : Array_Element_Id := Naming.Bodies;
-            Element : Array_Element;
+            Dot_Replacement : constant Variable_Value :=
+                                Util.Value_Of
+                                  (Name_Dot_Replacement,
+                                   Naming.Decl.Attributes);
 
          begin
-            while Current /= No_Array_Element loop
-               Element := Array_Elements.Table (Current);
-
-               if Element.Index /= No_Name then
-                  String_To_Name_Buffer (Element.Value.Value);
-                  Canonical_Case_File_Name (Name_Buffer (1 .. Name_Len));
+            pragma Assert (Dot_Replacement.Kind = Single,
+                           "Dot_Replacement is not a single string");
 
-                  if Canonical_Case_Name = Name_Find then
+            if not Dot_Replacement.Default then
+               Get_Name_String (Dot_Replacement.Value);
 
-                     --  File_Name corresponds to one body.
-                     --  So, we know it is a body, and we know the unit name.
+               if Name_Len = 0 then
+                  Error_Msg
+                    (Project,
+                     "Dot_Replacement cannot be empty",
+                     Dot_Replacement.Location);
 
-                     Unit_Kind := Body_Part;
-                     Unit_Name := Element.Index;
-                     Needs_Pragma := True;
-                     return;
-                  end if;
+               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;
-
-               Current := Element.Next;
-            end loop;
+            end if;
          end;
-      end if;
 
-      if Naming.Specifications /= No_Array_Element then
+         if Current_Verbosity = High then
+            Write_Str  ("  Dot_Replacement = """);
+            Write_Str  (Get_Name_String (Data.Naming.Dot_Replacement));
+            Write_Char ('"');
+            Write_Eol;
+         end if;
 
-         --  There are some specified file names for some bodiesspecifications
-         --  of this project. Find out if File_Name is one of these
-         --  specifications.
+         --  Check Casing
 
          declare
-            Current : Array_Element_Id := Naming.Specifications;
-            Element : Array_Element;
+            Casing_String : constant Variable_Value :=
+                              Util.Value_Of
+                                (Name_Casing, Naming.Decl.Attributes);
 
          begin
-            while Current /= No_Array_Element loop
-               Element := Array_Elements.Table (Current);
-
-               if Element.Index /= No_Name then
-                  String_To_Name_Buffer (Element.Value.Value);
-                  Canonical_Case_File_Name (Name_Buffer (1 .. Name_Len));
+            pragma Assert (Casing_String.Kind = Single,
+                           "Casing is not a single string");
 
-                  if Canonical_Case_Name = Name_Find then
+            if not Casing_String.Default then
+               declare
+                  Casing_Image : constant String :=
+                                   Get_Name_String (Casing_String.Value);
+               begin
+                  declare
+                     Casing_Value : constant Casing_Type :=
+                                      Value (Casing_Image);
+                  begin
+                     --  Ignore Casing on platforms where file names are
+                     --  case-insensitive.
 
-                     --  File_Name corresponds to one specification.
-                     --  So, we know it is a spec, and we know the unit name.
+                     if not File_Names_Case_Sensitive then
+                        Data.Naming.Casing := All_Lower_Case;
 
-                     Unit_Kind := Specification;
-                     Unit_Name := Element.Index;
-                     Needs_Pragma := True;
-                     return;
-                  end if;
+                     else
+                        Data.Naming.Casing := Casing_Value;
+                     end if;
+                  end;
 
-               end if;
+               exception
+                  when Constraint_Error =>
+                     if Casing_Image'Length = 0 then
+                        Error_Msg
+                          (Project,
+                           "Casing cannot be an empty string",
+                           Casing_String.Location);
 
-               Current := Element.Next;
+                     else
+                        Name_Len := Casing_Image'Length;
+                        Name_Buffer (1 .. Name_Len) := Casing_Image;
+                        Err_Vars.Error_Msg_Name_1 := Name_Find;
+                        Error_Msg
+                          (Project,
+                           "{ is not a correct Casing",
+                           Casing_String.Location);
+                     end if;
+               end;
+            end if;
+         end;
+
+         if Current_Verbosity = High then
+            Write_Str  ("  Casing = ");
+            Write_Str  (Image (Data.Naming.Casing));
+            Write_Char ('.');
+            Write_Eol;
+         end if;
+
+         --  Check Spec_Suffix
+
+         declare
+            Ada_Spec_Suffix : constant Variable_Value :=
+                                Prj.Util.Value_Of
+                                  (Index     => Name_Ada,
+                                   Src_Index => 0,
+                                   In_Array  => Data.Naming.Spec_Suffix);
+
+         begin
+            if Ada_Spec_Suffix.Kind = Single
+              and then Get_Name_String (Ada_Spec_Suffix.Value) /= ""
+            then
+               Get_Name_String (Ada_Spec_Suffix.Value);
+               Canonical_Case_File_Name (Name_Buffer (1 .. Name_Len));
+               Data.Naming.Current_Spec_Suffix := Name_Find;
+               Data.Naming.Spec_Suffix_Loc := Ada_Spec_Suffix.Location;
+
+            else
+               Data.Naming.Current_Spec_Suffix := Default_Ada_Spec_Suffix;
+            end if;
+         end;
+
+         if Current_Verbosity = High then
+            Write_Str  ("  Spec_Suffix = """);
+            Write_Str  (Get_Name_String (Data.Naming.Current_Spec_Suffix));
+            Write_Char ('"');
+            Write_Eol;
+         end if;
+
+         --  Check Body_Suffix
+
+         declare
+            Ada_Body_Suffix : constant Variable_Value :=
+              Prj.Util.Value_Of
+                (Index     => Name_Ada,
+                 Src_Index => 0,
+                 In_Array  => Data.Naming.Body_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.Current_Body_Suffix := Name_Find;
+               Data.Naming.Body_Suffix_Loc := Ada_Body_Suffix.Location;
+
+            else
+               Data.Naming.Current_Body_Suffix := Default_Ada_Body_Suffix;
+            end if;
+         end;
+
+         if Current_Verbosity = High then
+            Write_Str  ("  Body_Suffix = """);
+            Write_Str  (Get_Name_String (Data.Naming.Current_Body_Suffix));
+            Write_Char ('"');
+            Write_Eol;
+         end if;
+
+         --  Check Separate_Suffix
+
+         declare
+            Ada_Sep_Suffix : constant Variable_Value :=
+                               Prj.Util.Value_Of
+                                 (Variable_Name => Name_Separate_Suffix,
+                                  In_Variables  => Naming.Decl.Attributes);
+
+         begin
+            if Ada_Sep_Suffix.Default then
+               Data.Naming.Separate_Suffix :=
+                 Data.Naming.Current_Body_Suffix;
+
+            else
+               Get_Name_String (Ada_Sep_Suffix.Value);
+
+               if Name_Len = 0 then
+                  Error_Msg
+                    (Project,
+                     "Separate_Suffix cannot be empty",
+                     Ada_Sep_Suffix.Location);
+
+               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 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
+
+         Check_Ada_Naming_Scheme_Validity (Project, Data.Naming);
+
+      else
+         Data.Naming.Current_Spec_Suffix := Default_Ada_Spec_Suffix;
+         Data.Naming.Current_Body_Suffix := Default_Ada_Body_Suffix;
+         Data.Naming.Separate_Suffix     := Default_Ada_Body_Suffix;
+      end if;
+   end Check_Ada_Naming_Scheme;
+
+   -------------------
+   -- Check_Project --
+   -------------------
+
+   function Check_Project
+     (P            : Project_Id;
+      Root_Project : Project_Id;
+      Extending    : Boolean) return Boolean
+   is
+   begin
+      if P = Root_Project then
+         return True;
+
+      elsif Extending then
+         declare
+            Data : Project_Data := Projects.Table (Root_Project);
+
+         begin
+            while Data.Extends /= No_Project loop
+               if P = Data.Extends then
+                  return True;
+               end if;
+
+               Data := Projects.Table (Data.Extends);
             end loop;
          end;
       end if;
 
+      return False;
+   end Check_Project;
+
+   ----------------------------
+   -- Compute_Directory_Last --
+   ----------------------------
+
+   function Compute_Directory_Last (Dir : String) return Natural is
+   begin
+      if Dir'Length > 1
+        and then (Dir (Dir'Last - 1) = Directory_Separator
+                  or else Dir (Dir'Last - 1) = '/')
+      then
+         return Dir'Last - 1;
+      else
+         return Dir'Last;
+      end if;
+   end Compute_Directory_Last;
+
+   ---------------
+   -- Error_Msg --
+   ---------------
+
+   procedure Error_Msg
+     (Project       : Project_Id;
+      Msg           : String;
+      Flag_Location : Source_Ptr)
+   is
+      Error_Buffer : String (1 .. 5_000);
+      Error_Last   : Natural := 0;
+      Msg_Name     : Natural := 0;
+      First        : Positive := Msg'First;
+
+      procedure Add (C : Character);
+      --  Add a character to the buffer
+
+      procedure Add (S : String);
+      --  Add a string to the buffer
+
+      procedure Add (Id : Name_Id);
+      --  Add a name to the buffer
+
+      ---------
+      -- Add --
+      ---------
+
+      procedure Add (C : Character) is
+      begin
+         Error_Last := Error_Last + 1;
+         Error_Buffer (Error_Last) := C;
+      end Add;
+
+      procedure Add (S : String) is
+      begin
+         Error_Buffer (Error_Last + 1 .. Error_Last + S'Length) := S;
+         Error_Last := Error_Last + S'Length;
+      end Add;
+
+      procedure Add (Id : Name_Id) is
+      begin
+         Get_Name_String (Id);
+         Add (Name_Buffer (1 .. Name_Len));
+      end Add;
+
+   --  Start of processing for Error_Msg
+
+   begin
+      if Error_Report = null then
+         Prj.Err.Error_Msg (Msg, Flag_Location);
+         return;
+      end if;
+
+      if Msg (First) = '\' then
+
+         --  Continuation character, ignore.
+
+         First := First + 1;
+
+      elsif Msg (First) = '?' then
+
+         --  Warning character. It is always the first one in this package
+
+         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 ('"');
+
+            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);
+
+               when others => null;
+            end case;
+
+            Add ('"');
+
+         else
+            Add (Msg (Index));
+         end if;
+
+      end loop;
+
+      Error_Report (Error_Buffer (1 .. Error_Last), Project);
+   end Error_Msg;
+
+   ------------------
+   -- Find_Sources --
+   ------------------
+
+   procedure Find_Sources
+     (Project      : Project_Id;
+      Data         : in out Project_Data;
+      For_Language : Programming_Language;
+      Follow_Links : Boolean := False)
+   is
+      Source_Dir      : String_List_Id := Data.Source_Dirs;
+      Element         : String_Element;
+      Dir             : Dir_Type;
+      Current_Source  : String_List_Id := Nil_String;
+      Source_Recorded : Boolean := False;
+
+   begin
+      if Current_Verbosity = High then
+         Write_Line ("Looking for sources:");
+      end if;
+
+      --  For each subdirectory
+
+      while Source_Dir /= Nil_String loop
+         begin
+            Source_Recorded := False;
+            Element := String_Elements.Table (Source_Dir);
+            if Element.Value /= No_Name then
+               Get_Name_String (Element.Display_Value);
+
+               declare
+                  Source_Directory : constant String :=
+                    Name_Buffer (1 .. Name_Len) & Directory_Separator;
+                  Dir_Last  : constant Natural :=
+                     Compute_Directory_Last (Source_Directory);
+
+               begin
+                  if Current_Verbosity = High then
+                     Write_Str ("Source_Dir = ");
+                     Write_Line (Source_Directory);
+                  end if;
+
+                  --  We look to every entry in the source directory
+
+                  Open (Dir, Source_Directory
+                               (Source_Directory'First .. Dir_Last));
+
+                  loop
+                     Read (Dir, Name_Buffer, Name_Len);
+
+                     if Current_Verbosity = High then
+                        Write_Str  ("   Checking ");
+                        Write_Line (Name_Buffer (1 .. Name_Len));
+                     end if;
+
+                     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;
+
+                     begin
+                        Name_Len := Path'Length;
+                        Name_Buffer (1 .. Name_Len) := Path;
+                        Path_Name := Name_Find;
+
+                        if For_Language = Lang_Ada then
+                           --  We attempt to register it as a source.
+                           --  However, there is no error if the file
+                           --  does not contain a valid source.
+                           --  But there is an error if we have a
+                           --  duplicate unit name.
+
+                           Record_Ada_Source
+                             (File_Name       => File_Name,
+                              Path_Name       => Path_Name,
+                              Project         => Project,
+                              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,
+                              Data             => Data,
+                              Location         => No_Location,
+                              Language         => For_Language,
+                              Suffix           =>
+                                Get_Name_String
+                                  (Data.Impl_Suffixes (For_Language)),
+                              Naming_Exception => False);
+                        end if;
+                     end;
+                  end loop;
+
+                  Close (Dir);
+               end;
+            end if;
+
+         exception
+            when Directory_Error =>
+               null;
+         end;
+
+         if Source_Recorded then
+            String_Elements.Table (Source_Dir).Flag := True;
+         end if;
+
+         Source_Dir := Element.Next;
+      end loop;
+
+      if Current_Verbosity = High then
+         Write_Line ("end Looking for sources.");
+      end if;
+
+      if For_Language = Lang_Ada then
+         --  If we have looked for sources and found none, then
+         --  it is an error, except if it is an extending project.
+         --  If a non extending project is not supposed to contain
+         --  any source, then we never call Find_Sources.
+
+         if Current_Source /= Nil_String then
+            Data.Ada_Sources_Present := True;
+
+         elsif Data.Extends = No_Project then
+            Error_Msg
+              (Project,
+               "there are no Ada sources in this project",
+               Data.Location);
+         end if;
+      end if;
+   end Find_Sources;
+
+   --------------------------------
+   -- Free_Ada_Naming_Exceptions --
+   --------------------------------
+
+   procedure Free_Ada_Naming_Exceptions is
+   begin
+      Ada_Naming_Exception_Table.Set_Last (0);
+      Ada_Naming_Exceptions.Reset;
+      Reverse_Ada_Naming_Exceptions.Reset;
+   end Free_Ada_Naming_Exceptions;
+
+   ---------------
+   -- Get_Mains --
+   ---------------
+
+   procedure Get_Mains (Project : Project_Id; Data : in out Project_Data) is
+      Mains : constant Variable_Value :=
+        Prj.Util.Value_Of (Name_Main, Data.Decl.Attributes);
+
+   begin
+      Data.Mains := Mains.Values;
+
+      --  If no Mains were specified, and if we are an extending
+      --  project, inherit the Mains from the project we are extending.
+
+      if Mains.Default then
+         if Data.Extends /= No_Project then
+            Data.Mains := Projects.Table (Data.Extends).Mains;
+         end if;
+
+      --  In a library project file, Main cannot be specified
+
+      elsif Data.Library then
+         Error_Msg
+           (Project,
+            "a library project file cannot have Main specified",
+            Mains.Location);
+      end if;
+   end Get_Mains;
+
+   ---------------------------
+   -- Get_Sources_From_File --
+   ---------------------------
+
+   procedure Get_Sources_From_File
+     (Path     : String;
+      Location : Source_Ptr;
+      Project  : Project_Id)
+   is
+      File           : Prj.Util.Text_File;
+      Line           : String (1 .. 250);
+      Last           : Natural;
+      Source_Name    : Name_Id;
+
+   begin
+      Source_Names.Reset;
+
+      if Current_Verbosity = High then
+         Write_Str  ("Opening """);
+         Write_Str  (Path);
+         Write_Line (""".");
+      end if;
+
+      --  Open the file
+
+      Prj.Util.Open (File, Path);
+
+      if not Prj.Util.Is_Valid (File) then
+         Error_Msg (Project, "file does not exist", Location);
+      else
+         --  Read the lines one by one
+
+         while not Prj.Util.End_Of_File (File) loop
+            Prj.Util.Get_Line (File, Line, Last);
+
+            --  A non empty, non comment line should contain a file name
+
+            if Last /= 0
+              and then (Last = 1 or else Line (1 .. 2) /= "--")
+            then
+               --  ??? we should check that there is no directory information
+
+               Name_Len := Last;
+               Name_Buffer (1 .. Name_Len) := Line (1 .. Last);
+               Canonical_Case_File_Name (Name_Buffer (1 .. Name_Len));
+               Source_Name := Name_Find;
+               Source_Names.Set
+                 (K => Source_Name,
+                  E =>
+                    (Name     => Source_Name,
+                     Location => Location,
+                     Found    => False));
+            end if;
+         end loop;
+
+         Prj.Util.Close (File);
+
+      end if;
+   end Get_Sources_From_File;
+
+   --------------
+   -- Get_Unit --
+   --------------
+
+   procedure Get_Unit
+     (Canonical_File_Name : Name_Id;
+      Naming              : Naming_Data;
+      Exception_Id        : out Ada_Naming_Exception_Id;
+      Unit_Name           : out Name_Id;
+      Unit_Kind           : out Spec_Or_Body;
+      Needs_Pragma        : out Boolean)
+   is
+      Info_Id  : Ada_Naming_Exception_Id
+        := Ada_Naming_Exceptions.Get (Canonical_File_Name);
+      VMS_Name : Name_Id;
+
+   begin
+      if Info_Id = No_Ada_Naming_Exception then
+         if Hostparm.OpenVMS then
+            VMS_Name := Canonical_File_Name;
+            Get_Name_String (VMS_Name);
+
+            if Name_Buffer (Name_Len) = '.' then
+               Name_Len := Name_Len - 1;
+               VMS_Name := Name_Find;
+            end if;
+
+            Info_Id := Ada_Naming_Exceptions.Get (VMS_Name);
+         end if;
+
+      end if;
+
+      if Info_Id /= No_Ada_Naming_Exception then
+         Exception_Id := Info_Id;
+         Unit_Name := No_Name;
+         Unit_Kind := Specification;
+         Needs_Pragma := True;
+         return;
+      end if;
+
+      Needs_Pragma := False;
+      Exception_Id := No_Ada_Naming_Exception;
+
+      Get_Name_String (Canonical_File_Name);
+
       declare
-         File  : String   := Get_Name_String (Canonical_Case_Name);
-         First : Positive := File'First;
-         Last  : Natural  := File'Last;
+         File          : String := Name_Buffer (1 .. Name_Len);
+         First         : constant Positive := File'First;
+         Last          : Natural           := File'Last;
+         Standard_GNAT : Boolean;
 
       begin
+         Standard_GNAT :=
+           Naming.Current_Spec_Suffix = Default_Ada_Spec_Suffix
+             and then Naming.Current_Body_Suffix = Default_Ada_Body_Suffix;
+
          --  Check if the end of the file name is Specification_Append
 
          Get_Name_String (Naming.Current_Spec_Suffix);
@@ -1263,7 +2709,7 @@ package body Prj.Nmsc is
             end if;
 
          else
-            Get_Name_String (Naming.Current_Impl_Suffix);
+            Get_Name_String (Naming.Current_Body_Suffix);
 
             --  Check if the end of the file name is Body_Append
 
@@ -1324,6 +2770,8 @@ package body Prj.Nmsc is
          end if;
 
          Get_Name_String (Naming.Dot_Replacement);
+         Standard_GNAT :=
+           Standard_GNAT and then Name_Buffer (1 .. Name_Len) = "-";
 
          if Name_Buffer (1 .. Name_Len) /= "." then
 
@@ -1405,35 +2853,94 @@ package body Prj.Nmsc is
               (Source  => Src,
                Mapping => Lower_Case_Map);
 
+            --  In the standard GNAT naming scheme, check for special cases:
+            --  children or separates of A, G, I or S, and run time sources.
+
+            if Standard_GNAT and then Src'Length >= 3 then
+               declare
+                  S1 : constant Character := Src (Src'First);
+                  S2 : constant Character := Src (Src'First + 1);
+
+               begin
+                  if S1 = 'a' or else S1 = 'g'
+                    or else S1 = 'i' or else S1 = 's'
+                  then
+                     --  Children or separates of packages A, G, I or S
+
+                     if (Hostparm.OpenVMS and then S2 = '$')
+                       or else (not Hostparm.OpenVMS and then S2 = '~')
+                     then
+                        Src (Src'First + 1) := '.';
+
+                     --  If it is potentially a run time source, disable
+                     --  filling of the mapping file to avoid warnings.
+
+                     elsif S2 = '.' then
+                        Set_Mapping_File_Initial_State_To_Empty;
+                     end if;
+
+                  end if;
+               end;
+            end if;
+
             if Current_Verbosity = High then
                Write_Str  ("      ");
                Write_Line (Src);
             end if;
 
-            Name_Len := Src'Length;
-            Name_Buffer (1 .. Name_Len) := Src;
-
             --  Now, we check if this name is a valid unit name
 
-            Check_Ada_Name (Name => Name_Find, Unit => Unit_Name);
+            Check_Ada_Name (Name => Src, Unit => Unit_Name);
          end;
 
       end;
-
    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_Append --
+   -- Is_Illegal_Suffix --
    -----------------------
 
-   function Is_Illegal_Append (This : String) return Boolean is
+   function Is_Illegal_Suffix
+     (Suffix                          : String;
+      Dot_Replacement_Is_A_Single_Dot : Boolean) return Boolean
+   is
    begin
-      return This'Length = 0
-        or else Is_Alphanumeric (This (This'First))
-        or else (This'Length >= 2
-                 and then This (This'First) = '_'
-                 and then Is_Alphanumeric (This (This'First + 1)));
-   end Is_Illegal_Append;
+      if Suffix'Length = 0 or else Index (Suffix, ".") = 0 then
+         return True;
+      end if;
+
+      --  If dot replacement is a single dot, and first character of
+      --  suffix is also a dot
+
+      if Dot_Replacement_Is_A_Single_Dot
+        and then Suffix (Suffix'First) = '.'
+      then
+         for Index in Suffix'First + 1 .. Suffix'Last loop
+
+            --  If there is another dot
+
+            if Suffix (Index) = '.' then
+
+               --  It is illegal to have a letter following the initial dot
+
+               return Is_Letter (Suffix (Suffix'First + 1));
+            end if;
+         end loop;
+      end if;
+
+      --  Everything is OK
+
+      return False;
+   end Is_Illegal_Suffix;
 
    --------------------------------
    -- Language_Independent_Check --
@@ -1443,10 +2950,10 @@ package body Prj.Nmsc is
      (Project      : Project_Id;
       Report_Error : Put_Line_Access)
    is
-      Last_Source_Dir   : String_List_Id  := Nil_String;
-      Data              : Project_Data    := Projects.Table (Project);
+      Last_Source_Dir : String_List_Id  := Nil_String;
+      Data            : Project_Data    := Projects.Table (Project);
 
-      procedure Find_Source_Dirs (From : String_Id; Location : Source_Ptr);
+      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.
 
@@ -1454,69 +2961,110 @@ package body Prj.Nmsc is
       -- Find_Source_Dirs --
       ----------------------
 
-      procedure Find_Source_Dirs (From : String_Id; Location : Source_Ptr) is
+      procedure Find_Source_Dirs (From : Name_Id; Location : Source_Ptr) is
+         Directory : constant String := Get_Name_String (From);
+         Element   : String_Element;
 
-         Directory    : String (1 .. Integer (String_Length (From)));
-         Directory_Id : Name_Id;
-         Element      : String_Element;
-
-         procedure Recursive_Find_Dirs (Path : String_Id);
-         --  Find all the subdirectories (recursively) of Path
-         --  and add them to the list of source directories
-         --  of the project.
+         procedure Recursive_Find_Dirs (Path : Name_Id);
+         --  Find all the subdirectories (recursively) of Path and add them
+         --  to the list of source directories of the project.
 
          -------------------------
          -- Recursive_Find_Dirs --
          -------------------------
 
-         procedure Recursive_Find_Dirs (Path : String_Id) is
+         procedure Recursive_Find_Dirs (Path : Name_Id) is
             Dir      : Dir_Type;
             Name     : String (1 .. 250);
             Last     : Natural;
-            The_Path : String := Get_Name_String (Path) & Dir_Sep;
+            List     : String_List_Id := Data.Source_Dirs;
+            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)) &
+                         Directory_Separator;
 
-            The_Path_Last : Positive := The_Path'Last;
+            The_Path_Last : constant Natural :=
+                              Compute_Directory_Last (The_Path);
 
          begin
-            if The_Path'Length > 1
-              and then
-                (The_Path (The_Path_Last - 1) = Dir_Sep
-                   or else The_Path (The_Path_Last - 1) = '/')
-            then
-               The_Path_Last := The_Path_Last - 1;
-            end if;
+            Name_Len := The_Path_Last - The_Path'First + 1;
+            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;
+
+            --  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 Current_Verbosity = High then
-               Write_Str  ("   ");
-               Write_Line (The_Path (The_Path'First .. The_Path_Last));
+            else
+               Recursive_Dirs.Set (Canonical_Path, True);
             end if;
 
-            String_Elements.Increment_Last;
-            Element :=
-              (Value    => Path,
-               Location => No_Location,
-               Next     => Nil_String);
+            --  Check if directory is already in list
+
+            while List /= Nil_String loop
+               Element := String_Elements.Table (List);
 
-            --  Case of first source directory
+               if Element.Value /= No_Name then
+                  Found := Element.Value = Canonical_Path;
+                  exit when Found;
+               end if;
 
-            if Last_Source_Dir = Nil_String then
-               Data.Source_Dirs := String_Elements.Last;
+               List := Element.Next;
+            end loop;
 
-            --  Here we already have source directories.
+            --  If directory is not already in list, put it there
 
-            else
-               --  Link the previous last to the new one
+            if not Found then
+               if Current_Verbosity = High then
+                  Write_Str  ("   ");
+                  Write_Line (The_Path (The_Path'First .. The_Path_Last));
+               end if;
 
-               String_Elements.Table (Last_Source_Dir).Next :=
-                 String_Elements.Last;
-            end if;
+               String_Elements.Increment_Last;
+               Element :=
+                 (Value    => Canonical_Path,
+                  Display_Value => Non_Canonical_Path,
+                  Location => No_Location,
+                  Flag     => False,
+                  Next     => Nil_String,
+                  Index    => 0);
 
-            --  And register this source directory as the new last
+               --  Case of first source directory
 
-            Last_Source_Dir  := String_Elements.Last;
-            String_Elements.Table (Last_Source_Dir) := Element;
+               if Last_Source_Dir = Nil_String then
+                  Data.Source_Dirs := String_Elements.Last;
 
-            --  Now look for subdirectories
+                  --  Here we already have source directories.
+
+               else
+                  --  Link the previous last to the new one
+
+                  String_Elements.Table (Last_Source_Dir).Next :=
+                    String_Elements.Last;
+               end if;
+
+               --  And register this source directory as the new last
+
+               Last_Source_Dir  := String_Elements.Last;
+               String_Elements.Table (Last_Source_Dir) := Element;
+            end if;
+
+            --  Now look for subdirectories. We do that even when this
+            --  directory is already in the list, because some of its
+            --  subdirectories may not be in the list yet.
 
             Open (Dir, The_Path (The_Path'First .. The_Path_Last));
 
@@ -1524,30 +3072,34 @@ package body Prj.Nmsc is
                Read (Dir, Name, Last);
                exit when Last = 0;
 
-               if Current_Verbosity = High then
-                  Write_Str  ("   Checking ");
-                  Write_Line (Name (1 .. Last));
-               end if;
-
                if Name (1 .. Last) /= "."
                  and then Name (1 .. Last) /= ".."
                then
                   --  Avoid . and ..
 
+                  if Current_Verbosity = High then
+                     Write_Str  ("   Checking ");
+                     Write_Line (Name (1 .. Last));
+                  end if;
+
                   declare
                      Path_Name : constant String :=
-                                   The_Path (The_Path'First .. The_Path_Last) &
-                                   Name (1 .. Last);
+                                   Normalize_Pathname
+                                     (Name      => Name (1 .. Last),
+                                      Directory =>
+                                        The_Path
+                                          (The_Path'First .. The_Path_Last),
+                                      Resolve_Links  => False,
+                                      Case_Sensitive => True);
 
                   begin
                      if Is_Directory (Path_Name) then
 
-                        --  We have found a new subdirectory,
-                        --  register it and find its own subdirectories.
+                        --  We have found a new subdirectory, call self
 
-                        Start_String;
-                        Store_String_Chars (Path_Name);
-                        Recursive_Find_Dirs (End_String);
+                        Name_Len := Path_Name'Length;
+                        Name_Buffer (1 .. Name_Len) := Path_Name;
+                        Recursive_Find_Dirs (Name_Find);
                      end if;
                   end;
                end if;
@@ -1560,18 +3112,11 @@ package body Prj.Nmsc is
                null;
          end Recursive_Find_Dirs;
 
-         --  Start of processing for Find_Source_Dirs
+      --  Start of processing for Find_Source_Dirs
 
       begin
          if Current_Verbosity = High then
             Write_Str ("Find_Source_Dirs (""");
-         end if;
-
-         String_To_Name_Buffer (From);
-         Directory    := Name_Buffer (1 .. Name_Len);
-         Directory_Id := Name_Find;
-
-         if Current_Verbosity = High then
             Write_Str (Directory);
             Write_Line (""")");
          end if;
@@ -1583,11 +3128,14 @@ package body Prj.Nmsc is
            and then Directory (Directory'Last - 1 .. Directory'Last) = "**"
            and then (Directory (Directory'Last - 2) = '/'
                        or else
-                     Directory (Directory'Last - 2) = Dir_Sep)
+                     Directory (Directory'Last - 2) = Directory_Separator)
          then
+            Data.Known_Order_Of_Source_Dirs := False;
+
             Name_Len := Directory'Length - 3;
 
             if Name_Len = 0 then
+
                --  This is the case of "/**": all directories
                --  in the file system.
 
@@ -1607,16 +3155,28 @@ package body Prj.Nmsc is
 
             declare
                Base_Dir : constant Name_Id := Name_Find;
-               Root     : constant Name_Id :=
-                            Locate_Directory (Base_Dir, Data.Directory);
+               Root_Dir : constant String :=
+                            Normalize_Pathname
+                              (Name      => Get_Name_String (Base_Dir),
+                               Directory =>
+                                 Get_Name_String (Data.Display_Directory),
+                               Resolve_Links  => False,
+                               Case_Sensitive => True);
 
             begin
-               if Root = No_Name then
-                  Error_Msg_Name_1 := Base_Dir;
+               if Root_Dir'Length = 0 then
+                  Err_Vars.Error_Msg_Name_1 := Base_Dir;
+
                   if Location = No_Location then
-                     Error_Msg ("{ is not a valid directory.", Data.Location);
+                     Error_Msg
+                       (Project,
+                        "{ is not a valid directory.",
+                        Data.Location);
                   else
-                     Error_Msg ("{ is not a valid directory.", Location);
+                     Error_Msg
+                       (Project,
+                        "{ is not a valid directory.",
+                        Location);
                   end if;
 
                else
@@ -1627,9 +3187,9 @@ package body Prj.Nmsc is
                      Write_Line ("Looking for source directories:");
                   end if;
 
-                  Start_String;
-                  Store_String_Chars (Get_Name_String (Root));
-                  Recursive_Find_Dirs (End_String);
+                  Name_Len := Root_Dir'Length;
+                  Name_Buffer (1 .. Name_Len) := Root_Dir;
+                  Recursive_Find_Dirs (Name_Find);
 
                   if Current_Verbosity = High then
                      Write_Line ("End of looking for source directories.");
@@ -1641,16 +3201,24 @@ package body Prj.Nmsc is
 
          else
             declare
-               Path_Name : constant Name_Id :=
-                 Locate_Directory (Directory_Id, Data.Directory);
-
+               Path_Name : Name_Id;
+               Display_Path_Name : Name_Id;
             begin
+               Locate_Directory
+                 (From, Data.Display_Directory, Path_Name, Display_Path_Name);
                if Path_Name = No_Name then
-                  Error_Msg_Name_1 := Directory_Id;
+                  Err_Vars.Error_Msg_Name_1 := From;
+
                   if Location = No_Location then
-                     Error_Msg ("{ is not a valid directory", Data.Location);
+                     Error_Msg
+                       (Project,
+                        "{ is not a valid directory",
+                        Data.Location);
                   else
-                     Error_Msg ("{ is not a valid directory", Location);
+                     Error_Msg
+                       (Project,
+                        "{ is not a valid directory",
+                        Location);
                   end if;
                else
 
@@ -1658,9 +3226,8 @@ package body Prj.Nmsc is
                   --  the list of directories.
 
                   String_Elements.Increment_Last;
-                  Start_String;
-                  Store_String_Chars (Get_Name_String (Path_Name));
-                  Element.Value := End_String;
+                  Element.Value := Path_Name;
+                  Element.Display_Value := Display_Path_Name;
 
                   if Last_Source_Dir = Nil_String then
 
@@ -1685,10 +3252,9 @@ package body Prj.Nmsc is
          end if;
       end Find_Source_Dirs;
 
-      --  Start of processing for Language_Independent_Check
+   --  Start of processing for Language_Independent_Check
 
    begin
-
       if Data.Language_Independent_Checked then
          return;
       end if;
@@ -1697,14 +3263,16 @@ package body Prj.Nmsc is
 
       Error_Report := Report_Error;
 
+      Recursive_Dirs.Reset;
+
       if Current_Verbosity = High then
          Write_Line ("Starting to look for directories");
       end if;
 
-      --  Let's check the object directory
+      --  Check the object directory
 
       declare
-         Object_Dir : Variable_Value :=
+         Object_Dir : constant Variable_Value :=
                         Util.Value_Of (Name_Object_Dir, Data.Decl.Attributes);
 
       begin
@@ -1713,36 +3281,46 @@ package body Prj.Nmsc is
 
          --  We set the object directory to its default
 
-         Data.Object_Directory := Data.Directory;
+         Data.Object_Directory   := Data.Directory;
+         Data.Display_Object_Dir := Data.Display_Directory;
 
-         if not String_Equal (Object_Dir.Value, Empty_String) then
+         if Object_Dir.Value /= Empty_String then
 
-            String_To_Name_Buffer (Object_Dir.Value);
+            Get_Name_String (Object_Dir.Value);
 
             if Name_Len = 0 then
-               Error_Msg ("Object_Dir cannot be empty",
-                          Object_Dir.Location);
+               Error_Msg
+                 (Project,
+                  "Object_Dir cannot be empty",
+                  Object_Dir.Location);
 
             else
                --  We check that the specified object directory
                --  does exist.
 
-               Canonical_Case_File_Name (Name_Buffer (1 .. Name_Len));
-
-               declare
-                  Dir_Id : constant Name_Id := Name_Find;
+               Locate_Directory
+                 (Object_Dir.Value, Data.Display_Directory,
+                  Data.Object_Directory, Data.Display_Object_Dir);
 
-               begin
-                  Data.Object_Directory :=
-                    Locate_Directory (Dir_Id, Data.Directory);
-
-                  if Data.Object_Directory = No_Name then
-                     Error_Msg_Name_1 := Dir_Id;
-                     Error_Msg
-                       ("the object directory { cannot be found",
-                        Data.Location);
-                  end if;
-               end;
+               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,
+                     "the object directory { cannot be found",
+                     Data.Location);
+
+                  --  Do not keep a nil Object_Directory. Set it to the
+                  --  specified (relative or absolute) path.
+                  --  This is for the benefit of tools that recover from
+                  --  errors; for example, these tools could create the
+                  --  non existent directory.
+
+                  Data.Display_Object_Dir := Object_Dir.Value;
+                  Get_Name_String (Object_Dir.Value);
+                  Canonical_Case_File_Name (Name_Buffer (1 .. Name_Len));
+                  Data.Object_Directory := Name_Find;
+               end if;
             end if;
          end if;
       end;
@@ -1752,19 +3330,73 @@ package body Prj.Nmsc is
             Write_Line ("No object directory");
          else
             Write_Str ("Object directory: """);
-            Write_Str (Get_Name_String (Data.Object_Directory));
+            Write_Str (Get_Name_String (Data.Display_Object_Dir));
             Write_Line ("""");
          end if;
       end if;
 
-      --  Look for the source directories
+      --  Check the exec directory
 
       declare
-         Source_Dirs : Variable_Value :=
-           Util.Value_Of (Name_Source_Dirs, Data.Decl.Attributes);
+         Exec_Dir : constant Variable_Value :=
+                      Util.Value_Of (Name_Exec_Dir, Data.Decl.Attributes);
 
       begin
+         pragma Assert (Exec_Dir.Kind = Single,
+                        "Exec_Dir is not a single string");
+
+         --  We set the object directory to its default
+
+         Data.Exec_Directory   := Data.Object_Directory;
+         Data.Display_Exec_Dir := Data.Display_Object_Dir;
 
+         if Exec_Dir.Value /= Empty_String then
+
+            Get_Name_String (Exec_Dir.Value);
+
+            if Name_Len = 0 then
+               Error_Msg
+                 (Project,
+                  "Exec_Dir cannot be empty",
+                  Exec_Dir.Location);
+
+            else
+               --  We check that the specified object 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;
+                  Error_Msg
+                    (Project,
+                     "the exec directory { cannot be found",
+                     Data.Location);
+               end if;
+            end if;
+         end if;
+      end;
+
+      if Current_Verbosity = High then
+         if Data.Exec_Directory = No_Name then
+            Write_Line ("No exec directory");
+         else
+            Write_Str ("Exec directory: """);
+            Write_Str (Get_Name_String (Data.Display_Exec_Dir));
+            Write_Line ("""");
+         end if;
+      end if;
+
+      --  Look for the source directories
+
+      declare
+         Source_Dirs : constant Variable_Value :=
+                         Util.Value_Of
+                           (Name_Source_Dirs, Data.Decl.Attributes);
+
+      begin
          if Current_Verbosity = High then
             Write_Line ("Starting to look for source directories");
          end if;
@@ -1779,31 +3411,37 @@ package body Prj.Nmsc is
 
             String_Elements.Increment_Last;
             Data.Source_Dirs := String_Elements.Last;
-            Start_String;
-            Store_String_Chars (Get_Name_String (Data.Directory));
             String_Elements.Table (Data.Source_Dirs) :=
-              (Value    => End_String,
+              (Value    => Data.Directory,
+               Display_Value => Data.Display_Directory,
                Location => No_Location,
-               Next     => Nil_String);
+               Flag     => False,
+               Next     => Nil_String,
+               Index    => 0);
 
             if Current_Verbosity = High then
-               Write_Line ("(Undefined) Single object directory:");
+               Write_Line ("Single source directory:");
                Write_Str ("    """);
-               Write_Str (Get_Name_String (Data.Directory));
+               Write_Str (Get_Name_String (Data.Display_Directory));
                Write_Line ("""");
             end if;
 
          elsif Source_Dirs.Values = Nil_String then
 
             --  If Source_Dirs is an empty string list, this means
-            --  that this project contains no source.
+            --  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.Object_Directory = Data.Directory then
+            if Data.Extends = No_Project
+              and then  Data.Object_Directory = Data.Directory
+            then
                Data.Object_Directory := No_Name;
             end if;
 
-            Data.Source_Dirs     := Nil_String;
-            Data.Sources_Present := False;
+            Data.Source_Dirs           := Nil_String;
+            Data.Ada_Sources_Present   := False;
+            Data.Other_Sources_Present := False;
 
          else
             declare
@@ -1823,7 +3461,7 @@ package body Prj.Nmsc is
          end if;
 
          if Current_Verbosity = High then
-            Write_Line ("Puting source directories in canonical cases");
+            Write_Line ("Putting source directories in canonical cases");
          end if;
 
          declare
@@ -1833,12 +3471,10 @@ package body Prj.Nmsc is
          begin
             while Current /= Nil_String loop
                Element := String_Elements.Table (Current);
-               if Element.Value /= No_String then
-                  String_To_Name_Buffer (Element.Value);
+               if Element.Value /= No_Name then
+                  Get_Name_String (Element.Value);
                   Canonical_Case_File_Name (Name_Buffer (1 .. Name_Len));
-                  Start_String;
-                  Store_String_Chars (Name_Buffer (1 .. Name_Len));
-                  Element.Value := End_String;
+                  Element.Value := Name_Find;
                   String_Elements.Table (Current) := Element;
                end if;
 
@@ -1847,26 +3483,74 @@ package body Prj.Nmsc is
          end;
       end;
 
-      --  Library Dir, Name, Version and Kind
+      --  Library attributes
 
       declare
          Attributes : constant Prj.Variable_Id := Data.Decl.Attributes;
 
-         Lib_Dir : Prj.Variable_Value :=
-                     Prj.Util.Value_Of (Snames.Name_Library_Dir, Attributes);
+         Lib_Dir : constant Prj.Variable_Value :=
+                     Prj.Util.Value_Of (Snames.Name_Library_Dir, Attributes);
+
+         Lib_Name : constant Prj.Variable_Value :=
+                      Prj.Util.Value_Of (Snames.Name_Library_Name, Attributes);
+
+         Lib_Version : constant Prj.Variable_Value :=
+                         Prj.Util.Value_Of
+                           (Snames.Name_Library_Version, Attributes);
+
+         The_Lib_Kind : constant Prj.Variable_Value :=
+                          Prj.Util.Value_Of
+                            (Snames.Name_Library_Kind, Attributes);
+
+      begin
+         --  Special case of extending project
+
+         if Data.Extends /= No_Project then
+            declare
+               Extended_Data : constant Project_Data :=
+                 Projects.Table (Data.Extends);
+
+            begin
+               --  If the project extended is a library project, we inherit
+               --  the library name, if it is not redefined; we check that
+               --  the library directory is specified; and we reset the
+               --  library flag for the extended project.
+
+               if Extended_Data.Library then
+                  if Lib_Name.Default then
+                     Data.Library_Name := Extended_Data.Library_Name;
+                  end if;
+
+                  if Lib_Dir.Default then
+
+                     --  If the extending project is a virtual project, we
+                     --  put the error message in the library project that
+                     --  is extended, rather than in the extending all project.
+                     --  Of course, we cannot put it in the virtual extending
+                     --  project, because it has no source.
 
-         Lib_Name : Prj.Variable_Value :=
-                      Prj.Util.Value_Of (Snames.Name_Library_Name, Attributes);
+                     if Data.Virtual then
+                        Error_Msg_Name_1 := Extended_Data.Name;
 
-         Lib_Version : Prj.Variable_Value :=
-                         Prj.Util.Value_Of
-                           (Snames.Name_Library_Version, Attributes);
+                        Error_Msg
+                          (Project,
+                           "library project % cannot be virtually extended",
+                           Extended_Data.Location);
 
-         The_Lib_Kind : Prj.Variable_Value :=
-                          Prj.Util.Value_Of
-                            (Snames.Name_Library_Kind, Attributes);
+                     else
+                        Error_Msg
+                          (Project,
+                           "a project extending a library project must " &
+                           "specify an attribute Library_Dir",
+                           Data.Location);
+                     end if;
+                  end if;
+
+                  Projects.Table (Data.Extends).Library := False;
+               end if;
+            end;
+         end if;
 
-      begin
          pragma Assert (Lib_Dir.Kind = Single);
 
          if Lib_Dir.Value = Empty_String then
@@ -1878,69 +3562,84 @@ package body Prj.Nmsc is
          else
             --  Find path name, check that it is a directory
 
-            Stringt.String_To_Name_Buffer (Lib_Dir.Value);
+            Locate_Directory
+              (Lib_Dir.Value, Data.Display_Directory,
+               Data.Library_Dir, Data.Display_Library_Dir);
 
-            declare
-               Dir_Id : constant Name_Id := Name_Find;
+            if Data.Library_Dir = No_Name then
 
-            begin
-               Data.Library_Dir :=
-                 Locate_Directory (Dir_Id, Data.Directory);
+               --  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_Name_1 := Lib_Dir.Value;
+
+                  else
+                     Get_Name_String (Data.Display_Directory);
+
+                     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_Name_1 := Name_Find;
+                  end if;
 
-               if Data.Library_Dir = No_Name then
-                  Error_Msg ("not an existing directory",
-                             Lib_Dir.Location);
+                  --  Report the error
 
-               elsif Data.Library_Dir = Data.Object_Directory then
                   Error_Msg
-                    ("library directory cannot be the same " &
-                     "as object directory",
+                    (Project,
+                     "library directory { does not exist",
                      Lib_Dir.Location);
-                  Data.Library_Dir := No_Name;
+               end;
 
-               else
-                  if Current_Verbosity = High then
-                     Write_Str ("Library directory =""");
-                     Write_Str (Get_Name_String (Data.Library_Dir));
-                     Write_Line ("""");
-                  end if;
+            elsif Data.Library_Dir = Data.Object_Directory then
+               Error_Msg
+                 (Project,
+                  "library directory cannot be the same " &
+                  "as object directory",
+                  Lib_Dir.Location);
+               Data.Library_Dir := No_Name;
+               Data.Display_Library_Dir := No_Name;
+
+            else
+               if Current_Verbosity = High then
+                  Write_Str ("Library directory =""");
+                  Write_Str (Get_Name_String (Data.Display_Library_Dir));
+                  Write_Line ("""");
                end if;
-            end;
+            end if;
          end if;
 
          pragma Assert (Lib_Name.Kind = Single);
 
          if Lib_Name.Value = Empty_String then
-            if Current_Verbosity = High then
+            if Current_Verbosity = High
+              and then Data.Library_Name = No_Name
+            then
                Write_Line ("No library name");
             end if;
 
          else
-            Stringt.String_To_Name_Buffer (Lib_Name.Value);
+            --  There is no restriction on the syntax of library names
 
-            if not Is_Letter (Name_Buffer (1)) then
-               Error_Msg ("must start with a letter",
-                          Lib_Name.Location);
-
-            else
-               Data.Library_Name := Name_Find;
-
-               for Index in 2 .. Name_Len loop
-                  if not Is_Alphanumeric (Name_Buffer (Index)) then
-                     Data.Library_Name := No_Name;
-                     Error_Msg ("only letters and digits are allowed",
-                                Lib_Name.Location);
-                     exit;
-                  end if;
-               end loop;
+            Data.Library_Name := Lib_Name.Value;
+         end if;
 
-               if Data.Library_Name /= No_Name
-                 and then Current_Verbosity = High then
-                  Write_Str ("Library name = """);
-                  Write_Str (Get_Name_String (Data.Library_Name));
-                  Write_Line ("""");
-               end if;
-            end if;
+         if Data.Library_Name /= No_Name
+           and then Current_Verbosity = High
+         then
+            Write_Str ("Library name = """);
+            Write_Str (Get_Name_String (Data.Library_Name));
+            Write_Line ("""");
          end if;
 
          Data.Library :=
@@ -1949,17 +3648,14 @@ package body Prj.Nmsc is
            Data.Library_Name /= No_Name;
 
          if Data.Library then
-
-            if not MLib.Tgt.Libraries_Are_Supported then
-               Error_Msg ("?libraries are not supported on this platform",
-                          Lib_Name.Location);
+            if MLib.Tgt.Support_For_Libraries = MLib.Tgt.None then
+               Error_Msg
+                 (Project,
+                  "?libraries are not supported on this platform",
+                  Lib_Name.Location);
                Data.Library := False;
 
             else
-               if Current_Verbosity = High then
-                  Write_Line ("This is a library project file");
-               end if;
-
                pragma Assert (Lib_Version.Kind = Single);
 
                if Lib_Version.Value = Empty_String then
@@ -1968,8 +3664,7 @@ package body Prj.Nmsc is
                   end if;
 
                else
-                  Stringt.String_To_Name_Buffer (Lib_Version.Value);
-                  Data.Lib_Internal_Name := Name_Find;
+                  Data.Lib_Internal_Name := Lib_Version.Value;
                end if;
 
                pragma Assert (The_Lib_Kind.Kind = Single);
@@ -1980,7 +3675,7 @@ package body Prj.Nmsc is
                   end if;
 
                else
-                  Stringt.String_To_Name_Buffer (The_Lib_Kind.Value);
+                  Get_Name_String (The_Lib_Kind.Value);
 
                   declare
                      Kind_Name : constant String :=
@@ -2000,7 +3695,8 @@ package body Prj.Nmsc is
 
                      else
                         Error_Msg
-                          ("illegal value for Library_Kind",
+                          (Project,
+                           "illegal value for Library_Kind",
                            The_Lib_Kind.Location);
                         OK := False;
                      end if;
@@ -2009,8 +3705,24 @@ package body Prj.Nmsc is
                         Write_Str ("Library kind = ");
                         Write_Line (Kind_Name);
                      end if;
+
+                     if Data.Library_Kind /= Static and then
+                       MLib.Tgt.Support_For_Libraries = MLib.Tgt.Static_Only
+                     then
+                        Error_Msg
+                          (Project,
+                           "only static libraries are supported " &
+                           "on this platform",
+                          The_Lib_Kind.Location);
+                        Data.Library := False;
+                     end if;
                   end;
                end if;
+
+               if Data.Library and then Current_Verbosity = High then
+                  Write_Line ("This is a library project file");
+               end if;
+
             end if;
          end if;
       end;
@@ -2036,142 +3748,604 @@ package body Prj.Nmsc is
                Write_Line ("Checking ""Naming"".");
             end if;
 
-            --  Check Specification_Suffix
+            --  Check Spec_Suffix
+
+            declare
+               Spec_Suffixs : Array_Element_Id :=
+                                Util.Value_Of
+                                  (Name_Spec_Suffix,
+                                   Naming.Decl.Arrays);
+               Suffix  : Array_Element_Id;
+               Element : Array_Element;
+               Suffix2 : Array_Element_Id;
+
+            begin
+               --  If some suffixs have been specified, we make sure that
+               --  for each language for which a default suffix has been
+               --  specified, there is a suffix specified, either the one
+               --  in the project file or if there were none, the default.
+
+               if Spec_Suffixs /= No_Array_Element then
+                  Suffix := Data.Naming.Spec_Suffix;
+
+                  while Suffix /= No_Array_Element loop
+                     Element := Array_Elements.Table (Suffix);
+                     Suffix2 := Spec_Suffixs;
+
+                     while Suffix2 /= No_Array_Element loop
+                        exit when Array_Elements.Table (Suffix2).Index =
+                          Element.Index;
+                        Suffix2 := Array_Elements.Table (Suffix2).Next;
+                     end loop;
+
+                     --  There is a registered default suffix, but no
+                     --  suffix specified in the project file.
+                     --  Add the default to the array.
+
+                     if Suffix2 = No_Array_Element then
+                        Array_Elements.Increment_Last;
+                        Array_Elements.Table (Array_Elements.Last) :=
+                          (Index     => Element.Index,
+                           Src_Index => Element.Src_Index,
+                           Index_Case_Sensitive => False,
+                           Value     => Element.Value,
+                           Next      => Spec_Suffixs);
+                        Spec_Suffixs := Array_Elements.Last;
+                     end if;
+
+                     Suffix := Element.Next;
+                  end loop;
+
+                  --  Put the resulting array as the specification suffixs
+
+                  Data.Naming.Spec_Suffix := Spec_Suffixs;
+               end if;
+            end;
+
+            declare
+               Current : Array_Element_Id := Data.Naming.Spec_Suffix;
+               Element : Array_Element;
+
+            begin
+               while Current /= No_Array_Element loop
+                  Element := Array_Elements.Table (Current);
+                  Get_Name_String (Element.Value.Value);
+
+                  if Name_Len = 0 then
+                     Error_Msg
+                       (Project,
+                        "Spec_Suffix cannot be empty",
+                        Element.Value.Location);
+                  end if;
+
+                  Array_Elements.Table (Current) := Element;
+                  Current := Element.Next;
+               end loop;
+            end;
+
+            --  Check Body_Suffix
+
+            declare
+               Impl_Suffixs : Array_Element_Id :=
+                                Util.Value_Of
+                                  (Name_Body_Suffix,
+                                   Naming.Decl.Arrays);
 
-            Data.Naming.Specification_Suffix := Util.Value_Of
-                                                 (Name_Specification_Suffix,
-                                                  Naming.Decl.Arrays);
+               Suffix  : Array_Element_Id;
+               Element : Array_Element;
+               Suffix2 : Array_Element_Id;
+
+            begin
+               --  If some suffixs have been specified, we make sure that
+               --  for each language for which a default suffix has been
+               --  specified, there is a suffix specified, either the one
+               --  in the project file or if there were noe, the default.
+
+               if Impl_Suffixs /= No_Array_Element then
+                  Suffix := Data.Naming.Body_Suffix;
+
+                  while Suffix /= No_Array_Element loop
+                     Element := Array_Elements.Table (Suffix);
+                     Suffix2 := Impl_Suffixs;
+
+                     while Suffix2 /= No_Array_Element loop
+                        exit when Array_Elements.Table (Suffix2).Index =
+                          Element.Index;
+                        Suffix2 := Array_Elements.Table (Suffix2).Next;
+                     end loop;
+
+                     --  There is a registered default suffix, but no
+                     --  suffix specified in the project file.
+                     --  Add the default to the array.
+
+                     if Suffix2 = No_Array_Element then
+                        Array_Elements.Increment_Last;
+                        Array_Elements.Table (Array_Elements.Last) :=
+                          (Index => Element.Index,
+                           Src_Index => Element.Src_Index,
+                           Index_Case_Sensitive => False,
+                           Value => Element.Value,
+                           Next  => Impl_Suffixs);
+                        Impl_Suffixs := Array_Elements.Last;
+                     end if;
+
+                     Suffix := Element.Next;
+                  end loop;
+
+                  --  Put the resulting array as the implementation suffixs
+
+                  Data.Naming.Body_Suffix := Impl_Suffixs;
+               end if;
+            end;
 
             declare
-               Current : Array_Element_Id := Data.Naming.Specification_Suffix;
+               Current : Array_Element_Id := Data.Naming.Body_Suffix;
                Element : Array_Element;
 
             begin
                while Current /= No_Array_Element loop
                   Element := Array_Elements.Table (Current);
-                  String_To_Name_Buffer (Element.Value.Value);
+                  Get_Name_String (Element.Value.Value);
+
+                  if Name_Len = 0 then
+                     Error_Msg
+                       (Project,
+                        "Body_Suffix cannot be empty",
+                        Element.Value.Location);
+                  end if;
+
+                  Array_Elements.Table (Current) := Element;
+                  Current := Element.Next;
+               end loop;
+            end;
+
+            --  Get the exceptions, if any
+
+            Data.Naming.Specification_Exceptions :=
+              Util.Value_Of
+                (Name_Specification_Exceptions,
+                 In_Arrays => Naming.Decl.Arrays);
+
+            Data.Naming.Implementation_Exceptions :=
+              Util.Value_Of
+                (Name_Implementation_Exceptions,
+                 In_Arrays => Naming.Decl.Arrays);
+         end if;
+      end;
+
+      Projects.Table (Project) := Data;
+   end Language_Independent_Check;
+
+   ----------------------
+   -- Locate_Directory --
+   ----------------------
+
+   procedure Locate_Directory
+     (Name    : Name_Id;
+      Parent  : Name_Id;
+      Dir     : out Name_Id;
+      Display : out Name_Id)
+   is
+      The_Name   : constant String := Get_Name_String (Name);
+      The_Parent : constant String :=
+                     Get_Name_String (Parent) & Directory_Separator;
+      The_Parent_Last : constant Natural :=
+                     Compute_Directory_Last (The_Parent);
+
+   begin
+      if Current_Verbosity = High then
+         Write_Str ("Locate_Directory (""");
+         Write_Str (The_Name);
+         Write_Str (""", """);
+         Write_Str (The_Parent);
+         Write_Line (""")");
+      end if;
+
+      Dir     := No_Name;
+      Display := No_Name;
+
+      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);
+
+               Canonical_Path : constant String :=
+                                  Normalize_Pathname
+                                    (Normed,
+                                     Resolve_Links  => True,
+                                     Case_Sensitive => False);
+
+            begin
+               Name_Len := Normed'Length;
+               Name_Buffer (1 .. Name_Len) := Normed;
+               Display := Name_Find;
+
+               Name_Len := Canonical_Path'Length;
+               Name_Buffer (1 .. Name_Len) := Canonical_Path;
+               Dir := Name_Find;
+            end;
+         end if;
+
+      else
+         declare
+            Full_Path : constant String :=
+                          The_Parent (The_Parent'First .. The_Parent_Last) &
+                          The_Name;
+
+         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);
+
+               begin
+                  Name_Len := Normed'Length;
+                  Name_Buffer (1 .. Name_Len) := Normed;
+                  Display := Name_Find;
+
+                  Name_Len := Canonical_Path'Length;
+                  Name_Buffer (1 .. Name_Len) := Canonical_Path;
+                  Dir := Name_Find;
+               end;
+            end if;
+         end;
+      end if;
+   end Locate_Directory;
+
+   ---------------------------
+   -- Other_Languages_Check --
+   ---------------------------
+
+   procedure Other_Languages_Check
+     (Project      : Project_Id;
+      Report_Error : Put_Line_Access) is
+
+      Data         : Project_Data;
+
+      Languages    : Variable_Value := Nil_Variable_Value;
+
+   begin
+      Language_Independent_Check (Project, Report_Error);
+
+      Error_Report := Report_Error;
+
+      Data      := Projects.Table (Project);
+      Languages := Prj.Util.Value_Of (Name_Languages, Data.Decl.Attributes);
+
+      Data.Other_Sources_Present := Data.Source_Dirs /= Nil_String;
+
+      if Data.Other_Sources_Present then
+         --  Check if languages other than Ada are specified in this project
+
+         if Languages.Default then
+            --  Attribute Languages is not specified. So, it defaults to
+            --  a project of language Ada only.
+
+            Data.Languages (Lang_Ada) := True;
+
+            --  No sources of languages other than Ada
+
+            Data.Other_Sources_Present := False;
+
+         else
+            declare
+               Current        : String_List_Id := Languages.Values;
+               Element        : String_Element;
+               OK             : Boolean := False;
+            begin
+               --  Assumethat there is no language other than Ada specified.
+               --  If in fact there is at least one, we will set back
+               --  Other_Sources_Present to True.
+
+               Data.Other_Sources_Present := False;
+
+               --  Look through all the languages specified in attribute
+               --  Languages, if any
+
+               while Current /= Nil_String loop
+                  Element := String_Elements.Table (Current);
+                  Get_Name_String (Element.Value);
+                  To_Lower (Name_Buffer (1 .. Name_Len));
+                  OK := False;
+
+                  --  Check if it is a known language
+
+                  Lang_Loop : for Lang in Programming_Language loop
+                     if
+                       Name_Buffer (1 .. Name_Len) = Lang_Names (Lang).all
+                     then
+                        --  Yes, this is a known language
+
+                        OK := True;
+
+                        --  Indicate the presence of this language
+                        Data.Languages (Lang) := True;
+
+                        --  If it is a language other than Ada, indicate that
+                        --  there should be some sources of a language other
+                        --  than Ada.
+
+                        if Lang /= Lang_Ada then
+                           Data.Other_Sources_Present := True;
+                        end if;
+
+                        exit Lang_Loop;
+                     end if;
+                  end loop Lang_Loop;
+
+                  --  We don't support this language: report an error
+
+                  if not OK then
+                     Error_Msg_Name_1 := Element.Value;
+                     Error_Msg
+                       (Project,
+                        "unknown programming language {",
+                        Element.Location);
+                  end if;
+
+                  Current := Element.Next;
+               end loop;
+            end;
+         end if;
+      end if;
+
+      --  If there may be some sources, look for them
+
+      if Data.Other_Sources_Present then
+         --  Set Source_Present to False. It will be set back to True whenever
+         --  a source is found.
+
+         Data.Other_Sources_Present := False;
+
+         for Lang in Other_Programming_Language loop
+            --  For each language (other than Ada) in the project file
+
+            if Data.Languages (Lang) then
+               --  Reset the indication that there are sources of this
+               --  language. It will be set back to True whenever we find a
+               --  source of the language.
+
+               Data.Languages (Lang) := False;
+
+               --  First, get the source suffix for the language
+
+               Data.Impl_Suffixes (Lang) := Suffix_For (Lang, Data.Naming);
+
+               --  Then, deal with the naming exceptions, if any
+
+               Source_Names.Reset;
+
+               declare
+                  Naming_Exceptions : constant Variable_Value :=
+                    Value_Of
+                      (Index     => Lang_Name_Ids (Lang),
+                       Src_Index => 0,
+                       In_Array  => Data.Naming.Implementation_Exceptions);
+                  Element_Id : String_List_Id;
+                  Element    : String_Element;
+                  File_Id : Name_Id;
+                  Source_Found : Boolean := False;
+               begin
+                  --  If there are naming exceptions, look through them one
+                  --  by one.
+
+                  if Naming_Exceptions /= Nil_Variable_Value then
+                     Element_Id := Naming_Exceptions.Values;
+
+                     while Element_Id /= Nil_String loop
+                        Element := String_Elements.Table (Element_Id);
+                        Get_Name_String (Element.Value);
+                        Canonical_Case_File_Name (Name_Buffer (1 .. Name_Len));
+                        File_Id := Name_Find;
+
+                        --  Put each naming exception in the Source_Names
+                        --  hash table, but if there are repetition, don't
+                        --  bother after the first instance.
+
+                        if Source_Names.Get (File_Id) = No_Name_Location then
+                           Source_Found := True;
+                           Source_Names.Set
+                             (File_Id,
+                              (Name     => File_Id,
+                               Location => Element.Location,
+                               Found    => False));
+                        end if;
+
+                        Element_Id := Element.Next;
+                     end loop;
+
+                     --  If there is at least one naming exception, record
+                     --  those that are found in the source directories.
+
+                     if Source_Found then
+                        Record_Other_Sources
+                          (Project           => Project,
+                           Data              => Data,
+                           Language          => Lang,
+                           Naming_Exceptions => True);
+                     end if;
+
+                  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.
+
+               declare
+                  Sources : constant Variable_Value :=
+                    Util.Value_Of
+                      (Name_Source_Files,
+                       Data.Decl.Attributes);
+
+                  Source_List_File : constant Variable_Value :=
+                    Util.Value_Of
+                      (Name_Source_List_File,
+                       Data.Decl.Attributes);
+
+               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 not Sources.Default then
+                     if not Source_List_File.Default then
+                        Error_Msg
+                          (Project,
+                           "?both variables source_files and " &
+                           "source_list_file are present",
+                           Source_List_File.Location);
+                     end if;
+
+                     --  Sources is a list of file names
+
+                     declare
+                        Current        : String_List_Id := Sources.Values;
+                        Element        : String_Element;
+                        Location       : Source_Ptr;
+                        Name           : Name_Id;
+
+                     begin
+                        Source_Names.Reset;
+
+                        --  Put all the sources in the Source_Names hash
+                        --  table.
+
+                        while Current /= Nil_String loop
+                           Element := String_Elements.Table (Current);
+                           Get_Name_String (Element.Value);
+                           Canonical_Case_File_Name
+                             (Name_Buffer (1 .. Name_Len));
+                           Name := Name_Find;
 
-                  if Name_Len = 0 then
-                     Error_Msg
-                       ("Specification_Suffix cannot be empty",
-                        Element.Value.Location);
-                  end if;
+                           --  If the element has no location, then use the
+                           --  location of Sources to report possible errors.
 
-                  Array_Elements.Table (Current) := Element;
-                  Current := Element.Next;
-               end loop;
-            end;
+                           if Element.Location = No_Location then
+                              Location := Sources.Location;
 
-            --  Check Implementation_Suffix
+                           else
+                              Location := Element.Location;
+                           end if;
 
-            Data.Naming.Implementation_Suffix := Util.Value_Of
-                                          (Name_Implementation_Suffix,
-                                           Naming.Decl.Arrays);
+                           Source_Names.Set
+                             (K => Name,
+                              E =>
+                                (Name     => Name,
+                                 Location => Location,
+                                 Found    => False));
 
-            declare
-               Current : Array_Element_Id := Data.Naming.Implementation_Suffix;
-               Element : Array_Element;
+                           Current := Element.Next;
+                        end loop;
 
-            begin
-               while Current /= No_Array_Element loop
-                  Element := Array_Elements.Table (Current);
-                  String_To_Name_Buffer (Element.Value.Value);
+                        --  And look for their directories
 
-                  if Name_Len = 0 then
-                     Error_Msg
-                       ("Implementation_Suffix cannot be empty",
-                        Element.Value.Location);
-                  end if;
+                        Record_Other_Sources
+                          (Project           => Project,
+                           Data              => Data,
+                           Language          => Lang,
+                           Naming_Exceptions => False);
+                     end;
 
-                  Array_Elements.Table (Current) := Element;
-                  Current := Element.Next;
-               end loop;
-            end;
+                     --  No source_files specified.
+                     --  We check if Source_List_File has been specified.
 
-         end if;
-      end;
+                  elsif not Source_List_File.Default then
 
-      Projects.Table (Project) := Data;
-   end Language_Independent_Check;
+                     --  Source_List_File is the name of the file
+                     --  that contains the source file names
 
-   ----------------------
-   -- Locate_Directory --
-   ----------------------
+                     declare
+                        Source_File_Path_Name : constant String :=
+                          Path_Name_Of
+                            (Source_List_File.Value,
+                             Data.Directory);
 
-   function Locate_Directory
-     (Name   : Name_Id;
-      Parent : Name_Id)
-      return   Name_Id
-   is
-      The_Name   : constant String := Get_Name_String (Name);
-      The_Parent : constant String :=
-                     Get_Name_String (Parent) & Dir_Sep;
+                     begin
+                        if Source_File_Path_Name'Length = 0 then
+                           Err_Vars.Error_Msg_Name_1 := Source_List_File.Value;
+                           Error_Msg
+                             (Project,
+                              "file with sources { does not exist",
+                              Source_List_File.Location);
 
-      The_Parent_Last : Positive := The_Parent'Last;
+                        else
+                           --  Read the file, putting each source in the
+                           --  Source_Names hash table.
 
-   begin
-      if The_Parent'Length > 1
-        and then (The_Parent (The_Parent_Last - 1) = Dir_Sep
-                    or else The_Parent (The_Parent_Last - 1) = '/')
-      then
-         The_Parent_Last := The_Parent_Last - 1;
-      end if;
+                           Get_Sources_From_File
+                             (Source_File_Path_Name,
+                              Source_List_File.Location,
+                              Project);
 
-      if Current_Verbosity = High then
-         Write_Str ("Locate_Directory (""");
-         Write_Str (The_Name);
-         Write_Str (""", """);
-         Write_Str (The_Parent);
-         Write_Line (""")");
-      end if;
+                           --  And look for their directories.
 
-      if Is_Absolute_Path (The_Name) then
-         if Is_Directory (The_Name) then
-            return Name;
-         end if;
+                           Record_Other_Sources
+                             (Project           => Project,
+                              Data              => Data,
+                              Language          => Lang,
+                              Naming_Exceptions => False);
+                        end if;
+                     end;
 
-      else
-         declare
-            Full_Path : constant String :=
-                          The_Parent (The_Parent'First .. The_Parent_Last) &
-                                                                     The_Name;
+                  else
+                     --  Neither Source_Files nor Source_List_File has been
+                     --  specified. Find all the files that satisfy
+                     --  the naming scheme in all the source directories.
+                     --  All the naming exceptions that effectively exist are
+                     --  also part of the source of this language.
 
-         begin
-            if Is_Directory (Full_Path) then
-               Name_Len := Full_Path'Length;
-               Name_Buffer (1 .. Name_Len) := Full_Path;
-               return Name_Find;
-            end if;
-         end;
+                     Find_Sources (Project, Data, Lang);
+                  end if;
 
+               end;
+            end if;
+         end loop;
       end if;
 
-      return No_Name;
-   end Locate_Directory;
+      --  Finally, get the mains, if any
+
+      Get_Mains (Project, Data);
+
+      Projects.Table (Project) := Data;
+
+   end Other_Languages_Check;
 
    ------------------
    -- Path_Name_Of --
    ------------------
 
    function Path_Name_Of
-     (File_Name : String_Id;
-      Directory : String_Id)
-      return      String
+     (File_Name : Name_Id;
+      Directory : Name_Id) return String
    is
       Result : String_Access;
+      The_Directory : constant String := Get_Name_String (Directory);
 
    begin
-      String_To_Name_Buffer (File_Name);
-
-      declare
-         The_File_Name : constant String := Name_Buffer (1 .. Name_Len);
-
-      begin
-         String_To_Name_Buffer (Directory);
-         Result := Locate_Regular_File
-           (File_Name => The_File_Name,
-            Path      => Name_Buffer (1 .. Name_Len));
-      end;
+      Get_Name_String (File_Name);
+      Result := Locate_Regular_File
+        (File_Name => Name_Buffer (1 .. Name_Len),
+         Path      => The_Directory);
 
       if Result = null then
          return "";
@@ -2181,159 +4355,505 @@ package body Prj.Nmsc is
       end if;
    end Path_Name_Of;
 
-   function Path_Name_Of
-     (File_Name : String_Id;
-      Directory : Name_Id)
-      return      String
+   -------------------------------
+   -- Prepare_Ada_Naming_Exceptions --
+   -------------------------------
+
+   procedure Prepare_Ada_Naming_Exceptions
+     (List : Array_Element_Id;
+      Kind : Spec_Or_Body)
    is
-      Result : String_Access;
-      The_Directory : constant String := Get_Name_String (Directory);
+      Current : Array_Element_Id := List;
+      Element : Array_Element;
+
+      Unit : Unit_Info;
 
    begin
-      String_To_Name_Buffer (File_Name);
-      Result := Locate_Regular_File
-        (File_Name => Name_Buffer (1 .. Name_Len),
-         Path      => The_Directory);
+      --  Traverse the list
+
+      while Current /= No_Array_Element loop
+         Element := Array_Elements.Table (Current);
+
+         if Element.Index /= No_Name then
+            Unit :=
+              (Kind => Kind,
+               Unit => Element.Index,
+               Next => No_Ada_Naming_Exception);
+            Reverse_Ada_Naming_Exceptions.Set
+              (Unit, (Element.Value.Value, Element.Value.Index));
+            Unit.Next := Ada_Naming_Exceptions.Get (Element.Value.Value);
+            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);
+         end if;
 
-      if Result = null then
-         return "";
-      else
-         Canonical_Case_File_Name (Result.all);
-         return Result.all;
-      end if;
-   end Path_Name_Of;
+         Current := Element.Next;
+      end loop;
+   end Prepare_Ada_Naming_Exceptions;
 
-   -------------------
-   -- Record_Source --
-   -------------------
+   ---------------------
+   -- Project_Extends --
+   ---------------------
 
-   procedure Record_Source
-     (File_Name        : Name_Id;
-      Path_Name        : Name_Id;
-      Project          : Project_Id;
-      Data             : in out Project_Data;
-      Location         : Source_Ptr;
-      Current_Source   : in out String_List_Id)
+   function Project_Extends
+     (Extending : Project_Id;
+      Extended  : Project_Id) 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 := Projects.Table (Current).Extends;
+      end loop;
+   end Project_Extends;
+
+   -----------------------
+   -- Record_Ada_Source --
+   -----------------------
+
+   procedure Record_Ada_Source
+     (File_Name       : Name_Id;
+      Path_Name       : Name_Id;
+      Project         : Project_Id;
+      Data            : in out Project_Data;
+      Location        : Source_Ptr;
+      Current_Source  : in out String_List_Id;
+      Source_Recorded : in out Boolean;
+      Follow_Links    : Boolean)
    is
+      Canonical_File_Name : Name_Id;
+      Canonical_Path_Name : Name_Id;
+      Exception_Id : Ada_Naming_Exception_Id;
       Unit_Name    : Name_Id;
       Unit_Kind    : Spec_Or_Body;
+      Unit_Index   : Int := 0;
+      Info         : Unit_Info;
+      Name_Index   : Name_And_Index;
       Needs_Pragma : Boolean;
-      The_Location : Source_Ptr := Location;
+
+      The_Location    : Source_Ptr     := Location;
+      Previous_Source : constant String_List_Id := Current_Source;
+      Except_Name     : Name_And_Index := No_Name_And_Index;
+
+      Unit_Prj : Unit_Project;
+
+      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;
+
+      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;
+
       --  Find out the unit name, the unit kind and if it needs
       --  a specific SFN pragma.
 
       Get_Unit
-        (File_Name    => File_Name,
-         Naming       => Data.Naming,
-         Unit_Name    => Unit_Name,
-         Unit_Kind    => Unit_Kind,
-         Needs_Pragma => Needs_Pragma);
-
-      if Unit_Name = No_Name then
+        (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
+      then
          if Current_Verbosity = High then
             Write_Str  ("   """);
-            Write_Str  (Get_Name_String (File_Name));
+            Write_Str  (Get_Name_String (Canonical_File_Name));
             Write_Line (""" is not a valid source file name (ignored).");
          end if;
 
       else
-         --  Put the file name in the list of sources of the project
 
-         String_Elements.Increment_Last;
-         Get_Name_String (File_Name);
-         Start_String;
-         Store_String_Chars (Name_Buffer (1 .. Name_Len));
-         String_Elements.Table (String_Elements.Last) :=
-           (Value    => End_String,
-            Location => No_Location,
-            Next     => Nil_String);
+         --  Check to see if the source has been hidden by an exception,
+         --  but only if it is not an exception.
 
-         if Current_Source = Nil_String then
-            Data.Sources := String_Elements.Last;
+         if not Needs_Pragma then
+            Except_Name :=
+              Reverse_Ada_Naming_Exceptions.Get
+                ((Unit_Kind, Unit_Name, No_Ada_Naming_Exception));
 
-         else
-            String_Elements.Table (Current_Source).Next :=
-              String_Elements.Last;
+            if Except_Name /= No_Name_And_Index then
+               if Current_Verbosity = High then
+                  Write_Str  ("   """);
+                  Write_Str  (Get_Name_String (Canonical_File_Name));
+                  Write_Str  (""" contains a unit that is found in """);
+                  Write_Str  (Get_Name_String (Except_Name.Name));
+                  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.
+
+               return;
+            end if;
          end if;
 
-         Current_Source := String_Elements.Last;
+         loop
+            if Exception_Id /= No_Ada_Naming_Exception then
+               Info := Ada_Naming_Exception_Table.Table (Exception_Id);
+               Exception_Id := Info.Next;
+               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;
+            end if;
+            --  Put the file name in the list of sources of the project
+
+            if not File_Name_Recorded then
+               String_Elements.Increment_Last;
+               String_Elements.Table (String_Elements.Last) :=
+                 (Value         => Canonical_File_Name,
+                  Display_Value => File_Name,
+                  Location      => No_Location,
+                  Flag          => False,
+                  Next          => Nil_String,
+                  Index         => Unit_Index);
+            end if;
 
-         --  Put the unit in unit list
+            if Current_Source = Nil_String then
+               Data.Sources := String_Elements.Last;
 
-         declare
-            The_Unit      : Unit_Id := Units_Htable.Get (Unit_Name);
-            The_Unit_Data : Unit_Data;
+            else
+               String_Elements.Table (Current_Source).Next :=
+                 String_Elements.Last;
+            end if;
+
+            Current_Source := String_Elements.Last;
+
+            --  Put the unit in unit list
+
+            declare
+               The_Unit      : Unit_Id := Units_Htable.Get (Unit_Name);
+               The_Unit_Data : Unit_Data;
+
+            begin
+               if Current_Verbosity = High then
+                  Write_Str  ("Putting ");
+                  Write_Str  (Get_Name_String (Unit_Name));
+                  Write_Line (" in the unit list.");
+               end if;
+
+               --  The unit is already in the list, but may be it is
+               --  only the other unit kind (spec or body), or what is
+               --  in the unit list is a unit of a project we are extending.
+
+               if The_Unit /= Prj.Com.No_Unit then
+                  The_Unit_Data := Units.Table (The_Unit);
+
+                  if The_Unit_Data.File_Names (Unit_Kind).Name = No_Name
+                    or else Project_Extends
+                      (Data.Extends,
+                       The_Unit_Data.File_Names (Unit_Kind).Project)
+                  then
+                     if The_Unit_Data.File_Names (Unit_Kind).Path = Slash then
+                        Remove_Forbidden_File_Name
+                          (The_Unit_Data.File_Names (Unit_Kind).Name);
+                     end if;
+
+                     --  Record the file name in the hash table Files_Htable
+
+                     Unit_Prj := (Unit => The_Unit, Project => Project);
+                     Files_Htable.Set (Canonical_File_Name, Unit_Prj);
+
+                     The_Unit_Data.File_Names (Unit_Kind) :=
+                       (Name         => Canonical_File_Name,
+                        Index        => Unit_Index,
+                        Display_Name => File_Name,
+                        Path         => Canonical_Path_Name,
+                        Display_Path => Path_Name,
+                        Project      => Project,
+                        Needs_Pragma => Needs_Pragma);
+                     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)
+                  then
+                     if Previous_Source = Nil_String then
+                        Data.Sources := Nil_String;
+                     else
+                        String_Elements.Table (Previous_Source).Next :=
+                          Nil_String;
+                        String_Elements.Decrement_Last;
+                     end if;
+
+                     Current_Source := Previous_Source;
+
+                  else
+                     --  It is an error to have two units with the same name
+                     --  and the same kind (spec or body).
+
+                     if The_Location = No_Location then
+                        The_Location := Projects.Table (Project).Location;
+                     end if;
+
+                     Err_Vars.Error_Msg_Name_1 := Unit_Name;
+                     Error_Msg (Project, "duplicate source {", The_Location);
+
+                     Err_Vars.Error_Msg_Name_1 :=
+                       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;
+                     Error_Msg
+                       (Project, "\   project file {, {", The_Location);
+
+                     Err_Vars.Error_Msg_Name_1 :=
+                       Projects.Table (Project).Name;
+                     Err_Vars.Error_Msg_Name_2 := Canonical_Path_Name;
+                     Error_Msg
+                       (Project, "\   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.
+
+                  Unit_Prj := Files_Htable.Get (Canonical_File_Name);
+
+                  if not File_Name_Recorded and then
+                    Unit_Prj /= No_Unit_Project
+                  then
+                     Error_Msg_Name_1 := File_Name;
+                     Error_Msg_Name_2 :=
+                       Projects.Table (Unit_Prj.Project).Name;
+                     Error_Msg
+                       (Project,
+                        "{ is already a source of project {",
+                        Location);
+
+                  else
+                     Units.Increment_Last;
+                     The_Unit := Units.Last;
+                     Units_Htable.Set (Unit_Name, The_Unit);
+                     Unit_Prj := (Unit => The_Unit, Project => Project);
+                     Files_Htable.Set (Canonical_File_Name, Unit_Prj);
+                     The_Unit_Data.Name := Unit_Name;
+                     The_Unit_Data.File_Names (Unit_Kind) :=
+                       (Name         => Canonical_File_Name,
+                        Index        => Unit_Index,
+                        Display_Name => File_Name,
+                        Path         => Canonical_Path_Name,
+                        Display_Path => Path_Name,
+                        Project      => Project,
+                        Needs_Pragma => Needs_Pragma);
+                     Units.Table (The_Unit) := The_Unit_Data;
+                     Source_Recorded := True;
+                  end if;
+               end if;
+            end;
+
+            exit when Exception_Id = No_Ada_Naming_Exception;
+            File_Name_Recorded := True;
+         end loop;
+      end if;
+   end Record_Ada_Source;
+
+   --------------------------
+   -- Record_Other_Sources --
+   --------------------------
+
+   procedure Record_Other_Sources
+     (Project           : Project_Id;
+      Data              : in out Project_Data;
+      Language          : Programming_Language;
+      Naming_Exceptions : Boolean)
+   is
+      Source_Dir : String_List_Id := Data.Source_Dirs;
+      Element    : String_Element;
+      Path       : Name_Id;
 
+      Dir      : Dir_Type;
+      Canonical_Name : Name_Id;
+      Name_Str : String (1 .. 1_024);
+      Last     : Natural := 0;
+      NL       : Name_Location;
+
+      First_Error : Boolean := True;
+
+      Suffix : constant String :=
+        Get_Name_String (Data.Impl_Suffixes (Language));
+
+   begin
+      while Source_Dir /= Nil_String loop
+         Element := String_Elements.Table (Source_Dir);
+
+         declare
+            Dir_Path : constant String := Get_Name_String (Element.Value);
          begin
             if Current_Verbosity = High then
-               Write_Str  ("Putting ");
-               Write_Str  (Get_Name_String (Unit_Name));
-               Write_Line (" in the unit list.");
+               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 ");
+               Write_Line (Lang_Display_Names (Language).all);
             end if;
 
-            --  The unit is already in the list, but may be it 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.
+            Open (Dir, Dir_Path);
 
-            if The_Unit /= Prj.Com.No_Unit then
-               The_Unit_Data := Units.Table (The_Unit);
+            loop
+               Read (Dir, Name_Str, Last);
+               exit when Last = 0;
 
-               if The_Unit_Data.File_Names (Unit_Kind).Name = No_Name
-                 or else (Data.Modifies /= No_Project
-                            and then
-                          The_Unit_Data.File_Names (Unit_Kind).Project =
-                                                            Data.Modifies)
+               if Is_Regular_File
+                 (Dir_Path & Directory_Separator & Name_Str (1 .. Last))
                then
-                  The_Unit_Data.File_Names (Unit_Kind) :=
-                    (Name         => File_Name,
-                     Path         => Path_Name,
-                     Project      => Project,
-                     Needs_Pragma => Needs_Pragma);
-                  Units.Table (The_Unit) := The_Unit_Data;
+                  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);
 
-               else
-                  --  It is an error to have two units with the same name
-                  --  and the same kind (spec or body).
+                  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,
+                              "{ is found in several source directories",
+                              NL.Location);
+                        end if;
 
-                  if The_Location = No_Location then
-                     The_Location := Projects.Table (Project).Location;
+                     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,
+                           Data             => Data,
+                           Location         => NL.Location,
+                           Language         => Language,
+                           Suffix           => Suffix,
+                           Naming_Exception => Naming_Exceptions);
+                     end if;
                   end if;
+               end if;
+            end loop;
+
+            Close (Dir);
+         end;
 
-                  Error_Msg_Name_1 := Unit_Name;
-                  Error_Msg ("duplicate source {", The_Location);
+         Source_Dir := Element.Next;
+      end loop;
 
-                  Error_Msg_Name_1 :=
-                    Projects.Table
-                      (The_Unit_Data.File_Names (Unit_Kind).Project).Name;
-                  Error_Msg_Name_2 :=
-                    The_Unit_Data.File_Names (Unit_Kind).Path;
-                  Error_Msg ("\   project file {, {", The_Location);
+      if not Naming_Exceptions then
 
-                  Error_Msg_Name_1 := Projects.Table (Project).Name;
-                  Error_Msg_Name_2 := Path_Name;
-                  Error_Msg ("\   project file {, {", The_Location);
+         NL := Source_Names.Get_First;
 
-               end if;
+         --  It is an error if a source file name in a source list or
+         --  in a source list file is not found.
 
-            --  It is a new unit, create a new record
+         while NL /= No_Name_Location loop
+            if not NL.Found then
+               Err_Vars.Error_Msg_Name_1 := NL.Name;
 
-            else
-               Units.Increment_Last;
-               The_Unit := Units.Last;
-               Units_Htable.Set (Unit_Name, The_Unit);
-               The_Unit_Data.Name := Unit_Name;
-               The_Unit_Data.File_Names (Unit_Kind) :=
-                 (Name         => File_Name,
-                  Path         => Path_Name,
-                  Project      => Project,
-                  Needs_Pragma => Needs_Pragma);
-               Units.Table (The_Unit) := The_Unit_Data;
+               if First_Error then
+                  Error_Msg
+                    (Project,
+                     "source file { cannot be found",
+                     NL.Location);
+                  First_Error := False;
+
+               else
+                  Error_Msg
+                    (Project,
+                     "\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 := 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
+                     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;
+               end if;
+            end loop;
          end;
       end if;
-   end Record_Source;
+   end Record_Other_Sources;
 
    ----------------------
    -- Show_Source_Dirs --
@@ -2356,4 +4876,35 @@ package body Prj.Nmsc is
       Write_Line ("end Source_Dirs.");
    end Show_Source_Dirs;
 
+   ----------------
+   -- Suffix_For --
+   ----------------
+
+   function Suffix_For
+     (Language : Programming_Language;
+      Naming   : Naming_Data) return Name_Id
+   is
+      Suffix : constant Variable_Value :=
+        Value_Of
+          (Index     => Lang_Name_Ids (Language),
+           Src_Index => 0,
+           In_Array  => Naming.Body_Suffix);
+   begin
+      --  If no suffix for this language is found in package Naming, use the
+      --  default.
+
+      if Suffix = Nil_Variable_Value then
+         Name_Len := 0;
+         Add_Str_To_Name_Buffer (Lang_Suffixes (Language).all);
+
+      --  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;
+
 end Prj.Nmsc;