-- --
-- B o d y --
-- --
--- Copyright (C) 2000-2008, Free Software Foundation, Inc. --
+-- Copyright (C) 2000-2009, Free Software Foundation, Inc. --
-- --
-- GNAT is free software; you can redistribute it and/or modify it under --
-- terms of the GNU General Public License as published by the Free Soft- --
with GNAT.HTable;
with Err_Vars; use Err_Vars;
-with Fmap; use Fmap;
with Hostparm;
with MLib.Tgt;
with Opt; use Opt;
Except : Boolean := False;
Found : Boolean := False;
end record;
- -- Information about file names found in string list attribute
- -- Source_Files or in a source list file, stored in hash table
+ -- Information about file names found in string list attribute:
+ -- Source_Files or in a source list file, stored in hash table.
-- Source_Names, used by procedure Get_Path_Names_And_Record_Sources.
+ -- Except is set to True if source is a naming exception in the project.
No_Name_Location : constant Name_Location :=
(Name => No_File,
-- Hash table to store file names found in string list attribute
-- Source_Files or in a source list file, stored in hash table
-- Source_Names, used by procedure Get_Path_Names_And_Record_Sources.
+ --
+ -- ??? Should not be a global table, as it is needed only when processing
+ -- a project
-- More documentation needed on what unit exceptions are about ???
Spec : File_Name_Type;
Impl : File_Name_Type;
end record;
+ -- Record special naming schemes for Ada units (name of spec file and name
+ -- of implementation file).
No_Unit_Exception : constant Unit_Exception :=
(Name => No_Name,
Key => Name_Id,
Hash => Hash,
Equal => "=");
- -- Hash table to store the unit exceptions
+ -- Hash table to store the unit exceptions.
+ -- ??? Seems to be used only by the multi_lang mode
+ -- ??? Should not be a global array, but stored in the project_data
package Recursive_Dirs is new GNAT.HTable.Simple_HTable
(Header_Num => Header_Num,
end record;
-- Comment needed???
- -- Why is the following commented out ???
- -- 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,
Equal => "=");
-- A hash table to store naming exceptions for Ada. For each file name
-- there is one or several unit in table Ada_Naming_Exception_Table.
+ -- ??? This is for ada_only mode, we should be able to merge with
+ -- Unit_Exceptions table, used by multi_lang mode.
package Object_File_Names is new GNAT.HTable.Simple_HTable
(Header_Num => Header_Num,
procedure Find_Excluded_Sources
(Project : Project_Id;
- In_Tree : Project_Tree_Ref;
- Data : Project_Data);
+ In_Tree : Project_Tree_Ref);
-- Find the list of files that should not be considered as source files
-- for this project. Sets the list in the Excluded_Sources_Htable.
+ procedure Override_Kind (Source : Source_Id; Kind : Source_Kind);
+ -- Override the reference kind for a source file. This properly updates
+ -- the unit data if necessary.
+
function Hash (Unit : Unit_Info) return Header_Num;
type Name_And_Index is record
end record;
No_Name_And_Index : constant Name_And_Index :=
(Name => No_Name, Index => 0);
+ -- Name of a unit, and its index inside the source file. The first unit has
+ -- index 1 (see doc for pragma Source_File_Name), but the index might be
+ -- set to 0 when the source file contains a single unit.
package Reverse_Ada_Naming_Exceptions is new GNAT.HTable.Simple_HTable
(Header_Num => Header_Num,
-- A table to check if a unit with an exceptional name will hide a source
-- with a file name following the naming convention.
+ procedure Load_Naming_Exceptions
+ (Project : Project_Id;
+ In_Tree : Project_Tree_Ref);
+ -- All source files in Data.First_Source are considered as naming
+ -- exceptions, and copied into the Source_Names and Unit_Exceptions tables
+ -- as appropriate.
+
procedure Add_Source
(Id : out Source_Id;
- Data : in out Project_Data;
In_Tree : Project_Tree_Ref;
Project : Project_Id;
- Lang : Name_Id;
- Lang_Id : Language_Index;
+ Lang_Id : Language_Ptr;
Kind : Source_Kind;
File_Name : File_Name_Type;
Display_File : File_Name_Type;
- Lang_Kind : Language_Kind;
Naming_Exception : Boolean := False;
- Path : Path_Name_Type := No_Path;
- Display_Path : Path_Name_Type := No_Path;
- Alternate_Languages : Alternate_Language_Id := No_Alternate_Language;
- Other_Part : Source_Id := No_Source;
+ Path : Path_Information := No_Path_Information;
+ Alternate_Languages : Language_List := null;
Unit : Name_Id := No_Name;
Index : Int := 0;
Source_To_Replace : Source_Id := No_Source);
-- If Source_To_Replace is specified, it points to the source in the
-- extended project that the new file is overriding.
+ function Canonical_Case_File_Name (Name : Name_Id) return File_Name_Type;
+ -- Same as Osint.Canonical_Case_File_Name but applies to Name_Id.
+ -- This alters Name_Buffer
+
+ function Suffix_Matches
+ (Filename : String;
+ Suffix : File_Name_Type) return Boolean;
+ -- True if the file name ends with the given suffix. Always returns False
+ -- if Suffix is No_Name.
+
+ procedure Replace_Into_Name_Buffer
+ (Str : String;
+ Pattern : String;
+ Replacement : Character);
+ -- Copy Str into Name_Buffer, replacing Pattern with Replacement. Str is
+ -- converted to lower-case at the same time.
+
function ALI_File_Name (Source : String) return String;
-- Return the ALI file name corresponding to a source
procedure Check_Ada_Name (Name : String; Unit : out Name_Id);
-- Check that a name is a valid Ada unit name
- procedure Check_Naming_Schemes
- (Data : in out Project_Data;
- Project : Project_Id;
- In_Tree : Project_Tree_Ref);
- -- Check the naming scheme part of Data
-
- procedure Check_Ada_Naming_Scheme_Validity
- (Project : Project_Id;
- In_Tree : Project_Tree_Ref;
- Naming : Naming_Data);
- -- Check that the package Naming is correct
+ procedure Check_Package_Naming
+ (Project : Project_Id;
+ In_Tree : Project_Tree_Ref;
+ Is_Config_File : Boolean;
+ Bodies : out Array_Element_Id;
+ Specs : out Array_Element_Id);
+ -- Check the naming scheme part of Data, and initialize the naming scheme
+ -- data in the config of the various languages. Is_Config_File should be
+ -- True if Project is a config file (.cgpr) This also returns the naming
+ -- scheme exceptions for unit-based languages (Bodies and Specs are
+ -- associative arrays mapping individual unit names to source file names).
procedure Check_Configuration
- (Project : Project_Id;
- In_Tree : Project_Tree_Ref;
- Data : in out Project_Data);
+ (Project : Project_Id;
+ In_Tree : Project_Tree_Ref;
+ Compiler_Driver_Mandatory : Boolean);
-- Check the configuration attributes for the project
+ -- If Compiler_Driver_Mandatory is true, then a Compiler.Driver attribute
+ -- for each language must be defined, or we will not look for its source
+ -- files.
procedure Check_If_Externally_Built
(Project : Project_Id;
- In_Tree : Project_Tree_Ref;
- Data : in out Project_Data);
+ In_Tree : Project_Tree_Ref);
-- Check attribute Externally_Built of project Project in project tree
-- In_Tree and modify its data Data if it has the value "true".
procedure Check_Interfaces
(Project : Project_Id;
- In_Tree : Project_Tree_Ref;
- Data : in out Project_Data);
+ In_Tree : Project_Tree_Ref);
-- If a list of sources is specified in attribute Interfaces, set
-- In_Interfaces only for the sources specified in the list.
procedure Check_Library_Attributes
(Project : Project_Id;
- In_Tree : Project_Tree_Ref;
- Current_Dir : String;
- Data : in out Project_Data);
+ In_Tree : Project_Tree_Ref);
-- Check the library attributes of project Project in project tree In_Tree
-- and modify its data Data accordingly.
-- Current_Dir should represent the current directory, and is passed for
-- efficiency to avoid system calls to recompute it.
- procedure Check_Package_Naming
- (Project : Project_Id;
- In_Tree : Project_Tree_Ref;
- Data : in out Project_Data);
- -- Check package Naming of project Project in project tree In_Tree and
- -- modify its data Data accordingly.
-
procedure Check_Programming_Languages
(In_Tree : Project_Tree_Ref;
- Project : Project_Id;
- Data : in out Project_Data);
+ Project : Project_Id);
-- Check attribute Languages for the project with data Data in project
-- tree In_Tree and set the components of Data for all the programming
-- languages indicated in attribute Languages, if any.
function Check_Project
(P : Project_Id;
Root_Project : Project_Id;
- In_Tree : Project_Tree_Ref;
Extending : Boolean) return Boolean;
-- Returns True if P is Root_Project or, if Extending is True, a project
-- extended by Root_Project.
procedure Check_Stand_Alone_Library
(Project : Project_Id;
In_Tree : Project_Tree_Ref;
- Data : in out Project_Data;
Current_Dir : String;
Extending : Boolean);
-- Check if project Project in project tree In_Tree is a Stand-Alone
-- Current_Dir should represent the current directory, and is passed for
-- efficiency to avoid system calls to recompute it.
- procedure Get_Path_Names_And_Record_Ada_Sources
- (Project : Project_Id;
- In_Tree : Project_Tree_Ref;
- Data : in out Project_Data;
- Current_Dir : String);
- -- Find the path names of the source files in the Source_Names table
- -- in the source directories and record those that are Ada sources.
+ procedure Check_And_Normalize_Unit_Names
+ (Project : Project_Id;
+ In_Tree : Project_Tree_Ref;
+ List : Array_Element_Id;
+ Debug_Name : String);
+ -- Check that a list of unit names contains only valid names. Casing
+ -- is normalized where appropriate.
+ -- Debug_Name is the name representing the list, and is used for debug
+ -- output only.
+
+ procedure Find_Ada_Sources
+ (Project : Project_Id;
+ In_Tree : Project_Tree_Ref;
+ Explicit_Sources_Only : Boolean;
+ Proc_Data : in out Processing_Data);
+ -- Find all Ada sources by traversing all source directories. If
+ -- Explicit_Sources_Only is True, then the sources found must belong to
+ -- the list of sources specified explicitly in the project file. If
+ -- Explicit_Sources_Only is False, then all sources matching the naming
+ -- scheme are recorded.
function Compute_Directory_Last (Dir : String) return Natural;
-- Return the index of the last significant character in Dir. This is used
-- Prj.Err.Error_Msg. Otherwise, disregard Flag_Location and use
-- Error_Report.
- procedure Find_Ada_Sources
- (Project : Project_Id;
- In_Tree : Project_Tree_Ref;
- Data : in out Project_Data;
- Current_Dir : String);
- -- Find all the Ada sources in all of the source directories of a project
- -- Current_Dir should represent the current directory, and is passed for
- -- efficiency to avoid system calls to recompute it.
-
procedure Search_Directories
- (Project : Project_Id;
- In_Tree : Project_Tree_Ref;
- Data : in out Project_Data;
- For_All_Sources : Boolean);
- -- Search the source directories to find the sources.
- -- If For_All_Sources is True, check each regular file name against the
- -- naming schemes of the different languages. Otherwise consider only the
- -- file names in the hash table Source_Names.
+ (Project : Project_Id;
+ In_Tree : Project_Tree_Ref;
+ For_All_Sources : Boolean;
+ Allow_Duplicate_Basenames : Boolean);
+ -- Search the source directories to find the sources. If For_All_Sources is
+ -- True, check each regular file name against the naming schemes of the
+ -- different languages. Otherwise consider only the file names in the hash
+ -- table Source_Names. If Allow_Duplicate_Basenames, then files with the
+ -- same base names are authorized within a project for source-based
+ -- languages (never for unit based languages)
procedure Check_File
- (Project : Project_Id;
- In_Tree : Project_Tree_Ref;
- Data : in out Project_Data;
- Name : String;
- File_Name : File_Name_Type;
- Display_File_Name : File_Name_Type;
- Source_Directory : String;
- For_All_Sources : Boolean);
+ (Project : Project_Id;
+ In_Tree : Project_Tree_Ref;
+ Path : Path_Name_Type;
+ File_Name : File_Name_Type;
+ Display_File_Name : File_Name_Type;
+ For_All_Sources : Boolean;
+ Allow_Duplicate_Basenames : Boolean);
-- Check if file File_Name is a valid source of the project. This is used
- -- in multi-language mode only.
- -- When the file matches one of the naming schemes, it is added to
- -- various htables through Add_Source and to Source_Paths_Htable.
+ -- in multi-language mode only. When the file matches one of the naming
+ -- schemes, it is added to various htables through Add_Source and to
+ -- Source_Paths_Htable.
--
-- Name is the name of the candidate file. It hasn't been normalized yet
-- and is the direct result of readdir().
--
-- If For_All_Sources is True, then all possible file names are analyzed
-- otherwise only those currently set in the Source_Names htable.
+ --
+ -- If Allow_Duplicate_Basenames, then files with the same base names are
+ -- authorized within a project for source-based languages (never for unit
+ -- based languages)
- procedure Check_Naming_Schemes
+ procedure Check_File_Naming_Schemes
(In_Tree : Project_Tree_Ref;
- Data : in out Project_Data;
- Filename : String;
+ Project : Project_Id;
File_Name : File_Name_Type;
- Alternate_Languages : out Alternate_Language_Id;
- Language : out Language_Index;
- Language_Name : out Name_Id;
+ Alternate_Languages : out Language_List;
+ Language : out Language_Ptr;
Display_Language_Name : out Name_Id;
Unit : out Name_Id;
Lang_Kind : out Language_Kind;
-- Free the internal hash tables used for checking naming exceptions
procedure Get_Directories
- (Project : Project_Id;
- In_Tree : Project_Tree_Ref;
- Current_Dir : String;
- Data : in out Project_Data);
+ (Project : Project_Id;
+ In_Tree : Project_Tree_Ref;
+ Current_Dir : String);
-- Get the object directory, the exec directory and the source directories
-- of a project.
--
procedure Get_Mains
(Project : Project_Id;
- In_Tree : Project_Tree_Ref;
- Data : in out Project_Data);
+ In_Tree : Project_Tree_Ref);
-- Get the mains of a project from attribute Main, if it exists, and put
-- them in the project data.
-- Get the list of sources from a text file and put them in hash table
-- Source_Names.
- procedure Find_Explicit_Sources
- (Current_Dir : String;
- Project : Project_Id;
- In_Tree : Project_Tree_Ref;
- Data : in out Project_Data);
+ procedure Find_Sources
+ (Project : Project_Id;
+ In_Tree : Project_Tree_Ref;
+ Proc_Data : in out Processing_Data;
+ Allow_Duplicate_Basenames : Boolean);
-- Process the Source_Files and Source_List_File attributes, and store
-- the list of source files into the Source_Names htable.
- --
- -- Lang indicates which language is being processed when in Ada_Only mode
- -- (all languages are processed anyway when in Multi_Language mode).
+ -- When these attributes are not defined, find all files matching the
+ -- naming schemes in the source directories.
+ -- If Allow_Duplicate_Basenames, then files with the same base names are
+ -- authorized within a project for source-based languages (never for unit
+ -- based languages)
+
+ procedure Compute_Unit_Name
+ (File_Name : File_Name_Type;
+ Naming : Lang_Naming_Data;
+ Kind : out Source_Kind;
+ Unit : out Name_Id;
+ In_Tree : Project_Tree_Ref);
+ -- Check whether the file matches the naming scheme. If it does,
+ -- compute its unit name. If Unit is set to No_Name on exit, none of the
+ -- other out parameters are relevant.
procedure Get_Unit
(In_Tree : Project_Tree_Ref;
Canonical_File_Name : File_Name_Type;
- Naming : Naming_Data;
+ Project : Project_Id;
Exception_Id : out Ada_Naming_Exception_Id;
Unit_Name : out Name_Id;
- Unit_Kind : out Spec_Or_Body;
- Needs_Pragma : out Boolean);
+ Unit_Kind : out Spec_Or_Body);
-- Find out, from a file name, the unit name, the unit kind and if a
-- specific SFN pragma is needed. If the file name corresponds to no unit,
-- then Unit_Name will be No_Name. If the file is a multi-unit source or an
-- exception to the naming scheme, then Exception_Id is set to the unit or
- -- units that the source contains.
+ -- units that the source contains, and the other information are not set.
function Is_Illegal_Suffix
- (Suffix : String;
- Dot_Replacement_Is_A_Single_Dot : Boolean) return Boolean;
+ (Suffix : File_Name_Type;
+ Dot_Replacement : File_Name_Type) return Boolean;
-- Returns True if the string Suffix cannot be used as a spec suffix, a
-- body suffix or a separate suffix.
procedure Locate_Directory
- (Project : Project_Id;
- In_Tree : Project_Tree_Ref;
- Name : File_Name_Type;
- Parent : Path_Name_Type;
- Dir : out Path_Name_Type;
- Display : out Path_Name_Type;
- Create : String := "";
- Current_Dir : String;
- Location : Source_Ptr := No_Location);
- -- Locate a directory. Name is the directory name. Parent is the root
- -- directory, if Name a relative path name. Dir is set to the canonical
- -- case path name of the directory, and Display is the directory path name
- -- for display purposes. If the directory does not exist and Project_Setup
+ (Project : Project_Id;
+ In_Tree : Project_Tree_Ref;
+ Name : File_Name_Type;
+ Path : out Path_Information;
+ Dir_Exists : out Boolean;
+ Create : String := "";
+ Location : Source_Ptr := No_Location;
+ Must_Exist : Boolean := True;
+ Externally_Built : Boolean := False);
+ -- Locate a directory. Name is the directory name.
+ -- Relative paths are resolved relative to the project's directory.
+ -- If the directory does not exist and Setup_Projects
-- is True and Create is a non null string, an attempt is made to create
- -- the directory. If the directory does not exist and Project_Setup is
- -- false, then Dir and Display are set to No_Name.
+ -- the directory.
+ -- If the directory does not exist, it is either created if Setup_Projects
+ -- is False (and then returned), or simply returned without checking for
+ -- its existence (if Must_Exist is False) or No_Path_Information is
+ -- returned. In all cases, Dir_Exists indicates whether the directory now
+ -- exists.
--
- -- Current_Dir should represent the current directory, and is passed for
- -- efficiency to avoid system calls to recompute it.
+ -- Create is also used for debugging traces to show which path we are
+ -- computing
procedure Look_For_Sources
- (Project : Project_Id;
- In_Tree : Project_Tree_Ref;
- Data : in out Project_Data;
- Current_Dir : String);
+ (Project : Project_Id;
+ In_Tree : Project_Tree_Ref;
+ Proc_Data : in out Processing_Data;
+ Allow_Duplicate_Basenames : Boolean);
-- Find all the sources of project Project in project tree In_Tree and
- -- update its Data accordingly.
- --
- -- Current_Dir should represent the current directory, and is passed for
- -- efficiency to avoid system calls to recompute it.
+ -- update its Data accordingly. This assumes that Data.First_Source has
+ -- been initialized with the list of excluded sources and special naming
+ -- exceptions. If Allow_Duplicate_Basenames, then files with the same base
+ -- names are authorized within a project for source-based languages (never
+ -- for unit based languages)
function Path_Name_Of
(File_Name : File_Name_Type;
-- Prepare the internal hash tables used for checking naming exceptions
-- for Ada. Insert all elements of List in the tables.
- function Project_Extends
- (Extending : Project_Id;
- Extended : Project_Id;
- In_Tree : Project_Tree_Ref) return Boolean;
- -- Returns True if Extending is extending Extended either directly or
- -- indirectly.
-
procedure Record_Ada_Source
(File_Name : File_Name_Type;
Path_Name : Path_Name_Type;
Project : Project_Id;
In_Tree : Project_Tree_Ref;
- Data : in out Project_Data;
+ Proc_Data : in out Processing_Data;
+ Ada_Language : Language_Ptr;
Location : Source_Ptr;
- Current_Source : in out String_List_Id;
- Source_Recorded : in out Boolean;
- Current_Dir : String);
+ Source_Recorded : in out Boolean);
-- Put a unit in the list of units of a project, if the file name
- -- corresponds to a valid unit name.
- --
- -- Current_Dir should represent the current directory, and is passed for
- -- efficiency to avoid system calls to recompute it.
+ -- corresponds to a valid unit name. Ada_Language is a pointer to the
+ -- Language_Data for "Ada" in Project.
procedure Remove_Source
(Id : Source_Id;
- Replaced_By : Source_Id;
- Project : Project_Id;
- Data : in out Project_Data;
- In_Tree : Project_Tree_Ref);
- -- ??? needs comment
+ Replaced_By : Source_Id);
+ -- Remove a file from the list of sources of a project.
+ -- This might be because the file is replaced by another one in an
+ -- extending project, or because a file was added as a naming exception
+ -- but was not found in the end.
procedure Report_No_Sources
(Project : Project_Id;
-- when there are no sources for language Lang_Name.
procedure Show_Source_Dirs
- (Data : Project_Data; In_Tree : Project_Tree_Ref);
+ (Project : Project_Id; In_Tree : Project_Tree_Ref);
-- List all the source directories of a project
procedure Warn_If_Not_Sources
-- Check that individual naming conventions apply to immediate sources of
-- the project. If not, issue a warning.
+ procedure Write_Attr (Name, Value : String);
+ -- Debug print a value for a specific property. Does nothing when not in
+ -- debug mode
+
+ ------------------------------
+ -- Replace_Into_Name_Buffer --
+ ------------------------------
+
+ procedure Replace_Into_Name_Buffer
+ (Str : String;
+ Pattern : String;
+ Replacement : Character)
+ is
+ Max : constant Integer := Str'Last - Pattern'Length + 1;
+ J : Positive;
+
+ begin
+ Name_Len := 0;
+
+ J := Str'First;
+ while J <= Str'Last loop
+ Name_Len := Name_Len + 1;
+
+ if J <= Max
+ and then Str (J .. J + Pattern'Length - 1) = Pattern
+ then
+ Name_Buffer (Name_Len) := Replacement;
+ J := J + Pattern'Length;
+
+ else
+ Name_Buffer (Name_Len) := GNAT.Case_Util.To_Lower (Str (J));
+ J := J + 1;
+ end if;
+ end loop;
+ end Replace_Into_Name_Buffer;
+
+ --------------------
+ -- Suffix_Matches --
+ --------------------
+
+ function Suffix_Matches
+ (Filename : String;
+ Suffix : File_Name_Type) return Boolean
+ is
+ Min_Prefix_Length : Natural := 0;
+ begin
+ if Suffix = No_File or else Suffix = Empty_File then
+ return False;
+ end if;
+
+ declare
+ Suf : constant String := Get_Name_String (Suffix);
+ begin
+
+ -- The file name must end with the suffix (which is not an extension)
+ -- For instance a suffix "configure.in" must match a file with the
+ -- same name. To avoid dummy cases, though, a suffix starting with
+ -- '.' requires a file that is at least one character longer ('.cpp'
+ -- should not match a file with the same name)
+
+ if Suf (Suf'First) = '.' then
+ Min_Prefix_Length := 1;
+ end if;
+
+ return Filename'Length >= Suf'Length + Min_Prefix_Length
+ and then Filename
+ (Filename'Last - Suf'Length + 1 .. Filename'Last) = Suf;
+ end;
+ end Suffix_Matches;
+
+ ----------------
+ -- Write_Attr --
+ ----------------
+
+ procedure Write_Attr (Name, Value : String) is
+ begin
+ if Current_Verbosity = High then
+ Write_Str (" " & Name & " = """);
+ Write_Str (Value);
+ Write_Char ('"');
+ Write_Eol;
+ end if;
+ end Write_Attr;
+
----------------
-- Add_Source --
----------------
procedure Add_Source
(Id : out Source_Id;
- Data : in out Project_Data;
In_Tree : Project_Tree_Ref;
Project : Project_Id;
- Lang : Name_Id;
- Lang_Id : Language_Index;
+ Lang_Id : Language_Ptr;
Kind : Source_Kind;
File_Name : File_Name_Type;
Display_File : File_Name_Type;
- Lang_Kind : Language_Kind;
Naming_Exception : Boolean := False;
- Path : Path_Name_Type := No_Path;
- Display_Path : Path_Name_Type := No_Path;
- Alternate_Languages : Alternate_Language_Id := No_Alternate_Language;
- Other_Part : Source_Id := No_Source;
+ Path : Path_Information := No_Path_Information;
+ Alternate_Languages : Language_List := null;
Unit : Name_Id := No_Name;
Index : Int := 0;
Source_To_Replace : Source_Id := No_Source)
is
- Source : constant Source_Id := Data.Last_Source;
- Src_Data : Source_Data := No_Source_Data;
- Config : constant Language_Config :=
- In_Tree.Languages_Data.Table (Lang_Id).Config;
+ Config : constant Language_Config := Lang_Id.Config;
+ UData : Unit_Index;
begin
- -- This is a new source so create an entry for it in the Sources table
-
- Source_Data_Table.Increment_Last (In_Tree.Sources);
- Id := Source_Data_Table.Last (In_Tree.Sources);
+ Id := new Source_Data;
if Current_Verbosity = High then
- Write_Str ("Adding source #");
- Write_Str (Id'Img);
- Write_Str (", File : ");
+ Write_Str ("Adding source File: ");
Write_Str (Get_Name_String (File_Name));
- if Lang_Kind = Unit_Based then
- Write_Str (", Unit : ");
- Write_Str (Get_Name_String (Unit));
+ if Lang_Id.Config.Kind = Unit_Based then
+ Write_Str (" Unit: ");
+ -- ??? in gprclean, it seems we sometimes pass an empty Unit name
+ -- (see test extended_projects)
+ if Unit /= No_Name then
+ Write_Str (Get_Name_String (Unit));
+ end if;
+ Write_Str (" Kind: ");
+ Write_Str (Source_Kind'Image (Kind));
end if;
Write_Eol;
end if;
- Src_Data.Project := Project;
- Src_Data.Language_Name := Lang;
- Src_Data.Language := Lang_Id;
- Src_Data.Lang_Kind := Lang_Kind;
- Src_Data.Compiled := In_Tree.Languages_Data.Table
- (Lang_Id).Config.Compiler_Driver /=
- Empty_File_Name;
- Src_Data.Kind := Kind;
- Src_Data.Alternate_Languages := Alternate_Languages;
- Src_Data.Other_Part := Other_Part;
-
- Src_Data.Object_Exists := Config.Object_Generated;
- Src_Data.Object_Linked := Config.Objects_Linked;
-
- if Other_Part /= No_Source then
- In_Tree.Sources.Table (Other_Part).Other_Part := Id;
- end if;
+ Id.Project := Project;
+ Id.Language := Lang_Id;
+ Id.Kind := Kind;
+ Id.Alternate_Languages := Alternate_Languages;
- Src_Data.Unit := Unit;
- Src_Data.Index := Index;
- Src_Data.File := File_Name;
- Src_Data.Display_File := Display_File;
- Src_Data.Dependency := In_Tree.Languages_Data.Table
- (Lang_Id).Config.Dependency_Kind;
- Src_Data.Naming_Exception := Naming_Exception;
-
- if Src_Data.Compiled and then Src_Data.Object_Exists then
- Src_Data.Object := Object_Name (File_Name);
- Src_Data.Dep_Name :=
- Dependency_Name (File_Name, Src_Data.Dependency);
- Src_Data.Switches := Switches_Name (File_Name);
- end if;
+ -- Add the source id to the Unit_Sources_HT hash table, if the unit name
+ -- is not null.
- if Path /= No_Path then
- Src_Data.Path := (Path, Display_Path);
- Source_Paths_Htable.Set (In_Tree.Source_Paths_HT, Path, Id);
- end if;
+ if Unit /= No_Name then
+ Unit_Sources_Htable.Set (In_Tree.Unit_Sources_HT, Unit, Id);
- -- Add the source to the global list
+ -- ??? Record_Unit has already fetched that earlier, so this isn't
+ -- the most efficient way. But we can't really pass a parameter since
+ -- Process_Exceptions_Unit_Based and Check_File haven't looked it up.
- Src_Data.Next_In_Sources := In_Tree.First_Source;
- In_Tree.First_Source := Id;
+ UData := Units_Htable.Get (In_Tree.Units_HT, Unit);
- -- Add the source to the project list
+ if UData = No_Unit_Index then
+ UData := new Unit_Data;
+ UData.Name := Unit;
+ Units_Htable.Set (In_Tree.Units_HT, Unit, UData);
+ end if;
- if Source = No_Source then
- Data.First_Source := Id;
- else
- In_Tree.Sources.Table (Source).Next_In_Project := Id;
+ Id.Unit := UData;
+
+ -- Note that this updates Unit information as well
+
+ Override_Kind (Id, Kind);
end if;
- Data.Last_Source := Id;
+ Id.Index := Index;
+ Id.File := File_Name;
+ Id.Display_File := Display_File;
+ Id.Dep_Name := Dependency_Name
+ (File_Name, Lang_Id.Config.Dependency_Kind);
+ Id.Naming_Exception := Naming_Exception;
- -- Add the source to the language list
+ if Is_Compilable (Id) and then Config.Object_Generated then
+ Id.Object := Object_Name (File_Name, Config.Object_File_Suffix);
+ Id.Switches := Switches_Name (File_Name);
+ end if;
- Src_Data.Next_In_Lang :=
- In_Tree.Languages_Data.Table (Lang_Id).First_Source;
- In_Tree.Languages_Data.Table (Lang_Id).First_Source := Id;
+ if Path /= No_Path_Information then
+ Id.Path := Path;
+ Source_Paths_Htable.Set (In_Tree.Source_Paths_HT, Path.Name, Id);
+ end if;
+
+ -- Add the source to the language list
- In_Tree.Sources.Table (Id) := Src_Data;
+ Id.Next_In_Lang := Lang_Id.First_Source;
+ Lang_Id.First_Source := Id;
if Source_To_Replace /= No_Source then
- Remove_Source (Source_To_Replace, Id, Project, Data, In_Tree);
+ Remove_Source (Source_To_Replace, Id);
end if;
end Add_Source;
function ALI_File_Name (Source : String) return String is
begin
- -- If the source name has an extension, then replace it with
- -- the ALI suffix.
+ -- If the source name has extension, replace it with the ALI suffix
for Index in reverse Source'First + 1 .. Source'Last loop
if Source (Index) = '.' then
end if;
end loop;
- -- If there is no dot, or if it is the first character, just add the
- -- ALI suffix.
+ -- If no dot, or if it is the first character, just add the ALI suffix
return Source & ALI_Suffix;
end ALI_File_Name;
+ ------------------------------
+ -- Canonical_Case_File_Name --
+ ------------------------------
+
+ function Canonical_Case_File_Name (Name : Name_Id) return File_Name_Type is
+ begin
+ if Osint.File_Names_Case_Sensitive then
+ return File_Name_Type (Name);
+ else
+ Get_Name_String (Name);
+ Canonical_Case_File_Name (Name_Buffer (1 .. Name_Len));
+ return Name_Find;
+ end if;
+ end Canonical_Case_File_Name;
+
-----------
-- Check --
-----------
procedure Check
- (Project : Project_Id;
- In_Tree : Project_Tree_Ref;
- Report_Error : Put_Line_Access;
- When_No_Sources : Error_Warning;
- Current_Dir : String)
+ (Project : Project_Id;
+ In_Tree : Project_Tree_Ref;
+ Report_Error : Put_Line_Access;
+ When_No_Sources : Error_Warning;
+ Current_Dir : String;
+ Proc_Data : in out Processing_Data;
+ Is_Config_File : Boolean;
+ Compiler_Driver_Mandatory : Boolean;
+ Allow_Duplicate_Basenames : Boolean)
is
- Data : Project_Data := In_Tree.Projects.Table (Project);
+ Specs : Array_Element_Id;
+ Bodies : Array_Element_Id;
Extending : Boolean := False;
begin
Recursive_Dirs.Reset;
- Check_If_Externally_Built (Project, In_Tree, Data);
+ Check_If_Externally_Built (Project, In_Tree);
-- Object, exec and source directories
- Get_Directories (Project, In_Tree, Current_Dir, Data);
+ Get_Directories (Project, In_Tree, Current_Dir);
-- Get the programming languages
- Check_Programming_Languages (In_Tree, Project, Data);
+ Check_Programming_Languages (In_Tree, Project);
- if Data.Qualifier = Dry and then Data.Source_Dirs /= Nil_String then
- Error_Msg
- (Project, In_Tree,
- "an abstract project need to have no language, no sources or no " &
- "source directories",
- Data.Location);
+ if Project.Qualifier = Dry
+ and then Project.Source_Dirs /= Nil_String
+ then
+ declare
+ Source_Dirs : constant Variable_Value :=
+ Util.Value_Of
+ (Name_Source_Dirs,
+ Project.Decl.Attributes, In_Tree);
+ Source_Files : constant Variable_Value :=
+ Util.Value_Of
+ (Name_Source_Files,
+ Project.Decl.Attributes, In_Tree);
+ Source_List_File : constant Variable_Value :=
+ Util.Value_Of
+ (Name_Source_List_File,
+ Project.Decl.Attributes, In_Tree);
+ Languages : constant Variable_Value :=
+ Util.Value_Of
+ (Name_Languages,
+ Project.Decl.Attributes, In_Tree);
+
+ begin
+ if Source_Dirs.Values = Nil_String
+ and then Source_Files.Values = Nil_String
+ and then Languages.Values = Nil_String
+ and then Source_List_File.Default
+ then
+ Project.Source_Dirs := Nil_String;
+
+ else
+ Error_Msg
+ (Project, In_Tree,
+ "at least one of Source_Files, Source_Dirs or Languages " &
+ "must be declared empty for an abstract project",
+ Project.Location);
+ end if;
+ end;
end if;
-- Check configuration in multi language mode
if Must_Check_Configuration then
- Check_Configuration (Project, In_Tree, Data);
+ Check_Configuration
+ (Project, In_Tree,
+ Compiler_Driver_Mandatory => Compiler_Driver_Mandatory);
end if;
-- Library attributes
- Check_Library_Attributes (Project, In_Tree, Current_Dir, Data);
+ Check_Library_Attributes (Project, In_Tree);
if Current_Verbosity = High then
- Show_Source_Dirs (Data, In_Tree);
+ Show_Source_Dirs (Project, In_Tree);
end if;
- Check_Package_Naming (Project, In_Tree, Data);
+ Extending := Project.Extends /= No_Project;
- Extending := Data.Extends /= No_Project;
-
- Check_Naming_Schemes (Data, Project, In_Tree);
+ Check_Package_Naming (Project, In_Tree, Is_Config_File, Bodies, Specs);
if Get_Mode = Ada_Only then
- Prepare_Ada_Naming_Exceptions
- (Data.Naming.Bodies, In_Tree, Body_Part);
- Prepare_Ada_Naming_Exceptions
- (Data.Naming.Specs, In_Tree, Specification);
+ Prepare_Ada_Naming_Exceptions (Bodies, In_Tree, Impl);
+ Prepare_Ada_Naming_Exceptions (Specs, In_Tree, Spec);
end if;
-- Find the sources
- if Data.Source_Dirs /= Nil_String then
- Look_For_Sources (Project, In_Tree, Data, Current_Dir);
+ if Project.Source_Dirs /= Nil_String then
+ Look_For_Sources
+ (Project, In_Tree, Proc_Data, Allow_Duplicate_Basenames);
if Get_Mode = Ada_Only then
-- of this project file.
Warn_If_Not_Sources
- (Project, In_Tree, Data.Naming.Bodies,
+ (Project, In_Tree, Bodies,
Specs => False,
Extending => Extending);
Warn_If_Not_Sources
- (Project, In_Tree, Data.Naming.Specs,
+ (Project, In_Tree, Specs,
Specs => True,
Extending => Extending);
elsif Get_Mode = Multi_Language and then
- (not Data.Externally_Built) and then
+ (not Project.Externally_Built) and then
(not Extending)
then
declare
- Language : Language_Index;
+ Language : Language_Ptr;
Source : Source_Id;
- Src_Data : Source_Data;
- Alt_Lang : Alternate_Language_Id;
- Alt_Lang_Data : Alternate_Language_Data;
+ Alt_Lang : Language_List;
Continuation : Boolean := False;
+ Iter : Source_Iterator;
begin
- Language := Data.First_Language_Processing;
+ Language := Project.Languages;
while Language /= No_Language_Index loop
- Source := Data.First_Source;
- Source_Loop : while Source /= No_Source loop
- Src_Data := In_Tree.Sources.Table (Source);
-
- exit Source_Loop when Src_Data.Language = Language;
- Alt_Lang := Src_Data.Alternate_Languages;
+ -- If there are no sources for this language, check whether
+ -- there are sources for which this is an alternate
+ -- language.
- Alternate_Loop :
- while Alt_Lang /= No_Alternate_Language loop
- Alt_Lang_Data :=
- In_Tree.Alt_Langs.Table (Alt_Lang);
- exit Source_Loop
- when Alt_Lang_Data.Language = Language;
- Alt_Lang := Alt_Lang_Data.Next;
- end loop Alternate_Loop;
+ if Language.First_Source = No_Source then
+ Iter := For_Each_Source (In_Tree => In_Tree,
+ Project => Project);
+ Source_Loop : loop
+ Source := Element (Iter);
+ exit Source_Loop when Source = No_Source
+ or else Source.Language = Language;
+
+ Alt_Lang := Source.Alternate_Languages;
+ while Alt_Lang /= null loop
+ exit Source_Loop when Alt_Lang.Language = Language;
+ Alt_Lang := Alt_Lang.Next;
+ end loop;
- Source := Src_Data.Next_In_Project;
- end loop Source_Loop;
+ Next (Iter);
+ end loop Source_Loop;
- if Source = No_Source then
- Report_No_Sources
- (Project,
- Get_Name_String
- (In_Tree.Languages_Data.Table
- (Language).Display_Name),
- In_Tree,
- Data.Location,
- Continuation);
- Continuation := True;
+ if Source = No_Source then
+ Report_No_Sources
+ (Project,
+ Get_Name_String (Language.Display_Name),
+ In_Tree,
+ Project.Location,
+ Continuation);
+ Continuation := True;
+ end if;
end if;
- Language := In_Tree.Languages_Data.Table (Language).Next;
+ Language := Language.Next;
end loop;
end;
end if;
-- If a list of sources is specified in attribute Interfaces, set
-- In_Interfaces only for the sources specified in the list.
- Check_Interfaces (Project, In_Tree, Data);
+ Check_Interfaces (Project, In_Tree);
end if;
-- If it is a library project file, check if it is a standalone library
- if Data.Library then
+ if Project.Library then
Check_Stand_Alone_Library
- (Project, In_Tree, Data, Current_Dir, Extending);
+ (Project, In_Tree, Current_Dir, Extending);
end if;
-- Put the list of Mains, if any, in the project data
- Get_Mains (Project, In_Tree, Data);
-
- -- Update the project data in the Projects table
-
- In_Tree.Projects.Table (Project) := Data;
+ Get_Mains (Project, In_Tree);
Free_Ada_Naming_Exceptions;
end Check;
end if;
end Check_Ada_Name;
- --------------------------------------
- -- Check_Ada_Naming_Scheme_Validity --
- --------------------------------------
-
- procedure Check_Ada_Naming_Scheme_Validity
- (Project : Project_Id;
- In_Tree : Project_Tree_Ref;
- Naming : Naming_Data)
- is
- begin
- -- Only check if we are not using the Default naming scheme
-
- if Naming /= In_Tree.Private_Part.Default_Naming then
- declare
- Dot_Replacement : constant String :=
- Get_Name_String
- (Naming.Dot_Replacement);
-
- Spec_Suffix : constant String :=
- Spec_Suffix_Of (In_Tree, "ada", Naming);
-
- Body_Suffix : constant String :=
- Body_Suffix_Of (In_Tree, "ada", Naming);
-
- Separate_Suffix : constant String :=
- Get_Name_String
- (Naming.Separate_Suffix);
-
- begin
- -- Dot_Replacement cannot
-
- -- - be empty
- -- - start or end with an alphanumeric
- -- - be a single '_'
- -- - start with an '_' followed by an alphanumeric
- -- - contain a '.' except if it is "."
-
- if Dot_Replacement'Length = 0
- or else Is_Alphanumeric
- (Dot_Replacement (Dot_Replacement'First))
- or else Is_Alphanumeric
- (Dot_Replacement (Dot_Replacement'Last))
- or else (Dot_Replacement (Dot_Replacement'First) = '_'
- and then
- (Dot_Replacement'Length = 1
- or else
- Is_Alphanumeric
- (Dot_Replacement (Dot_Replacement'First + 1))))
- or else (Dot_Replacement'Length > 1
- and then
- Index (Source => Dot_Replacement,
- Pattern => ".") /= 0)
- then
- Error_Msg
- (Project, In_Tree,
- '"' & Dot_Replacement &
- """ is illegal for Dot_Replacement.",
- Naming.Dot_Repl_Loc);
- end if;
-
- -- Suffixes cannot
- -- - be empty
-
- if Is_Illegal_Suffix
- (Spec_Suffix, Dot_Replacement = ".")
- then
- Err_Vars.Error_Msg_File_1 :=
- Spec_Suffix_Id_Of (In_Tree, Name_Ada, Naming);
- Error_Msg
- (Project, In_Tree,
- "{ is illegal for Spec_Suffix",
- Naming.Ada_Spec_Suffix_Loc);
- end if;
-
- if Is_Illegal_Suffix
- (Body_Suffix, Dot_Replacement = ".")
- then
- Err_Vars.Error_Msg_File_1 :=
- Body_Suffix_Id_Of (In_Tree, Name_Ada, Naming);
- Error_Msg
- (Project, In_Tree,
- "{ is illegal for Body_Suffix",
- Naming.Ada_Body_Suffix_Loc);
- end if;
-
- if Body_Suffix /= Separate_Suffix then
- if Is_Illegal_Suffix
- (Separate_Suffix, Dot_Replacement = ".")
- then
- Err_Vars.Error_Msg_File_1 := Naming.Separate_Suffix;
- Error_Msg
- (Project, In_Tree,
- "{ is illegal for Separate_Suffix",
- Naming.Sep_Suffix_Loc);
- end if;
- end if;
-
- -- Spec_Suffix cannot be equal to Body_Suffix Separate_Suffix,
- -- since that would cause a clear ambiguity. Note that we do
- -- allow a Spec_Suffix to have the same termination as one of
- -- these, which causes a potential ambiguity, but we resolve
- -- that my matching the longest possible suffix.
-
- if Spec_Suffix = Body_Suffix then
- Error_Msg
- (Project, In_Tree,
- "Body_Suffix (""" &
- Body_Suffix &
- """) cannot be the same as Spec_Suffix.",
- Naming.Ada_Body_Suffix_Loc);
- end if;
-
- if Body_Suffix /= Separate_Suffix
- and then Spec_Suffix = Separate_Suffix
- then
- Error_Msg
- (Project, In_Tree,
- "Separate_Suffix (""" &
- Separate_Suffix &
- """) cannot be the same as Spec_Suffix.",
- Naming.Sep_Suffix_Loc);
- end if;
- end;
- end if;
- end Check_Ada_Naming_Scheme_Validity;
-
-------------------------
-- Check_Configuration --
-------------------------
procedure Check_Configuration
- (Project : Project_Id;
- In_Tree : Project_Tree_Ref;
- Data : in out Project_Data)
+ (Project : Project_Id;
+ In_Tree : Project_Tree_Ref;
+ Compiler_Driver_Mandatory : Boolean)
is
Dot_Replacement : File_Name_Type := No_File;
Casing : Casing_Type := All_Lower_Case;
Separate_Suffix : File_Name_Type := No_File;
- Lang_Index : Language_Index := No_Language_Index;
+ Lang_Index : Language_Ptr := No_Language_Index;
-- The index of the language data being checked
- Prev_Index : Language_Index := No_Language_Index;
+ Prev_Index : Language_Ptr := No_Language_Index;
-- The index of the previous language
- Current_Language : Name_Id := No_Name;
- -- The name of the language
-
- Lang_Data : Language_Data;
- -- The data of the language being checked
-
- procedure Get_Language_Index_Of (Language : Name_Id);
- -- Get the language index of Language, if Language is one of the
- -- languages of the project.
-
procedure Process_Project_Level_Simple_Attributes;
-- Process the simple attributes at the project level
procedure Process_Packages;
-- Read the packages of the project
- ---------------------------
- -- Get_Language_Index_Of --
- ---------------------------
-
- procedure Get_Language_Index_Of (Language : Name_Id) is
- Real_Language : Name_Id;
-
- begin
- Get_Name_String (Language);
- To_Lower (Name_Buffer (1 .. Name_Len));
- Real_Language := Name_Find;
-
- -- Nothing to do if the language is the same as the current language
-
- if Current_Language /= Real_Language then
- Lang_Index := Data.First_Language_Processing;
- while Lang_Index /= No_Language_Index loop
- exit when In_Tree.Languages_Data.Table (Lang_Index).Name =
- Real_Language;
- Lang_Index :=
- In_Tree.Languages_Data.Table (Lang_Index).Next;
- end loop;
-
- if Lang_Index = No_Language_Index then
- Current_Language := No_Name;
- else
- Current_Language := Real_Language;
- end if;
- end if;
- end Get_Language_Index_Of;
-
----------------------
-- Process_Packages --
----------------------
while Element_Id /= No_Array_Element loop
Element := In_Tree.Array_Elements.Table (Element_Id);
- -- Get the name of the language
+ if Element.Index /= All_Other_Names then
- Get_Language_Index_Of (Element.Index);
+ -- Get the name of the language
- if Lang_Index /= No_Language_Index then
- case Current_Array.Name is
- when Name_Driver =>
+ Lang_Index :=
+ Get_Language_From_Name
+ (Project, Get_Name_String (Element.Index));
- -- Attribute Driver (<language>)
+ if Lang_Index /= No_Language_Index then
+ case Current_Array.Name is
+ when Name_Driver =>
- In_Tree.Languages_Data.Table
- (Lang_Index).Config.Binder_Driver :=
- File_Name_Type (Element.Value.Value);
+ -- Attribute Driver (<language>)
- when Name_Required_Switches =>
- Put (Into_List =>
- In_Tree.Languages_Data.Table
- (Lang_Index).Config.Binder_Required_Switches,
- From_List => Element.Value.Values,
- In_Tree => In_Tree);
+ Lang_Index.Config.Binder_Driver :=
+ File_Name_Type (Element.Value.Value);
- when Name_Prefix =>
+ when Name_Required_Switches =>
+ Put
+ (Into_List =>
+ Lang_Index.Config.Binder_Required_Switches,
+ From_List => Element.Value.Values,
+ In_Tree => In_Tree);
- -- Attribute Prefix (<language>)
+ when Name_Prefix =>
- In_Tree.Languages_Data.Table
- (Lang_Index).Config.Binder_Prefix :=
- Element.Value.Value;
+ -- Attribute Prefix (<language>)
- when Name_Objects_Path =>
+ Lang_Index.Config.Binder_Prefix :=
+ Element.Value.Value;
- -- Attribute Objects_Path (<language>)
+ when Name_Objects_Path =>
- In_Tree.Languages_Data.Table
- (Lang_Index).Config.Objects_Path :=
- Element.Value.Value;
+ -- Attribute Objects_Path (<language>)
- when Name_Objects_Path_File =>
+ Lang_Index.Config.Objects_Path :=
+ Element.Value.Value;
- -- Attribute Objects_Path (<language>)
+ when Name_Objects_Path_File =>
- In_Tree.Languages_Data.Table
- (Lang_Index).Config.Objects_Path_File :=
- Element.Value.Value;
+ -- Attribute Objects_Path (<language>)
- when others =>
- null;
- end case;
+ Lang_Index.Config.Objects_Path_File :=
+ Element.Value.Value;
+
+ when others =>
+ null;
+ end case;
+ end if;
end if;
Element_Id := Element.Next;
-- Attribute Executable_Suffix: the suffix of the
-- executables.
- Data.Config.Executable_Suffix :=
+ Project.Config.Executable_Suffix :=
Attribute.Value.Value;
end if;
end if;
while Element_Id /= No_Array_Element loop
Element := In_Tree.Array_Elements.Table (Element_Id);
- -- Get the name of the language
+ if Element.Index /= All_Other_Names then
- Get_Language_Index_Of (Element.Index);
+ -- Get the name of the language
- if Lang_Index /= No_Language_Index then
- case Current_Array.Name is
+ Lang_Index := Get_Language_From_Name
+ (Project, Get_Name_String (Element.Index));
+
+ if Lang_Index /= No_Language_Index then
+ case Current_Array.Name is
when Name_Dependency_Switches =>
-- Attribute Dependency_Switches (<language>)
- if In_Tree.Languages_Data.Table
- (Lang_Index).Config.Dependency_Kind = None
- then
- In_Tree.Languages_Data.Table
- (Lang_Index).Config.Dependency_Kind :=
- Makefile;
+ if Lang_Index.Config.Dependency_Kind = None then
+ Lang_Index.Config.Dependency_Kind := Makefile;
end if;
List := Element.Value.Values;
if List /= Nil_String then
Put (Into_List =>
- In_Tree.Languages_Data.Table
- (Lang_Index).Config.Dependency_Option,
+ Lang_Index.Config.Dependency_Option,
From_List => List,
In_Tree => In_Tree);
end if;
-- Attribute Dependency_Driver (<language>)
- if In_Tree.Languages_Data.Table
- (Lang_Index).Config.Dependency_Kind = None
- then
- In_Tree.Languages_Data.Table
- (Lang_Index).Config.Dependency_Kind :=
- Makefile;
+ if Lang_Index.Config.Dependency_Kind = None then
+ Lang_Index.Config.Dependency_Kind := Makefile;
end if;
List := Element.Value.Values;
if List /= Nil_String then
Put (Into_List =>
- In_Tree.Languages_Data.Table
- (Lang_Index).Config.Compute_Dependency,
+ Lang_Index.Config.Compute_Dependency,
From_List => List,
In_Tree => In_Tree);
end if;
end if;
Put (Into_List =>
- In_Tree.Languages_Data.Table
- (Lang_Index).Config.Include_Option,
+ Lang_Index.Config.Include_Option,
From_List => List,
In_Tree => In_Tree);
-- Attribute Include_Path (<language>)
- In_Tree.Languages_Data.Table
- (Lang_Index).Config.Include_Path :=
+ Lang_Index.Config.Include_Path :=
Element.Value.Value;
when Name_Include_Path_File =>
-- Attribute Include_Path_File (<language>)
- In_Tree.Languages_Data.Table
- (Lang_Index).Config.Include_Path_File :=
- Element.Value.Value;
+ Lang_Index.Config.Include_Path_File :=
+ Element.Value.Value;
when Name_Driver =>
-- Attribute Driver (<language>)
- Get_Name_String (Element.Value.Value);
-
- In_Tree.Languages_Data.Table
- (Lang_Index).Config.Compiler_Driver :=
+ Lang_Index.Config.Compiler_Driver :=
File_Name_Type (Element.Value.Value);
- when Name_Required_Switches =>
+ when Name_Required_Switches |
+ Name_Leading_Required_Switches =>
+ Put (Into_List =>
+ Lang_Index.Config.
+ Compiler_Leading_Required_Switches,
+ From_List => Element.Value.Values,
+ In_Tree => In_Tree);
+
+ when Name_Trailing_Required_Switches =>
Put (Into_List =>
- In_Tree.Languages_Data.Table
- (Lang_Index).Config.
- Compiler_Required_Switches,
+ Lang_Index.Config.
+ Compiler_Trailing_Required_Switches,
From_List => Element.Value.Values,
In_Tree => In_Tree);
when Name_Path_Syntax =>
begin
- In_Tree.Languages_Data.Table
- (Lang_Index).Config.Path_Syntax :=
- Path_Syntax_Kind'Value
- (Get_Name_String (Element.Value.Value));
+ Lang_Index.Config.Path_Syntax :=
+ Path_Syntax_Kind'Value
+ (Get_Name_String (Element.Value.Value));
exception
when Constraint_Error =>
Element.Value.Location);
end;
+ when Name_Object_File_Suffix =>
+ if Get_Name_String (Element.Value.Value) = "" then
+ Error_Msg
+ (Project, In_Tree,
+ "object file suffix cannot be empty",
+ Element.Value.Location);
+
+ else
+ Lang_Index.Config.Object_File_Suffix :=
+ Element.Value.Value;
+ end if;
+
+ when Name_Object_File_Switches =>
+ Put (Into_List =>
+ Lang_Index.Config.Object_File_Switches,
+ From_List => Element.Value.Values,
+ In_Tree => In_Tree);
+
when Name_Pic_Option =>
-- Attribute Compiler_Pic_Option (<language>)
end if;
Put (Into_List =>
- In_Tree.Languages_Data.Table
- (Lang_Index).Config.Compilation_PIC_Option,
+ Lang_Index.Config.Compilation_PIC_Option,
From_List => List,
In_Tree => In_Tree);
end if;
Put (Into_List =>
- In_Tree.Languages_Data.Table
- (Lang_Index).Config.Mapping_File_Switches,
+ Lang_Index.Config.Mapping_File_Switches,
From_List => List,
In_Tree => In_Tree);
-- Attribute Mapping_Spec_Suffix (<language>)
- In_Tree.Languages_Data.Table
- (Lang_Index).Config.Mapping_Spec_Suffix :=
- File_Name_Type (Element.Value.Value);
+ Lang_Index.Config.Mapping_Spec_Suffix :=
+ File_Name_Type (Element.Value.Value);
when Name_Mapping_Body_Suffix =>
-- Attribute Mapping_Body_Suffix (<language>)
- In_Tree.Languages_Data.Table
- (Lang_Index).Config.Mapping_Body_Suffix :=
- File_Name_Type (Element.Value.Value);
+ Lang_Index.Config.Mapping_Body_Suffix :=
+ File_Name_Type (Element.Value.Value);
when Name_Config_File_Switches =>
end if;
Put (Into_List =>
- In_Tree.Languages_Data.Table
- (Lang_Index).Config.Config_File_Switches,
+ Lang_Index.Config.Config_File_Switches,
From_List => List,
In_Tree => In_Tree);
-- Attribute Objects_Path (<language>)
- In_Tree.Languages_Data.Table
- (Lang_Index).Config.Objects_Path :=
+ Lang_Index.Config.Objects_Path :=
Element.Value.Value;
when Name_Objects_Path_File =>
-- Attribute Objects_Path_File (<language>)
- In_Tree.Languages_Data.Table
- (Lang_Index).Config.Objects_Path_File :=
+ Lang_Index.Config.Objects_Path_File :=
Element.Value.Value;
when Name_Config_Body_File_Name =>
-- Attribute Config_Body_File_Name (<language>)
- In_Tree.Languages_Data.Table
- (Lang_Index).Config.Config_Body :=
+ Lang_Index.Config.Config_Body :=
Element.Value.Value;
when Name_Config_Body_File_Name_Pattern =>
-- Attribute Config_Body_File_Name_Pattern
-- (<language>)
- In_Tree.Languages_Data.Table
- (Lang_Index).Config.Config_Body_Pattern :=
- Element.Value.Value;
+ Lang_Index.Config.Config_Body_Pattern :=
+ Element.Value.Value;
when Name_Config_Spec_File_Name =>
-- Attribute Config_Spec_File_Name (<language>)
- In_Tree.Languages_Data.Table
- (Lang_Index).Config.Config_Spec :=
+ Lang_Index.Config.Config_Spec :=
Element.Value.Value;
when Name_Config_Spec_File_Name_Pattern =>
-- Attribute Config_Spec_File_Name_Pattern
-- (<language>)
- In_Tree.Languages_Data.Table
- (Lang_Index).Config.Config_Spec_Pattern :=
- Element.Value.Value;
+ Lang_Index.Config.Config_Spec_Pattern :=
+ Element.Value.Value;
when Name_Config_File_Unique =>
-- Attribute Config_File_Unique (<language>)
begin
- In_Tree.Languages_Data.Table
- (Lang_Index).Config.Config_File_Unique :=
- Boolean'Value
- (Get_Name_String (Element.Value.Value));
+ Lang_Index.Config.Config_File_Unique :=
+ Boolean'Value
+ (Get_Name_String (Element.Value.Value));
exception
when Constraint_Error =>
Error_Msg
when others =>
null;
- end case;
+ end case;
+ end if;
end if;
Element_Id := Element.Next;
Attribute_Id := Attributes;
while Attribute_Id /= No_Variable loop
- Attribute :=
- In_Tree.Variable_Elements.Table (Attribute_Id);
+ Attribute := In_Tree.Variable_Elements.Table (Attribute_Id);
if not Attribute.Value.Default then
if Attribute.Name = Name_Separate_Suffix then
-- Attribute Separate_Suffix
- Separate_Suffix := File_Name_Type (Attribute.Value.Value);
+ Get_Name_String (Attribute.Value.Value);
+ Canonical_Case_File_Name (Name_Buffer (1 .. Name_Len));
+ Separate_Suffix := Name_Find;
elsif Attribute.Name = Name_Casing then
-- Get the name of the language
- Get_Language_Index_Of (Element.Index);
+ Lang_Index := Get_Language_From_Name
+ (Project, Get_Name_String (Element.Index));
if Lang_Index /= No_Language_Index then
case Current_Array.Name is
- when Name_Specification_Suffix | Name_Spec_Suffix =>
+ when Name_Spec_Suffix | Name_Specification_Suffix =>
-- Attribute Spec_Suffix (<language>)
- In_Tree.Languages_Data.Table
- (Lang_Index).Config.Naming_Data.Spec_Suffix :=
- File_Name_Type (Element.Value.Value);
+ Get_Name_String (Element.Value.Value);
+ Canonical_Case_File_Name
+ (Name_Buffer (1 .. Name_Len));
+ Lang_Index.Config.Naming_Data.Spec_Suffix :=
+ Name_Find;
when Name_Implementation_Suffix | Name_Body_Suffix =>
- -- Attribute Body_Suffix (<language>)
+ Get_Name_String (Element.Value.Value);
+ Canonical_Case_File_Name
+ (Name_Buffer (1 .. Name_Len));
- In_Tree.Languages_Data.Table
- (Lang_Index).Config.Naming_Data.Body_Suffix :=
- File_Name_Type (Element.Value.Value);
+ -- Attribute Body_Suffix (<language>)
- In_Tree.Languages_Data.Table
- (Lang_Index).Config.Naming_Data.Separate_Suffix :=
- File_Name_Type (Element.Value.Value);
+ Lang_Index.Config.Naming_Data.Body_Suffix :=
+ Name_Find;
+ Lang_Index.Config.Naming_Data.Separate_Suffix :=
+ Lang_Index.Config.Naming_Data.Body_Suffix;
when others =>
null;
-- Attribute Linker'Driver: the default linker to use
- Data.Config.Linker :=
+ Project.Config.Linker :=
Path_Name_Type (Attribute.Value.Value);
+ -- Linker'Driver is also used to link shared libraries
+ -- if the obsolescent attribute Library_GCC has not been
+ -- specified.
+
+ if Project.Config.Shared_Lib_Driver = No_File then
+ Project.Config.Shared_Lib_Driver :=
+ File_Name_Type (Attribute.Value.Value);
+ end if;
+
elsif Attribute.Name = Name_Required_Switches then
-- Attribute Required_Switches: the minimum
-- options to use when invoking the linker
- Put (Into_List =>
- Data.Config.Minimum_Linker_Options,
+ Put (Into_List => Project.Config.Minimum_Linker_Options,
From_List => Attribute.Value.Values,
In_Tree => In_Tree);
elsif Attribute.Name = Name_Map_File_Option then
- Data.Config.Map_File_Option := Attribute.Value.Value;
+ Project.Config.Map_File_Option := Attribute.Value.Value;
+
+ elsif Attribute.Name = Name_Max_Command_Line_Length then
+ begin
+ Project.Config.Max_Command_Line_Length :=
+ Natural'Value (Get_Name_String
+ (Attribute.Value.Value));
+
+ exception
+ when Constraint_Error =>
+ Error_Msg
+ (Project,
+ In_Tree,
+ "value must be positive or equal to 0",
+ Attribute.Value.Location);
+ end;
+
+ elsif Attribute.Name = Name_Response_File_Format then
+ declare
+ Name : Name_Id;
+
+ begin
+ Get_Name_String (Attribute.Value.Value);
+ To_Lower (Name_Buffer (1 .. Name_Len));
+ Name := Name_Find;
+
+ if Name = Name_None then
+ Project.Config.Resp_File_Format := None;
+
+ elsif Name = Name_Gnu then
+ Project.Config.Resp_File_Format := GNU;
+
+ elsif Name = Name_Object_List then
+ Project.Config.Resp_File_Format := Object_List;
+
+ elsif Name = Name_Option_List then
+ Project.Config.Resp_File_Format := Option_List;
+
+ else
+ Error_Msg
+ (Project,
+ In_Tree,
+ "illegal response file format",
+ Attribute.Value.Location);
+ end if;
+ end;
+
+ elsif Attribute.Name = Name_Response_File_Switches then
+ Put (Into_List => Project.Config.Resp_File_Options,
+ From_List => Attribute.Value.Values,
+ In_Tree => In_Tree);
end if;
end if;
-- Start of processing for Process_Packages
begin
- Packages := Data.Decl.Packages;
+ Packages := Project.Decl.Packages;
while Packages /= No_Package loop
Element := In_Tree.Packages.Table (Packages);
begin
-- Process non associated array attribute at project level
- Attribute_Id := Data.Decl.Attributes;
+ Attribute_Id := Project.Decl.Attributes;
while Attribute_Id /= No_Variable loop
Attribute :=
In_Tree.Variable_Elements.Table (Attribute_Id);
if not Attribute.Value.Default then
- if Attribute.Name = Name_Library_Builder then
+ if Attribute.Name = Name_Target then
+
+ -- Attribute Target: the target specified
+
+ Project.Config.Target := Attribute.Value.Value;
+
+ elsif Attribute.Name = Name_Library_Builder then
-- Attribute Library_Builder: the application to invoke
-- to build libraries.
- Data.Config.Library_Builder :=
+ Project.Config.Library_Builder :=
Path_Name_Type (Attribute.Value.Value);
elsif Attribute.Name = Name_Archive_Builder then
Attribute.Value.Location);
end if;
- Put (Into_List => Data.Config.Archive_Builder,
+ Put (Into_List => Project.Config.Archive_Builder,
From_List => List,
In_Tree => In_Tree);
if List /= Nil_String then
Put
- (Into_List => Data.Config.Archive_Builder_Append_Option,
+ (Into_List =>
+ Project.Config.Archive_Builder_Append_Option,
From_List => List,
In_Tree => In_Tree);
end if;
Attribute.Value.Location);
end if;
- Put (Into_List => Data.Config.Archive_Indexer,
+ Put (Into_List => Project.Config.Archive_Indexer,
From_List => List,
In_Tree => In_Tree);
Attribute.Value.Location);
end if;
- Put (Into_List => Data.Config.Lib_Partial_Linker,
+ Put (Into_List => Project.Config.Lib_Partial_Linker,
From_List => List,
In_Tree => In_Tree);
elsif Attribute.Name = Name_Library_GCC then
- Data.Config.Shared_Lib_Driver :=
+ Project.Config.Shared_Lib_Driver :=
File_Name_Type (Attribute.Value.Value);
+ Error_Msg
+ (Project,
+ In_Tree,
+ "?Library_'G'C'C is an obsolescent attribute, " &
+ "use Linker''Driver instead",
+ Attribute.Value.Location);
elsif Attribute.Name = Name_Archive_Suffix then
- Data.Config.Archive_Suffix :=
+ Project.Config.Archive_Suffix :=
File_Name_Type (Attribute.Value.Value);
elsif Attribute.Name = Name_Linker_Executable_Option then
Attribute.Value.Location);
end if;
- Put (Into_List => Data.Config.Linker_Executable_Option,
+ Put (Into_List => Project.Config.Linker_Executable_Option,
From_List => List,
In_Tree => In_Tree);
Attribute.Value.Location);
end if;
- Data.Config.Linker_Lib_Dir_Option := Attribute.Value.Value;
+ Project.Config.Linker_Lib_Dir_Option :=
+ Attribute.Value.Value;
elsif Attribute.Name = Name_Linker_Lib_Name_Option then
Attribute.Value.Location);
end if;
- Data.Config.Linker_Lib_Name_Option := Attribute.Value.Value;
+ Project.Config.Linker_Lib_Name_Option :=
+ Attribute.Value.Value;
elsif Attribute.Name = Name_Run_Path_Option then
List := Attribute.Value.Values;
if List /= Nil_String then
- Put (Into_List => Data.Config.Run_Path_Option,
+ Put (Into_List => Project.Config.Run_Path_Option,
From_List => List,
In_Tree => In_Tree);
end if;
+ elsif Attribute.Name = Name_Separate_Run_Path_Options then
+ declare
+ pragma Unsuppress (All_Checks);
+ begin
+ Project.Config.Separate_Run_Path_Options :=
+ Boolean'Value (Get_Name_String (Attribute.Value.Value));
+ exception
+ when Constraint_Error =>
+ Error_Msg
+ (Project,
+ In_Tree,
+ "invalid value """ &
+ Get_Name_String (Attribute.Value.Value) &
+ """ for Separate_Run_Path_Options",
+ Attribute.Value.Location);
+ end;
+
elsif Attribute.Name = Name_Library_Support then
declare
pragma Unsuppress (All_Checks);
begin
- Data.Config.Lib_Support :=
+ Project.Config.Lib_Support :=
Library_Support'Value (Get_Name_String
(Attribute.Value.Value));
exception
end;
elsif Attribute.Name = Name_Shared_Library_Prefix then
- Data.Config.Shared_Lib_Prefix :=
+ Project.Config.Shared_Lib_Prefix :=
File_Name_Type (Attribute.Value.Value);
elsif Attribute.Name = Name_Shared_Library_Suffix then
- Data.Config.Shared_Lib_Suffix :=
+ Project.Config.Shared_Lib_Suffix :=
File_Name_Type (Attribute.Value.Value);
elsif Attribute.Name = Name_Symbolic_Link_Supported then
declare
pragma Unsuppress (All_Checks);
begin
- Data.Config.Symbolic_Link_Supported :=
+ Project.Config.Symbolic_Link_Supported :=
Boolean'Value (Get_Name_String
(Attribute.Value.Value));
exception
declare
pragma Unsuppress (All_Checks);
begin
- Data.Config.Lib_Maj_Min_Id_Supported :=
+ Project.Config.Lib_Maj_Min_Id_Supported :=
Boolean'Value (Get_Name_String
(Attribute.Value.Value));
exception
declare
pragma Unsuppress (All_Checks);
begin
- Data.Config.Auto_Init_Supported :=
+ Project.Config.Auto_Init_Supported :=
Boolean'Value (Get_Name_String (Attribute.Value.Value));
exception
when Constraint_Error =>
List := Attribute.Value.Values;
if List /= Nil_String then
- Put (Into_List => Data.Config.Shared_Lib_Min_Options,
+ Put (Into_List => Project.Config.Shared_Lib_Min_Options,
From_List => List,
In_Tree => In_Tree);
end if;
List := Attribute.Value.Values;
if List /= Nil_String then
- Put (Into_List => Data.Config.Lib_Version_Options,
+ Put (Into_List => Project.Config.Lib_Version_Options,
From_List => List,
In_Tree => In_Tree);
end if;
begin
-- Process the associative array attributes at project level
- Current_Array_Id := Data.Decl.Arrays;
+ Current_Array_Id := Project.Decl.Arrays;
while Current_Array_Id /= No_Array loop
Current_Array := In_Tree.Arrays.Table (Current_Array_Id);
-- Get the name of the language
- Get_Language_Index_Of (Element.Index);
+ Lang_Index :=
+ Get_Language_From_Name
+ (Project, Get_Name_String (Element.Index));
if Lang_Index /= No_Language_Index then
case Current_Array.Name is
if List /= Nil_String then
Put
(Into_List =>
- In_Tree.Languages_Data.Table (Lang_Index).
- Config.Include_Compatible_Languages,
+ Lang_Index.Config.Include_Compatible_Languages,
From_List => List,
In_Tree => In_Tree,
Lower_Case => True);
-- Attribute Toolchain_Description (<language>)
- In_Tree.Languages_Data.Table
- (Lang_Index).Config.Toolchain_Description :=
+ Lang_Index.Config.Toolchain_Description :=
Element.Value.Value;
when Name_Toolchain_Version =>
-- Attribute Toolchain_Version (<language>)
- In_Tree.Languages_Data.Table
- (Lang_Index).Config.Toolchain_Version :=
+ Lang_Index.Config.Toolchain_Version :=
Element.Value.Value;
when Name_Runtime_Library_Dir =>
-- Attribute Runtime_Library_Dir (<language>)
- In_Tree.Languages_Data.Table
- (Lang_Index).Config.Runtime_Library_Dir :=
+ Lang_Index.Config.Runtime_Library_Dir :=
+ Element.Value.Value;
+
+ when Name_Runtime_Source_Dir =>
+
+ -- Attribute Runtime_Library_Dir (<language>)
+
+ Lang_Index.Config.Runtime_Source_Dir :=
Element.Value.Value;
when Name_Object_Generated =>
Boolean'Value
(Get_Name_String (Element.Value.Value));
- In_Tree.Languages_Data.Table
- (Lang_Index).Config.Object_Generated := Value;
+ Lang_Index.Config.Object_Generated := Value;
-- If no object is generated, no object may be
-- linked.
if not Value then
- In_Tree.Languages_Data.Table
- (Lang_Index).Config.Objects_Linked := False;
+ Lang_Index.Config.Objects_Linked := False;
end if;
exception
-- No change if Object_Generated is False, as this
-- forces Objects_Linked to be False too.
- if In_Tree.Languages_Data.Table
- (Lang_Index).Config.Object_Generated
- then
- In_Tree.Languages_Data.Table
- (Lang_Index).Config.Objects_Linked :=
- Value;
+ if Lang_Index.Config.Object_Generated then
+ Lang_Index.Config.Objects_Linked := Value;
end if;
exception
-- For unit based languages, set Casing, Dot_Replacement and
-- Separate_Suffix in Naming_Data.
- Lang_Index := Data.First_Language_Processing;
+ Lang_Index := Project.Languages;
while Lang_Index /= No_Language_Index loop
- if In_Tree.Languages_Data.Table
- (Lang_Index).Name = Name_Ada
- then
- In_Tree.Languages_Data.Table
- (Lang_Index).Config.Naming_Data.Casing := Casing;
- In_Tree.Languages_Data.Table
- (Lang_Index).Config.Naming_Data.Dot_Replacement :=
- Dot_Replacement;
+ if Lang_Index.Name = Name_Ada then
+ Lang_Index.Config.Naming_Data.Casing := Casing;
+ Lang_Index.Config.Naming_Data.Dot_Replacement := Dot_Replacement;
if Separate_Suffix /= No_File then
- In_Tree.Languages_Data.Table
- (Lang_Index).Config.Naming_Data.Separate_Suffix :=
+ Lang_Index.Config.Naming_Data.Separate_Suffix :=
Separate_Suffix;
end if;
exit;
end if;
- Lang_Index := In_Tree.Languages_Data.Table (Lang_Index).Next;
+ Lang_Index := Lang_Index.Next;
end loop;
-- Give empty names to various prefixes/suffixes, if they have not
-- been specified in the configuration.
- if Data.Config.Archive_Suffix = No_File then
- Data.Config.Archive_Suffix := Empty_File;
+ if Project.Config.Archive_Suffix = No_File then
+ Project.Config.Archive_Suffix := Empty_File;
end if;
- if Data.Config.Shared_Lib_Prefix = No_File then
- Data.Config.Shared_Lib_Prefix := Empty_File;
+ if Project.Config.Shared_Lib_Prefix = No_File then
+ Project.Config.Shared_Lib_Prefix := Empty_File;
end if;
- if Data.Config.Shared_Lib_Suffix = No_File then
- Data.Config.Shared_Lib_Suffix := Empty_File;
+ if Project.Config.Shared_Lib_Suffix = No_File then
+ Project.Config.Shared_Lib_Suffix := Empty_File;
end if;
- Lang_Index := Data.First_Language_Processing;
+ Lang_Index := Project.Languages;
while Lang_Index /= No_Language_Index loop
- Lang_Data := In_Tree.Languages_Data.Table (Lang_Index);
-
- Current_Language := Lang_Data.Display_Name;
+ -- For all languages, Compiler_Driver needs to be specified. This is
+ -- only needed if we do intend to compile (not in GPS for instance).
- -- For all languages, Compiler_Driver needs to be specified
-
- if Lang_Data.Config.Compiler_Driver = No_File then
- Error_Msg_Name_1 := Current_Language;
+ if Compiler_Driver_Mandatory
+ and then Lang_Index.Config.Compiler_Driver = No_File
+ then
+ Error_Msg_Name_1 := Lang_Index.Display_Name;
Error_Msg
(Project,
In_Tree,
"?no compiler specified for language %%" &
- ", ignoring all its sources",
+ ", ignoring all its sources",
No_Location);
- if Lang_Index = Data.First_Language_Processing then
- Data.First_Language_Processing :=
- Lang_Data.Next;
+ if Lang_Index = Project.Languages then
+ Project.Languages := Lang_Index.Next;
else
- In_Tree.Languages_Data.Table (Prev_Index).Next :=
- Lang_Data.Next;
+ Prev_Index.Next := Lang_Index.Next;
end if;
- elsif Lang_Data.Name = Name_Ada then
+ elsif Lang_Index.Name = Name_Ada then
Prev_Index := Lang_Index;
-- For unit based languages, Dot_Replacement, Spec_Suffix and
-- Body_Suffix need to be specified.
- if Lang_Data.Config.Naming_Data.Dot_Replacement = No_File then
+ if Lang_Index.Config.Naming_Data.Dot_Replacement = No_File then
Error_Msg
(Project,
In_Tree,
No_Location);
end if;
- if Lang_Data.Config.Naming_Data.Spec_Suffix = No_File then
+ if Lang_Index.Config.Naming_Data.Spec_Suffix = No_File then
Error_Msg
(Project,
In_Tree,
No_Location);
end if;
- if Lang_Data.Config.Naming_Data.Body_Suffix = No_File then
+ if Lang_Index.Config.Naming_Data.Body_Suffix = No_File then
Error_Msg
(Project,
In_Tree,
-- For file based languages, either Spec_Suffix or Body_Suffix
-- need to be specified.
- if Lang_Data.Config.Naming_Data.Spec_Suffix = No_File and then
- Lang_Data.Config.Naming_Data.Body_Suffix = No_File
+ if Lang_Index.Config.Naming_Data.Spec_Suffix = No_File and then
+ Lang_Index.Config.Naming_Data.Body_Suffix = No_File
then
- Error_Msg_Name_1 := Current_Language;
+ Error_Msg_Name_1 := Lang_Index.Display_Name;
Error_Msg
(Project,
In_Tree,
end if;
end if;
- Lang_Index := Lang_Data.Next;
+ Lang_Index := Lang_Index.Next;
end loop;
end Check_Configuration;
procedure Check_If_Externally_Built
(Project : Project_Id;
- In_Tree : Project_Tree_Ref;
- Data : in out Project_Data)
+ In_Tree : Project_Tree_Ref)
is
Externally_Built : constant Variable_Value :=
Util.Value_Of
(Name_Externally_Built,
- Data.Decl.Attributes, In_Tree);
+ Project.Decl.Attributes, In_Tree);
begin
if not Externally_Built.Default then
To_Lower (Name_Buffer (1 .. Name_Len));
if Name_Buffer (1 .. Name_Len) = "true" then
- Data.Externally_Built := True;
+ Project.Externally_Built := True;
elsif Name_Buffer (1 .. Name_Len) /= "false" then
Error_Msg (Project, In_Tree,
-- A virtual project extending an externally built project is itself
-- externally built.
- if Data.Virtual and then Data.Extends /= No_Project then
- Data.Externally_Built :=
- In_Tree.Projects.Table (Data.Extends).Externally_Built;
+ if Project.Virtual and then Project.Extends /= No_Project then
+ Project.Externally_Built := Project.Extends.Externally_Built;
end if;
if Current_Verbosity = High then
Write_Str ("Project is ");
- if not Data.Externally_Built then
+ if not Project.Externally_Built then
Write_Str ("not ");
end if;
procedure Check_Interfaces
(Project : Project_Id;
- In_Tree : Project_Tree_Ref;
- Data : in out Project_Data)
+ In_Tree : Project_Tree_Ref)
is
Interfaces : constant Prj.Variable_Value :=
Prj.Util.Value_Of
(Snames.Name_Interfaces,
- Data.Decl.Attributes,
+ Project.Decl.Attributes,
In_Tree);
- List : String_List_Id;
- Element : String_Element;
- Name : File_Name_Type;
-
- Source : Source_Id;
- Src_Data : Source_Data;
-
+ List : String_List_Id;
+ Element : String_Element;
+ Name : File_Name_Type;
+ Iter : Source_Iterator;
+ Source : Source_Id;
Project_2 : Project_Id;
- Data_2 : Project_Data;
+ Other : Source_Id;
begin
if not Interfaces.Default then
-- later for the sources in the Interfaces list.
Project_2 := Project;
- Data_2 := Data;
- loop
- Source := Data_2.First_Source;
- while Source /= No_Source loop
- Src_Data := In_Tree.Sources.Table (Source);
- Src_Data.In_Interfaces := False;
- In_Tree.Sources.Table (Source) := Src_Data;
- Source := Src_Data.Next_In_Project;
- end loop;
-
- Project_2 := Data_2.Extends;
+ while Project_2 /= No_Project loop
+ Iter := For_Each_Source (In_Tree, Project_2);
- exit when Project_2 = No_Project;
+ loop
+ Source := Prj.Element (Iter);
+ exit when Source = No_Source;
+ Source.In_Interfaces := False;
+ Next (Iter);
+ end loop;
- Data_2 := In_Tree.Projects.Table (Project_2);
+ Project_2 := Project_2.Extends;
end loop;
List := Interfaces.Values;
while List /= Nil_String loop
Element := In_Tree.String_Elements.Table (List);
- Get_Name_String (Element.Value);
- Canonical_Case_File_Name (Name_Buffer (1 .. Name_Len));
- Name := Name_Find;
+ Name := Canonical_Case_File_Name (Element.Value);
Project_2 := Project;
- Data_2 := Data;
Big_Loop :
- loop
- Source := Data_2.First_Source;
- while Source /= No_Source loop
- Src_Data := In_Tree.Sources.Table (Source);
- if Src_Data.File = Name then
- if not Src_Data.Locally_Removed then
- In_Tree.Sources.Table (Source).In_Interfaces := True;
- In_Tree.Sources.Table
- (Source).Declared_In_Interfaces := True;
-
- if Src_Data.Other_Part /= No_Source then
- In_Tree.Sources.Table
- (Src_Data.Other_Part).In_Interfaces := True;
- In_Tree.Sources.Table
- (Src_Data.Other_Part).Declared_In_Interfaces :=
- True;
+ while Project_2 /= No_Project loop
+ Iter := For_Each_Source (In_Tree, Project_2);
+
+ loop
+ Source := Prj.Element (Iter);
+ exit when Source = No_Source;
+
+ if Source.File = Name then
+ if not Source.Locally_Removed then
+ Source.In_Interfaces := True;
+ Source.Declared_In_Interfaces := True;
+
+ Other := Other_Part (Source);
+
+ if Other /= No_Source then
+ Other.In_Interfaces := True;
+ Other.Declared_In_Interfaces := True;
end if;
if Current_Verbosity = High then
Write_Str (" interface: ");
- Write_Line (Get_Name_String (Src_Data.Path.Name));
+ Write_Line (Get_Name_String (Source.Path.Name));
end if;
end if;
exit Big_Loop;
end if;
- Source := Src_Data.Next_In_Project;
+ Next (Iter);
end loop;
- Project_2 := Data_2.Extends;
-
- exit Big_Loop when Project_2 = No_Project;
-
- Data_2 := In_Tree.Projects.Table (Project_2);
+ Project_2 := Project_2.Extends;
end loop Big_Loop;
if Source = No_Source then
Error_Msg_File_1 := File_Name_Type (Element.Value);
- Error_Msg_Name_1 := Data.Name;
+ Error_Msg_Name_1 := Project.Name;
Error_Msg
(Project,
In_Tree,
- "{ cannot be an interface of project %% " &
- "as it is not one of its sources",
+ "{ cannot be an interface of project %% "
+ & "as it is not one of its sources",
Element.Location);
end if;
List := Element.Next;
end loop;
- Data.Interfaces_Defined := True;
+ Project.Interfaces_Defined := True;
- elsif Data.Extends /= No_Project then
- Data.Interfaces_Defined :=
- In_Tree.Projects.Table (Data.Extends).Interfaces_Defined;
+ elsif Project.Extends /= No_Project then
+ Project.Interfaces_Defined := Project.Extends.Interfaces_Defined;
- if Data.Interfaces_Defined then
- Source := Data.First_Source;
- while Source /= No_Source loop
- Src_Data := In_Tree.Sources.Table (Source);
+ if Project.Interfaces_Defined then
+ Iter := For_Each_Source (In_Tree, Project);
+ loop
+ Source := Prj.Element (Iter);
+ exit when Source = No_Source;
- if not Src_Data.Declared_In_Interfaces then
- Src_Data.In_Interfaces := False;
- In_Tree.Sources.Table (Source) := Src_Data;
+ if not Source.Declared_In_Interfaces then
+ Source.In_Interfaces := False;
end if;
- Source := Src_Data.Next_In_Project;
+ Next (Iter);
end loop;
end if;
end if;
end Check_Interfaces;
+ ------------------------------------
+ -- Check_And_Normalize_Unit_Names --
+ ------------------------------------
+
+ procedure Check_And_Normalize_Unit_Names
+ (Project : Project_Id;
+ In_Tree : Project_Tree_Ref;
+ List : Array_Element_Id;
+ Debug_Name : String)
+ is
+ Current : Array_Element_Id;
+ Element : Array_Element;
+ Unit_Name : Name_Id;
+
+ begin
+ if Current_Verbosity = High then
+ Write_Line (" Checking unit names in " & Debug_Name);
+ end if;
+
+ Current := List;
+ while Current /= No_Array_Element loop
+ Element := In_Tree.Array_Elements.Table (Current);
+ Element.Value.Value :=
+ Name_Id (Canonical_Case_File_Name (Element.Value.Value));
+
+ -- Check that it contains a valid unit name
+
+ Get_Name_String (Element.Index);
+ Check_Ada_Name (Name_Buffer (1 .. Name_Len), Unit_Name);
+
+ if Unit_Name = No_Name then
+ Err_Vars.Error_Msg_Name_1 := Element.Index;
+ Error_Msg
+ (Project, In_Tree,
+ "%% is not a valid unit name.",
+ Element.Value.Location);
+
+ else
+ if Current_Verbosity = High then
+ Write_Str (" for unit: ");
+ Write_Line (Get_Name_String (Unit_Name));
+ end if;
+
+ Element.Index := Unit_Name;
+ In_Tree.Array_Elements.Table (Current) := Element;
+ end if;
+
+ Current := Element.Next;
+ end loop;
+ end Check_And_Normalize_Unit_Names;
+
--------------------------
- -- Check_Naming_Schemes --
+ -- Check_Package_Naming --
--------------------------
- procedure Check_Naming_Schemes
- (Data : in out Project_Data;
- Project : Project_Id;
- In_Tree : Project_Tree_Ref)
+ procedure Check_Package_Naming
+ (Project : Project_Id;
+ In_Tree : Project_Tree_Ref;
+ Is_Config_File : Boolean;
+ Bodies : out Array_Element_Id;
+ Specs : out Array_Element_Id)
is
Naming_Id : constant Package_Id :=
- Util.Value_Of (Name_Naming, Data.Decl.Packages, In_Tree);
+ Util.Value_Of (Name_Naming, Project.Decl.Packages, In_Tree);
Naming : Package_Element;
- procedure Check_Unit_Names (List : Array_Element_Id);
- -- Check that a list of unit names contains only valid names
+ Ada_Body_Suffix_Loc : Source_Ptr := No_Location;
+ Ada_Spec_Suffix_Loc : Source_Ptr := No_Location;
+
+ procedure Check_Naming_Ada_Only;
+ -- Does Check_Naming_Schemes processing in Ada_Only mode.
+ -- If there is a package Naming, puts in Data.Naming the contents of
+ -- this package.
+
+ procedure Check_Naming_Multi_Lang;
+ -- Does Check_Naming_Schemes processing for Multi_Language mode
+
+ procedure Check_Common
+ (Dot_Replacement : in out File_Name_Type;
+ Casing : in out Casing_Type;
+ Casing_Defined : out Boolean;
+ Separate_Suffix : in out File_Name_Type;
+ Sep_Suffix_Loc : out Source_Ptr);
+ -- Check attributes common to Ada_Only and Multi_Lang modes
+
+ procedure Process_Exceptions_File_Based
+ (Lang_Id : Language_Ptr;
+ Kind : Source_Kind);
+ procedure Process_Exceptions_Unit_Based
+ (Lang_Id : Language_Ptr;
+ Kind : Source_Kind);
+ -- In Multi_Lang mode, process the naming exceptions for the two types
+ -- of languages we can have.
+
+ procedure Initialize_Naming_Data;
+ -- Initialize internal naming data for the various languages
+
+ ------------------
+ -- Check_Common --
+ ------------------
+
+ procedure Check_Common
+ (Dot_Replacement : in out File_Name_Type;
+ Casing : in out Casing_Type;
+ Casing_Defined : out Boolean;
+ Separate_Suffix : in out File_Name_Type;
+ Sep_Suffix_Loc : out Source_Ptr)
+ is
+ Dot_Repl : constant Variable_Value :=
+ Util.Value_Of
+ (Name_Dot_Replacement,
+ Naming.Decl.Attributes,
+ In_Tree);
+ Casing_String : constant Variable_Value :=
+ Util.Value_Of
+ (Name_Casing,
+ Naming.Decl.Attributes,
+ In_Tree);
+ Sep_Suffix : constant Variable_Value :=
+ Util.Value_Of
+ (Name_Separate_Suffix,
+ Naming.Decl.Attributes,
+ In_Tree);
+ Dot_Repl_Loc : Source_Ptr;
- procedure Get_Exceptions (Kind : Source_Kind);
+ begin
+ Sep_Suffix_Loc := No_Location;
- procedure Get_Unit_Exceptions (Kind : Source_Kind);
+ if not Dot_Repl.Default then
+ pragma Assert
+ (Dot_Repl.Kind = Single, "Dot_Replacement is not a string");
- ----------------------
- -- Check_Unit_Names --
- ----------------------
+ if Length_Of_Name (Dot_Repl.Value) = 0 then
+ Error_Msg
+ (Project, In_Tree,
+ "Dot_Replacement cannot be empty",
+ Dot_Repl.Location);
+ end if;
- procedure Check_Unit_Names (List : Array_Element_Id) is
- Current : Array_Element_Id;
- Element : Array_Element;
- Unit_Name : Name_Id;
+ Dot_Replacement := Canonical_Case_File_Name (Dot_Repl.Value);
+ Dot_Repl_Loc := Dot_Repl.Location;
- begin
- -- Loop through elements of the string list
+ declare
+ Repl : constant String := Get_Name_String (Dot_Replacement);
+
+ begin
+ -- Dot_Replacement cannot
+ -- - be empty
+ -- - start or end with an alphanumeric
+ -- - be a single '_'
+ -- - start with an '_' followed by an alphanumeric
+ -- - contain a '.' except if it is "."
+
+ if Repl'Length = 0
+ or else Is_Alphanumeric (Repl (Repl'First))
+ or else Is_Alphanumeric (Repl (Repl'Last))
+ or else (Repl (Repl'First) = '_'
+ and then
+ (Repl'Length = 1
+ or else
+ Is_Alphanumeric (Repl (Repl'First + 1))))
+ or else (Repl'Length > 1
+ and then
+ Index (Source => Repl, Pattern => ".") /= 0)
+ then
+ Error_Msg
+ (Project, In_Tree,
+ '"' & Repl &
+ """ is illegal for Dot_Replacement.",
+ Dot_Repl_Loc);
+ end if;
+ end;
+ end if;
- Current := List;
- while Current /= No_Array_Element loop
- Element := In_Tree.Array_Elements.Table (Current);
+ if Dot_Replacement /= No_File then
+ Write_Attr
+ ("Dot_Replacement", Get_Name_String (Dot_Replacement));
+ end if;
- -- Put file name in canonical case
+ Casing_Defined := False;
- if not Osint.File_Names_Case_Sensitive then
- Get_Name_String (Element.Value.Value);
- Canonical_Case_File_Name (Name_Buffer (1 .. Name_Len));
- Element.Value.Value := Name_Find;
- end if;
+ if not Casing_String.Default then
+ pragma Assert
+ (Casing_String.Kind = Single, "Casing is not a string");
+
+ declare
+ Casing_Image : constant String :=
+ Get_Name_String (Casing_String.Value);
+ begin
+ if Casing_Image'Length = 0 then
+ Error_Msg
+ (Project, In_Tree,
+ "Casing cannot be an empty string",
+ Casing_String.Location);
+ end if;
- -- Check that it contains a valid unit name
+ Casing := Value (Casing_Image);
+ Casing_Defined := True;
- Get_Name_String (Element.Index);
- Check_Ada_Name (Name_Buffer (1 .. Name_Len), Unit_Name);
+ exception
+ when Constraint_Error =>
+ Name_Len := Casing_Image'Length;
+ Name_Buffer (1 .. Name_Len) := Casing_Image;
+ Err_Vars.Error_Msg_Name_1 := Name_Find;
+ Error_Msg
+ (Project, In_Tree,
+ "%% is not a correct Casing",
+ Casing_String.Location);
+ end;
+ end if;
+
+ Write_Attr ("Casing", Image (Casing));
- if Unit_Name = No_Name then
- Err_Vars.Error_Msg_Name_1 := Element.Index;
+ if not Sep_Suffix.Default then
+ if Length_Of_Name (Sep_Suffix.Value) = 0 then
Error_Msg
(Project, In_Tree,
- "%% is not a valid unit name.",
- Element.Value.Location);
+ "Separate_Suffix cannot be empty",
+ Sep_Suffix.Location);
else
- if Current_Verbosity = High then
- Write_Str (" Unit (""");
- Write_Str (Get_Name_String (Unit_Name));
- Write_Line (""")");
- end if;
+ Separate_Suffix := Canonical_Case_File_Name (Sep_Suffix.Value);
+ Sep_Suffix_Loc := Sep_Suffix.Location;
- Element.Index := Unit_Name;
- In_Tree.Array_Elements.Table (Current) := Element;
+ if Is_Illegal_Suffix (Separate_Suffix, Dot_Replacement) then
+ Err_Vars.Error_Msg_File_1 := Separate_Suffix;
+ Error_Msg
+ (Project, In_Tree,
+ "{ is illegal for Separate_Suffix",
+ Sep_Suffix.Location);
+ end if;
end if;
+ end if;
- Current := Element.Next;
- end loop;
- end Check_Unit_Names;
+ if Separate_Suffix /= No_File then
+ Write_Attr
+ ("Separate_Suffix", Get_Name_String (Separate_Suffix));
+ end if;
+ end Check_Common;
- --------------------
- -- Get_Exceptions --
- --------------------
+ -----------------------------------
+ -- Process_Exceptions_File_Based --
+ -----------------------------------
- procedure Get_Exceptions (Kind : Source_Kind) is
+ procedure Process_Exceptions_File_Based
+ (Lang_Id : Language_Ptr;
+ Kind : Source_Kind)
+ is
+ Lang : constant Name_Id := Lang_Id.Name;
Exceptions : Array_Element_Id;
Exception_List : Variable_Value;
Element_Id : String_List_Id;
Element : String_Element;
File_Name : File_Name_Type;
- Lang_Id : Language_Index;
- Lang : Name_Id;
- Lang_Kind : Language_Kind;
Source : Source_Id;
+ Iter : Source_Iterator;
begin
- if Kind = Impl then
- Exceptions :=
- Value_Of
- (Name_Implementation_Exceptions,
- In_Arrays => Naming.Decl.Arrays,
- In_Tree => In_Tree);
-
- else
- Exceptions :=
- Value_Of
- (Name_Specification_Exceptions,
- In_Arrays => Naming.Decl.Arrays,
- In_Tree => In_Tree);
- end if;
+ case Kind is
+ when Impl | Sep =>
+ Exceptions :=
+ Value_Of
+ (Name_Implementation_Exceptions,
+ In_Arrays => Naming.Decl.Arrays,
+ In_Tree => In_Tree);
- Lang_Id := Data.First_Language_Processing;
- while Lang_Id /= No_Language_Index loop
- if In_Tree.Languages_Data.Table (Lang_Id).Config.Kind =
- File_Based
- then
- Lang := In_Tree.Languages_Data.Table (Lang_Id).Name;
- Lang_Kind :=
- In_Tree.Languages_Data.Table (Lang_Id).Config.Kind;
-
- Exception_List := Value_Of
- (Index => Lang,
- In_Array => Exceptions,
- In_Tree => In_Tree);
-
- if Exception_List /= Nil_Variable_Value then
- Element_Id := Exception_List.Values;
- while Element_Id /= Nil_String loop
- Element := In_Tree.String_Elements.Table (Element_Id);
-
- if Osint.File_Names_Case_Sensitive then
- File_Name := File_Name_Type (Element.Value);
- else
- Get_Name_String (Element.Value);
- Canonical_Case_File_Name (Name_Buffer (1 .. Name_Len));
- File_Name := Name_Find;
- end if;
+ when Spec =>
+ Exceptions :=
+ Value_Of
+ (Name_Specification_Exceptions,
+ In_Arrays => Naming.Decl.Arrays,
+ In_Tree => In_Tree);
+ end case;
- Source := Data.First_Source;
- while Source /= No_Source
- and then
- In_Tree.Sources.Table (Source).File /= File_Name
- loop
- Source :=
- In_Tree.Sources.Table (Source).Next_In_Project;
- end loop;
+ Exception_List := Value_Of
+ (Index => Lang,
+ In_Array => Exceptions,
+ In_Tree => In_Tree);
- if Source = No_Source then
- Add_Source
- (Id => Source,
- Data => Data,
- In_Tree => In_Tree,
- Project => Project,
- Lang => Lang,
- Lang_Id => Lang_Id,
- Kind => Kind,
- File_Name => File_Name,
- Display_File => File_Name_Type (Element.Value),
- Naming_Exception => True,
- Lang_Kind => Lang_Kind);
+ if Exception_List /= Nil_Variable_Value then
+ Element_Id := Exception_List.Values;
+ while Element_Id /= Nil_String loop
+ Element := In_Tree.String_Elements.Table (Element_Id);
+ File_Name := Canonical_Case_File_Name (Element.Value);
- else
- -- Check if the file name is already recorded for
- -- another language or another kind.
+ Iter := For_Each_Source (In_Tree, Project);
+ loop
+ Source := Prj.Element (Iter);
+ exit when Source = No_Source or else Source.File = File_Name;
+ Next (Iter);
+ end loop;
- if
- In_Tree.Sources.Table (Source).Language /= Lang_Id
- then
- Error_Msg
- (Project,
- In_Tree,
- "the same file cannot be a source " &
- "of two languages",
- Element.Location);
+ if Source = No_Source then
+ Add_Source
+ (Id => Source,
+ In_Tree => In_Tree,
+ Project => Project,
+ Lang_Id => Lang_Id,
+ Kind => Kind,
+ File_Name => File_Name,
+ Display_File => File_Name_Type (Element.Value),
+ Naming_Exception => True);
- elsif In_Tree.Sources.Table (Source).Kind /= Kind then
- Error_Msg
- (Project,
- In_Tree,
- "the same file cannot be a source " &
- "and a template",
- Element.Location);
- end if;
+ else
+ -- Check if the file name is already recorded for another
+ -- language or another kind.
- -- If the file is already recorded for the same
- -- language and the same kind, it means that the file
- -- name appears several times in the *_Exceptions
- -- attribute; so there is nothing to do.
+ if Source.Language /= Lang_Id then
+ Error_Msg
+ (Project,
+ In_Tree,
+ "the same file cannot be a source of two languages",
+ Element.Location);
- end if;
+ elsif Source.Kind /= Kind then
+ Error_Msg
+ (Project,
+ In_Tree,
+ "the same file cannot be a source and a template",
+ Element.Location);
+ end if;
- Element_Id := Element.Next;
- end loop;
+ -- If the file is already recorded for the same
+ -- language and the same kind, it means that the file
+ -- name appears several times in the *_Exceptions
+ -- attribute; so there is nothing to do.
end if;
- end if;
- Lang_Id := In_Tree.Languages_Data.Table (Lang_Id).Next;
- end loop;
- end Get_Exceptions;
-
- -------------------------
- -- Get_Unit_Exceptions --
- -------------------------
-
- procedure Get_Unit_Exceptions (Kind : Source_Kind) is
- Exceptions : Array_Element_Id;
- Element : Array_Element;
- Unit : Name_Id;
- Index : Int;
- File_Name : File_Name_Type;
- Lang_Id : constant Language_Index :=
- Data.Unit_Based_Language_Index;
- Lang : constant Name_Id :=
- Data.Unit_Based_Language_Name;
+ Element_Id := Element.Next;
+ end loop;
+ end if;
+ end Process_Exceptions_File_Based;
+
+ -----------------------------------
+ -- Process_Exceptions_Unit_Based --
+ -----------------------------------
+ procedure Process_Exceptions_Unit_Based
+ (Lang_Id : Language_Ptr;
+ Kind : Source_Kind)
+ is
+ Lang : constant Name_Id := Lang_Id.Name;
+ Exceptions : Array_Element_Id;
+ Element : Array_Element;
+ Unit : Name_Id;
+ Index : Int;
+ File_Name : File_Name_Type;
Source : Source_Id;
Source_To_Replace : Source_Id := No_Source;
-
- Other_Project : Project_Id;
- Other_Part : Source_Id := No_Source;
+ Other_Project : Project_Id;
+ Iter : Source_Iterator;
begin
- if Lang_Id = No_Language_Index or else Lang = No_Name then
- return;
- end if;
+ case Kind is
+ when Impl | Sep =>
+ Exceptions := Value_Of
+ (Name_Body,
+ In_Arrays => Naming.Decl.Arrays,
+ In_Tree => In_Tree);
- if Kind = Impl then
- Exceptions := Value_Of
- (Name_Body,
- In_Arrays => Naming.Decl.Arrays,
- In_Tree => In_Tree);
+ if Exceptions = No_Array_Element then
+ Exceptions :=
+ Value_Of
+ (Name_Implementation,
+ In_Arrays => Naming.Decl.Arrays,
+ In_Tree => In_Tree);
+ end if;
- if Exceptions = No_Array_Element then
+ when Spec =>
Exceptions :=
Value_Of
- (Name_Implementation,
+ (Name_Spec,
In_Arrays => Naming.Decl.Arrays,
In_Tree => In_Tree);
- end if;
-
- else
- Exceptions :=
- Value_Of
- (Name_Spec,
- In_Arrays => Naming.Decl.Arrays,
- In_Tree => In_Tree);
-
- if Exceptions = No_Array_Element then
- Exceptions := Value_Of
- (Name_Specification,
- In_Arrays => Naming.Decl.Arrays,
- In_Tree => In_Tree);
- end if;
- end if;
+ if Exceptions = No_Array_Element then
+ Exceptions := Value_Of
+ (Name_Spec,
+ In_Arrays => Naming.Decl.Arrays,
+ In_Tree => In_Tree);
+ end if;
+ end case;
while Exceptions /= No_Array_Element loop
- Element := In_Tree.Array_Elements.Table (Exceptions);
-
- if Osint.File_Names_Case_Sensitive then
- File_Name := File_Name_Type (Element.Value.Value);
- else
- Get_Name_String (Element.Value.Value);
- Canonical_Case_File_Name (Name_Buffer (1 .. Name_Len));
- File_Name := Name_Find;
- end if;
+ Element := In_Tree.Array_Elements.Table (Exceptions);
+ File_Name := Canonical_Case_File_Name (Element.Value.Value);
Get_Name_String (Element.Index);
To_Lower (Name_Buffer (1 .. Name_Len));
- Unit := Name_Find;
-
+ Unit := Name_Find;
Index := Element.Value.Index;
-- For Ada, check if it is a valid unit name
if Unit /= No_Name then
-- Check if the source already exists
+ -- ??? In Ada_Only mode (Record_Unit), we use a htable for
+ -- efficiency
- Source := In_Tree.First_Source;
Source_To_Replace := No_Source;
+ Iter := For_Each_Source (In_Tree);
- while Source /= No_Source and then
- (In_Tree.Sources.Table (Source).Unit /= Unit or else
- In_Tree.Sources.Table (Source).Index /= Index)
loop
- Source := In_Tree.Sources.Table (Source).Next_In_Sources;
+ Source := Prj.Element (Iter);
+ exit when Source = No_Source
+ or else (Source.Unit /= null
+ and then Source.Unit.Name = Unit
+ and then Source.Index = Index);
+ Next (Iter);
end loop;
if Source /= No_Source then
- if In_Tree.Sources.Table (Source).Kind /= Kind then
- Other_Part := Source;
-
+ if Source.Kind /= Kind then
loop
- Source :=
- In_Tree.Sources.Table (Source).Next_In_Sources;
+ Next (Iter);
+ Source := Prj.Element (Iter);
- exit when Source = No_Source or else
- (In_Tree.Sources.Table (Source).Unit = Unit
- and then
- In_Tree.Sources.Table (Source).Index = Index);
+ exit when Source = No_Source
+ or else (Source.Unit /= null
+ and then Source.Unit.Name = Unit
+ and then Source.Index = Index);
end loop;
end if;
if Source /= No_Source then
- Other_Project := In_Tree.Sources.Table (Source).Project;
-
- if Is_Extending (Project, Other_Project, In_Tree) then
- Other_Part :=
- In_Tree.Sources.Table (Source).Other_Part;
-
- -- Record the source to be removed
+ Other_Project := Source.Project;
+ if Is_Extending (Project, Other_Project) then
Source_To_Replace := Source;
Source := No_Source;
else
Error_Msg_Name_1 := Unit;
- Error_Msg_Name_2 :=
- In_Tree.Projects.Table (Other_Project).Name;
+ Error_Msg_Name_2 := Other_Project.Name;
Error_Msg
(Project,
In_Tree,
if Source = No_Source then
Add_Source
(Id => Source,
- Data => Data,
In_Tree => In_Tree,
Project => Project,
- Lang => Lang,
Lang_Id => Lang_Id,
Kind => Kind,
File_Name => File_Name,
Display_File => File_Name_Type (Element.Value.Value),
- Lang_Kind => Unit_Based,
- Other_Part => Other_Part,
Unit => Unit,
Index => Index,
Naming_Exception => True,
Exceptions := Element.Next;
end loop;
+ end Process_Exceptions_Unit_Based;
- end Get_Unit_Exceptions;
-
- -- Start of processing for Check_Naming_Schemes
-
- begin
- if Get_Mode = Ada_Only then
-
- -- If there is a package Naming, we will put in Data.Naming what is
- -- in this package Naming.
-
- if Naming_Id /= No_Package then
- Naming := In_Tree.Packages.Table (Naming_Id);
-
- if Current_Verbosity = High then
- Write_Line ("Checking ""Naming"" for Ada.");
- end if;
-
- declare
- Bodies : constant Array_Element_Id :=
- Util.Value_Of
- (Name_Body, Naming.Decl.Arrays, In_Tree);
-
- Specs : constant Array_Element_Id :=
- Util.Value_Of
- (Name_Spec, Naming.Decl.Arrays, In_Tree);
-
- 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;
-
- if Specs /= No_Array_Element then
-
- -- We have elements in the array Specs
+ ---------------------------
+ -- Check_Naming_Ada_Only --
+ ---------------------------
- if Current_Verbosity = High then
- Write_Line ("Found Specs.");
- end if;
+ procedure Check_Naming_Ada_Only is
+ Ada : constant Language_Ptr :=
+ Get_Language_From_Name (Project, "ada");
- Data.Naming.Specs := Specs;
- Check_Unit_Names (Specs);
+ Casing_Defined : Boolean;
+ Sep_Suffix_Loc : Source_Ptr;
- else
- if Current_Verbosity = High then
- Write_Line ("No Specs.");
- end if;
- end if;
- end;
+ begin
+ -- If no language, then nothing to do
- -- We are now checking if variables Dot_Replacement, Casing,
- -- Spec_Suffix, Body_Suffix and/or Separate_Suffix exist.
+ if Ada = null then
+ return;
+ end if;
- -- For each variable, if it does not exist, we do nothing,
- -- because we already have the default.
+ declare
+ Data : Lang_Naming_Data renames Ada.Config.Naming_Data;
- -- Check Dot_Replacement
+ begin
+ -- The default value of separate suffix should be the same as the
+ -- body suffix, so we need to compute that first.
- declare
- Dot_Replacement : constant Variable_Value :=
- Util.Value_Of
- (Name_Dot_Replacement,
- Naming.Decl.Attributes, In_Tree);
+ Data.Separate_Suffix := Data.Body_Suffix;
+ Write_Attr ("Body_Suffix", Get_Name_String (Data.Body_Suffix));
- begin
- pragma Assert (Dot_Replacement.Kind = Single,
- "Dot_Replacement is not a single string");
+ -- We'll need the dot replacement below, so compute it now
- if not Dot_Replacement.Default then
- Get_Name_String (Dot_Replacement.Value);
+ Check_Common
+ (Dot_Replacement => Data.Dot_Replacement,
+ Casing => Data.Casing,
+ Casing_Defined => Casing_Defined,
+ Separate_Suffix => Data.Separate_Suffix,
+ Sep_Suffix_Loc => Sep_Suffix_Loc);
- if Name_Len = 0 then
- Error_Msg
- (Project, In_Tree,
- "Dot_Replacement cannot be empty",
- Dot_Replacement.Location);
+ Bodies := Util.Value_Of (Name_Body, Naming.Decl.Arrays, In_Tree);
- else
- if Osint.File_Names_Case_Sensitive then
- Data.Naming.Dot_Replacement :=
- File_Name_Type (Dot_Replacement.Value);
- else
- Canonical_Case_File_Name (Name_Buffer (1 .. Name_Len));
- Data.Naming.Dot_Replacement := Name_Find;
- end if;
- Data.Naming.Dot_Repl_Loc := Dot_Replacement.Location;
- end if;
- end if;
- end;
-
- if Current_Verbosity = High then
- Write_Str (" Dot_Replacement = """);
- Write_Str (Get_Name_String (Data.Naming.Dot_Replacement));
- Write_Char ('"');
- Write_Eol;
+ if Bodies /= No_Array_Element then
+ Check_And_Normalize_Unit_Names
+ (Project, In_Tree, Bodies, "Naming.Bodies");
end if;
- -- Check Casing
-
- declare
- Casing_String : constant Variable_Value :=
- Util.Value_Of
- (Name_Casing,
- Naming.Decl.Attributes,
- In_Tree);
-
- begin
- pragma Assert (Casing_String.Kind = Single,
- "Casing is not a single string");
-
- if not Casing_String.Default then
- declare
- Casing_Image : constant String :=
- Get_Name_String (Casing_String.Value);
- begin
- declare
- Casing_Value : constant Casing_Type :=
- Value (Casing_Image);
- begin
- Data.Naming.Casing := Casing_Value;
- end;
-
- exception
- when Constraint_Error =>
- if Casing_Image'Length = 0 then
- Error_Msg
- (Project, In_Tree,
- "Casing cannot be an empty string",
- Casing_String.Location);
-
- else
- Name_Len := Casing_Image'Length;
- Name_Buffer (1 .. Name_Len) := Casing_Image;
- Err_Vars.Error_Msg_Name_1 := Name_Find;
- Error_Msg
- (Project, In_Tree,
- "%% is not a correct Casing",
- Casing_String.Location);
- end if;
- end;
- end if;
- end;
+ Specs := Util.Value_Of (Name_Spec, Naming.Decl.Arrays, In_Tree);
- if Current_Verbosity = High then
- Write_Str (" Casing = ");
- Write_Str (Image (Data.Naming.Casing));
- Write_Char ('.');
- Write_Eol;
+ if Specs /= No_Array_Element then
+ Check_And_Normalize_Unit_Names
+ (Project, In_Tree, Specs, "Naming.Specs");
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,
- In_Tree => In_Tree);
-
- 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));
- Set_Spec_Suffix (In_Tree, "ada", Data.Naming, Name_Find);
- Data.Naming.Ada_Spec_Suffix_Loc := Ada_Spec_Suffix.Location;
-
- else
- Set_Spec_Suffix
- (In_Tree,
- "ada",
- Data.Naming,
- Default_Ada_Spec_Suffix);
- end if;
- end;
-
- if Current_Verbosity = High then
- Write_Str (" Spec_Suffix = """);
- Write_Str (Spec_Suffix_Of (In_Tree, "ada", Data.Naming));
- Write_Char ('"');
- Write_Eol;
+ if Is_Illegal_Suffix (Data.Spec_Suffix, Data.Dot_Replacement) then
+ Err_Vars.Error_Msg_File_1 := Data.Spec_Suffix;
+ Error_Msg
+ (Project, In_Tree,
+ "{ is illegal for Spec_Suffix",
+ Ada_Spec_Suffix_Loc);
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,
- In_Tree => In_Tree);
+ Write_Attr ("Spec_Suffix", Get_Name_String (Data.Spec_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));
- Set_Body_Suffix (In_Tree, "ada", Data.Naming, Name_Find);
- Data.Naming.Ada_Body_Suffix_Loc := Ada_Body_Suffix.Location;
-
- else
- Set_Body_Suffix
- (In_Tree,
- "ada",
- Data.Naming,
- Default_Ada_Body_Suffix);
- end if;
- end;
+ -- Check Body_Suffix
- if Current_Verbosity = High then
- Write_Str (" Body_Suffix = """);
- Write_Str (Body_Suffix_Of (In_Tree, "ada", Data.Naming));
- Write_Char ('"');
- Write_Eol;
+ if Is_Illegal_Suffix (Data.Body_Suffix, Data.Dot_Replacement) then
+ Err_Vars.Error_Msg_File_1 := Data.Body_Suffix;
+ Error_Msg
+ (Project, In_Tree,
+ "{ is illegal for Body_Suffix",
+ Ada_Body_Suffix_Loc);
end if;
- -- Check Separate_Suffix
+ -- Spec_Suffix cannot be equal to Body_Suffix or Separate_Suffix,
+ -- since that would cause a clear ambiguity. Note that we do allow
+ -- a Spec_Suffix to have the same termination as one of these,
+ -- which causes a potential ambiguity, but we resolve that my
+ -- matching the longest possible suffix.
- declare
- Ada_Sep_Suffix : constant Variable_Value :=
- Prj.Util.Value_Of
- (Variable_Name => Name_Separate_Suffix,
- In_Variables => Naming.Decl.Attributes,
- In_Tree => In_Tree);
+ if Data.Spec_Suffix = Data.Body_Suffix then
+ Error_Msg
+ (Project, In_Tree,
+ "Body_Suffix ("""
+ & Get_Name_String (Data.Body_Suffix)
+ & """) cannot be the same as Spec_Suffix.",
+ Ada_Body_Suffix_Loc);
+ end if;
- begin
- if Ada_Sep_Suffix.Default then
- Data.Naming.Separate_Suffix :=
- Body_Suffix_Id_Of (In_Tree, Name_Ada, Data.Naming);
+ if Data.Body_Suffix /= Data.Separate_Suffix
+ and then Data.Spec_Suffix = Data.Separate_Suffix
+ then
+ Error_Msg
+ (Project, In_Tree,
+ "Separate_Suffix ("""
+ & Get_Name_String (Data.Separate_Suffix)
+ & """) cannot be the same as Spec_Suffix.",
+ Sep_Suffix_Loc);
+ end if;
+ end;
+ end Check_Naming_Ada_Only;
+
+ -----------------------------
+ -- Check_Naming_Multi_Lang --
+ -----------------------------
+
+ procedure Check_Naming_Multi_Lang is
+ Dot_Replacement : File_Name_Type := No_File;
+ Separate_Suffix : File_Name_Type := No_File;
+ Casing : Casing_Type := All_Lower_Case;
+ Casing_Defined : Boolean;
+ Lang_Id : Language_Ptr;
+ Sep_Suffix_Loc : Source_Ptr;
+ Suffix : Variable_Value;
+ Lang : Name_Id;
- else
- Get_Name_String (Ada_Sep_Suffix.Value);
+ begin
+ Check_Common
+ (Dot_Replacement => Dot_Replacement,
+ Casing => Casing,
+ Casing_Defined => Casing_Defined,
+ Separate_Suffix => Separate_Suffix,
+ Sep_Suffix_Loc => Sep_Suffix_Loc);
+
+ -- For all unit based languages, if any, set the specified value
+ -- of Dot_Replacement, Casing and/or Separate_Suffix. Do not
+ -- systematically overwrite, since the defaults come from the
+ -- configuration file
+
+ if Dot_Replacement /= No_File
+ or else Casing_Defined
+ or else Separate_Suffix /= No_File
+ then
+ Lang_Id := Project.Languages;
+ while Lang_Id /= No_Language_Index loop
+ if Lang_Id.Config.Kind = Unit_Based then
+ if Dot_Replacement /= No_File then
+ Lang_Id.Config.Naming_Data.Dot_Replacement :=
+ Dot_Replacement;
+ end if;
- if Name_Len = 0 then
- Error_Msg
- (Project, In_Tree,
- "Separate_Suffix cannot be empty",
- Ada_Sep_Suffix.Location);
+ if Casing_Defined then
+ Lang_Id.Config.Naming_Data.Casing := Casing;
+ end if;
- else
- Canonical_Case_File_Name (Name_Buffer (1 .. Name_Len));
- Data.Naming.Separate_Suffix := Name_Find;
- Data.Naming.Sep_Suffix_Loc := Ada_Sep_Suffix.Location;
+ if Separate_Suffix /= No_File then
+ Lang_Id.Config.Naming_Data.Separate_Suffix :=
+ Separate_Suffix;
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, In_Tree, Data.Naming);
+ Lang_Id := Lang_Id.Next;
+ end loop;
end if;
- elsif not In_Configuration then
-
- -- Look into package Naming, if there is one
+ -- Next, get the spec and body suffixes
- if Naming_Id /= No_Package then
- Naming := In_Tree.Packages.Table (Naming_Id);
+ Lang_Id := Project.Languages;
+ while Lang_Id /= No_Language_Index loop
+ Lang := Lang_Id.Name;
+
+ -- Spec_Suffix
+
+ Suffix := Value_Of
+ (Name => Lang,
+ Attribute_Or_Array_Name => Name_Spec_Suffix,
+ In_Package => Naming_Id,
+ In_Tree => In_Tree);
+
+ if Suffix = Nil_Variable_Value then
+ Suffix := Value_Of
+ (Name => Lang,
+ Attribute_Or_Array_Name => Name_Spec_Suffix,
+ In_Package => Naming_Id,
+ In_Tree => In_Tree);
+ end if;
- if Current_Verbosity = High then
- Write_Line ("Checking package Naming.");
+ if Suffix /= Nil_Variable_Value then
+ Lang_Id.Config.Naming_Data.Spec_Suffix :=
+ File_Name_Type (Suffix.Value);
end if;
- -- We are now checking if attribute Dot_Replacement, Casing,
- -- and/or Separate_Suffix exist.
+ -- Body_Suffix
- -- For each attribute, if it does not exist, we do nothing,
- -- because we already have the default.
- -- Otherwise, for all unit-based languages, we put the declared
- -- value in the language config.
+ Suffix := Value_Of
+ (Name => Lang,
+ Attribute_Or_Array_Name => Name_Body_Suffix,
+ In_Package => Naming_Id,
+ In_Tree => In_Tree);
- declare
- Dot_Repl : constant Variable_Value :=
- Util.Value_Of
- (Name_Dot_Replacement,
- Naming.Decl.Attributes, In_Tree);
- Dot_Replacement : File_Name_Type := No_File;
+ if Suffix = Nil_Variable_Value then
+ Suffix := Value_Of
+ (Name => Lang,
+ Attribute_Or_Array_Name => Name_Implementation_Suffix,
+ In_Package => Naming_Id,
+ In_Tree => In_Tree);
+ end if;
- Casing_String : constant Variable_Value :=
- Util.Value_Of
- (Name_Casing,
- Naming.Decl.Attributes,
- In_Tree);
- Casing : Casing_Type;
- Casing_Defined : Boolean := False;
+ if Suffix /= Nil_Variable_Value then
+ Lang_Id.Config.Naming_Data.Body_Suffix :=
+ File_Name_Type (Suffix.Value);
+ end if;
- Sep_Suffix : constant Variable_Value :=
- Prj.Util.Value_Of
- (Variable_Name => Name_Separate_Suffix,
- In_Variables => Naming.Decl.Attributes,
- In_Tree => In_Tree);
- Separate_Suffix : File_Name_Type := No_File;
+ -- ??? As opposed to what is done in Check_Naming_Ada_Only,
+ -- we do not check whether spec_suffix=body_suffix, which
+ -- should be illegal. Best would be to share this code into
+ -- Check_Common, but we access the attributes from the project
+ -- files slightly differently apparently.
- Lang_Id : Language_Index;
- begin
- -- Check attribute Dot_Replacement
+ Lang_Id := Lang_Id.Next;
+ end loop;
- if not Dot_Repl.Default then
- Get_Name_String (Dot_Repl.Value);
+ -- Get the naming exceptions for all languages
- if Name_Len = 0 then
- Error_Msg
- (Project, In_Tree,
- "Dot_Replacement cannot be empty",
- Dot_Repl.Location);
+ for Kind in Spec .. Impl loop
+ Lang_Id := Project.Languages;
+ while Lang_Id /= No_Language_Index loop
+ case Lang_Id.Config.Kind is
+ when File_Based =>
+ Process_Exceptions_File_Based (Lang_Id, Kind);
- else
- Canonical_Case_File_Name (Name_Buffer (1 .. Name_Len));
- Dot_Replacement := Name_Find;
+ when Unit_Based =>
+ Process_Exceptions_Unit_Based (Lang_Id, Kind);
+ end case;
- if Current_Verbosity = High then
- Write_Str (" Dot_Replacement = """);
- Write_Str (Get_Name_String (Dot_Replacement));
- Write_Char ('"');
- Write_Eol;
- end if;
- end if;
- end if;
+ Lang_Id := Lang_Id.Next;
+ end loop;
+ end loop;
+ end Check_Naming_Multi_Lang;
- -- Check attribute Casing
+ ----------------------------
+ -- Initialize_Naming_Data --
+ ----------------------------
- 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
- Casing := Casing_Value;
- Casing_Defined := True;
+ procedure Initialize_Naming_Data is
+ Specs : Array_Element_Id :=
+ Util.Value_Of
+ (Name_Spec_Suffix,
+ Naming.Decl.Arrays,
+ In_Tree);
- if Current_Verbosity = High then
- Write_Str (" Casing = ");
- Write_Str (Image (Casing));
- Write_Char ('.');
- Write_Eol;
- end if;
- end;
+ Impls : Array_Element_Id :=
+ Util.Value_Of
+ (Name_Body_Suffix,
+ Naming.Decl.Arrays,
+ In_Tree);
- exception
- when Constraint_Error =>
- if Casing_Image'Length = 0 then
- Error_Msg
- (Project, In_Tree,
- "Casing cannot be an empty string",
- Casing_String.Location);
+ Lang : Language_Ptr;
+ Lang_Name : Name_Id;
+ Value : Variable_Value;
+ Extended : Project_Id;
- else
- Name_Len := Casing_Image'Length;
- Name_Buffer (1 .. Name_Len) := Casing_Image;
- Err_Vars.Error_Msg_Name_1 := Name_Find;
- Error_Msg
- (Project, In_Tree,
- "%% is not a correct Casing",
- Casing_String.Location);
- end if;
- end;
- end if;
+ begin
+ -- At this stage, the project already contains the default extensions
+ -- for the various languages. We now merge those suffixes read in the
+ -- user project, and they override the default.
- if not Sep_Suffix.Default then
- Get_Name_String (Sep_Suffix.Value);
+ while Specs /= No_Array_Element loop
+ Lang_Name := In_Tree.Array_Elements.Table (Specs).Index;
+ Lang := Get_Language_From_Name
+ (Project, Name => Get_Name_String (Lang_Name));
- if Name_Len = 0 then
- Error_Msg
- (Project, In_Tree,
- "Separate_Suffix cannot be empty",
- Sep_Suffix.Location);
+ -- An extending project inherits its parent projects' languages
+ -- so if needed we should create entries for those languages
- else
- Canonical_Case_File_Name (Name_Buffer (1 .. Name_Len));
- Separate_Suffix := Name_Find;
+ if Lang = null then
+ Extended := Project.Extends;
- if Current_Verbosity = High then
- Write_Str (" Separate_Suffix = """);
- Write_Str (Get_Name_String (Separate_Suffix));
- Write_Char ('"');
- Write_Eol;
- end if;
- end if;
- end if;
+ while Extended /= null loop
+ Lang := Get_Language_From_Name
+ (Extended, Name => Get_Name_String (Lang_Name));
+ exit when Lang /= null;
- -- For all unit based languages, if any, set the specified
- -- value of Dot_Replacement, Casing and/or Separate_Suffix.
+ Extended := Extended.Extends;
+ end loop;
- if Dot_Replacement /= No_File
- or else Casing_Defined
- or else Separate_Suffix /= No_File
- then
- Lang_Id := Data.First_Language_Processing;
- while Lang_Id /= No_Language_Index loop
- if In_Tree.Languages_Data.Table
- (Lang_Id).Config.Kind = Unit_Based
- then
- if Dot_Replacement /= No_File then
- In_Tree.Languages_Data.Table
- (Lang_Id).Config.Naming_Data.Dot_Replacement :=
- Dot_Replacement;
- end if;
+ if Lang /= null then
+ Lang := new Language_Data'(Lang.all);
+ Lang.First_Source := null;
+ Lang.Next := Project.Languages;
+ Project.Languages := Lang;
+ end if;
+ end if;
- if Casing_Defined then
- In_Tree.Languages_Data.Table
- (Lang_Id).Config.Naming_Data.Casing := Casing;
- end if;
+ -- If the language was not found in project or the projects it
+ -- extends
- if Separate_Suffix /= No_File then
- In_Tree.Languages_Data.Table
- (Lang_Id).Config.Naming_Data.Separate_Suffix :=
- Separate_Suffix;
- end if;
- end if;
+ if Lang = null then
+ if Current_Verbosity = High then
+ Write_Line
+ ("Ignoring spec naming data for "
+ & Get_Name_String (Lang_Name)
+ & " since language is not defined for this project");
+ end if;
+ else
+ Value := In_Tree.Array_Elements.Table (Specs).Value;
- Lang_Id :=
- In_Tree.Languages_Data.Table (Lang_Id).Next;
- end loop;
+ if Lang.Name = Name_Ada then
+ Ada_Spec_Suffix_Loc := Value.Location;
end if;
- end;
- -- Next, get the spec and body suffixes
+ if Value.Kind = Single then
+ Lang.Config.Naming_Data.Spec_Suffix :=
+ Canonical_Case_File_Name (Value.Value);
+ end if;
+ end if;
- declare
- Suffix : Variable_Value;
- Lang_Id : Language_Index;
- Lang : Name_Id;
+ Specs := In_Tree.Array_Elements.Table (Specs).Next;
+ end loop;
- begin
- Lang_Id := Data.First_Language_Processing;
- while Lang_Id /= No_Language_Index loop
- Lang := In_Tree.Languages_Data.Table (Lang_Id).Name;
-
- -- Spec_Suffix
-
- Suffix := Value_Of
- (Name => Lang,
- Attribute_Or_Array_Name => Name_Spec_Suffix,
- In_Package => Naming_Id,
- In_Tree => In_Tree);
-
- if Suffix = Nil_Variable_Value then
- Suffix := Value_Of
- (Name => Lang,
- Attribute_Or_Array_Name => Name_Specification_Suffix,
- In_Package => Naming_Id,
- In_Tree => In_Tree);
- end if;
+ while Impls /= No_Array_Element loop
+ Lang_Name := In_Tree.Array_Elements.Table (Impls).Index;
+ Lang := Get_Language_From_Name
+ (Project, Name => Get_Name_String (Lang_Name));
- if Suffix /= Nil_Variable_Value then
- In_Tree.Languages_Data.Table (Lang_Id).
- Config.Naming_Data.Spec_Suffix :=
- File_Name_Type (Suffix.Value);
- end if;
+ if Lang = null then
+ if Current_Verbosity = High then
+ Write_Line
+ ("Ignoring impl naming data for "
+ & Get_Name_String (Lang_Name)
+ & " since language is not defined for this project");
+ end if;
+ else
+ Value := In_Tree.Array_Elements.Table (Impls).Value;
- -- Body_Suffix
+ if Lang.Name = Name_Ada then
+ Ada_Body_Suffix_Loc := Value.Location;
+ end if;
- Suffix := Value_Of
- (Name => Lang,
- Attribute_Or_Array_Name => Name_Body_Suffix,
- In_Package => Naming_Id,
- In_Tree => In_Tree);
+ if Value.Kind = Single then
+ Lang.Config.Naming_Data.Body_Suffix :=
+ Canonical_Case_File_Name (Value.Value);
+ end if;
+ end if;
- if Suffix = Nil_Variable_Value then
- Suffix := Value_Of
- (Name => Lang,
- Attribute_Or_Array_Name => Name_Implementation_Suffix,
- In_Package => Naming_Id,
- In_Tree => In_Tree);
- end if;
+ Impls := In_Tree.Array_Elements.Table (Impls).Next;
+ end loop;
+ end Initialize_Naming_Data;
- if Suffix /= Nil_Variable_Value then
- In_Tree.Languages_Data.Table (Lang_Id).
- Config.Naming_Data.Body_Suffix :=
- File_Name_Type (Suffix.Value);
- end if;
+ -- Start of processing for Check_Naming_Schemes
- Lang_Id := In_Tree.Languages_Data.Table (Lang_Id).Next;
- end loop;
- end;
+ begin
+ Specs := No_Array_Element;
+ Bodies := No_Array_Element;
- -- Get the exceptions for file based languages
+ -- No Naming package or parsing a configuration file? nothing to do
- Get_Exceptions (Spec);
- Get_Exceptions (Impl);
+ if Naming_Id /= No_Package and not Is_Config_File then
+ Naming := In_Tree.Packages.Table (Naming_Id);
- -- Get the exceptions for unit based languages
+ if Current_Verbosity = High then
+ Write_Line ("Checking package Naming for project "
+ & Get_Name_String (Project.Name));
+ end if;
- Get_Unit_Exceptions (Spec);
- Get_Unit_Exceptions (Impl);
+ Initialize_Naming_Data;
- end if;
+ case Get_Mode is
+ when Ada_Only =>
+ Check_Naming_Ada_Only;
+ when Multi_Language =>
+ Check_Naming_Multi_Lang;
+ end case;
end if;
- end Check_Naming_Schemes;
+ end Check_Package_Naming;
------------------------------
-- Check_Library_Attributes --
------------------------------
procedure Check_Library_Attributes
- (Project : Project_Id;
- In_Tree : Project_Tree_Ref;
- Current_Dir : String;
- Data : in out Project_Data)
+ (Project : Project_Id;
+ In_Tree : Project_Tree_Ref)
is
- Attributes : constant Prj.Variable_Id := Data.Decl.Attributes;
+ Attributes : constant Prj.Variable_Id := Project.Decl.Attributes;
Lib_Dir : constant Prj.Variable_Value :=
Prj.Util.Value_Of
Prj.Util.Value_Of
(Snames.Name_Library_Ali_Dir, Attributes, In_Tree);
+ Lib_GCC : constant Prj.Variable_Value :=
+ Prj.Util.Value_Of
+ (Snames.Name_Library_GCC, Attributes, In_Tree);
+
The_Lib_Kind : constant Prj.Variable_Value :=
Prj.Util.Value_Of
(Snames.Name_Library_Kind, Attributes, In_Tree);
- Imported_Project_List : Project_List := Empty_Project_List;
+ Imported_Project_List : Project_List;
Continuation : String_Access := No_Continuation_String'Access;
-------------------
procedure Check_Library (Proj : Project_Id; Extends : Boolean) is
- Proj_Data : Project_Data;
Src_Id : Source_Id;
- Src : Source_Data;
+ Iter : Source_Iterator;
begin
if Proj /= No_Project then
- Proj_Data := In_Tree.Projects.Table (Proj);
-
- if not Proj_Data.Library then
+ if not Proj.Library then
-- The only not library projects that are OK are those that
-- have no sources. However, header files from non-Ada
-- languages are OK, as there is nothing to compile.
- Src_Id := Proj_Data.First_Source;
- while Src_Id /= No_Source loop
- Src := In_Tree.Sources.Table (Src_Id);
-
- exit when Src.Lang_Kind /= File_Based
- or else Src.Kind /= Spec;
-
- Src_Id := Src.Next_In_Project;
+ Iter := For_Each_Source (In_Tree, Proj);
+ loop
+ Src_Id := Prj.Element (Iter);
+ exit when Src_Id = No_Source
+ or else Src_Id.Language.Config.Kind /= File_Based
+ or else Src_Id.Kind /= Spec;
+ Next (Iter);
end loop;
if Src_Id /= No_Source then
- Error_Msg_Name_1 := Data.Name;
- Error_Msg_Name_2 := Proj_Data.Name;
+ Error_Msg_Name_1 := Project.Name;
+ Error_Msg_Name_2 := Proj.Name;
if Extends then
- if Data.Library_Kind /= Static then
+ if Project.Library_Kind /= Static then
Error_Msg
(Project, In_Tree,
Continuation.all &
"shared library project %% cannot extend " &
"project %% that is not a library project",
- Data.Location);
+ Project.Location);
Continuation := Continuation_String'Access;
end if;
- elsif Data.Library_Kind /= Static then
+ elsif (not Unchecked_Shared_Lib_Imports)
+ and then Project.Library_Kind /= Static
+ then
Error_Msg
(Project, In_Tree,
Continuation.all &
"shared library project %% cannot import project %% " &
"that is not a shared library project",
- Data.Location);
+ Project.Location);
Continuation := Continuation_String'Access;
end if;
end if;
- elsif Data.Library_Kind /= Static and then
- Proj_Data.Library_Kind = Static
+ elsif Project.Library_Kind /= Static and then
+ Proj.Library_Kind = Static
then
- Error_Msg_Name_1 := Data.Name;
- Error_Msg_Name_2 := Proj_Data.Name;
+ Error_Msg_Name_1 := Project.Name;
+ Error_Msg_Name_2 := Proj.Name;
if Extends then
Error_Msg
Continuation.all &
"shared library project %% cannot extend static " &
"library project %%",
- Data.Location);
+ Project.Location);
+ Continuation := Continuation_String'Access;
- else
+ elsif not Unchecked_Shared_Lib_Imports then
Error_Msg
(Project, In_Tree,
Continuation.all &
"shared library project %% cannot import static " &
"library project %%",
- Data.Location);
+ Project.Location);
+ Continuation := Continuation_String'Access;
end if;
- Continuation := Continuation_String'Access;
end if;
end if;
end Check_Library;
+ Dir_Exists : Boolean;
+
-- Start of processing for Check_Library_Attributes
begin
-- Special case of extending project
- if Data.Extends /= No_Project then
- declare
- Extended_Data : constant Project_Data :=
- In_Tree.Projects.Table (Data.Extends);
+ if Project.Extends /= No_Project then
- 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.
+ -- 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.
- if Extended_Data.Library then
- if Data.Qualifier = Standard then
- Error_Msg
- (Project, In_Tree,
- "a standard project cannot extend a library project",
- Data.Location);
+ if Project.Extends.Library then
+ if Project.Qualifier = Standard then
+ Error_Msg
+ (Project, In_Tree,
+ "a standard project cannot extend a library project",
+ Project.Location);
- else
- if Lib_Name.Default then
- Data.Library_Name := Extended_Data.Library_Name;
- end if;
+ else
+ if Lib_Name.Default then
+ Project.Library_Name := Project.Extends.Library_Name;
+ end if;
- if Lib_Dir.Default then
- if not Data.Virtual then
- Error_Msg
- (Project, In_Tree,
- "a project extending a library project must " &
- "specify an attribute Library_Dir",
- Data.Location);
+ if Lib_Dir.Default then
+ if not Project.Virtual then
+ Error_Msg
+ (Project, In_Tree,
+ "a project extending a library project must " &
+ "specify an attribute Library_Dir",
+ Project.Location);
- else
- -- For a virtual project extending a library project,
- -- inherit library directory.
+ else
+ -- For a virtual project extending a library project,
+ -- inherit library directory.
- Data.Library_Dir := Extended_Data.Library_Dir;
- Library_Directory_Present := True;
- end if;
+ Project.Library_Dir := Project.Extends.Library_Dir;
+ Library_Directory_Present := True;
end if;
end if;
end if;
- end;
+ end if;
end if;
pragma Assert (Lib_Name.Kind = Single);
if Lib_Name.Value = Empty_String then
if Current_Verbosity = High
- and then Data.Library_Name = No_Name
+ and then Project.Library_Name = No_Name
then
Write_Line ("No library name");
end if;
else
-- There is no restriction on the syntax of library names
- Data.Library_Name := Lib_Name.Value;
+ Project.Library_Name := Lib_Name.Value;
end if;
- if Data.Library_Name /= No_Name then
+ if Project.Library_Name /= No_Name then
if Current_Verbosity = High then
- Write_Str ("Library name = """);
- Write_Str (Get_Name_String (Data.Library_Name));
- Write_Line ("""");
+ Write_Attr
+ ("Library name", Get_Name_String (Project.Library_Name));
end if;
pragma Assert (Lib_Dir.Kind = Single);
else
-- Find path name (unless inherited), check that it is a directory
- if Data.Library_Dir = No_Path_Information then
+ if Project.Library_Dir = No_Path_Information then
Locate_Directory
(Project,
In_Tree,
File_Name_Type (Lib_Dir.Value),
- Data.Directory.Display_Name,
- Data.Library_Dir.Name,
- Data.Library_Dir.Display_Name,
- Create => "library",
- Current_Dir => Current_Dir,
- Location => Lib_Dir.Location);
- end if;
+ Path => Project.Library_Dir,
+ Dir_Exists => Dir_Exists,
+ Create => "library",
+ Must_Exist => False,
+ Location => Lib_Dir.Location,
+ Externally_Built => Project.Externally_Built);
- if Data.Library_Dir = No_Path_Information then
+ else
+ Dir_Exists :=
+ Is_Directory
+ (Get_Name_String
+ (Project.Library_Dir.Display_Name));
+ end if;
+ if not Dir_Exists then
-- Get the absolute name of the library directory that
-- does not exist, to report an error.
- declare
- Dir_Name : constant String :=
- Get_Name_String (Lib_Dir.Value);
-
- begin
- if Is_Absolute_Path (Dir_Name) then
- Err_Vars.Error_Msg_File_1 :=
- File_Name_Type (Lib_Dir.Value);
-
- else
- Get_Name_String (Data.Directory.Display_Name);
-
- if Name_Buffer (Name_Len) /= Directory_Separator then
- Name_Len := Name_Len + 1;
- Name_Buffer (Name_Len) := Directory_Separator;
- end if;
-
- Name_Buffer
- (Name_Len + 1 .. Name_Len + Dir_Name'Length) :=
- Dir_Name;
- Name_Len := Name_Len + Dir_Name'Length;
- Err_Vars.Error_Msg_File_1 := Name_Find;
- end if;
-
- -- Report the error
-
- Error_Msg
- (Project, In_Tree,
- "library directory { does not exist",
- Lib_Dir.Location);
- end;
+ Err_Vars.Error_Msg_File_1 :=
+ File_Name_Type (Project.Library_Dir.Display_Name);
+ Error_Msg
+ (Project, In_Tree,
+ "library directory { does not exist",
+ Lib_Dir.Location);
-- The library directory cannot be the same as the Object
-- directory.
- elsif Data.Library_Dir.Name = Data.Object_Directory.Name then
+ elsif Project.Library_Dir.Name = Project.Object_Directory.Name then
Error_Msg
(Project, In_Tree,
"library directory cannot be the same " &
"as object directory",
Lib_Dir.Location);
- Data.Library_Dir := No_Path_Information;
+ Project.Library_Dir := No_Path_Information;
else
declare
OK : Boolean := True;
Dirs_Id : String_List_Id;
Dir_Elem : String_Element;
+ Pid : Project_List;
begin
-- The library directory cannot be the same as a source
-- directory of the current project.
- Dirs_Id := Data.Source_Dirs;
+ Dirs_Id := Project.Source_Dirs;
while Dirs_Id /= Nil_String loop
Dir_Elem := In_Tree.String_Elements.Table (Dirs_Id);
Dirs_Id := Dir_Elem.Next;
- if
- Data.Library_Dir.Name = Path_Name_Type (Dir_Elem.Value)
+ if Project.Library_Dir.Name =
+ Path_Name_Type (Dir_Elem.Value)
then
Err_Vars.Error_Msg_File_1 :=
File_Name_Type (Dir_Elem.Value);
-- The library directory cannot be the same as a source
-- directory of another project either.
- Project_Loop :
- for Pid in 1 .. Project_Table.Last (In_Tree.Projects) loop
- if Pid /= Project then
- Dirs_Id := In_Tree.Projects.Table (Pid).Source_Dirs;
+ Pid := In_Tree.Projects;
+ Project_Loop : loop
+ exit Project_Loop when Pid = null;
+
+ if Pid.Project /= Project then
+ Dirs_Id := Pid.Project.Source_Dirs;
Dir_Loop : while Dirs_Id /= Nil_String loop
Dir_Elem :=
In_Tree.String_Elements.Table (Dirs_Id);
Dirs_Id := Dir_Elem.Next;
- if Data.Library_Dir.Name =
+ if Project.Library_Dir.Name =
Path_Name_Type (Dir_Elem.Value)
then
Err_Vars.Error_Msg_File_1 :=
File_Name_Type (Dir_Elem.Value);
- Err_Vars.Error_Msg_Name_1 :=
- In_Tree.Projects.Table (Pid).Name;
+ Err_Vars.Error_Msg_Name_1 := Pid.Project.Name;
Error_Msg
(Project, In_Tree,
end if;
end loop Dir_Loop;
end if;
+
+ Pid := Pid.Next;
end loop Project_Loop;
end if;
if not OK then
- Data.Library_Dir := No_Path_Information;
+ Project.Library_Dir := No_Path_Information;
elsif Current_Verbosity = High then
-- Display the Library directory in high verbosity
- Write_Str ("Library directory =""");
- Write_Str
- (Get_Name_String (Data.Library_Dir.Display_Name));
- Write_Line ("""");
+ Write_Attr
+ ("Library directory",
+ Get_Name_String (Project.Library_Dir.Display_Name));
end if;
end;
end if;
end if;
- Data.Library :=
- Data.Library_Dir /= No_Path_Information
- and then
- Data.Library_Name /= No_Name;
+ Project.Library :=
+ Project.Library_Dir /= No_Path_Information
+ and then Project.Library_Name /= No_Name;
- if Data.Extends = No_Project then
- case Data.Qualifier is
+ if Project.Extends = No_Project then
+ case Project.Qualifier is
when Standard =>
- if Data.Library then
+ if Project.Library then
Error_Msg
(Project, In_Tree,
"a standard project cannot be a library project",
end if;
when Library =>
- if not Data.Library then
- Error_Msg
- (Project, In_Tree,
- "not a library project",
- Data.Location);
+ if not Project.Library then
+ if Project.Library_Dir = No_Path_Information then
+ Error_Msg
+ (Project, In_Tree,
+ "\attribute Library_Dir not declared",
+ Project.Location);
+ end if;
+
+ if Project.Library_Name = No_Name then
+ Error_Msg
+ (Project, In_Tree,
+ "\attribute Library_Name not declared",
+ Project.Location);
+ end if;
end if;
when others =>
end case;
end if;
- if Data.Library then
+ if Project.Library then
if Get_Mode = Multi_Language then
- Support_For_Libraries := Data.Config.Lib_Support;
+ Support_For_Libraries := Project.Config.Lib_Support;
else
Support_For_Libraries := MLib.Tgt.Support_For_Libraries;
(Project, In_Tree,
"?libraries are not supported on this platform",
Lib_Name.Location);
- Data.Library := False;
+ Project.Library := False;
else
if Lib_ALI_Dir.Value = Empty_String then
if Current_Verbosity = High then
Write_Line ("No library ALI directory specified");
end if;
- Data.Library_ALI_Dir := Data.Library_Dir;
+
+ Project.Library_ALI_Dir := Project.Library_Dir;
else
-- Find path name, check that it is a directory
(Project,
In_Tree,
File_Name_Type (Lib_ALI_Dir.Value),
- Data.Directory.Display_Name,
- Data.Library_ALI_Dir.Name,
- Data.Library_ALI_Dir.Display_Name,
- Create => "library ALI",
- Current_Dir => Current_Dir,
- Location => Lib_ALI_Dir.Location);
-
- if Data.Library_ALI_Dir = No_Path_Information then
-
+ Path => Project.Library_ALI_Dir,
+ Create => "library ALI",
+ Dir_Exists => Dir_Exists,
+ Must_Exist => False,
+ Location => Lib_ALI_Dir.Location,
+ Externally_Built => Project.Externally_Built);
+
+ if not Dir_Exists then
-- Get the absolute name of the library ALI directory that
-- does not exist, to report an error.
- declare
- Dir_Name : constant String :=
- Get_Name_String (Lib_ALI_Dir.Value);
-
- begin
- if Is_Absolute_Path (Dir_Name) then
- Err_Vars.Error_Msg_File_1 :=
- File_Name_Type (Lib_Dir.Value);
-
- else
- Get_Name_String (Data.Directory.Display_Name);
-
- if Name_Buffer (Name_Len) /= Directory_Separator then
- Name_Len := Name_Len + 1;
- Name_Buffer (Name_Len) := Directory_Separator;
- end if;
-
- Name_Buffer
- (Name_Len + 1 .. Name_Len + Dir_Name'Length) :=
- Dir_Name;
- Name_Len := Name_Len + Dir_Name'Length;
- Err_Vars.Error_Msg_File_1 := Name_Find;
- end if;
-
- -- Report the error
-
- Error_Msg
- (Project, In_Tree,
- "library 'A'L'I directory { does not exist",
- Lib_ALI_Dir.Location);
- end;
+ Err_Vars.Error_Msg_File_1 :=
+ File_Name_Type (Project.Library_ALI_Dir.Display_Name);
+ Error_Msg
+ (Project, In_Tree,
+ "library 'A'L'I directory { does not exist",
+ Lib_ALI_Dir.Location);
end if;
- if Data.Library_ALI_Dir /= Data.Library_Dir then
+ if Project.Library_ALI_Dir /= Project.Library_Dir then
-- The library ALI directory cannot be the same as the
-- Object directory.
- if Data.Library_ALI_Dir = Data.Object_Directory then
+ if Project.Library_ALI_Dir = Project.Object_Directory then
Error_Msg
(Project, In_Tree,
"library 'A'L'I directory cannot be the same " &
"as object directory",
Lib_ALI_Dir.Location);
- Data.Library_ALI_Dir := No_Path_Information;
+ Project.Library_ALI_Dir := No_Path_Information;
else
declare
OK : Boolean := True;
Dirs_Id : String_List_Id;
Dir_Elem : String_Element;
+ Pid : Project_List;
begin
-- The library ALI directory cannot be the same as
-- a source directory of the current project.
- Dirs_Id := Data.Source_Dirs;
+ Dirs_Id := Project.Source_Dirs;
while Dirs_Id /= Nil_String loop
Dir_Elem := In_Tree.String_Elements.Table (Dirs_Id);
Dirs_Id := Dir_Elem.Next;
- if Data.Library_ALI_Dir.Name =
+ if Project.Library_ALI_Dir.Name =
Path_Name_Type (Dir_Elem.Value)
then
Err_Vars.Error_Msg_File_1 :=
-- The library ALI directory cannot be the same as
-- a source directory of another project either.
- ALI_Project_Loop :
- for
- Pid in 1 .. Project_Table.Last (In_Tree.Projects)
- loop
- if Pid /= Project then
- Dirs_Id :=
- In_Tree.Projects.Table (Pid).Source_Dirs;
+ Pid := In_Tree.Projects;
+ ALI_Project_Loop : loop
+ exit ALI_Project_Loop when Pid = null;
+
+ if Pid.Project /= Project then
+ Dirs_Id := Pid.Project.Source_Dirs;
ALI_Dir_Loop :
while Dirs_Id /= Nil_String loop
In_Tree.String_Elements.Table (Dirs_Id);
Dirs_Id := Dir_Elem.Next;
- if Data.Library_ALI_Dir.Name =
+ if Project.Library_ALI_Dir.Name =
Path_Name_Type (Dir_Elem.Value)
then
Err_Vars.Error_Msg_File_1 :=
File_Name_Type (Dir_Elem.Value);
Err_Vars.Error_Msg_Name_1 :=
- In_Tree.Projects.Table (Pid).Name;
+ Pid.Project.Name;
Error_Msg
(Project, In_Tree,
end if;
end loop ALI_Dir_Loop;
end if;
+ Pid := Pid.Next;
end loop ALI_Project_Loop;
end if;
if not OK then
- Data.Library_ALI_Dir := No_Path_Information;
+ Project.Library_ALI_Dir := No_Path_Information;
elsif Current_Verbosity = High then
-- Display the Library ALI directory in high
-- verbosity.
- Write_Str ("Library ALI directory =""");
- Write_Str
- (Get_Name_String
- (Data.Library_ALI_Dir.Display_Name));
- Write_Line ("""");
+ Write_Attr
+ ("Library ALI dir",
+ Get_Name_String
+ (Project.Library_ALI_Dir.Display_Name));
end if;
end;
end if;
end if;
else
- Data.Lib_Internal_Name := Lib_Version.Value;
+ Project.Lib_Internal_Name := Lib_Version.Value;
end if;
pragma Assert (The_Lib_Kind.Kind = Single);
begin
if Kind_Name = "static" then
- Data.Library_Kind := Static;
+ Project.Library_Kind := Static;
elsif Kind_Name = "dynamic" then
- Data.Library_Kind := Dynamic;
+ Project.Library_Kind := Dynamic;
elsif Kind_Name = "relocatable" then
- Data.Library_Kind := Relocatable;
+ Project.Library_Kind := Relocatable;
else
Error_Msg
end if;
if Current_Verbosity = High and then OK then
- Write_Str ("Library kind = ");
- Write_Line (Kind_Name);
+ Write_Attr ("Library kind", Kind_Name);
end if;
- if Data.Library_Kind /= Static and then
- Support_For_Libraries = Prj.Static_Only
- then
- Error_Msg
- (Project, In_Tree,
- "only static libraries are supported " &
- "on this platform",
- The_Lib_Kind.Location);
- Data.Library := False;
+ if Project.Library_Kind /= Static then
+ if Support_For_Libraries = Prj.Static_Only then
+ Error_Msg
+ (Project, In_Tree,
+ "only static libraries are supported " &
+ "on this platform",
+ The_Lib_Kind.Location);
+ Project.Library := False;
+
+ else
+ -- Check if (obsolescent) attribute Library_GCC or
+ -- Linker'Driver is declared.
+
+ if Lib_GCC.Value /= Empty_String then
+ Error_Msg
+ (Project,
+ In_Tree,
+ "?Library_'G'C'C is an obsolescent attribute, " &
+ "use Linker''Driver instead",
+ Lib_GCC.Location);
+ Project.Config.Shared_Lib_Driver :=
+ File_Name_Type (Lib_GCC.Value);
+
+ else
+ declare
+ Linker : constant Package_Id :=
+ Value_Of
+ (Name_Linker,
+ Project.Decl.Packages,
+ In_Tree);
+ Driver : constant Variable_Value :=
+ Value_Of
+ (Name => No_Name,
+ Attribute_Or_Array_Name =>
+ Name_Driver,
+ In_Package => Linker,
+ In_Tree =>
+ In_Tree);
+
+ begin
+ if Driver /= Nil_Variable_Value
+ and then Driver.Value /= Empty_String
+ then
+ Project.Config.Shared_Lib_Driver :=
+ File_Name_Type (Driver.Value);
+ end if;
+ end;
+ end if;
+ end if;
end if;
end;
end if;
- if Data.Library then
+ if Project.Library then
if Current_Verbosity = High then
Write_Line ("This is a library project file");
end if;
if Get_Mode = Multi_Language then
- Check_Library (Data.Extends, Extends => True);
+ Check_Library (Project.Extends, Extends => True);
- Imported_Project_List := Data.Imported_Projects;
- while Imported_Project_List /= Empty_Project_List loop
+ Imported_Project_List := Project.Imported_Projects;
+ while Imported_Project_List /= null loop
Check_Library
- (In_Tree.Project_Lists.Table
- (Imported_Project_List).Project,
+ (Imported_Project_List.Project,
Extends => False);
- Imported_Project_List :=
- In_Tree.Project_Lists.Table
- (Imported_Project_List).Next;
+ Imported_Project_List := Imported_Project_List.Next;
end loop;
end if;
end if;
-- Warn if they are declared, as it is a common error to think that
-- library are "linked" with Linker switches.
- if Data.Library then
+ if Project.Library then
declare
Linker_Package_Id : constant Package_Id :=
Util.Value_Of
- (Name_Linker, Data.Decl.Packages, In_Tree);
+ (Name_Linker,
+ Project.Decl.Packages, In_Tree);
Linker_Package : Package_Element;
Switches : Array_Element_Id := No_Array_Element;
end;
end if;
- if Data.Extends /= No_Project then
- In_Tree.Projects.Table (Data.Extends).Library := False;
+ if Project.Extends /= No_Project then
+ Project.Extends.Library := False;
end if;
end Check_Library_Attributes;
- --------------------------
- -- Check_Package_Naming --
- --------------------------
+ ---------------------------------
+ -- Check_Programming_Languages --
+ ---------------------------------
- procedure Check_Package_Naming
- (Project : Project_Id;
- In_Tree : Project_Tree_Ref;
- Data : in out Project_Data)
+ procedure Check_Programming_Languages
+ (In_Tree : Project_Tree_Ref;
+ Project : Project_Id)
is
- Naming_Id : constant Package_Id :=
- Util.Value_Of (Name_Naming, Data.Decl.Packages, In_Tree);
-
- Naming : Package_Element;
-
- begin
- -- If there is a package Naming, we will put in Data.Naming
- -- what is in this package Naming.
-
- if Naming_Id /= No_Package then
- Naming := In_Tree.Packages.Table (Naming_Id);
-
- if Current_Verbosity = High then
- Write_Line ("Checking ""Naming"".");
- end if;
-
- -- Check Spec_Suffix
-
- declare
- Spec_Suffixs : Array_Element_Id :=
- Util.Value_Of
- (Name_Spec_Suffix,
- Naming.Decl.Arrays,
- In_Tree);
-
- Suffix : Array_Element_Id;
- Element : Array_Element;
- Suffix2 : Array_Element_Id;
-
- begin
- -- If some suffixes have been specified, we make sure that
- -- for each language for which a default suffix has been
- -- specified, there is a suffix specified, either the one
- -- in the project file or if there were none, the default.
-
- if Spec_Suffixs /= No_Array_Element then
- Suffix := Data.Naming.Spec_Suffix;
-
- while Suffix /= No_Array_Element loop
- Element :=
- In_Tree.Array_Elements.Table (Suffix);
- Suffix2 := Spec_Suffixs;
-
- while Suffix2 /= No_Array_Element loop
- exit when In_Tree.Array_Elements.Table
- (Suffix2).Index = Element.Index;
- Suffix2 := In_Tree.Array_Elements.Table
- (Suffix2).Next;
- end loop;
-
- -- There is a registered default suffix, but no
- -- suffix specified in the project file.
- -- Add the default to the array.
-
- if Suffix2 = No_Array_Element then
- Array_Element_Table.Increment_Last
- (In_Tree.Array_Elements);
- In_Tree.Array_Elements.Table
- (Array_Element_Table.Last
- (In_Tree.Array_Elements)) :=
- (Index => Element.Index,
- Src_Index => Element.Src_Index,
- Index_Case_Sensitive => False,
- Value => Element.Value,
- Next => Spec_Suffixs);
- Spec_Suffixs := Array_Element_Table.Last
- (In_Tree.Array_Elements);
- end if;
-
- Suffix := Element.Next;
- end loop;
+ Languages : Variable_Value := Nil_Variable_Value;
+ Def_Lang : Variable_Value := Nil_Variable_Value;
+ Def_Lang_Id : Name_Id;
- -- Put the resulting array as the specification suffixes
+ procedure Add_Language (Name, Display_Name : Name_Id);
+ -- Add a new language to the list of languages for the project.
+ -- Nothing is done if the language has already been defined
- Data.Naming.Spec_Suffix := Spec_Suffixs;
+ procedure Add_Language (Name, Display_Name : Name_Id) is
+ Lang : Language_Ptr := Project.Languages;
+ begin
+ while Lang /= No_Language_Index loop
+ if Name = Lang.Name then
+ return;
end if;
- end;
-
- declare
- Current : Array_Element_Id;
- Element : Array_Element;
-
- begin
- Current := Data.Naming.Spec_Suffix;
- while Current /= No_Array_Element loop
- Element := In_Tree.Array_Elements.Table (Current);
- Get_Name_String (Element.Value.Value);
-
- if Name_Len = 0 then
- Error_Msg
- (Project, In_Tree,
- "Spec_Suffix cannot be empty",
- Element.Value.Location);
- end if;
-
- In_Tree.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,
- In_Tree);
-
- Suffix : Array_Element_Id;
- Element : Array_Element;
- Suffix2 : Array_Element_Id;
-
- begin
- -- If some suffixes have been specified, we make sure that
- -- for each language for which a default suffix has been
- -- specified, there is a suffix specified, either the one
- -- in the project file or if there were none, the default.
-
- if Impl_Suffixs /= No_Array_Element then
- Suffix := Data.Naming.Body_Suffix;
- while Suffix /= No_Array_Element loop
- Element :=
- In_Tree.Array_Elements.Table (Suffix);
-
- Suffix2 := Impl_Suffixs;
- while Suffix2 /= No_Array_Element loop
- exit when In_Tree.Array_Elements.Table
- (Suffix2).Index = Element.Index;
- Suffix2 := In_Tree.Array_Elements.Table
- (Suffix2).Next;
- end loop;
- -- There is a registered default suffix, but no suffix was
- -- specified in the project file. Add default to the array.
-
- if Suffix2 = No_Array_Element then
- Array_Element_Table.Increment_Last
- (In_Tree.Array_Elements);
- In_Tree.Array_Elements.Table
- (Array_Element_Table.Last
- (In_Tree.Array_Elements)) :=
- (Index => Element.Index,
- Src_Index => Element.Src_Index,
- Index_Case_Sensitive => False,
- Value => Element.Value,
- Next => Impl_Suffixs);
- Impl_Suffixs := Array_Element_Table.Last
- (In_Tree.Array_Elements);
- end if;
+ Lang := Lang.Next;
+ end loop;
- Suffix := Element.Next;
- end loop;
+ Lang := new Language_Data'(No_Language_Data);
+ Lang.Next := Project.Languages;
+ Project.Languages := Lang;
+ Lang.Name := Name;
+ Lang.Display_Name := Display_Name;
- -- Put the resulting array as the implementation suffixes
+ if Name = Name_Ada then
+ Lang.Config.Kind := Unit_Based;
+ Lang.Config.Dependency_Kind := ALI_File;
- Data.Naming.Body_Suffix := Impl_Suffixs;
+ if Get_Mode = Ada_Only then
+ -- Create a default config for Ada (since there is no
+ -- configuration file to create it for us)
+ -- ??? We should do as GPS does and create a dummy config
+ -- file
+
+ Lang.Config.Naming_Data :=
+ (Dot_Replacement => File_Name_Type
+ (First_Name_Id + Character'Pos ('-')),
+ Casing => All_Lower_Case,
+ Separate_Suffix => Default_Ada_Body_Suffix,
+ Spec_Suffix => Default_Ada_Spec_Suffix,
+ Body_Suffix => Default_Ada_Body_Suffix);
end if;
- end;
-
- declare
- Current : Array_Element_Id;
- Element : Array_Element;
-
- begin
- Current := Data.Naming.Body_Suffix;
- while Current /= No_Array_Element loop
- Element := In_Tree.Array_Elements.Table (Current);
- Get_Name_String (Element.Value.Value);
-
- if Name_Len = 0 then
- Error_Msg
- (Project, In_Tree,
- "Body_Suffix cannot be empty",
- Element.Value.Location);
- end if;
-
- In_Tree.Array_Elements.Table (Current) := Element;
- Current := Element.Next;
- end loop;
- end;
-
- -- Get the exceptions, if any
-
- Data.Naming.Specification_Exceptions :=
- Util.Value_Of
- (Name_Specification_Exceptions,
- In_Arrays => Naming.Decl.Arrays,
- In_Tree => In_Tree);
-
- Data.Naming.Implementation_Exceptions :=
- Util.Value_Of
- (Name_Implementation_Exceptions,
- In_Arrays => Naming.Decl.Arrays,
- In_Tree => In_Tree);
- end if;
- end Check_Package_Naming;
- ---------------------------------
- -- Check_Programming_Languages --
- ---------------------------------
+ else
+ Lang.Config.Kind := File_Based;
+ end if;
+ end Add_Language;
- procedure Check_Programming_Languages
- (In_Tree : Project_Tree_Ref;
- Project : Project_Id;
- Data : in out Project_Data)
- is
- Languages : Variable_Value := Nil_Variable_Value;
- Def_Lang : Variable_Value := Nil_Variable_Value;
- Def_Lang_Id : Name_Id;
+ -- Start of processing for Check_Programming_Languages
begin
- Data.First_Language_Processing := No_Language_Index;
+ Project.Languages := null;
Languages :=
- Prj.Util.Value_Of (Name_Languages, Data.Decl.Attributes, In_Tree);
+ Prj.Util.Value_Of (Name_Languages, Project.Decl.Attributes, In_Tree);
Def_Lang :=
Prj.Util.Value_Of
- (Name_Default_Language, Data.Decl.Attributes, In_Tree);
- Data.Ada_Sources_Present := Data.Source_Dirs /= Nil_String;
- Data.Other_Sources_Present := Data.Source_Dirs /= Nil_String;
+ (Name_Default_Language, Project.Decl.Attributes, In_Tree);
+
+ -- Shouldn't these be set to False by default, and only set to True when
+ -- we actually find some source file???
- if Data.Source_Dirs /= Nil_String then
+ if Project.Source_Dirs /= Nil_String then
-- Check if languages are specified in this project
if Languages.Default then
- -- Attribute Languages is not specified. So, it defaults to
- -- a project of the default language only.
-
- Name_List_Table.Increment_Last (In_Tree.Name_Lists);
- Data.Languages := Name_List_Table.Last (In_Tree.Name_Lists);
-
-- In Ada_Only mode, the default language is Ada
if Get_Mode = Ada_Only then
- In_Tree.Name_Lists.Table (Data.Languages) :=
- (Name => Name_Ada, Next => No_Name_List);
-
- -- Attribute Languages is not specified. So, it defaults to
- -- a project of language Ada only. No sources of languages
- -- other than Ada
-
- Data.Other_Sources_Present := False;
+ Def_Lang_Id := Name_Ada;
else
-- Fail if there is no default language defined
(Project,
In_Tree,
"no languages defined for this project",
- Data.Location);
+ Project.Location);
Def_Lang_Id := No_Name;
+
else
Def_Lang_Id := Name_Ada;
end if;
To_Lower (Name_Buffer (1 .. Name_Len));
Def_Lang_Id := Name_Find;
end if;
+ end if;
- if Def_Lang_Id /= No_Name then
- In_Tree.Name_Lists.Table (Data.Languages) :=
- (Name => Def_Lang_Id, Next => No_Name_List);
-
- Language_Data_Table.Increment_Last (In_Tree.Languages_Data);
-
- Data.First_Language_Processing :=
- Language_Data_Table.Last (In_Tree.Languages_Data);
- In_Tree.Languages_Data.Table
- (Data.First_Language_Processing) := No_Language_Data;
- In_Tree.Languages_Data.Table
- (Data.First_Language_Processing).Name := Def_Lang_Id;
- Get_Name_String (Def_Lang_Id);
- Name_Buffer (1) := GNAT.Case_Util.To_Upper (Name_Buffer (1));
- In_Tree.Languages_Data.Table
- (Data.First_Language_Processing).Display_Name := Name_Find;
-
- if Def_Lang_Id = Name_Ada then
- In_Tree.Languages_Data.Table
- (Data.First_Language_Processing).Config.Kind
- := Unit_Based;
- In_Tree.Languages_Data.Table
- (Data.First_Language_Processing).Config.Dependency_Kind
- := ALI_File;
- Data.Unit_Based_Language_Name := Name_Ada;
- Data.Unit_Based_Language_Index :=
- Data.First_Language_Processing;
- else
- In_Tree.Languages_Data.Table
- (Data.First_Language_Processing).Config.Kind
- := File_Based;
- end if;
- end if;
+ if Def_Lang_Id /= No_Name then
+ Get_Name_String (Def_Lang_Id);
+ Name_Buffer (1) := GNAT.Case_Util.To_Upper (Name_Buffer (1));
+ Add_Language
+ (Name => Def_Lang_Id,
+ Display_Name => Name_Find);
end if;
else
declare
- Current : String_List_Id := Languages.Values;
- Element : String_Element;
- Lang_Name : Name_Id;
- Index : Language_Index;
- Lang_Data : Language_Data;
- NL_Id : Name_List_Index := No_Name_List;
+ Current : String_List_Id := Languages.Values;
+ Element : String_Element;
begin
- -- Assume there are no language declared
-
- Data.Ada_Sources_Present := False;
- Data.Other_Sources_Present := False;
-
-- If there are no languages declared, there are no sources
if Current = Nil_String then
- Data.Source_Dirs := Nil_String;
+ Project.Source_Dirs := Nil_String;
- if Data.Qualifier = Standard then
+ if Project.Qualifier = Standard then
Error_Msg
(Project,
In_Tree,
- "a standard project cannot have no language declared",
+ "a standard project must have at least one language",
Languages.Location);
end if;
-- Languages.
while Current /= Nil_String loop
- Element :=
- In_Tree.String_Elements.Table (Current);
+ Element := In_Tree.String_Elements.Table (Current);
Get_Name_String (Element.Value);
To_Lower (Name_Buffer (1 .. Name_Len));
- Lang_Name := Name_Find;
-
- NL_Id := Data.Languages;
- while NL_Id /= No_Name_List loop
- exit when
- Lang_Name = In_Tree.Name_Lists.Table (NL_Id).Name;
- NL_Id := In_Tree.Name_Lists.Table (NL_Id).Next;
- end loop;
-
- if NL_Id = No_Name_List then
- Name_List_Table.Increment_Last (In_Tree.Name_Lists);
-
- if Data.Languages = No_Name_List then
- Data.Languages :=
- Name_List_Table.Last (In_Tree.Name_Lists);
-
- else
- NL_Id := Data.Languages;
- while In_Tree.Name_Lists.Table (NL_Id).Next /=
- No_Name_List
- loop
- NL_Id := In_Tree.Name_Lists.Table (NL_Id).Next;
- end loop;
-
- In_Tree.Name_Lists.Table (NL_Id).Next :=
- Name_List_Table.Last (In_Tree.Name_Lists);
- end if;
- NL_Id := Name_List_Table.Last (In_Tree.Name_Lists);
- In_Tree.Name_Lists.Table (NL_Id) :=
- (Lang_Name, No_Name_List);
-
- if Get_Mode = Ada_Only then
- -- Check for language Ada
-
- if Lang_Name = Name_Ada then
- Data.Ada_Sources_Present := True;
-
- else
- Data.Other_Sources_Present := True;
- end if;
-
- else
- Language_Data_Table.Increment_Last
- (In_Tree.Languages_Data);
- Index :=
- Language_Data_Table.Last (In_Tree.Languages_Data);
- Lang_Data.Name := Lang_Name;
- Lang_Data.Display_Name := Element.Value;
- Lang_Data.Next := Data.First_Language_Processing;
-
- if Lang_Name = Name_Ada then
- Lang_Data.Config.Kind := Unit_Based;
- Lang_Data.Config.Dependency_Kind := ALI_File;
- Data.Unit_Based_Language_Name := Name_Ada;
- Data.Unit_Based_Language_Index := Index;
-
- else
- Lang_Data.Config.Kind := File_Based;
- Lang_Data.Config.Dependency_Kind := None;
- end if;
-
- In_Tree.Languages_Data.Table (Index) := Lang_Data;
- Data.First_Language_Processing := Index;
- end if;
- end if;
+ Add_Language
+ (Name => Name_Find,
+ Display_Name => Element.Value);
Current := Element.Next;
end loop;
function Check_Project
(P : Project_Id;
Root_Project : Project_Id;
- In_Tree : Project_Tree_Ref;
Extending : Boolean) return Boolean
is
+ Prj : Project_Id;
+
begin
if P = Root_Project then
return True;
elsif Extending then
- declare
- Data : Project_Data := In_Tree.Projects.Table (Root_Project);
-
- begin
- while Data.Extends /= No_Project loop
- if P = Data.Extends then
- return True;
- end if;
+ Prj := Root_Project;
+ while Prj.Extends /= No_Project loop
+ if P = Prj.Extends then
+ return True;
+ end if;
- Data := In_Tree.Projects.Table (Data.Extends);
- end loop;
- end;
+ Prj := Prj.Extends;
+ end loop;
end if;
return False;
procedure Check_Stand_Alone_Library
(Project : Project_Id;
In_Tree : Project_Tree_Ref;
- Data : in out Project_Data;
Current_Dir : String;
Extending : Boolean)
is
Lib_Interfaces : constant Prj.Variable_Value :=
Prj.Util.Value_Of
(Snames.Name_Library_Interface,
- Data.Decl.Attributes,
+ Project.Decl.Attributes,
In_Tree);
Lib_Auto_Init : constant Prj.Variable_Value :=
Prj.Util.Value_Of
(Snames.Name_Library_Auto_Init,
- Data.Decl.Attributes,
+ Project.Decl.Attributes,
In_Tree);
Lib_Src_Dir : constant Prj.Variable_Value :=
Prj.Util.Value_Of
(Snames.Name_Library_Src_Dir,
- Data.Decl.Attributes,
+ Project.Decl.Attributes,
In_Tree);
Lib_Symbol_File : constant Prj.Variable_Value :=
Prj.Util.Value_Of
(Snames.Name_Library_Symbol_File,
- Data.Decl.Attributes,
+ Project.Decl.Attributes,
In_Tree);
Lib_Symbol_Policy : constant Prj.Variable_Value :=
Prj.Util.Value_Of
(Snames.Name_Library_Symbol_Policy,
- Data.Decl.Attributes,
+ Project.Decl.Attributes,
In_Tree);
Lib_Ref_Symbol_File : constant Prj.Variable_Value :=
Prj.Util.Value_Of
(Snames.Name_Library_Reference_Symbol_File,
- Data.Decl.Attributes,
+ Project.Decl.Attributes,
In_Tree);
Auto_Init_Supported : Boolean;
OK : Boolean := True;
Source : Source_Id;
Next_Proj : Project_Id;
+ Iter : Source_Iterator;
begin
if Get_Mode = Multi_Language then
- Auto_Init_Supported := Data.Config.Auto_Init_Supported;
+ Auto_Init_Supported := Project.Config.Auto_Init_Supported;
else
Auto_Init_Supported :=
MLib.Tgt.Standalone_Library_Auto_Init_Is_Supported;
Interfaces : String_List_Id := Lib_Interfaces.Values;
Interface_ALIs : String_List_Id := Nil_String;
Unit : Name_Id;
- The_Unit_Id : Unit_Index;
- The_Unit_Data : Unit_Data;
+ UData : Unit_Index;
procedure Add_ALI_For (Source : File_Name_Type);
-- Add an ALI file name to the list of Interface ALIs
-- Start of processing for SAL_Library
begin
- Data.Standalone_Library := True;
+ Project.Standalone_Library := True;
-- Library_Interface cannot be an empty list
Error_Msg_Name_1 := Unit;
if Get_Mode = Ada_Only then
- The_Unit_Id :=
- Units_Htable.Get (In_Tree.Units_HT, Unit);
+ UData := Units_Htable.Get (In_Tree.Units_HT, Unit);
- if The_Unit_Id = No_Unit_Index then
+ if UData = No_Unit_Index then
Error_Msg
(Project, In_Tree,
"unknown unit %%",
else
-- Check that the unit is part of the project
- The_Unit_Data :=
- In_Tree.Units.Table (The_Unit_Id);
-
- if The_Unit_Data.File_Names (Body_Part).Name /= No_File
- and then The_Unit_Data.File_Names
- (Body_Part).Path.Name /= Slash
+ if UData.File_Names (Impl) /= null
+ and then not UData.File_Names (Impl).Locally_Removed
then
if Check_Project
- (The_Unit_Data.File_Names (Body_Part).Project,
- Project, In_Tree, Extending)
+ (UData.File_Names (Impl).Project,
+ Project, Extending)
then
- -- There is a body for this unit.
- -- If there is no spec, we need to check
- -- that it is not a subunit.
+ -- There 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_File
- then
+ if UData.File_Names (Spec) = null then
declare
Src_Ind : Source_File_Index;
begin
- Src_Ind := Sinput.P.Load_Project_File
- (Get_Name_String
- (The_Unit_Data.File_Names
- (Body_Part).Path.Name));
+ Src_Ind :=
+ Sinput.P.Load_Project_File
+ (Get_Name_String (UData.File_Names
+ (Impl).Path.Name));
if Sinput.P.Source_File_Is_Subunit
- (Src_Ind)
+ (Src_Ind)
then
Error_Msg
(Project, In_Tree,
end;
end if;
- -- The unit is not a subunit, so we add
- -- to the Interface ALIs the ALI file
- -- corresponding to the body.
+ -- The unit is not a subunit, so we add the
+ -- ALI file for its body to the Interface ALIs.
Add_ALI_For
- (The_Unit_Data.File_Names (Body_Part).Name);
+ (UData.File_Names (Impl).File);
else
Error_Msg
(Interfaces).Location);
end if;
- elsif The_Unit_Data.File_Names
- (Specification).Name /= No_File
- and then The_Unit_Data.File_Names
- (Specification).Path.Name /= Slash
+ elsif UData.File_Names (Spec) /= null
+ and then not UData.File_Names (Spec).Locally_Removed
and then Check_Project
- (The_Unit_Data.File_Names
- (Specification).Project,
- Project, In_Tree, Extending)
+ (UData.File_Names (Spec).Project,
+ Project, Extending)
then
- -- The unit is part of the project, it has
- -- a spec, but no body. We add to the Interface
- -- ALIs the ALI file corresponding to the spec.
+ -- The unit is part of the project, it has a spec,
+ -- but no body. We add the ALI for its spec to the
+ -- Interface ALIs.
Add_ALI_For
- (The_Unit_Data.File_Names (Specification).Name);
+ (UData.File_Names (Spec).File);
else
Error_Msg
else
-- Multi_Language mode
- Next_Proj := Data.Extends;
- Source := Data.First_Source;
-
+ Next_Proj := Project.Extends;
+ Iter := For_Each_Source (In_Tree, Project);
loop
- while Source /= No_Source and then
- In_Tree.Sources.Table (Source).Unit /= Unit
+ while Prj.Element (Iter) /= No_Source
+ and then
+ (Prj.Element (Iter).Unit = null
+ or else Prj.Element (Iter).Unit.Name /= Unit)
loop
- Source :=
- In_Tree.Sources.Table (Source).Next_In_Project;
+ Next (Iter);
end loop;
- exit when Source /= No_Source or else
- Next_Proj = No_Project;
+ Source := Prj.Element (Iter);
+ exit when Source /= No_Source
+ or else Next_Proj = No_Project;
- Source :=
- In_Tree.Projects.Table (Next_Proj).First_Source;
- Next_Proj :=
- In_Tree.Projects.Table (Next_Proj).Extends;
+ Iter := For_Each_Source (In_Tree, Next_Proj);
+ Next_Proj := Next_Proj.Extends;
end loop;
if Source /= No_Source then
- if In_Tree.Sources.Table (Source).Kind = Sep then
+ if Source.Kind = Sep then
Source := No_Source;
-
- elsif In_Tree.Sources.Table (Source).Kind = Spec
- and then
- In_Tree.Sources.Table (Source).Other_Part /=
- No_Source
+ elsif Source.Kind = Spec
+ and then Other_Part (Source) /= No_Source
then
- Source := In_Tree.Sources.Table (Source).Other_Part;
+ Source := Other_Part (Source);
end if;
end if;
if Source /= No_Source then
- if In_Tree.Sources.Table (Source).Project /= Project
- and then
- not Is_Extending
- (Project,
- In_Tree.Sources.Table (Source).Project,
- In_Tree)
+ if Source.Project /= Project
+ and then not Is_Extending (Project, Source.Project)
then
Source := No_Source;
end if;
(Interfaces).Location);
else
- if In_Tree.Sources.Table (Source).Kind = Spec and then
- In_Tree.Sources.Table (Source).Other_Part /=
- No_Source
+ if Source.Kind = Spec
+ and then Other_Part (Source) /= No_Source
then
- Source := In_Tree.Sources.Table (Source).Other_Part;
+ Source := Other_Part (Source);
end if;
String_Element_Table.Increment_Last
(In_Tree.String_Elements);
+
In_Tree.String_Elements.Table
(String_Element_Table.Last
(In_Tree.String_Elements)) :=
- (Value =>
- Name_Id (In_Tree.Sources.Table (Source).Dep_Name),
+ (Value => Name_Id (Source.Dep_Name),
Index => 0,
- Display_Value =>
- Name_Id (In_Tree.Sources.Table (Source).Dep_Name),
+ Display_Value => Name_Id (Source.Dep_Name),
Location =>
In_Tree.String_Elements.Table
(Interfaces).Location,
Flag => False,
Next => Interface_ALIs);
- Interface_ALIs := String_Element_Table.Last
- (In_Tree.String_Elements);
+
+ Interface_ALIs :=
+ String_Element_Table.Last (In_Tree.String_Elements);
end if;
end if;
-- Put the list of Interface ALIs in the project data
- Data.Lib_Interface_ALIs := Interface_ALIs;
+ Project.Lib_Interface_ALIs := Interface_ALIs;
-- Check value of attribute Library_Auto_Init and set
-- Lib_Auto_Init accordingly.
-- If no attribute Library_Auto_Init is declared, then set auto
-- init only if it is supported.
- Data.Lib_Auto_Init := Auto_Init_Supported;
+ Project.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;
+ Project.Lib_Auto_Init := False;
elsif Name_Buffer (1 .. Name_Len) = "true" then
if Auto_Init_Supported then
- Data.Lib_Auto_Init := True;
+ Project.Lib_Auto_Init := True;
else
-- Library_Auto_Init cannot be "true" if auto init is not
- -- supported
+ -- supported.
Error_Msg
(Project, In_Tree,
declare
Dir_Id : constant File_Name_Type :=
File_Name_Type (Lib_Src_Dir.Value);
+ Dir_Exists : Boolean;
begin
Locate_Directory
(Project,
In_Tree,
Dir_Id,
- Data.Directory.Display_Name,
- Data.Library_Src_Dir.Name,
- Data.Library_Src_Dir.Display_Name,
- Create => "library source copy",
- Current_Dir => Current_Dir,
- Location => Lib_Src_Dir.Location);
+ Path => Project.Library_Src_Dir,
+ Dir_Exists => Dir_Exists,
+ Must_Exist => False,
+ Create => "library source copy",
+ Location => Lib_Src_Dir.Location,
+ Externally_Built => Project.Externally_Built);
-- If directory does not exist, report an error
- if Data.Library_Src_Dir = No_Path_Information then
-
+ if not Dir_Exists then
-- Get the absolute name of the library directory that does
-- not exist, to report an error.
- declare
- Dir_Name : constant String :=
- Get_Name_String (Dir_Id);
-
- begin
- if Is_Absolute_Path (Dir_Name) then
- Err_Vars.Error_Msg_File_1 := Dir_Id;
-
- else
- Get_Name_String (Data.Directory.Name);
-
- if Name_Buffer (Name_Len) /=
- Directory_Separator
- then
- Name_Len := Name_Len + 1;
- Name_Buffer (Name_Len) :=
- Directory_Separator;
- end if;
-
- Name_Buffer
- (Name_Len + 1 ..
- Name_Len + Dir_Name'Length) :=
- Dir_Name;
- Name_Len := Name_Len + Dir_Name'Length;
- Err_Vars.Error_Msg_Name_1 := Name_Find;
- end if;
-
- -- Report the error
-
- Error_Msg_File_1 := Dir_Id;
- Error_Msg
- (Project, In_Tree,
- "Directory { does not exist",
- Lib_Src_Dir.Location);
- end;
+ Err_Vars.Error_Msg_File_1 :=
+ File_Name_Type (Project.Library_Src_Dir.Display_Name);
+ Error_Msg
+ (Project, In_Tree,
+ "Directory { does not exist",
+ Lib_Src_Dir.Location);
-- Report error if it is the same as the object directory
- elsif Data.Library_Src_Dir = Data.Object_Directory then
+ elsif Project.Library_Src_Dir = Project.Object_Directory then
Error_Msg
(Project, In_Tree,
"directory to copy interfaces cannot be " &
"the object directory",
Lib_Src_Dir.Location);
- Data.Library_Src_Dir := No_Path_Information;
+ Project.Library_Src_Dir := No_Path_Information;
else
declare
Src_Dirs : String_List_Id;
Src_Dir : String_Element;
+ Pid : Project_List;
begin
-- Interface copy directory cannot be one of the source
-- directory of the current project.
- Src_Dirs := Data.Source_Dirs;
+ Src_Dirs := Project.Source_Dirs;
while Src_Dirs /= Nil_String loop
Src_Dir := In_Tree.String_Elements.Table (Src_Dirs);
-- Report error if it is one of the source directories
- if Data.Library_Src_Dir.Name =
+ if Project.Library_Src_Dir.Name =
Path_Name_Type (Src_Dir.Value)
then
Error_Msg
"directory to copy interfaces cannot " &
"be one of the source directories",
Lib_Src_Dir.Location);
- Data.Library_Src_Dir := No_Path_Information;
+ Project.Library_Src_Dir := No_Path_Information;
exit;
end if;
Src_Dirs := Src_Dir.Next;
end loop;
- if Data.Library_Src_Dir /= No_Path_Information then
+ if Project.Library_Src_Dir /= No_Path_Information then
-- It cannot be a source directory of any other
-- project either.
- Project_Loop : for Pid in 1 ..
- Project_Table.Last (In_Tree.Projects)
- loop
- Src_Dirs :=
- In_Tree.Projects.Table (Pid).Source_Dirs;
+ Pid := In_Tree.Projects;
+ Project_Loop : loop
+ exit Project_Loop when Pid = null;
+
+ Src_Dirs := Pid.Project.Source_Dirs;
Dir_Loop : while Src_Dirs /= Nil_String loop
Src_Dir :=
In_Tree.String_Elements.Table (Src_Dirs);
-- Report error if it is one of the source
-- directories
- if Data.Library_Src_Dir.Name =
+ if Project.Library_Src_Dir.Name =
Path_Name_Type (Src_Dir.Value)
then
Error_Msg_File_1 :=
File_Name_Type (Src_Dir.Value);
- Error_Msg_Name_1 :=
- In_Tree.Projects.Table (Pid).Name;
+ Error_Msg_Name_1 := Pid.Project.Name;
Error_Msg
(Project, In_Tree,
"directory to copy interfaces cannot " &
"be the same as source directory { of " &
"project %%",
Lib_Src_Dir.Location);
- Data.Library_Src_Dir := No_Path_Information;
+ Project.Library_Src_Dir :=
+ No_Path_Information;
exit Project_Loop;
end if;
Src_Dirs := Src_Dir.Next;
end loop Dir_Loop;
+
+ Pid := Pid.Next;
end loop Project_Loop;
end if;
end;
-- In high verbosity, if there is a valid Library_Src_Dir,
-- display its path name.
- if Data.Library_Src_Dir /= No_Path_Information
+ if Project.Library_Src_Dir /= No_Path_Information
and then Current_Verbosity = High
then
- Write_Str ("Directory to copy interfaces =""");
- Write_Str (Get_Name_String (Data.Library_Src_Dir.Name));
- Write_Line ("""");
+ Write_Attr
+ ("Directory to copy interfaces",
+ Get_Name_String (Project.Library_Src_Dir.Name));
end if;
end if;
end;
-- Symbol policy must hove one of a limited number of values
if Value = "autonomous" or else Value = "default" then
- Data.Symbol_Data.Symbol_Policy := Autonomous;
+ Project.Symbol_Data.Symbol_Policy := Autonomous;
elsif Value = "compliant" then
- Data.Symbol_Data.Symbol_Policy := Compliant;
+ Project.Symbol_Data.Symbol_Policy := Compliant;
elsif Value = "controlled" then
- Data.Symbol_Data.Symbol_Policy := Controlled;
+ Project.Symbol_Data.Symbol_Policy := Controlled;
elsif Value = "restricted" then
- Data.Symbol_Data.Symbol_Policy := Restricted;
+ Project.Symbol_Data.Symbol_Policy := Restricted;
elsif Value = "direct" then
- Data.Symbol_Data.Symbol_Policy := Direct;
+ Project.Symbol_Data.Symbol_Policy := Direct;
else
Error_Msg
-- cannot be Restricted.
if Lib_Symbol_File.Default then
- if Data.Symbol_Data.Symbol_Policy = Restricted then
+ if Project.Symbol_Data.Symbol_Policy = Restricted then
Error_Msg
(Project, In_Tree,
"Library_Symbol_File needs to be defined when " &
else
-- Library_Symbol_File is defined
- Data.Symbol_Data.Symbol_File :=
+ Project.Symbol_Data.Symbol_File :=
Path_Name_Type (Lib_Symbol_File.Value);
Get_Name_String (Lib_Symbol_File.Value);
-- symbol policy cannot be Compliant or Controlled.
if Lib_Ref_Symbol_File.Default then
- if Data.Symbol_Data.Symbol_Policy = Compliant
- or else Data.Symbol_Data.Symbol_Policy = Controlled
+ if Project.Symbol_Data.Symbol_Policy = Compliant
+ or else Project.Symbol_Data.Symbol_Policy = Controlled
then
Error_Msg
(Project, In_Tree,
- "a reference symbol file need to be defined",
+ "a reference symbol file needs to be defined",
Lib_Symbol_Policy.Location);
end if;
else
-- Library_Reference_Symbol_File is defined, check file exists
- Data.Symbol_Data.Reference :=
+ Project.Symbol_Data.Reference :=
Path_Name_Type (Lib_Ref_Symbol_File.Value);
Get_Name_String (Lib_Ref_Symbol_File.Value);
if not Is_Absolute_Path (Name_Buffer (1 .. Name_Len)) then
Name_Len := 0;
Add_Str_To_Name_Buffer
- (Get_Name_String (Data.Directory.Name));
+ (Get_Name_String (Project.Directory.Name));
Add_Char_To_Name_Buffer (Directory_Separator);
Add_Str_To_Name_Buffer
(Get_Name_String (Lib_Ref_Symbol_File.Value));
- Data.Symbol_Data.Reference := Name_Find;
+ Project.Symbol_Data.Reference := Name_Find;
end if;
if not Is_Regular_File
- (Get_Name_String (Data.Symbol_Data.Reference))
+ (Get_Name_String (Project.Symbol_Data.Reference))
then
Error_Msg_File_1 :=
File_Name_Type (Lib_Ref_Symbol_File.Value);
-- symbol policies, this is just a warning
Error_Msg_Warn :=
- Data.Symbol_Data.Symbol_Policy /= Controlled
- and then Data.Symbol_Data.Symbol_Policy /= Direct;
+ Project.Symbol_Data.Symbol_Policy /= Controlled
+ and then Project.Symbol_Data.Symbol_Policy /= Direct;
Error_Msg
(Project, In_Tree,
-- is no reference to check against, and we don't want to
-- fail in this case.
- if Data.Symbol_Data.Symbol_Policy /= Controlled then
- if Data.Symbol_Data.Symbol_Policy = Compliant then
- Data.Symbol_Data.Symbol_Policy := Autonomous;
+ if Project.Symbol_Data.Symbol_Policy /= Controlled then
+ if Project.Symbol_Data.Symbol_Policy = Compliant then
+ Project.Symbol_Data.Symbol_Policy := Autonomous;
end if;
end if;
end if;
-- If both the reference symbol file and the symbol file are
-- defined, then check that they are not the same file.
- if Data.Symbol_Data.Symbol_File /= No_Path then
- Get_Name_String (Data.Symbol_Data.Symbol_File);
+ if Project.Symbol_Data.Symbol_File /= No_Path then
+ Get_Name_String (Project.Symbol_Data.Symbol_File);
if Name_Len > 0 then
declare
Symb_Path : constant String :=
Normalize_Pathname
(Get_Name_String
- (Data.Object_Directory.Name) &
+ (Project.Object_Directory.Name) &
Directory_Separator &
Name_Buffer (1 .. Name_Len),
Directory => Current_Dir,
Ref_Path : constant String :=
Normalize_Pathname
(Get_Name_String
- (Data.Symbol_Data.Reference),
+ (Project.Symbol_Data.Reference),
Directory => Current_Dir,
Resolve_Links =>
Opt.Follow_Links_For_Files);
-- If location of error is unknown, use the location of the project
if Real_Location = No_Location then
- Real_Location := In_Tree.Projects.Table (Project).Location;
+ Real_Location := Project.Location;
end if;
if Error_Report = null then
return;
end if;
- -- Ignore continuation character
-
- if Msg (First) = '\' then
- First := First + 1;
- end if;
-
- -- Warning character is always the first one in this package
- -- this is an undocumented kludge???
-
- if Msg (First) = '?' then
- First := First + 1;
- Add ("Warning: ");
-
- elsif Msg (First) = '<' then
- First := First + 1;
-
- if Err_Vars.Error_Msg_Warn then
- Add ("Warning: ");
- end if;
- end if;
-
- Index := First;
- while Index <= Msg'Last loop
- if Msg (Index) = '{' then
- Add_File;
-
- elsif Msg (Index) = '%' then
- if Index < Msg'Last and then Msg (Index + 1) = '%' then
- Index := Index + 1;
- end if;
-
- Add_Name;
- else
- Add (Msg (Index));
- end if;
- Index := Index + 1;
-
- end loop;
-
- Error_Report (Error_Buffer (1 .. Error_Last), Project, In_Tree);
- end Error_Msg;
-
- ----------------------
- -- Find_Ada_Sources --
- ----------------------
-
- procedure Find_Ada_Sources
- (Project : Project_Id;
- In_Tree : Project_Tree_Ref;
- Data : in out Project_Data;
- Current_Dir : String)
- 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 := In_Tree.String_Elements.Table (Source_Dir);
- if Element.Value /= No_Name then
- Get_Name_String (Element.Display_Value);
-
- declare
- Source_Directory : constant String :=
- Name_Buffer (1 .. Name_Len) & Directory_Separator;
- 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 at every entry in the source directory
+ -- Ignore continuation character
- Open (Dir,
- Source_Directory (Source_Directory'First .. Dir_Last));
+ if Msg (First) = '\' then
+ First := First + 1;
+ end if;
- loop
- Read (Dir, Name_Buffer, Name_Len);
+ -- Warning character is always the first one in this package
+ -- this is an undocumented kludge???
- if Current_Verbosity = High then
- Write_Str (" Checking ");
- Write_Line (Name_Buffer (1 .. Name_Len));
- end if;
+ if Msg (First) = '?' then
+ First := First + 1;
+ Add ("Warning: ");
- exit when Name_Len = 0;
+ elsif Msg (First) = '<' then
+ First := First + 1;
- declare
- File_Name : constant File_Name_Type := Name_Find;
-
- -- ??? We could probably optimize the following call:
- -- we need to resolve links only once for the
- -- directory itself, and then do a single call to
- -- readlink() for each file. Unfortunately that would
- -- require a change in Normalize_Pathname so that it
- -- has the option of not resolving links for its
- -- Directory parameter, only for Name.
-
- Path : constant String :=
- Normalize_Pathname
- (Name => Name_Buffer (1 .. Name_Len),
- Directory =>
- Source_Directory
- (Source_Directory'First .. Dir_Last),
- Resolve_Links =>
- Opt.Follow_Links_For_Files,
- Case_Sensitive => True);
-
- Path_Name : Path_Name_Type;
+ if Err_Vars.Error_Msg_Warn then
+ Add ("Warning: ");
+ end if;
+ end if;
- begin
- Name_Len := Path'Length;
- Name_Buffer (1 .. Name_Len) := Path;
- 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_Ada_Source
- (File_Name => File_Name,
- Path_Name => Path_Name,
- Project => Project,
- In_Tree => In_Tree,
- Data => Data,
- Location => No_Location,
- Current_Source => Current_Source,
- Source_Recorded => Source_Recorded,
- Current_Dir => Current_Dir);
- end;
- end loop;
+ Index := First;
+ while Index <= Msg'Last loop
+ if Msg (Index) = '{' then
+ Add_File;
- Close (Dir);
- end;
+ elsif Msg (Index) = '%' then
+ if Index < Msg'Last and then Msg (Index + 1) = '%' then
+ Index := Index + 1;
end if;
- exception
- when Directory_Error =>
- null;
- end;
-
- if Source_Recorded then
- In_Tree.String_Elements.Table (Source_Dir).Flag :=
- True;
+ Add_Name;
+ else
+ Add (Msg (Index));
end if;
+ Index := Index + 1;
- Source_Dir := Element.Next;
end loop;
- if Current_Verbosity = High then
- Write_Line ("end Looking for sources.");
- end if;
-
- end Find_Ada_Sources;
+ Error_Report (Error_Buffer (1 .. Error_Last), Project, In_Tree);
+ end Error_Msg;
--------------------------------
-- Free_Ada_Naming_Exceptions --
procedure Get_Directories
(Project : Project_Id;
In_Tree : Project_Tree_Ref;
- Current_Dir : String;
- Data : in out Project_Data)
+ Current_Dir : String)
is
Object_Dir : constant Variable_Value :=
Util.Value_Of
- (Name_Object_Dir, Data.Decl.Attributes, In_Tree);
+ (Name_Object_Dir, Project.Decl.Attributes, In_Tree);
Exec_Dir : constant Variable_Value :=
Util.Value_Of
- (Name_Exec_Dir, Data.Decl.Attributes, In_Tree);
+ (Name_Exec_Dir, Project.Decl.Attributes, In_Tree);
Source_Dirs : constant Variable_Value :=
Util.Value_Of
- (Name_Source_Dirs, Data.Decl.Attributes, In_Tree);
+ (Name_Source_Dirs, Project.Decl.Attributes, In_Tree);
Excluded_Source_Dirs : constant Variable_Value :=
Util.Value_Of
(Name_Excluded_Source_Dirs,
- Data.Decl.Attributes,
+ Project.Decl.Attributes,
In_Tree);
Source_Files : constant Variable_Value :=
Util.Value_Of
- (Name_Source_Files, Data.Decl.Attributes, In_Tree);
+ (Name_Source_Files, Project.Decl.Attributes, In_Tree);
Last_Source_Dir : String_List_Id := Nil_String;
+ Languages : constant Variable_Value :=
+ Prj.Util.Value_Of
+ (Name_Languages, Project.Decl.Attributes, In_Tree);
+
procedure Find_Source_Dirs
(From : File_Name_Type;
Location : Source_Ptr;
Name_Buffer (1 .. Name_Len) :=
The_Path (The_Path'First .. The_Path_Last);
Non_Canonical_Path := Name_Find;
-
- if Osint.File_Names_Case_Sensitive then
- Canonical_Path := Non_Canonical_Path;
- else
- Get_Name_String (Non_Canonical_Path);
- Canonical_Case_File_Name (Name_Buffer (1 .. Name_Len));
- Canonical_Path := Name_Find;
- end if;
+ Canonical_Path :=
+ Name_Id (Canonical_Case_File_Name (Non_Canonical_Path));
-- To avoid processing the same directory several times, check
-- if the directory is already in Recursive_Dirs. If it is, then
-- Check if directory is already in list
- List := Data.Source_Dirs;
+ List := Project.Source_Dirs;
Prev := Nil_String;
while List /= Nil_String loop
Element := In_Tree.String_Elements.Table (List);
-- Case of first source directory
if Last_Source_Dir = Nil_String then
- Data.Source_Dirs := String_Element_Table.Last
+ Project.Source_Dirs := String_Element_Table.Last
(In_Tree.String_Elements);
-- Here we already have source directories
elsif Removed and Found then
if Prev = Nil_String then
- Data.Source_Dirs :=
+ Project.Source_Dirs :=
In_Tree.String_Elements.Table (List).Next;
else
In_Tree.String_Elements.Table (Prev).Next :=
Directory (Directory'Last - 2) = Directory_Separator)
then
if not Removed then
- Data.Known_Order_Of_Source_Dirs := False;
+ Project.Known_Order_Of_Source_Dirs := False;
end if;
Name_Len := Directory'Length - 3;
Normalize_Pathname
(Name => Get_Name_String (Base_Dir),
Directory =>
- Get_Name_String (Data.Directory.Display_Name),
+ Get_Name_String
+ (Project.Directory.Display_Name),
Resolve_Links => False,
Case_Sensitive => True);
Error_Msg
(Project, In_Tree,
"{ is not a valid directory.",
- Data.Location);
+ Project.Location);
else
Error_Msg
(Project, In_Tree,
else
declare
- Path_Name : Path_Name_Type;
- Display_Path_Name : Path_Name_Type;
+ Path_Name : Path_Information;
List : String_List_Id;
Prev : String_List_Id;
+ Dir_Exists : Boolean;
begin
Locate_Directory
(Project => Project,
In_Tree => In_Tree,
Name => From,
- Parent => Data.Directory.Display_Name,
- Dir => Path_Name,
- Display => Display_Path_Name,
- Current_Dir => Current_Dir);
+ Path => Path_Name,
+ Dir_Exists => Dir_Exists,
+ Must_Exist => False);
- if Path_Name = No_Path then
+ if not Dir_Exists then
Err_Vars.Error_Msg_File_1 := From;
if Location = No_Location then
Error_Msg
(Project, In_Tree,
"{ is not a valid directory",
- Data.Location);
+ Project.Location);
else
Error_Msg
(Project, In_Tree,
else
declare
Path : constant String :=
- Get_Name_String (Path_Name) &
+ Get_Name_String (Path_Name.Name) &
Directory_Separator;
Last_Path : constant Natural :=
Compute_Directory_Last (Path);
Path_Id : Name_Id;
Display_Path : constant String :=
Get_Name_String
- (Display_Path_Name) &
+ (Path_Name.Display_Name) &
Directory_Separator;
Last_Display_Path : constant Natural :=
Compute_Directory_Last
-- This is the first source directory
- Data.Source_Dirs := String_Element_Table.Last
+ Project.Source_Dirs := String_Element_Table.Last
(In_Tree.String_Elements);
else
else
-- Remove source dir, if present
- List := Data.Source_Dirs;
Prev := Nil_String;
-- Look for source dir in current list
+ List := Project.Source_Dirs;
while List /= Nil_String loop
Element := In_Tree.String_Elements.Table (List);
exit when Element.Value = Path_Id;
-- Source dir was found, remove it from the list
if Prev = Nil_String then
- Data.Source_Dirs :=
+ Project.Source_Dirs :=
In_Tree.String_Elements.Table (List).Next;
else
-- Start of processing for Get_Directories
+ Dir_Exists : Boolean;
+
begin
if Current_Verbosity = High then
Write_Line ("Starting to look for directories");
end if;
- -- Check the object directory
-
- pragma Assert (Object_Dir.Kind = Single,
- "Object_Dir is not a single string");
+ -- Set the object directory to its default which may be nil, if there
+ -- is no sources in the project.
- -- We set the object directory to its default
+ if (((not Source_Files.Default)
+ and then Source_Files.Values = Nil_String)
+ or else
+ ((not Source_Dirs.Default) and then Source_Dirs.Values = Nil_String)
+ or else
+ ((not Languages.Default) and then Languages.Values = Nil_String))
+ and then Project.Extends = No_Project
+ then
+ Project.Object_Directory := No_Path_Information;
+ else
+ Project.Object_Directory := Project.Directory;
+ end if;
- Data.Object_Directory := Data.Directory;
+ -- Check the object directory
if Object_Dir.Value /= Empty_String then
Get_Name_String (Object_Dir.Value);
Object_Dir.Location);
else
- -- We check that the specified object directory does exist
+ -- We check that the specified object directory does exist.
+ -- However, even when it doesn't exist, we set it to a default
+ -- value. This is for the benefit of tools that recover from
+ -- errors; for example, these tools could create the non existent
+ -- directory.
+ -- We always return an absolute directory name though
Locate_Directory
(Project,
In_Tree,
File_Name_Type (Object_Dir.Value),
- Data.Directory.Display_Name,
- Data.Object_Directory.Name,
- Data.Object_Directory.Display_Name,
- Create => "object",
- Location => Object_Dir.Location,
- Current_Dir => Current_Dir);
-
- if Data.Object_Directory = No_Path_Information then
-
- -- The object directory does not exist, report an error if the
- -- project is not externally built.
-
- if not Data.Externally_Built then
- Err_Vars.Error_Msg_File_1 :=
- File_Name_Type (Object_Dir.Value);
- Error_Msg
- (Project, In_Tree,
- "the object directory { cannot be found",
- Data.Location);
- end if;
-
- -- Do not keep a nil Object_Directory. Set it to the specified
- -- (relative or absolute) path. This is for the benefit of
- -- tools that recover from errors; for example, these tools
- -- could create the non existent directory.
-
- Data.Object_Directory.Display_Name :=
- Path_Name_Type (Object_Dir.Value);
+ Path => Project.Object_Directory,
+ Create => "object",
+ Dir_Exists => Dir_Exists,
+ Location => Object_Dir.Location,
+ Must_Exist => False,
+ Externally_Built => Project.Externally_Built);
+
+ if not Dir_Exists
+ and then not Project.Externally_Built
+ then
+ -- The object directory does not exist, report an error if
+ -- the project is not externally built.
- if Osint.File_Names_Case_Sensitive then
- Data.Object_Directory.Name :=
- Path_Name_Type (Object_Dir.Value);
- else
- Get_Name_String (Object_Dir.Value);
- Canonical_Case_File_Name (Name_Buffer (1 .. Name_Len));
- Data.Object_Directory.Name := Name_Find;
- end if;
+ Err_Vars.Error_Msg_File_1 :=
+ File_Name_Type (Object_Dir.Value);
+ Error_Msg
+ (Project, In_Tree,
+ "object directory { not found",
+ Project.Location);
end if;
end if;
- elsif Subdirs /= null then
+ elsif Project.Object_Directory /= No_Path_Information
+ and then Subdirs /= null
+ then
Name_Len := 1;
Name_Buffer (1) := '.';
Locate_Directory
(Project,
In_Tree,
Name_Find,
- Data.Directory.Display_Name,
- Data.Object_Directory.Name,
- Data.Object_Directory.Display_Name,
- Create => "object",
- Location => Object_Dir.Location,
- Current_Dir => Current_Dir);
+ Path => Project.Object_Directory,
+ Create => "object",
+ Dir_Exists => Dir_Exists,
+ Location => Object_Dir.Location,
+ Externally_Built => Project.Externally_Built);
end if;
if Current_Verbosity = High then
- if Data.Object_Directory = No_Path_Information then
+ if Project.Object_Directory = No_Path_Information then
Write_Line ("No object directory");
else
- Write_Str ("Object directory: """);
- Write_Str (Get_Name_String (Data.Object_Directory.Display_Name));
- Write_Line ("""");
+ Write_Attr
+ ("Object directory",
+ Get_Name_String (Project.Object_Directory.Display_Name));
end if;
end if;
-- Check the exec directory
- pragma Assert (Exec_Dir.Kind = Single,
- "Exec_Dir is not a single string");
-
-- We set the object directory to its default
- Data.Exec_Directory := Data.Object_Directory;
+ Project.Exec_Directory := Project.Object_Directory;
if Exec_Dir.Value /= Empty_String then
Get_Name_String (Exec_Dir.Value);
(Project,
In_Tree,
File_Name_Type (Exec_Dir.Value),
- Data.Directory.Display_Name,
- Data.Exec_Directory.Name,
- Data.Exec_Directory.Display_Name,
- Create => "exec",
- Location => Exec_Dir.Location,
- Current_Dir => Current_Dir);
-
- if Data.Exec_Directory = No_Path_Information then
+ Path => Project.Exec_Directory,
+ Dir_Exists => Dir_Exists,
+ Create => "exec",
+ Location => Exec_Dir.Location,
+ Externally_Built => Project.Externally_Built);
+
+ if not Dir_Exists then
Err_Vars.Error_Msg_File_1 := File_Name_Type (Exec_Dir.Value);
Error_Msg
(Project, In_Tree,
- "the exec directory { cannot be found",
- Data.Location);
+ "exec directory { not found",
+ Project.Location);
end if;
end if;
end if;
if Current_Verbosity = High then
- if Data.Exec_Directory = No_Path_Information then
+ if Project.Exec_Directory = No_Path_Information then
Write_Line ("No exec directory");
else
Write_Str ("Exec directory: """);
- Write_Str (Get_Name_String (Data.Exec_Directory.Display_Name));
+ Write_Str (Get_Name_String (Project.Exec_Directory.Display_Name));
Write_Line ("""");
end if;
end if;
if (not Source_Files.Default) and then
Source_Files.Values = Nil_String
then
- Data.Source_Dirs := Nil_String;
+ Project.Source_Dirs := Nil_String;
- if Data.Qualifier = Standard then
+ if Project.Qualifier = Standard then
Error_Msg
(Project,
In_Tree,
Source_Files.Location);
end if;
- if Data.Extends = No_Project
- and then Data.Object_Directory = Data.Directory
- then
- Data.Object_Directory := No_Path_Information;
- end if;
-
elsif Source_Dirs.Default then
-- No Source_Dirs specified: the single source directory is the one
-- containing the project file
- String_Element_Table.Increment_Last
- (In_Tree.String_Elements);
- Data.Source_Dirs := String_Element_Table.Last
- (In_Tree.String_Elements);
- In_Tree.String_Elements.Table (Data.Source_Dirs) :=
- (Value => Name_Id (Data.Directory.Name),
- Display_Value => Name_Id (Data.Directory.Display_Name),
+ String_Element_Table.Append (In_Tree.String_Elements,
+ (Value => Name_Id (Project.Directory.Name),
+ Display_Value => Name_Id (Project.Directory.Display_Name),
Location => No_Location,
Flag => False,
Next => Nil_String,
- Index => 0);
+ Index => 0));
+ Project.Source_Dirs := String_Element_Table.Last
+ (In_Tree.String_Elements);
if Current_Verbosity = High then
- Write_Line ("Single source directory:");
- Write_Str (" """);
- Write_Str (Get_Name_String (Data.Directory.Display_Name));
- Write_Line ("""");
+ Write_Attr
+ ("Default source directory",
+ Get_Name_String (Project.Directory.Display_Name));
end if;
elsif Source_Dirs.Values = Nil_String then
- if Data.Qualifier = Standard then
+ if Project.Qualifier = Standard then
Error_Msg
(Project,
In_Tree,
Source_Dirs.Location);
end if;
- -- If Source_Dirs is an empty string list, this means that this
- -- project contains no source. For projects that don't extend other
- -- projects, this also means that there is no need for an object
- -- directory, if not specified.
-
- if Data.Extends = No_Project
- and then Data.Object_Directory = Data.Directory
- then
- Data.Object_Directory := No_Path_Information;
- end if;
-
- Data.Source_Dirs := Nil_String;
+ Project.Source_Dirs := Nil_String;
else
declare
end if;
declare
- Current : String_List_Id := Data.Source_Dirs;
+ Current : String_List_Id := Project.Source_Dirs;
Element : String_Element;
begin
while Current /= Nil_String loop
Element := In_Tree.String_Elements.Table (Current);
if Element.Value /= No_Name then
- if not Osint.File_Names_Case_Sensitive then
- Get_Name_String (Element.Value);
- Canonical_Case_File_Name (Name_Buffer (1 .. Name_Len));
- Element.Value := Name_Find;
- end if;
-
+ Element.Value :=
+ Name_Id (Canonical_Case_File_Name (Name_Id (Element.Value)));
In_Tree.String_Elements.Table (Current) := Element;
end if;
Current := Element.Next;
end loop;
end;
-
end Get_Directories;
---------------
procedure Get_Mains
(Project : Project_Id;
- In_Tree : Project_Tree_Ref;
- Data : in out Project_Data)
+ In_Tree : Project_Tree_Ref)
is
Mains : constant Variable_Value :=
- Prj.Util.Value_Of (Name_Main, Data.Decl.Attributes, In_Tree);
+ Prj.Util.Value_Of (Name_Main, Project.Decl.Attributes, In_Tree);
+ List : String_List_Id;
+ Elem : String_Element;
begin
- Data.Mains := Mains.Values;
+ Project.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 not Data.Library and then Data.Extends /= No_Project then
- Data.Mains :=
- In_Tree.Projects.Table (Data.Extends).Mains;
+ if not Project.Library and then Project.Extends /= No_Project then
+ Project.Mains := Project.Extends.Mains;
end if;
-- In a library project file, Main cannot be specified
- elsif Data.Library then
+ elsif Project.Library then
Error_Msg
(Project, In_Tree,
"a library project file cannot have Main specified",
Mains.Location);
+
+ else
+ List := Mains.Values;
+ while List /= Nil_String loop
+ Elem := In_Tree.String_Elements.Table (List);
+
+ if Length_Of_Name (Elem.Value) = 0 then
+ Error_Msg
+ (Project, In_Tree,
+ "?a main cannot have an empty name",
+ Elem.Location);
+ exit;
+ end if;
+
+ List := Elem.Next;
+ end loop;
end if;
end Get_Mains;
end if;
end Get_Sources_From_File;
- --------------
- -- Get_Unit --
- --------------
+ -----------------------
+ -- Compute_Unit_Name --
+ -----------------------
- procedure Get_Unit
- (In_Tree : Project_Tree_Ref;
- Canonical_File_Name : File_Name_Type;
- Naming : Naming_Data;
- Exception_Id : out Ada_Naming_Exception_Id;
- Unit_Name : out Name_Id;
- Unit_Kind : out Spec_Or_Body;
- Needs_Pragma : out Boolean)
+ procedure Compute_Unit_Name
+ (File_Name : File_Name_Type;
+ Naming : Lang_Naming_Data;
+ Kind : out Source_Kind;
+ Unit : out Name_Id;
+ In_Tree : Project_Tree_Ref)
is
- Info_Id : Ada_Naming_Exception_Id :=
- Ada_Naming_Exceptions.Get (Canonical_File_Name);
- VMS_Name : File_Name_Type;
+ Filename : constant String := Get_Name_String (File_Name);
+ Last : Integer := Filename'Last;
+ Sep_Len : constant Integer :=
+ Integer (Length_Of_Name (Naming.Separate_Suffix));
+ Body_Len : constant Integer :=
+ Integer (Length_Of_Name (Naming.Body_Suffix));
+ Spec_Len : constant Integer :=
+ Integer (Length_Of_Name (Naming.Spec_Suffix));
+
+ Standard_GNAT : constant Boolean :=
+ Naming.Spec_Suffix = Default_Ada_Spec_Suffix
+ and then
+ Naming.Body_Suffix = Default_Ada_Body_Suffix;
+
+ Unit_Except : Unit_Exception;
+ Masked : Boolean := False;
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;
+ Unit := No_Name;
+ Kind := Spec;
- Info_Id := Ada_Naming_Exceptions.Get (VMS_Name);
+ if Naming.Dot_Replacement = No_File then
+ if Current_Verbosity = High then
+ Write_Line (" No dot_replacement specified");
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);
-
- -- How about some comments and a name for this declare block ???
- -- In fact the whole code below needs more comments ???
-
- declare
- File : String := Name_Buffer (1 .. Name_Len);
- First : constant Positive := File'First;
- Last : Natural := File'Last;
- Standard_GNAT : Boolean;
- Spec : constant File_Name_Type :=
- Spec_Suffix_Id_Of (In_Tree, Name_Ada, Naming);
- Body_Suff : constant File_Name_Type :=
- Body_Suffix_Id_Of (In_Tree, Name_Ada, Naming);
-
- begin
- Standard_GNAT := Spec = Default_Ada_Spec_Suffix
- and then Body_Suff = Default_Ada_Body_Suffix;
-
- declare
- Spec_Suffix : constant String := Get_Name_String (Spec);
- Body_Suffix : constant String := Get_Name_String (Body_Suff);
- Sep_Suffix : constant String :=
- Get_Name_String (Naming.Separate_Suffix);
+ -- Choose the longest suffix that matches. If there are several matches,
+ -- give priority to specs, then bodies, then separates.
- May_Be_Spec : Boolean;
- May_Be_Body : Boolean;
- May_Be_Sep : Boolean;
+ if Naming.Separate_Suffix /= Naming.Body_Suffix
+ and then Suffix_Matches (Filename, Naming.Separate_Suffix)
+ then
+ Last := Filename'Last - Sep_Len;
+ Kind := Sep;
+ end if;
- begin
- May_Be_Spec :=
- File'Length > Spec_Suffix'Length
- and then
- File (Last - Spec_Suffix'Length + 1 .. Last) = Spec_Suffix;
+ if Filename'Last - Body_Len <= Last
+ and then Suffix_Matches (Filename, Naming.Body_Suffix)
+ then
+ Last := Natural'Min (Last, Filename'Last - Body_Len);
+ Kind := Impl;
+ end if;
- May_Be_Body :=
- File'Length > Body_Suffix'Length
- and then
- File (Last - Body_Suffix'Length + 1 .. Last) = Body_Suffix;
+ if Filename'Last - Spec_Len <= Last
+ and then Suffix_Matches (Filename, Naming.Spec_Suffix)
+ then
+ Last := Natural'Min (Last, Filename'Last - Spec_Len);
+ Kind := Spec;
+ end if;
- May_Be_Sep :=
- File'Length > Sep_Suffix'Length
- and then
- File (Last - Sep_Suffix'Length + 1 .. Last) = Sep_Suffix;
+ if Last = Filename'Last then
+ if Current_Verbosity = High then
+ Write_Line (" No matching suffix");
+ end if;
- -- If two May_Be_ booleans are True, always choose the longer one
+ return;
+ end if;
- if May_Be_Spec then
- if May_Be_Body and then
- Spec_Suffix'Length < Body_Suffix'Length
- then
- Unit_Kind := Body_Part;
+ -- Check that the casing matches
- if May_Be_Sep and then
- Body_Suffix'Length < Sep_Suffix'Length
+ if File_Names_Case_Sensitive then
+ case Naming.Casing is
+ when All_Lower_Case =>
+ for J in Filename'First .. Last loop
+ if Is_Letter (Filename (J))
+ and then not Is_Lower (Filename (J))
then
- Last := Last - Sep_Suffix'Length;
- May_Be_Body := False;
+ if Current_Verbosity = High then
+ Write_Line (" Invalid casing");
+ end if;
- else
- Last := Last - Body_Suffix'Length;
- May_Be_Sep := False;
+ return;
end if;
+ end loop;
- elsif May_Be_Sep and then
- Spec_Suffix'Length < Sep_Suffix'Length
- then
- Unit_Kind := Body_Part;
- Last := Last - Sep_Suffix'Length;
-
- else
- Unit_Kind := Specification;
- Last := Last - Spec_Suffix'Length;
- end if;
-
- elsif May_Be_Body then
- Unit_Kind := Body_Part;
-
- if May_Be_Sep and then
- Body_Suffix'Length < Sep_Suffix'Length
- then
- Last := Last - Sep_Suffix'Length;
- May_Be_Body := False;
- else
- Last := Last - Body_Suffix'Length;
- May_Be_Sep := False;
- end if;
+ when All_Upper_Case =>
+ for J in Filename'First .. Last loop
+ if Is_Letter (Filename (J))
+ and then not Is_Upper (Filename (J))
+ then
+ if Current_Verbosity = High then
+ Write_Line (" Invalid casing");
+ end if;
- elsif May_Be_Sep then
- Unit_Kind := Body_Part;
- Last := Last - Sep_Suffix'Length;
+ return;
+ end if;
+ end loop;
- else
- Last := 0;
- end if;
+ when Mixed_Case | Unknown =>
+ null;
+ end case;
+ end if;
- if Last = 0 then
+ -- If Dot_Replacement is not a single dot, then there should not
+ -- be any dot in the name.
- -- This is not a source file
+ declare
+ Dot_Repl : constant String :=
+ Get_Name_String (Naming.Dot_Replacement);
- Unit_Name := No_Name;
- Unit_Kind := Specification;
+ begin
+ if Dot_Repl /= "." then
+ for Index in Filename'First .. Last loop
+ if Filename (Index) = '.' then
+ if Current_Verbosity = High then
+ Write_Line (" Invalid name, contains dot");
+ end if;
- if Current_Verbosity = High then
- Write_Line (" Not a valid file name.");
+ return;
end if;
+ end loop;
- return;
+ Replace_Into_Name_Buffer
+ (Filename (Filename'First .. Last), Dot_Repl, '.');
- elsif Current_Verbosity = High then
- case Unit_Kind is
- when Specification =>
- Write_Str (" Specification: ");
- Write_Line (File (First .. Last + Spec_Suffix'Length));
+ else
+ Name_Len := Last - Filename'First + 1;
+ Name_Buffer (1 .. Name_Len) := Filename (Filename'First .. Last);
+ Fixed.Translate
+ (Source => Name_Buffer (1 .. Name_Len),
+ Mapping => Lower_Case_Map);
+ end if;
+ end;
- when Body_Part =>
- if May_Be_Body then
- Write_Str (" Body: ");
- Write_Line (File (First .. Last + Body_Suffix'Length));
+ -- In the standard GNAT naming scheme, check for special cases: children
+ -- or separates of A, G, I or S, and run time sources.
- else
- Write_Str (" Separate: ");
- Write_Line (File (First .. Last + Sep_Suffix'Length));
- end if;
- end case;
- end if;
- end;
+ if Standard_GNAT and then Name_Len >= 3 then
+ declare
+ S1 : constant Character := Name_Buffer (1);
+ S2 : constant Character := Name_Buffer (2);
+ S3 : constant Character := Name_Buffer (3);
- Get_Name_String (Naming.Dot_Replacement);
- Standard_GNAT :=
- Standard_GNAT and then Name_Buffer (1 .. Name_Len) = "-";
+ begin
+ if S1 = 'a'
+ or else S1 = 'g'
+ or else S1 = 'i'
+ or else S1 = 's'
+ then
+ -- Children or separates of packages A, G, I or S. These names
+ -- are x__ ... or x~... (where x is a, g, i, or s). Both
+ -- versions (x__... and x~...) are allowed in all platforms,
+ -- because it is not possible to know the platform before
+ -- processing of the project files.
- if Name_Buffer (1 .. Name_Len) /= "." then
+ if S2 = '_' and then S3 = '_' then
+ Name_Buffer (2) := '.';
+ Name_Buffer (3 .. Name_Len - 1) :=
+ Name_Buffer (4 .. Name_Len);
+ Name_Len := Name_Len - 1;
- -- If Dot_Replacement is not a single dot, then there should not
- -- be any dot in the name.
+ elsif S2 = '~' then
+ Name_Buffer (2) := '.';
- for Index in First .. Last loop
- if File (Index) = '.' then
- if Current_Verbosity = High then
- Write_Line
- (" Not a valid file name (some dot not replaced).");
- end if;
+ elsif S2 = '.' then
- Unit_Name := No_Name;
- return;
+ -- If it is potentially a run time source, disable filling
+ -- of the mapping file to avoid warnings.
+ Set_Mapping_File_Initial_State_To_Empty (In_Tree);
end if;
- end loop;
-
- -- Replace the substring Dot_Replacement with dots
-
- declare
- Index : Positive := First;
+ end if;
+ end;
+ end if;
- begin
- while Index <= Last - Name_Len + 1 loop
+ -- Name_Buffer contains the name of the the unit in lower-cases. Check
+ -- that this is a valid unit name
- if File (Index .. Index + Name_Len - 1) =
- Name_Buffer (1 .. Name_Len)
- then
- File (Index) := '.';
+ Check_Ada_Name (Name_Buffer (1 .. Name_Len), Unit);
- if Name_Len > 1 and then Index < Last then
- File (Index + 1 .. Last - Name_Len + 1) :=
- File (Index + Name_Len .. Last);
- end if;
+ -- If there is a naming exception for the same unit, the file is not
+ -- a source for the unit. Currently, this only applies in multi_lang
+ -- mode, since Unit_Exceptions is no set in ada_only mode.
- Last := Last - Name_Len + 1;
- end if;
+ if Unit /= No_Name then
+ Unit_Except := Unit_Exceptions.Get (Unit);
- Index := Index + 1;
- end loop;
- end;
+ if Kind = Spec then
+ Masked := Unit_Except.Spec /= No_File
+ and then
+ Unit_Except.Spec /= File_Name;
+ else
+ Masked := Unit_Except.Impl /= No_File
+ and then
+ Unit_Except.Impl /= File_Name;
end if;
- -- Check if the casing is right
-
- declare
- Src : String := File (First .. Last);
- Src_Last : Positive := Last;
-
- begin
- case Naming.Casing is
- when All_Lower_Case =>
- Fixed.Translate
- (Source => Src,
- Mapping => Lower_Case_Map);
-
- when All_Upper_Case =>
- Fixed.Translate
- (Source => Src,
- Mapping => Upper_Case_Map);
-
- when Mixed_Case | Unknown =>
- null;
- end case;
+ if Masked then
+ if Current_Verbosity = High then
+ Write_Str (" """ & Filename & """ contains the ");
- if Src /= File (First .. Last) then
- if Current_Verbosity = High then
- Write_Line (" Not a valid file name (casing).");
+ if Kind = Spec then
+ Write_Str ("spec of a unit found in """);
+ Write_Str (Get_Name_String (Unit_Except.Spec));
+ else
+ Write_Str ("body of a unit found in """);
+ Write_Str (Get_Name_String (Unit_Except.Impl));
end if;
- Unit_Name := No_Name;
- return;
+ Write_Line (""" (ignored)");
end if;
- -- We put the name in lower case
+ Unit := No_Name;
+ end if;
+ end if;
- Fixed.Translate
- (Source => Src,
- Mapping => Lower_Case_Map);
+ if Unit /= No_Name
+ and then Current_Verbosity = High
+ then
+ case Kind is
+ when Spec => Write_Str (" spec of ");
+ when Impl => Write_Str (" body of ");
+ when Sep => Write_Str (" sep of ");
+ end case;
- -- In the standard GNAT naming scheme, check for special cases:
- -- children or separates of A, G, I or S, and run time sources.
+ Write_Line (Get_Name_String (Unit));
+ end if;
+ end Compute_Unit_Name;
- if Standard_GNAT and then Src'Length >= 3 then
- declare
- S1 : constant Character := Src (Src'First);
- S2 : constant Character := Src (Src'First + 1);
- S3 : constant Character := Src (Src'First + 2);
+ --------------
+ -- Get_Unit --
+ --------------
- begin
- if S1 = 'a' or else
- S1 = 'g' or else
- S1 = 'i' or else
- S1 = 's'
- then
- -- Children or separates of packages A, G, I or S. These
- -- names are x__ ... or x~... (where x is a, g, i, or s).
- -- Both versions (x__... and x~...) are allowed in all
- -- platforms, because it is not possible to know the
- -- platform before processing of the project files.
-
- if S2 = '_' and then S3 = '_' then
- Src (Src'First + 1) := '.';
- Src_Last := Src_Last - 1;
- Src (Src'First + 2 .. Src_Last) :=
- Src (Src'First + 3 .. Src_Last + 1);
-
- elsif 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;
+ procedure Get_Unit
+ (In_Tree : Project_Tree_Ref;
+ Canonical_File_Name : File_Name_Type;
+ Project : Project_Id;
+ Exception_Id : out Ada_Naming_Exception_Id;
+ Unit_Name : out Name_Id;
+ Unit_Kind : out Spec_Or_Body)
+ is
+ Info_Id : Ada_Naming_Exception_Id :=
+ Ada_Naming_Exceptions.Get (Canonical_File_Name);
+ VMS_Name : File_Name_Type;
+ Kind : Source_Kind;
+ Lang : Language_Ptr;
+
+ begin
+ if Info_Id = No_Ada_Naming_Exception
+ and then Hostparm.OpenVMS
+ then
+ VMS_Name := Canonical_File_Name;
+ Get_Name_String (VMS_Name);
- if Current_Verbosity = High then
- Write_Str (" ");
- Write_Line (Src (Src'First .. Src_Last));
- end if;
+ if Name_Buffer (Name_Len) = '.' then
+ Name_Len := Name_Len - 1;
+ VMS_Name := Name_Find;
+ end if;
- -- Now, we check if this name is a valid unit name
+ Info_Id := Ada_Naming_Exceptions.Get (VMS_Name);
+ end if;
- Check_Ada_Name
- (Name => Src (Src'First .. Src_Last), Unit => Unit_Name);
- end;
+ if Info_Id /= No_Ada_Naming_Exception then
+ Exception_Id := Info_Id;
+ Unit_Name := No_Name;
+ Unit_Kind := Spec;
- end;
+ else
+ Exception_Id := No_Ada_Naming_Exception;
+ Lang := Get_Language_From_Name (Project, "ada");
+
+ if Lang = null then
+ Unit_Name := No_Name;
+ Unit_Kind := Spec;
+ else
+ Compute_Unit_Name
+ (File_Name => Canonical_File_Name,
+ Naming => Lang.Config.Naming_Data,
+ Kind => Kind,
+ Unit => Unit_Name,
+ In_Tree => In_Tree);
+
+ case Kind is
+ when Spec => Unit_Kind := Spec;
+ when Impl | Sep => Unit_Kind := Impl;
+ end case;
+ end if;
+ end if;
end Get_Unit;
----------
-----------------------
function Is_Illegal_Suffix
- (Suffix : String;
- Dot_Replacement_Is_A_Single_Dot : Boolean) return Boolean
+ (Suffix : File_Name_Type;
+ Dot_Replacement : File_Name_Type) return Boolean
is
+ Suffix_Str : constant String := Get_Name_String (Suffix);
+
begin
- if Suffix'Length = 0 or else Index (Suffix, ".") = 0 then
+ if Suffix_Str'Length = 0 then
+ return False;
+ elsif Index (Suffix_Str, ".") = 0 then
return True;
end if;
- -- If dot replacement is a single dot, and first character of suffix is
- -- also a dot
+ -- Case of 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) = '.'
+ if Get_Name_String (Dot_Replacement) = "."
+ and then Suffix_Str (Suffix_Str'First) = '.'
then
- for Index in Suffix'First + 1 .. Suffix'Last loop
+ for Index in Suffix_Str'First + 1 .. Suffix_Str'Last loop
- -- If there is another dot
+ -- Case of following dot
- if Suffix (Index) = '.' then
+ if Suffix_Str (Index) = '.' then
-- It is illegal to have a letter following the initial dot
- return Is_Letter (Suffix (Suffix'First + 1));
+ return Is_Letter (Suffix_Str (Suffix_Str'First + 1));
end if;
end loop;
end if;
- -- Everything is OK
-
return False;
end Is_Illegal_Suffix;
----------------------
procedure Locate_Directory
- (Project : Project_Id;
- In_Tree : Project_Tree_Ref;
- Name : File_Name_Type;
- Parent : Path_Name_Type;
- Dir : out Path_Name_Type;
- Display : out Path_Name_Type;
- Create : String := "";
- Current_Dir : String;
- Location : Source_Ptr := No_Location)
+ (Project : Project_Id;
+ In_Tree : Project_Tree_Ref;
+ Name : File_Name_Type;
+ Path : out Path_Information;
+ Dir_Exists : out Boolean;
+ Create : String := "";
+ Location : Source_Ptr := No_Location;
+ Must_Exist : Boolean := True;
+ Externally_Built : Boolean := False)
is
+ Parent : constant Path_Name_Type :=
+ Project.Directory.Display_Name;
The_Parent : constant String :=
Get_Name_String (Parent) & Directory_Separator;
-
The_Parent_Last : constant Natural :=
Compute_Directory_Last (The_Parent);
-
Full_Name : File_Name_Type;
-
The_Name : File_Name_Type;
begin
Write_Line (""")");
end if;
- Dir := No_Path;
- Display := No_Path;
+ Path := No_Path_Information;
+ Dir_Exists := False;
if Is_Absolute_Path (Get_Name_String (The_Name)) then
Full_Name := The_Name;
end if;
declare
- Full_Path_Name : constant String := Get_Name_String (Full_Name);
+ Full_Path_Name : String_Access :=
+ new String'(Get_Name_String (Full_Name));
begin
if (Setup_Projects or else Subdirs /= null)
and then Create'Length > 0
- and then not Is_Directory (Full_Path_Name)
then
- begin
- Create_Path (Full_Path_Name);
+ if not Is_Directory (Full_Path_Name.all) then
- if not Quiet_Output then
- Write_Str (Create);
- Write_Str (" directory """);
- Write_Str (Full_Path_Name);
- Write_Line (""" created");
- end if;
+ -- If project is externally built, do not create a subdir,
+ -- use the specified directory, without the subdir.
- exception
- when Use_Error =>
- Error_Msg
- (Project, In_Tree,
- "could not create " & Create &
- " directory " & Full_Path_Name,
- Location);
- end;
+ if Externally_Built then
+ if Is_Absolute_Path (Get_Name_String (Name)) then
+ Get_Name_String (Name);
+
+ else
+ Name_Len := 0;
+ Add_Str_To_Name_Buffer
+ (The_Parent (The_Parent'First .. The_Parent_Last));
+ Add_Str_To_Name_Buffer (Get_Name_String (Name));
+ end if;
+
+ Full_Path_Name := new String'(Name_Buffer (1 .. Name_Len));
+
+ else
+ begin
+ Create_Path (Full_Path_Name.all);
+
+ if not Quiet_Output then
+ Write_Str (Create);
+ Write_Str (" directory """);
+ Write_Str (Full_Path_Name.all);
+ Write_Str (""" created for project ");
+ Write_Line (Get_Name_String (Project.Name));
+ end if;
+
+ exception
+ when Use_Error =>
+ Error_Msg
+ (Project, In_Tree,
+ "could not create " & Create &
+ " directory " & Full_Path_Name.all,
+ Location);
+ end;
+ end if;
+ end if;
end if;
- if Is_Directory (Full_Path_Name) then
+ Dir_Exists := Is_Directory (Full_Path_Name.all);
+
+ if not Must_Exist or else Dir_Exists then
declare
Normed : constant String :=
Normalize_Pathname
- (Full_Path_Name,
- Directory => Current_Dir,
+ (Full_Path_Name.all,
+ Directory =>
+ The_Parent (The_Parent'First .. The_Parent_Last),
Resolve_Links => False,
Case_Sensitive => True);
Canonical_Path : constant String :=
Normalize_Pathname
(Normed,
- Directory => Current_Dir,
+ Directory =>
+ The_Parent
+ (The_Parent'First .. The_Parent_Last),
Resolve_Links =>
Opt.Follow_Links_For_Dirs,
Case_Sensitive => False);
begin
Name_Len := Normed'Length;
Name_Buffer (1 .. Name_Len) := Normed;
- Display := Name_Find;
+ Path.Display_Name := Name_Find;
Name_Len := Canonical_Path'Length;
Name_Buffer (1 .. Name_Len) := Canonical_Path;
- Dir := Name_Find;
+ Path.Name := Name_Find;
end;
end if;
+
+ Free (Full_Path_Name);
end;
end Locate_Directory;
procedure Find_Excluded_Sources
(Project : Project_Id;
- In_Tree : Project_Tree_Ref;
- Data : Project_Data)
+ In_Tree : Project_Tree_Ref)
is
- Excluded_Sources : Variable_Value;
-
- Excluded_Source_List_File : Variable_Value;
-
- Current : String_List_Id;
-
- Element : String_Element;
-
- Location : Source_Ptr;
-
- Name : File_Name_Type;
-
- File : Prj.Util.Text_File;
- Line : String (1 .. 300);
- Last : Natural;
-
+ Excluded_Source_List_File : constant Variable_Value :=
+ Util.Value_Of
+ (Name_Excluded_Source_List_File,
+ Project.Decl.Attributes,
+ In_Tree);
+
+ Excluded_Sources : Variable_Value := Util.Value_Of
+ (Name_Excluded_Source_Files,
+ Project.Decl.Attributes,
+ In_Tree);
+
+ Current : String_List_Id;
+ Element : String_Element;
+ Location : Source_Ptr;
+ Name : File_Name_Type;
+ File : Prj.Util.Text_File;
+ Line : String (1 .. 300);
+ Last : Natural;
Locally_Removed : Boolean := False;
- begin
- Excluded_Source_List_File :=
- Util.Value_Of
- (Name_Excluded_Source_List_File, Data.Decl.Attributes, In_Tree);
-
- Excluded_Sources :=
- Util.Value_Of
- (Name_Excluded_Source_Files, Data.Decl.Attributes, In_Tree);
+ begin
-- If Excluded_Source_Files is not declared, check
-- Locally_Removed_Files.
Locally_Removed := True;
Excluded_Sources :=
Util.Value_Of
- (Name_Locally_Removed_Files, Data.Decl.Attributes, In_Tree);
+ (Name_Locally_Removed_Files, Project.Decl.Attributes, In_Tree);
end if;
Excluded_Sources_Htable.Reset;
Current := Excluded_Sources.Values;
while Current /= Nil_String loop
Element := In_Tree.String_Elements.Table (Current);
+ Name := Canonical_Case_File_Name (Element.Value);
- if Osint.File_Names_Case_Sensitive then
- Name := File_Name_Type (Element.Value);
- else
- Get_Name_String (Element.Value);
- Canonical_Case_File_Name (Name_Buffer (1 .. Name_Len));
- Name := Name_Find;
- end if;
-
- -- If the element has no location, then use the location
- -- of Excluded_Sources to report possible errors.
+ -- If the element has no location, then use the location of
+ -- Excluded_Sources to report possible errors.
if Element.Location = No_Location then
Location := Excluded_Sources.Location;
Path_Name_Of
(File_Name_Type
(Excluded_Source_List_File.Value),
- Data.Directory.Name);
+ Project.Directory.Name);
begin
if Source_File_Path_Name'Length = 0 then
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
+ -- Non empty, non comment line should contain a file name
if Last /= 0
and then (Last = 1 or else Line (1 .. 2) /= "--")
end if;
end Find_Excluded_Sources;
- ---------------------------
- -- Find_Explicit_Sources --
- ---------------------------
+ ------------------
+ -- Find_Sources --
+ ------------------
- procedure Find_Explicit_Sources
- (Current_Dir : String;
- Project : Project_Id;
- In_Tree : Project_Tree_Ref;
- Data : in out Project_Data)
+ procedure Find_Sources
+ (Project : Project_Id;
+ In_Tree : Project_Tree_Ref;
+ Proc_Data : in out Processing_Data;
+ Allow_Duplicate_Basenames : Boolean)
is
Sources : constant Variable_Value :=
Util.Value_Of
(Name_Source_Files,
- Data.Decl.Attributes,
+ Project.Decl.Attributes,
In_Tree);
Source_List_File : constant Variable_Value :=
Util.Value_Of
(Name_Source_List_File,
- Data.Decl.Attributes,
+ Project.Decl.Attributes,
In_Tree);
Name_Loc : Name_Location;
+ Has_Explicit_Sources : Boolean;
+
begin
pragma Assert (Sources.Kind = List, "Source_Files is not a list");
pragma Assert
(Source_List_File.Kind = Single,
"Source_List_File is not a single string");
- -- If the user has specified a Sources attribute
+ -- If the user has specified a Source_Files attribute
if not Sources.Default then
if not Source_List_File.Default then
Name : File_Name_Type;
begin
- if Get_Mode = Ada_Only then
- Data.Ada_Sources_Present := Current /= Nil_String;
- end if;
-
if Get_Mode = Multi_Language then
if Current = Nil_String then
- Data.First_Language_Processing := No_Language_Index;
+ Project.Languages := No_Language_Index;
- -- 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.
+ -- This project contains no source. For projects that don't
+ -- extend other projects, this also means that there is no
+ -- need for an object directory, if not specified.
- if Data.Extends = No_Project
- and then Data.Object_Directory = Data.Directory
+ if Project.Extends = No_Project
+ and then Project.Object_Directory = Project.Directory
then
- Data.Object_Directory := No_Path_Information;
+ Project.Object_Directory := No_Path_Information;
end if;
end if;
end if;
while Current /= Nil_String loop
Element := In_Tree.String_Elements.Table (Current);
+ Name := Canonical_Case_File_Name (Element.Value);
Get_Name_String (Element.Value);
- if Osint.File_Names_Case_Sensitive then
- Name := File_Name_Type (Element.Value);
- else
- Canonical_Case_File_Name (Name_Buffer (1 .. Name_Len));
- Name := Name_Find;
- end if;
-
- -- If the element has no location, then use the
- -- location of Sources to report possible errors.
+ -- If the element has no location, then use the location of
+ -- Sources to report possible errors.
if Element.Location = No_Location then
Location := Sources.Location;
end if;
end loop;
- -- In Multi_Language mode, check whether the file is
- -- already there: the same file name may be in the list; if
- -- the source is missing, the error will be on the first
- -- mention of the source file name.
+ -- In Multi_Language mode, check whether the file is already
+ -- there: the same file name may be in the list. If the source
+ -- is missing, the error will be on the first mention of the
+ -- source file name.
case Get_Mode is
when Ada_Only =>
Current := Element.Next;
end loop;
- if Get_Mode = Ada_Only then
- Get_Path_Names_And_Record_Ada_Sources
- (Project, In_Tree, Data, Current_Dir);
- end if;
+ Has_Explicit_Sources := True;
end;
-- If we have no Source_Files attribute, check the Source_List_File
- -- attribute
+ -- attribute.
elsif not Source_List_File.Default then
- -- Source_List_File is the name of the file
- -- that contains the source file names
+ -- Source_List_File is the name of the file that contains the source
+ -- file names.
declare
Source_File_Path_Name : constant String :=
Path_Name_Of
- (File_Name_Type (Source_List_File.Value), Data.Directory.Name);
+ (File_Name_Type (Source_List_File.Value),
+ Project.Directory.Name);
begin
+ Has_Explicit_Sources := True;
+
if Source_File_Path_Name'Length = 0 then
Err_Vars.Error_Msg_File_1 :=
File_Name_Type (Source_List_File.Value);
Get_Sources_From_File
(Source_File_Path_Name, Source_List_File.Location,
Project, In_Tree);
-
- if Get_Mode = Ada_Only then
- -- Look in the source directories to find those sources
-
- Get_Path_Names_And_Record_Ada_Sources
- (Project, In_Tree, Data, Current_Dir);
- end if;
end if;
end;
else
- -- Neither Source_Files nor Source_List_File has been
- -- specified. Find all the files that satisfy the naming
- -- scheme in all the source directories.
+ -- Neither Source_Files nor Source_List_File has been specified. Find
+ -- all the files that satisfy the naming scheme in all the source
+ -- directories.
- if Get_Mode = Ada_Only then
- Find_Ada_Sources (Project, In_Tree, Data, Current_Dir);
- end if;
+ Has_Explicit_Sources := False;
end if;
- if Get_Mode = Multi_Language then
- Search_Directories
- (Project, In_Tree, Data,
- For_All_Sources =>
- Sources.Default and then Source_List_File.Default);
+ if Get_Mode = Ada_Only then
+ Find_Ada_Sources
+ (Project, In_Tree,
+ Explicit_Sources_Only => Has_Explicit_Sources,
+ Proc_Data => Proc_Data);
- -- Check if all exceptions have been found.
- -- For Ada, it is an error if an exception is not found.
- -- For other language, the source is simply removed.
+ else
+ Search_Directories
+ (Project, In_Tree,
+ For_All_Sources =>
+ Sources.Default and then Source_List_File.Default,
+ Allow_Duplicate_Basenames => Allow_Duplicate_Basenames);
+ end if;
- declare
- Source : Source_Id;
- Src_Data : Source_Data;
+ -- Check if all exceptions have been found. For Ada, it is an error if
+ -- an exception is not found. For other language, the source is simply
+ -- removed.
- begin
- Source := Data.First_Source;
- while Source /= No_Source loop
- Src_Data := In_Tree.Sources.Table (Source);
+ declare
+ Source : Source_Id;
+ Iter : Source_Iterator;
- if Src_Data.Naming_Exception
- and then Src_Data.Path = No_Path_Information
- then
- if Src_Data.Unit /= No_Name then
- Error_Msg_Name_1 := Name_Id (Src_Data.Display_File);
- Error_Msg_Name_2 := Name_Id (Src_Data.Unit);
- Error_Msg
- (Project, In_Tree,
- "source file %% for unit %% not found",
- No_Location);
- end if;
+ begin
+ Iter := For_Each_Source (In_Tree, Project);
+ loop
+ Source := Prj.Element (Iter);
+ exit when Source = No_Source;
- Remove_Source (Source, No_Source, Project, Data, In_Tree);
+ if Source.Naming_Exception
+ and then Source.Path = No_Path_Information
+ then
+ if Source.Unit /= No_Unit_Index then
+ Error_Msg_Name_1 := Name_Id (Source.Display_File);
+ Error_Msg_Name_2 := Name_Id (Source.Unit.Name);
+ Error_Msg
+ (Project, In_Tree,
+ "source file %% for unit %% not found",
+ No_Location);
end if;
- Source := Src_Data.Next_In_Project;
- end loop;
- end;
+ Remove_Source (Source, No_Source);
+ end if;
- -- Check that all sources in Source_Files or the file
- -- Source_List_File has been found.
+ Next (Iter);
+ end loop;
+ end;
+ -- It is an error if a source file name in a source list or in a source
+ -- list file is not found.
+
+ if Has_Explicit_Sources then
declare
- Name_Loc : Name_Location;
+ NL : Name_Location;
+ First_Error : Boolean;
begin
- Name_Loc := Source_Names.Get_First;
- while Name_Loc /= No_Name_Location loop
- if (not Name_Loc.Except) and then (not Name_Loc.Found) then
- Error_Msg_Name_1 := Name_Id (Name_Loc.Name);
- Error_Msg
- (Project,
- In_Tree,
- "file %% not found",
- Name_Loc.Location);
+ NL := Source_Names.Get_First;
+ First_Error := True;
+ while NL /= No_Name_Location loop
+ if not NL.Found then
+ Err_Vars.Error_Msg_File_1 := NL.Name;
+
+ if First_Error then
+ Error_Msg
+ (Project, In_Tree,
+ "source file { not found",
+ NL.Location);
+ First_Error := False;
+
+ else
+ Error_Msg
+ (Project, In_Tree,
+ "\source file { not found",
+ NL.Location);
+ end if;
end if;
- Name_Loc := Source_Names.Get_Next;
+ NL := Source_Names.Get_Next;
end loop;
end;
end if;
if Get_Mode = Ada_Only
- and then Data.Extends = No_Project
+ and then Project.Extends = No_Project
then
-- We should have found at least one source, if not report an error
- if Data.Ada_Sources = Nil_String then
- Report_No_Sources
- (Project, "Ada", In_Tree, Source_List_File.Location);
- end if;
- end if;
-
- end Find_Explicit_Sources;
-
- -------------------------------------------
- -- Get_Path_Names_And_Record_Ada_Sources --
- -------------------------------------------
-
- procedure Get_Path_Names_And_Record_Ada_Sources
- (Project : Project_Id;
- In_Tree : Project_Tree_Ref;
- Data : in out Project_Data;
- Current_Dir : String)
- is
- Source_Dir : String_List_Id;
- Element : String_Element;
- Path : Path_Name_Type;
- Dir : Dir_Type;
- Name : File_Name_Type;
- Canonical_Name : File_Name_Type;
- Name_Str : String (1 .. 1_024);
- Last : Natural := 0;
- NL : Name_Location;
- Current_Source : String_List_Id := Nil_String;
- First_Error : Boolean := True;
- Source_Recorded : Boolean := False;
-
- begin
- -- We look in all source directories for the file names in the hash
- -- table Source_Names.
-
- Source_Dir := Data.Source_Dirs;
- while Source_Dir /= Nil_String loop
- Source_Recorded := False;
- Element := In_Tree.String_Elements.Table (Source_Dir);
-
- declare
- Dir_Path : constant String :=
- Get_Name_String (Element.Display_Value);
- begin
- if Current_Verbosity = High then
- Write_Str ("checking directory """);
- Write_Str (Dir_Path);
- Write_Line ("""");
- end if;
-
- 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;
-
- if Osint.File_Names_Case_Sensitive then
- Canonical_Name := Name;
- else
- Canonical_Case_File_Name (Name_Str (1 .. Last));
- Name_Buffer (1 .. Name_Len) := Name_Str (1 .. Last);
- Canonical_Name := Name_Find;
- end if;
-
- 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;
-
- Add_Str_To_Name_Buffer (Name_Str (1 .. Last));
- Path := Name_Find;
-
- if Current_Verbosity = High then
- Write_Str (" found ");
- Write_Line (Get_Name_String (Name));
- end if;
-
- -- Register the source if it is an Ada compilation unit
-
- Record_Ada_Source
- (File_Name => Name,
- Path_Name => Path,
- Project => Project,
- In_Tree => In_Tree,
- Data => Data,
- Location => NL.Location,
- Current_Source => Current_Source,
- Source_Recorded => Source_Recorded,
- Current_Dir => Current_Dir);
- end if;
- end loop;
-
- Close (Dir);
- end;
-
- if Source_Recorded then
- In_Tree.String_Elements.Table (Source_Dir).Flag :=
- True;
- end if;
-
- Source_Dir := Element.Next;
- end loop;
-
- -- It is an error if a source file name in a source list or
- -- in a source list file is not found.
-
- NL := Source_Names.Get_First;
- while NL /= No_Name_Location loop
- if not NL.Found then
- Err_Vars.Error_Msg_File_1 := NL.Name;
-
- if First_Error then
- Error_Msg
- (Project, In_Tree,
- "source file { cannot be found",
- NL.Location);
- First_Error := False;
-
- else
- Error_Msg
- (Project, In_Tree,
- "\source file { cannot be found",
- NL.Location);
- end if;
- end if;
-
- NL := Source_Names.Get_Next;
- end loop;
- end Get_Path_Names_And_Record_Ada_Sources;
-
- --------------------------
- -- Check_Naming_Schemes --
- --------------------------
-
- procedure Check_Naming_Schemes
- (In_Tree : Project_Tree_Ref;
- Data : in out Project_Data;
- Filename : String;
- File_Name : File_Name_Type;
- Alternate_Languages : out Alternate_Language_Id;
- Language : out Language_Index;
- Language_Name : out Name_Id;
- Display_Language_Name : out Name_Id;
- Unit : out Name_Id;
- Lang_Kind : out Language_Kind;
- Kind : out Source_Kind)
- is
- Last : Positive := Filename'Last;
- Config : Language_Config;
- Lang : Name_List_Index := Data.Languages;
- Header_File : Boolean := False;
- First_Language : Language_Index;
- OK : Boolean;
-
- Last_Spec : Natural;
- Last_Body : Natural;
- Last_Sep : Natural;
-
- begin
- Unit := No_Name;
- Alternate_Languages := No_Alternate_Language;
-
- while Lang /= No_Name_List loop
- Language_Name := In_Tree.Name_Lists.Table (Lang).Name;
- Language := Data.First_Language_Processing;
-
- if Current_Verbosity = High then
- Write_Line
- (" Testing language "
- & Get_Name_String (Language_Name)
- & " Header_File=" & Header_File'Img);
- end if;
-
- while Language /= No_Language_Index loop
- if In_Tree.Languages_Data.Table (Language).Name =
- Language_Name
- then
- Display_Language_Name :=
- In_Tree.Languages_Data.Table (Language).Display_Name;
- Config := In_Tree.Languages_Data.Table (Language).Config;
- Lang_Kind := Config.Kind;
-
- if Config.Kind = File_Based then
-
- -- For file based languages, there is no Unit. Just
- -- check if the file name has the implementation or,
- -- if it is specified, the template suffix of the
- -- language.
-
- Unit := No_Name;
-
- if not Header_File
- and then Config.Naming_Data.Body_Suffix /= No_File
- then
- declare
- Impl_Suffix : constant String :=
- Get_Name_String (Config.Naming_Data.Body_Suffix);
-
- begin
- if Filename'Length > Impl_Suffix'Length
- and then
- Filename
- (Last - Impl_Suffix'Length + 1 .. Last) =
- Impl_Suffix
- then
- Kind := Impl;
-
- if Current_Verbosity = High then
- Write_Str (" source of language ");
- Write_Line
- (Get_Name_String (Display_Language_Name));
- end if;
-
- return;
- end if;
- end;
- end if;
-
- if Config.Naming_Data.Spec_Suffix /= No_File then
- declare
- Spec_Suffix : constant String :=
- Get_Name_String
- (Config.Naming_Data.Spec_Suffix);
-
- begin
- if Filename'Length > Spec_Suffix'Length
- and then
- Filename
- (Last - Spec_Suffix'Length + 1 .. Last) =
- Spec_Suffix
- then
- Kind := Spec;
-
- if Current_Verbosity = High then
- Write_Str (" header file of language ");
- Write_Line
- (Get_Name_String (Display_Language_Name));
- end if;
-
- if Header_File then
- Alternate_Language_Table.Increment_Last
- (In_Tree.Alt_Langs);
- In_Tree.Alt_Langs.Table
- (Alternate_Language_Table.Last
- (In_Tree.Alt_Langs)) :=
- (Language => Language,
- Next => Alternate_Languages);
- Alternate_Languages :=
- Alternate_Language_Table.Last
- (In_Tree.Alt_Langs);
- else
- Header_File := True;
- First_Language := Language;
- end if;
- end if;
- end;
- end if;
-
- elsif not Header_File then
- -- Unit based language
-
- OK := Config.Naming_Data.Dot_Replacement /= No_File;
-
- if OK then
+ if not Has_Ada_Sources (Project) then
+ Report_No_Sources
+ (Project, "Ada", In_Tree, Source_List_File.Location);
+ end if;
+ end if;
+ end Find_Sources;
- -- Check casing
- -- ??? Are we doing this once per file in the project ?
- -- It should be done only once per project.
-
- case Config.Naming_Data.Casing is
- when All_Lower_Case =>
- for J in Filename'Range loop
- if Is_Letter (Filename (J)) then
- if not Is_Lower (Filename (J)) then
- OK := False;
- exit;
- end if;
- end if;
- end loop;
-
- when All_Upper_Case =>
- for J in Filename'Range loop
- if Is_Letter (Filename (J)) then
- if not Is_Upper (Filename (J)) then
- OK := False;
- exit;
- end if;
- end if;
- end loop;
+ ----------------
+ -- Initialize --
+ ----------------
- when others =>
- OK := False;
- end case;
- end if;
+ procedure Initialize (Proc_Data : in out Processing_Data) is
+ begin
+ Files_Htable.Reset (Proc_Data.Units);
+ end Initialize;
- if OK then
- Last_Spec := Natural'Last;
- Last_Body := Natural'Last;
- Last_Sep := Natural'Last;
-
- if Config.Naming_Data.Separate_Suffix /= No_File
- and then
- Config.Naming_Data.Separate_Suffix /=
- Config.Naming_Data.Body_Suffix
- then
- declare
- Suffix : constant String :=
- Get_Name_String
- (Config.Naming_Data.Separate_Suffix);
- begin
- if Filename'Length > Suffix'Length
- and then
- Filename
- (Last - Suffix'Length + 1 .. Last) =
- Suffix
- then
- Last_Sep := Last - Suffix'Length;
- end if;
- end;
- end if;
+ ----------
+ -- Free --
+ ----------
- if Config.Naming_Data.Body_Suffix /= No_File then
- declare
- Suffix : constant String :=
- Get_Name_String
- (Config.Naming_Data.Body_Suffix);
- begin
- if Filename'Length > Suffix'Length
- and then
- Filename
- (Last - Suffix'Length + 1 .. Last) =
- Suffix
- then
- Last_Body := Last - Suffix'Length;
- end if;
- end;
- end if;
+ procedure Free (Proc_Data : in out Processing_Data) is
+ begin
+ Files_Htable.Reset (Proc_Data.Units);
+ end Free;
- if Config.Naming_Data.Spec_Suffix /= No_File then
- declare
- Suffix : constant String :=
- Get_Name_String
- (Config.Naming_Data.Spec_Suffix);
- begin
- if Filename'Length > Suffix'Length
- and then
- Filename
- (Last - Suffix'Length + 1 .. Last) =
- Suffix
- then
- Last_Spec := Last - Suffix'Length;
- end if;
- end;
- end if;
+ ----------------------
+ -- Find_Ada_Sources --
+ ----------------------
- declare
- Last_Min : constant Natural :=
- Natural'Min (Natural'Min (Last_Spec,
- Last_Body),
- Last_Sep);
+ procedure Find_Ada_Sources
+ (Project : Project_Id;
+ In_Tree : Project_Tree_Ref;
+ Explicit_Sources_Only : Boolean;
+ Proc_Data : in out Processing_Data)
+ is
+ Source_Dir : String_List_Id;
+ Element : String_Element;
+ Dir : Dir_Type;
+ Dir_Has_Source : Boolean := False;
+ NL : Name_Location;
+ Ada_Language : Language_Ptr;
- begin
- OK := Last_Min < Last;
+ begin
+ if Current_Verbosity = High then
+ Write_Line ("Looking for Ada sources:");
+ end if;
- if OK then
- Last := Last_Min;
+ Ada_Language := Project.Languages;
+ while Ada_Language /= No_Language_Index
+ and then Ada_Language.Name /= Name_Ada
+ loop
+ Ada_Language := Ada_Language.Next;
+ end loop;
- if Last_Min = Last_Spec then
- Kind := Spec;
+ -- We look in all source directories for the file names in the hash
+ -- table Source_Names.
- elsif Last_Min = Last_Body then
- Kind := Impl;
+ Source_Dir := Project.Source_Dirs;
+ while Source_Dir /= Nil_String loop
+ Dir_Has_Source := False;
+ Element := In_Tree.String_Elements.Table (Source_Dir);
- else
- Kind := Sep;
- end if;
- end if;
- end;
- end if;
+ declare
+ Dir_Path : constant String :=
+ Get_Name_String (Element.Display_Value) &
+ Directory_Separator;
+ Dir_Last : constant Natural := Compute_Directory_Last (Dir_Path);
- if OK then
+ begin
+ if Current_Verbosity = High then
+ Write_Line ("checking directory """ & Dir_Path & """");
+ end if;
- -- Replace dot replacements with dots
+ -- Look for all files in the current source directory
- Name_Len := 0;
+ Open (Dir, Dir_Path (Dir_Path'First .. Dir_Last));
- declare
- J : Positive := Filename'First;
+ loop
+ Read (Dir, Name_Buffer, Name_Len);
+ exit when Name_Len = 0;
- Dot_Replacement : constant String :=
- Get_Name_String
- (Config.Naming_Data.
- Dot_Replacement);
+ if Current_Verbosity = High then
+ Write_Line (" Checking " & Name_Buffer (1 .. Name_Len));
+ end if;
- Max : constant Positive :=
- Last - Dot_Replacement'Length + 1;
+ declare
+ Name : constant File_Name_Type := Name_Find;
+ Canonical_Name : File_Name_Type;
+
+ -- ??? We could probably optimize the following call: we
+ -- need to resolve links only once for the directory itself,
+ -- and then do a single call to readlink() for each file.
+ -- Unfortunately that would require a change in
+ -- Normalize_Pathname so that it has the option of not
+ -- resolving links for its Directory parameter, only for
+ -- Name.
+
+ Path : constant String :=
+ Normalize_Pathname
+ (Name => Name_Buffer (1 .. Name_Len),
+ Directory => Dir_Path (Dir_Path'First .. Dir_Last),
+ Resolve_Links => Opt.Follow_Links_For_Files,
+ Case_Sensitive => True); -- no case folding
+
+ Path_Name : Path_Name_Type;
+ To_Record : Boolean := False;
+ Location : Source_Ptr;
- begin
- loop
- Name_Len := Name_Len + 1;
+ begin
+ -- If the file was listed in the explicit list of sources,
+ -- mark it as such (since we'll need to report an error when
+ -- an explicit source was not found)
+
+ if Explicit_Sources_Only then
+ Canonical_Name :=
+ Canonical_Case_File_Name (Name_Id (Name));
+ NL := Source_Names.Get (Canonical_Name);
+ To_Record := NL /= No_Name_Location and then not NL.Found;
+
+ if To_Record then
+ NL.Found := True;
+ Location := NL.Location;
+ Source_Names.Set (Canonical_Name, NL);
+ end if;
- if J <= Max and then
- Filename
- (J .. J + Dot_Replacement'Length - 1) =
- Dot_Replacement
- then
- Name_Buffer (Name_Len) := '.';
- J := J + Dot_Replacement'Length;
+ else
+ To_Record := True;
+ Location := No_Location;
+ end if;
- else
- if Filename (J) = '.' then
- OK := False;
- exit;
- end if;
+ if To_Record then
+ Name_Len := Path'Length;
+ Name_Buffer (1 .. Name_Len) := Path;
+ Path_Name := Name_Find;
- Name_Buffer (Name_Len) :=
- GNAT.Case_Util.To_Lower (Filename (J));
- J := J + 1;
- end if;
+ if Current_Verbosity = High then
+ Write_Line (" recording " & Get_Name_String (Name));
+ end if;
- exit when J > Last;
- end loop;
- end;
+ -- Register the source if it is an Ada compilation unit
+
+ Record_Ada_Source
+ (File_Name => Name,
+ Path_Name => Path_Name,
+ Project => Project,
+ In_Tree => In_Tree,
+ Proc_Data => Proc_Data,
+ Ada_Language => Ada_Language,
+ Location => Location,
+ Source_Recorded => Dir_Has_Source);
end if;
+ end;
+ end loop;
- if OK then
+ Close (Dir);
- -- The name buffer should contain the name of the
- -- the unit, if it is one.
+ exception
+ when others =>
+ Close (Dir);
+ raise;
+ end;
- -- Check that this is a valid unit name
+ if Dir_Has_Source then
+ In_Tree.String_Elements.Table (Source_Dir).Flag := True;
+ end if;
- Check_Ada_Name (Name_Buffer (1 .. Name_Len), Unit);
+ Source_Dir := Element.Next;
+ end loop;
- if Unit /= No_Name then
+ if Current_Verbosity = High then
+ Write_Line ("End looking for sources");
+ end if;
+ end Find_Ada_Sources;
- if Current_Verbosity = High then
- if Kind = Spec then
- Write_Str (" spec of ");
- else
- Write_Str (" body of ");
- end if;
+ -------------------------------
+ -- Check_File_Naming_Schemes --
+ -------------------------------
- Write_Str (Get_Name_String (Unit));
- Write_Str (" (language ");
- Write_Str
- (Get_Name_String (Display_Language_Name));
- Write_Line (")");
- end if;
+ procedure Check_File_Naming_Schemes
+ (In_Tree : Project_Tree_Ref;
+ Project : Project_Id;
+ File_Name : File_Name_Type;
+ Alternate_Languages : out Language_List;
+ Language : out Language_Ptr;
+ Display_Language_Name : out Name_Id;
+ Unit : out Name_Id;
+ Lang_Kind : out Language_Kind;
+ Kind : out Source_Kind)
+ is
+ Filename : constant String := Get_Name_String (File_Name);
+ Config : Language_Config;
+ Tmp_Lang : Language_Ptr;
+
+ Header_File : Boolean := False;
+ -- True if we found at least one language for which the file is a header
+ -- In such a case, we search for all possible languages where this is
+ -- also a header (C and C++ for instance), since the file might be used
+ -- for several such languages.
+
+ procedure Check_File_Based_Lang;
+ -- Does the naming scheme test for file-based languages. For those,
+ -- there is no Unit. Just check if the file name has the implementation
+ -- or, if it is specified, the template suffix of the language.
+ --
+ -- Returns True if the file belongs to the current language and we
+ -- should stop searching for matching languages. Not that a given header
+ -- file could belong to several languages (C and C++ for instance). Thus
+ -- if we found a header we'll check whether it matches other languages.
- -- Comments required, declare block should
- -- be named ???
+ ---------------------------
+ -- Check_File_Based_Lang --
+ ---------------------------
- declare
- Unit_Except : constant Unit_Exception :=
- Unit_Exceptions.Get (Unit);
+ procedure Check_File_Based_Lang is
+ begin
+ if not Header_File
+ and then Suffix_Matches (Filename, Config.Naming_Data.Body_Suffix)
+ then
+ Unit := No_Name;
+ Kind := Impl;
+ Language := Tmp_Lang;
- procedure Masked_Unit (Spec : Boolean);
- -- Indicate that there is an exception for
- -- the same unit, so the file is not a
- -- source for the unit.
+ if Current_Verbosity = High then
+ Write_Str (" implementation of language ");
+ Write_Line (Get_Name_String (Display_Language_Name));
+ end if;
- -----------------
- -- Masked_Unit --
- -----------------
+ elsif Suffix_Matches (Filename, Config.Naming_Data.Spec_Suffix) then
+ if Current_Verbosity = High then
+ Write_Str (" header of language ");
+ Write_Line (Get_Name_String (Display_Language_Name));
+ end if;
- procedure Masked_Unit (Spec : Boolean) is
- begin
- if Current_Verbosity = High then
- Write_Str (" """);
- Write_Str (Filename);
- Write_Str (""" contains the ");
+ if Header_File then
+ Alternate_Languages := new Language_List_Element'
+ (Language => Language,
+ Next => Alternate_Languages);
- if Spec then
- Write_Str ("spec");
- else
- Write_Str ("body");
- end if;
+ else
+ Header_File := True;
+ Kind := Spec;
+ Unit := No_Name;
+ Language := Tmp_Lang;
+ end if;
+ end if;
+ end Check_File_Based_Lang;
- Write_Str
- (" of a unit that is found in """);
+ -- Start of processing for Check_File_Naming_Schemes
- if Spec then
- Write_Str
- (Get_Name_String
- (Unit_Except.Spec));
- else
- Write_Str
- (Get_Name_String
- (Unit_Except.Impl));
- end if;
+ begin
+ Language := No_Language_Index;
+ Alternate_Languages := null;
+ Display_Language_Name := No_Name;
+ Unit := No_Name;
+ Lang_Kind := File_Based;
+ Kind := Spec;
+
+ Tmp_Lang := Project.Languages;
+ while Tmp_Lang /= No_Language_Index loop
+ if Current_Verbosity = High then
+ Write_Line
+ (" Testing language "
+ & Get_Name_String (Tmp_Lang.Name)
+ & " Header_File=" & Header_File'Img);
+ end if;
- Write_Line (""" (ignored)");
- end if;
+ Display_Language_Name := Tmp_Lang.Display_Name;
+ Config := Tmp_Lang.Config;
+ Lang_Kind := Config.Kind;
- Language := No_Language_Index;
- end Masked_Unit;
+ case Config.Kind is
+ when File_Based =>
+ Check_File_Based_Lang;
+ exit when Kind = Impl;
- begin
- if Kind = Spec then
- if Unit_Except.Spec /= No_File
- and then Unit_Except.Spec /= File_Name
- then
- Masked_Unit (Spec => True);
- end if;
+ when Unit_Based =>
- else
- if Unit_Except.Impl /= No_File
- and then Unit_Except.Impl /= File_Name
- then
- Masked_Unit (Spec => False);
- end if;
- end if;
- end;
+ -- We know it belongs to a least a file_based language, no
+ -- need to check unit-based ones.
- return;
- end if;
+ if not Header_File then
+ Compute_Unit_Name
+ (File_Name => File_Name,
+ Naming => Config.Naming_Data,
+ Kind => Kind,
+ Unit => Unit,
+ In_Tree => In_Tree);
+
+ if Unit /= No_Name then
+ Language := Tmp_Lang;
+ exit;
end if;
end if;
- end if;
-
- Language := In_Tree.Languages_Data.Table (Language).Next;
- end loop;
+ end case;
- Lang := In_Tree.Name_Lists.Table (Lang).Next;
+ Tmp_Lang := Tmp_Lang.Next;
end loop;
- -- Comment needed here ???
+ if Language = No_Language_Index
+ and then Current_Verbosity = High
+ then
+ Write_Line (" not a source of any language");
+ end if;
+ end Check_File_Naming_Schemes;
- if Header_File then
- Language := First_Language;
+ -------------------
+ -- Override_Kind --
+ -------------------
- else
- Language := No_Language_Index;
+ procedure Override_Kind (Source : Source_Id; Kind : Source_Kind) is
+ begin
+ -- If the file was previously already associated with a unit, change it
- if Current_Verbosity = High then
- Write_Line (" not a source of any language");
+ if Source.Unit /= null
+ and then Source.Kind in Spec_Or_Body
+ and then Source.Unit.File_Names (Source.Kind) /= null
+ then
+ -- If we had another file referencing the same unit (for instance it
+ -- was in an extended project), that source file is in fact invisible
+ -- from now on, and in particular doesn't belong to the same unit.
+
+ if Source.Unit.File_Names (Source.Kind) /= Source then
+ Source.Unit.File_Names (Source.Kind).Unit := No_Unit_Index;
end if;
+
+ Source.Unit.File_Names (Source.Kind) := null;
+ end if;
+
+ Source.Kind := Kind;
+
+ if Source.Kind in Spec_Or_Body and then Source.Unit /= null then
+ Source.Unit.File_Names (Source.Kind) := Source;
end if;
- end Check_Naming_Schemes;
+ end Override_Kind;
----------------
-- Check_File --
----------------
procedure Check_File
- (Project : Project_Id;
- In_Tree : Project_Tree_Ref;
- Data : in out Project_Data;
- Name : String;
- File_Name : File_Name_Type;
- Display_File_Name : File_Name_Type;
- Source_Directory : String;
- For_All_Sources : Boolean)
+ (Project : Project_Id;
+ In_Tree : Project_Tree_Ref;
+ Path : Path_Name_Type;
+ File_Name : File_Name_Type;
+ Display_File_Name : File_Name_Type;
+ For_All_Sources : Boolean;
+ Allow_Duplicate_Basenames : Boolean)
is
- Display_Path : constant String :=
- Normalize_Pathname
- (Name => Name,
- Directory => Source_Directory,
- Resolve_Links => Opt.Follow_Links_For_Files,
- Case_Sensitive => True);
-
- Name_Loc : Name_Location := Source_Names.Get (File_Name);
- Path_Id : Path_Name_Type;
- Display_Path_Id : Path_Name_Type;
- Check_Name : Boolean := False;
- Alternate_Languages : Alternate_Language_Id := No_Alternate_Language;
- Language : Language_Index;
- Source : Source_Id;
- Other_Part : Source_Id;
- Add_Src : Boolean;
- Src_Ind : Source_File_Index;
- Src_Data : Source_Data;
- Unit : Name_Id;
- Source_To_Replace : Source_Id := No_Source;
- Language_Name : Name_Id;
+ Canonical_Path : constant Path_Name_Type :=
+ Path_Name_Type
+ (Canonical_Case_File_Name (Name_Id (Path)));
+
+ Name_Loc : Name_Location := Source_Names.Get (File_Name);
+ Check_Name : Boolean := False;
+ Alternate_Languages : Language_List;
+ Language : Language_Ptr;
+ Source : Source_Id;
+ Add_Src : Boolean;
+ Src_Ind : Source_File_Index;
+ Unit : Name_Id;
+ Source_To_Replace : Source_Id := No_Source;
Display_Language_Name : Name_Id;
Lang_Kind : Language_Kind;
Kind : Source_Kind := Spec;
+ Iter : Source_Iterator;
begin
- Name_Len := Display_Path'Length;
- Name_Buffer (1 .. Name_Len) := Display_Path;
- Display_Path_Id := Name_Find;
-
- if Osint.File_Names_Case_Sensitive then
- Path_Id := Display_Path_Id;
- else
- Canonical_Case_File_Name (Name_Buffer (1 .. Name_Len));
- Path_Id := Name_Find;
- end if;
-
if Name_Loc = No_Name_Location then
Check_Name := For_All_Sources;
else
if Name_Loc.Found then
-
-- Check if it is OK to have the same file name in several
-- source directories.
- if not Data.Known_Order_Of_Source_Dirs then
+ if not Project.Known_Order_Of_Source_Dirs then
Error_Msg_File_1 := File_Name;
Error_Msg
(Project, In_Tree,
Check_Name := True;
else
- In_Tree.Sources.Table (Name_Loc.Source).Path :=
- (Path_Id, Display_Path_Id);
+ -- ??? Issue: there could be several entries for the same
+ -- source file in the list of sources, in case the file
+ -- contains multiple units. We should share the data as much
+ -- as possible, and more importantly set the path for all
+ -- instances.
+
+ Name_Loc.Source.Path := (Canonical_Path, Path);
Source_Paths_Htable.Set
(In_Tree.Source_Paths_HT,
- Path_Id,
+ Canonical_Path,
Name_Loc.Source);
-- Check if this is a subunit
- if In_Tree.Sources.Table (Name_Loc.Source).Unit /= No_Name
- and then
- In_Tree.Sources.Table (Name_Loc.Source).Kind = Impl
+ if Name_Loc.Source.Unit /= No_Unit_Index
+ and then Name_Loc.Source.Kind = Impl
then
Src_Ind := Sinput.P.Load_Project_File
- (Get_Name_String (Path_Id));
+ (Get_Name_String (Canonical_Path));
if Sinput.P.Source_File_Is_Subunit (Src_Ind) then
- In_Tree.Sources.Table (Name_Loc.Source).Kind := Sep;
+ Override_Kind (Name_Loc.Source, Sep);
end if;
end if;
end if;
end if;
if Check_Name then
- Other_Part := No_Source;
-
- Check_Naming_Schemes
+ Check_File_Naming_Schemes
(In_Tree => In_Tree,
- Data => Data,
- Filename => Get_Name_String (File_Name),
+ Project => Project,
File_Name => File_Name,
Alternate_Languages => Alternate_Languages,
Language => Language,
- Language_Name => Language_Name,
Display_Language_Name => Display_Language_Name,
Unit => Unit,
Lang_Kind => Lang_Kind,
else
-- Check if the same file name or unit is used in the prj tree
- Source := In_Tree.First_Source;
+ Iter := For_Each_Source (In_Tree);
Add_Src := True;
- while Source /= No_Source loop
- Src_Data := In_Tree.Sources.Table (Source);
+ loop
+ Source := Prj.Element (Iter);
+ exit when Source = No_Source;
if Unit /= No_Name
- and then Src_Data.Unit = Unit
+ and then Source.Unit /= No_Unit_Index
+ and then Source.Unit.Name = Unit
and then
- ((Src_Data.Kind = Spec and then Kind = Impl)
- or else
- (Src_Data.Kind = Impl and then Kind = Spec))
+ ((Source.Kind = Spec and then Kind = Impl)
+ or else
+ (Source.Kind = Impl and then Kind = Spec))
then
- Other_Part := Source;
+ -- We found the "other_part (source)"
+
+ null;
elsif (Unit /= No_Name
- and then Src_Data.Unit = Unit
- and then
- (Src_Data.Kind = Kind
- or else
- (Src_Data.Kind = Sep and then Kind = Impl)
- or else
- (Src_Data.Kind = Impl and then Kind = Sep)))
- or else (Unit = No_Name and then Src_Data.File = File_Name)
+ and then Source.Unit /= No_Unit_Index
+ and then Source.Unit.Name = Unit
+ and then
+ (Source.Kind = Kind
+ or else
+ (Source.Kind = Sep and then Kind = Impl)
+ or else
+ (Source.Kind = Impl and then Kind = Sep)))
+ or else
+ (Unit = No_Name and then Source.File = File_Name)
then
-- Duplication of file/unit in same project is only
-- allowed if order of source directories is known.
- if Project = Src_Data.Project then
- if Data.Known_Order_Of_Source_Dirs then
- Add_Src := False;
-
- elsif Unit /= No_Name then
- Error_Msg_Name_1 := Unit;
- Error_Msg
- (Project, In_Tree, "duplicate unit %%", No_Location);
- Add_Src := False;
+ if Project = Source.Project then
+ if Unit = No_Name then
+ if Allow_Duplicate_Basenames then
+ Add_Src := True;
+ elsif Project.Known_Order_Of_Source_Dirs then
+ Add_Src := False;
+ else
+ Error_Msg_File_1 := File_Name;
+ Error_Msg
+ (Project, In_Tree, "duplicate source file name {",
+ No_Location);
+ Add_Src := False;
+ end if;
else
- Error_Msg_File_1 := File_Name;
- Error_Msg
- (Project, In_Tree, "duplicate source file name {",
- No_Location);
- Add_Src := False;
+ if Project.Known_Order_Of_Source_Dirs then
+ Add_Src := False;
+ else
+ Error_Msg_Name_1 := Unit;
+ Error_Msg
+ (Project, In_Tree, "duplicate unit %%",
+ No_Location);
+ Add_Src := False;
+ end if;
end if;
- -- Do not allow the same unit name in different
- -- projects, except if one is extending the other.
+ -- Do not allow the same unit name in different projects,
+ -- except if one is extending the other.
- -- For a file based language, the same file name
- -- replaces a file in a project being extended, but
- -- it is allowed to have the same file name in
- -- unrelated projects.
+ -- For a file based language, the same file name replaces
+ -- a file in a project being extended, but it is allowed
+ -- to have the same file name in unrelated projects.
- elsif Is_Extending
- (Project, Src_Data.Project, In_Tree)
- then
+ elsif Is_Extending (Project, Source.Project) then
Source_To_Replace := Source;
- elsif Unit /= No_Name then
+ elsif Unit /= No_Name
+ and then not Source.Locally_Removed
+ then
Error_Msg_Name_1 := Unit;
Error_Msg
(Project, In_Tree,
"unit %% cannot belong to several projects",
No_Location);
- Error_Msg_Name_1 := In_Tree.Projects.Table (Project).Name;
- Error_Msg_Name_2 := Name_Id (Display_Path_Id);
+ Error_Msg_Name_1 := Project.Name;
+ Error_Msg_Name_2 := Name_Id (Path);
Error_Msg
(Project, In_Tree, "\ project %%, %%", No_Location);
- Error_Msg_Name_1 :=
- In_Tree.Projects.Table (Src_Data.Project).Name;
- Error_Msg_Name_2 := Name_Id (Src_Data.Path.Display_Name);
+ Error_Msg_Name_1 := Source.Project.Name;
+ Error_Msg_Name_2 := Name_Id (Source.Path.Display_Name);
Error_Msg
(Project, In_Tree, "\ project %%, %%", No_Location);
end if;
end if;
- Source := Src_Data.Next_In_Sources;
+ Next (Iter);
end loop;
if Add_Src then
Add_Source
(Id => Source,
- Data => Data,
In_Tree => In_Tree,
Project => Project,
- Lang => Language_Name,
Lang_Id => Language,
- Lang_Kind => Lang_Kind,
Kind => Kind,
Alternate_Languages => Alternate_Languages,
File_Name => File_Name,
Display_File => Display_File_Name,
- Other_Part => Other_Part,
Unit => Unit,
- Path => Path_Id,
- Display_Path => Display_Path_Id,
+ Path => (Canonical_Path, Path),
Source_To_Replace => Source_To_Replace);
end if;
end if;
------------------------
procedure Search_Directories
- (Project : Project_Id;
- In_Tree : Project_Tree_Ref;
- Data : in out Project_Data;
- For_All_Sources : Boolean)
+ (Project : Project_Id;
+ In_Tree : Project_Tree_Ref;
+ For_All_Sources : Boolean;
+ Allow_Duplicate_Basenames : Boolean)
is
Source_Dir : String_List_Id;
Element : String_Element;
-- Loop through subdirectories
- Source_Dir := Data.Source_Dirs;
+ Source_Dir := Project.Source_Dirs;
while Source_Dir /= Nil_String loop
begin
Element := In_Tree.String_Elements.Table (Source_Dir);
begin
if Current_Verbosity = High then
- Write_Str ("Source_Dir = ");
- Write_Line (Source_Directory);
+ Write_Attr ("Source_Dir", Source_Directory);
end if;
-- We look to every entry in the source directory
end if;
declare
- FF : File_Found :=
- Excluded_Sources_Htable.Get (File_Name);
+ Path_Name : constant String :=
+ Normalize_Pathname
+ (Name (1 .. Last),
+ Directory =>
+ Source_Directory
+ (Source_Directory'First ..
+ Dir_Last),
+ Resolve_Links =>
+ Opt.Follow_Links_For_Files,
+ Case_Sensitive => True);
+ -- Case_Sensitive set True (no folding)
+
+ Path : Path_Name_Type;
+ FF : File_Found :=
+ Excluded_Sources_Htable.Get (File_Name);
begin
+ Name_Len := Path_Name'Length;
+ Name_Buffer (1 .. Name_Len) := Path_Name;
+ Path := Name_Find;
+
if FF /= No_File_Found then
if not FF.Found then
FF.Found := True;
- Excluded_Sources_Htable.Set
- (File_Name, FF);
+ Excluded_Sources_Htable.Set (File_Name, FF);
if Current_Verbosity = High then
Write_Str (" excluded source """);
else
Check_File
- (Project => Project,
- In_Tree => In_Tree,
- Data => Data,
- Name => Name (1 .. Last),
- File_Name => File_Name,
- Display_File_Name => Display_File_Name,
- Source_Directory => Source_Directory
- (Source_Directory'First .. Dir_Last),
- For_All_Sources => For_All_Sources);
+ (Project => Project,
+ In_Tree => In_Tree,
+ Path => Path,
+ File_Name => File_Name,
+ Display_File_Name =>
+ Display_File_Name,
+ For_All_Sources => For_All_Sources,
+ Allow_Duplicate_Basenames =>
+ Allow_Duplicate_Basenames);
end if;
end;
end if;
end if;
end Search_Directories;
- ----------------------
- -- Look_For_Sources --
- ----------------------
+ ----------------------------
+ -- Load_Naming_Exceptions --
+ ----------------------------
- procedure Look_For_Sources
- (Project : Project_Id;
- In_Tree : Project_Tree_Ref;
- Data : in out Project_Data;
- Current_Dir : String)
+ procedure Load_Naming_Exceptions
+ (Project : Project_Id;
+ In_Tree : Project_Tree_Ref)
is
- procedure Remove_Locally_Removed_Files_From_Units;
- -- Mark all locally removed sources as such in the Units table
-
- procedure Process_Sources_In_Multi_Language_Mode;
- -- Find all source files when in multi language mode
-
- ---------------------------------------------
- -- Remove_Locally_Removed_Files_From_Units --
- ---------------------------------------------
-
- procedure Remove_Locally_Removed_Files_From_Units is
- Excluded : File_Found;
- OK : Boolean;
- Unit : Unit_Data;
- Extended : Project_Id;
-
- begin
- Excluded := Excluded_Sources_Htable.Get_First;
- while Excluded /= No_File_Found loop
- OK := False;
-
- For_Each_Unit :
- for Index in Unit_Table.First ..
- Unit_Table.Last (In_Tree.Units)
- loop
- Unit := In_Tree.Units.Table (Index);
-
- for Kind in Spec_Or_Body'Range loop
- if Unit.File_Names (Kind).Name = Excluded.File then
- OK := True;
+ Source : Source_Id;
+ Iter : Source_Iterator;
- -- Check that this is from the current project or
- -- that the current project extends.
-
- Extended := Unit.File_Names (Kind).Project;
-
- if Extended = Project
- or else Project_Extends (Project, Extended, In_Tree)
- then
- Unit.File_Names (Kind).Path.Name := Slash;
- Unit.File_Names (Kind).Needs_Pragma := False;
- In_Tree.Units.Table (Index) := Unit;
- Add_Forbidden_File_Name
- (Unit.File_Names (Kind).Name);
- else
- Error_Msg
- (Project, In_Tree,
- "cannot remove a source from " &
- "another project",
- Excluded.Location);
- end if;
- exit For_Each_Unit;
- end if;
- end loop;
- end loop For_Each_Unit;
-
- if not OK then
- Err_Vars.Error_Msg_File_1 := Excluded.File;
- Error_Msg
- (Project, In_Tree, "unknown file {", Excluded.Location);
- end if;
-
- Excluded := Excluded_Sources_Htable.Get_Next;
- end loop;
- end Remove_Locally_Removed_Files_From_Units;
-
- --------------------------------------------
- -- Process_Sources_In_Multi_Language_Mode --
- --------------------------------------------
-
- procedure Process_Sources_In_Multi_Language_Mode is
- Source : Source_Id;
- Src_Data : Source_Data;
- Name_Loc : Name_Location;
- OK : Boolean;
- FF : File_Found;
+ begin
+ Unit_Exceptions.Reset;
- begin
- -- First, put all naming exceptions if any, in the Source_Names table
+ Iter := For_Each_Source (In_Tree, Project);
+ loop
+ Source := Prj.Element (Iter);
+ exit when Source = No_Source;
- Unit_Exceptions.Reset;
+ -- An excluded file cannot also be an exception file name
- Source := Data.First_Source;
- while Source /= No_Source loop
- Src_Data := In_Tree.Sources.Table (Source);
+ if Excluded_Sources_Htable.Get (Source.File) /= No_File_Found then
+ Error_Msg_File_1 := Source.File;
+ Error_Msg
+ (Project, In_Tree,
+ "{ cannot be both excluded and an exception file name",
+ No_Location);
+ end if;
- -- A file that is excluded cannot also be an exception file name
+ if Current_Verbosity = High then
+ Write_Str ("Naming exception: Putting source file ");
+ Write_Str (Get_Name_String (Source.File));
+ Write_Line (" in Source_Names");
+ end if;
- if Excluded_Sources_Htable.Get (Src_Data.File) /=
- No_File_Found
- then
- Error_Msg_File_1 := Src_Data.File;
- Error_Msg
- (Project, In_Tree,
- "{ cannot be both excluded and an exception file name",
- No_Location);
- end if;
+ Source_Names.Set
+ (K => Source.File,
+ E => Name_Location'
+ (Name => Source.File,
+ Location => No_Location,
+ Source => Source,
+ Except => Source.Unit /= No_Unit_Index,
+ Found => False));
- Name_Loc := (Name => Src_Data.File,
- Location => No_Location,
- Source => Source,
- Except => Src_Data.Unit /= No_Name,
- Found => False);
+ -- If this is an Ada exception, record in table Unit_Exceptions
- if Current_Verbosity = High then
- Write_Str ("Putting source #");
- Write_Str (Source'Img);
- Write_Str (", file ");
- Write_Str (Get_Name_String (Src_Data.File));
- Write_Line (" in Source_Names");
- end if;
+ if Source.Unit /= No_Unit_Index then
+ declare
+ Unit_Except : Unit_Exception :=
+ Unit_Exceptions.Get (Source.Unit.Name);
- Source_Names.Set (K => Src_Data.File, E => Name_Loc);
+ begin
+ Unit_Except.Name := Source.Unit.Name;
- -- If this is an Ada exception, record it in table Unit_Exceptions
+ if Source.Kind = Spec then
+ Unit_Except.Spec := Source.File;
+ else
+ Unit_Except.Impl := Source.File;
+ end if;
- if Src_Data.Unit /= No_Name then
- declare
- Unit_Except : Unit_Exception :=
- Unit_Exceptions.Get (Src_Data.Unit);
+ Unit_Exceptions.Set (Source.Unit.Name, Unit_Except);
+ end;
+ end if;
- begin
- Unit_Except.Name := Src_Data.Unit;
+ Next (Iter);
+ end loop;
+ end Load_Naming_Exceptions;
- if Src_Data.Kind = Spec then
- Unit_Except.Spec := Src_Data.File;
- else
- Unit_Except.Impl := Src_Data.File;
- end if;
+ ----------------------
+ -- Look_For_Sources --
+ ----------------------
- Unit_Exceptions.Set (Src_Data.Unit, Unit_Except);
- end;
- end if;
+ procedure Look_For_Sources
+ (Project : Project_Id;
+ In_Tree : Project_Tree_Ref;
+ Proc_Data : in out Processing_Data;
+ Allow_Duplicate_Basenames : Boolean)
+ is
+ Iter : Source_Iterator;
- Source := Src_Data.Next_In_Project;
- end loop;
+ procedure Process_Sources_In_Multi_Language_Mode;
+ -- Find all source files when in multi language mode
- Find_Explicit_Sources
- (Current_Dir, Project, In_Tree, Data);
+ procedure Mark_Excluded_Sources;
+ -- Mark as such the sources that are declared as excluded
- -- Mark as such the sources that are declared as excluded
+ ---------------------------
+ -- Mark_Excluded_Sources --
+ ---------------------------
- FF := Excluded_Sources_Htable.Get_First;
- while FF /= No_File_Found loop
- OK := False;
- Source := In_Tree.First_Source;
+ procedure Mark_Excluded_Sources is
+ Source : Source_Id := No_Source;
+ OK : Boolean;
+ Excluded : File_Found;
- while Source /= No_Source loop
- Src_Data := In_Tree.Sources.Table (Source);
+ begin
+ Excluded := Excluded_Sources_Htable.Get_First;
+ while Excluded /= No_File_Found loop
+ OK := False;
- if Src_Data.File = FF.File then
+ -- ??? Don't we have a hash table to map files to Source_Id?
+ -- ??? Why can't simply iterate over the sources of the current
+ -- project, as opposed to the whole tree ?
- -- Check that this is from this project or a project that
- -- the current project extends.
+ Iter := For_Each_Source (In_Tree);
+ loop
+ Source := Prj.Element (Iter);
+ exit when Source = No_Source;
- if Src_Data.Project = Project or else
- Is_Extending (Project, Src_Data.Project, In_Tree)
+ if Source.File = Excluded.File then
+ if Source.Project = Project
+ or else Is_Extending (Project, Source.Project)
then
- Src_Data.Locally_Removed := True;
- Src_Data.In_Interfaces := False;
- In_Tree.Sources.Table (Source) := Src_Data;
- Add_Forbidden_File_Name (FF.File);
OK := True;
- exit;
+ Source.Locally_Removed := True;
+ Source.In_Interfaces := False;
+
+ if Current_Verbosity = High then
+ Write_Str ("Removing file ");
+ Write_Line
+ (Get_Name_String (Excluded.File)
+ & " " & Get_Name_String (Source.Project.Name));
+ end if;
+
+ else
+ Error_Msg
+ (Project, In_Tree,
+ "cannot remove a source from another project",
+ Excluded.Location);
end if;
+
+ -- We used to exit here, but in fact when a source is
+ -- overridden in an extended project we have only marked the
+ -- original source file if we stop here, not the one from
+ -- the extended project.
+ -- ??? We could exit (and thus be faster) if the loop could
+ -- be done only on the current project, but this isn't
+ -- compatible with the way gprbuild works with excluded
+ -- sources apparently
+
+ -- exit;
end if;
- Source := Src_Data.Next_In_Sources;
+ Next (Iter);
end loop;
- if not FF.Found and not OK then
- Err_Vars.Error_Msg_File_1 := FF.File;
- Error_Msg (Project, In_Tree, "unknown file {", FF.Location);
+ OK := OK or Excluded.Found;
+
+ if not OK then
+ Err_Vars.Error_Msg_File_1 := Excluded.File;
+ Error_Msg
+ (Project, In_Tree, "unknown file {", Excluded.Location);
end if;
- FF := Excluded_Sources_Htable.Get_Next;
+ Excluded := Excluded_Sources_Htable.Get_Next;
end loop;
+ end Mark_Excluded_Sources;
+
+ --------------------------------------------
+ -- Process_Sources_In_Multi_Language_Mode --
+ --------------------------------------------
+
+ procedure Process_Sources_In_Multi_Language_Mode is
+ Iter : Source_Iterator;
+ begin
-- Check that two sources of this project do not have the same object
-- file name.
Check_Object_File_Names : declare
Src_Id : Source_Id;
- Src_Data : Source_Data;
Source_Name : File_Name_Type;
- procedure Check_Object;
+ procedure Check_Object (Src : Source_Id);
-- Check if object file name of the current source is already in
-- hash table Object_File_Names. If it is, report an error. If it
-- is not, put it there with the file name of the current source.
-- Check_Object --
------------------
- procedure Check_Object is
+ procedure Check_Object (Src : Source_Id) is
begin
- Source_Name := Object_File_Names.Get (Src_Data.Object);
+ Source_Name := Object_File_Names.Get (Src.Object);
if Source_Name /= No_File then
- Error_Msg_File_1 := Src_Data.File;
+ Error_Msg_File_1 := Src.File;
Error_Msg_File_2 := Source_Name;
Error_Msg
(Project,
No_Location);
else
- Object_File_Names.Set (Src_Data.Object, Src_Data.File);
+ Object_File_Names.Set (Src.Object, Src.File);
end if;
end Check_Object;
begin
Object_File_Names.Reset;
- Src_Id := In_Tree.First_Source;
- while Src_Id /= No_Source loop
- Src_Data := In_Tree.Sources.Table (Src_Id);
+ Iter := For_Each_Source (In_Tree);
+ loop
+ Src_Id := Prj.Element (Iter);
+ exit when Src_Id = No_Source;
- if Src_Data.Compiled and then Src_Data.Object_Exists
- and then Project_Extends (Project, Src_Data.Project, In_Tree)
+ if Is_Compilable (Src_Id)
+ and then Src_Id.Language.Config.Object_Generated
+ and then Is_Extending (Project, Src_Id.Project)
then
- if Src_Data.Unit = No_Name then
- if Src_Data.Kind = Impl then
- Check_Object;
+ if Src_Id.Unit = No_Unit_Index then
+ if Src_Id.Kind = Impl then
+ Check_Object (Src_Id);
end if;
else
- case Src_Data.Kind is
+ case Src_Id.Kind is
when Spec =>
- if Src_Data.Other_Part = No_Source then
- Check_Object;
+ if Other_Part (Src_Id) = No_Source then
+ Check_Object (Src_Id);
end if;
when Sep =>
null;
when Impl =>
- if Src_Data.Other_Part /= No_Source then
- Check_Object;
+ if Other_Part (Src_Id) /= No_Source then
+ Check_Object (Src_Id);
else
-- Check if it is a subunit
Src_Ind : constant Source_File_Index :=
Sinput.P.Load_Project_File
(Get_Name_String
- (Src_Data.Path.Name));
-
+ (Src_Id.Path.Name));
begin
if Sinput.P.Source_File_Is_Subunit
- (Src_Ind)
+ (Src_Ind)
then
- In_Tree.Sources.Table (Src_Id).Kind := Sep;
+ Override_Kind (Src_Id, Sep);
else
- Check_Object;
+ Check_Object (Src_Id);
end if;
end;
end if;
end if;
end if;
- Src_Id := Src_Data.Next_In_Sources;
+ Next (Iter);
end loop;
end Check_Object_File_Names;
end Process_Sources_In_Multi_Language_Mode;
begin
Source_Names.Reset;
- Find_Excluded_Sources (Project, In_Tree, Data);
+ Find_Excluded_Sources (Project, In_Tree);
- case Get_Mode is
- when Ada_Only =>
- if Is_A_Language (In_Tree, Data, Name_Ada) then
- Find_Explicit_Sources (Current_Dir, Project, In_Tree, Data);
- Remove_Locally_Removed_Files_From_Units;
- end if;
+ if (Get_Mode = Ada_Only and then Is_A_Language (Project, Name_Ada))
+ or else (Get_Mode = Multi_Language
+ and then Project.Languages /= No_Language_Index)
+ then
+ if Get_Mode = Multi_Language then
+ Load_Naming_Exceptions (Project, In_Tree);
+ end if;
- when Multi_Language =>
- if Data.First_Language_Processing /= No_Language_Index then
- Process_Sources_In_Multi_Language_Mode;
- end if;
- end case;
+ Find_Sources (Project, In_Tree, Proc_Data, Allow_Duplicate_Basenames);
+ Mark_Excluded_Sources;
+
+ if Get_Mode = Multi_Language then
+ Process_Sources_In_Multi_Language_Mode;
+ end if;
+ end if;
end Look_For_Sources;
------------------
if Result = null then
return "";
else
- Canonical_Case_File_Name (Result.all);
- return Result.all;
+ declare
+ R : String := Result.all;
+ begin
+ Free (Result);
+ Canonical_Case_File_Name (R);
+ return R;
+ end;
end if;
end Path_Name_Of;
- -------------------------------
+ -----------------------------------
-- Prepare_Ada_Naming_Exceptions --
- -------------------------------
+ -----------------------------------
procedure Prepare_Ada_Naming_Exceptions
(List : Array_Element_Id;
end loop;
end Prepare_Ada_Naming_Exceptions;
- ---------------------
- -- Project_Extends --
- ---------------------
-
- function Project_Extends
- (Extending : Project_Id;
- Extended : Project_Id;
- In_Tree : Project_Tree_Ref) return Boolean
- is
- Current : Project_Id := Extending;
-
- begin
- loop
- if Current = No_Project then
- return False;
-
- elsif Current = Extended then
- return True;
- end if;
-
- Current := In_Tree.Projects.Table (Current).Extends;
- end loop;
- end Project_Extends;
-
-----------------------
-- Record_Ada_Source --
-----------------------
Path_Name : Path_Name_Type;
Project : Project_Id;
In_Tree : Project_Tree_Ref;
- Data : in out Project_Data;
+ Proc_Data : in out Processing_Data;
+ Ada_Language : Language_Ptr;
Location : Source_Ptr;
- Current_Source : in out String_List_Id;
- Source_Recorded : in out Boolean;
- Current_Dir : String)
+ Source_Recorded : in out Boolean)
is
- Canonical_File_Name : File_Name_Type;
- Canonical_Path_Name : Path_Name_Type;
-
- Exception_Id : Ada_Naming_Exception_Id;
- Unit_Name : Name_Id;
- Unit_Kind : Spec_Or_Body;
- Unit_Ind : Int := 0;
- Info : Unit_Info;
- Name_Index : Name_And_Index;
- Needs_Pragma : Boolean;
-
- The_Location : Source_Ptr := Location;
- Previous_Source : constant String_List_Id := Current_Source;
- Except_Name : Name_And_Index := No_Name_And_Index;
+ Canonical_File : File_Name_Type;
+ Canonical_Path : Path_Name_Type;
- Unit_Prj : Unit_Project;
+ File_Recorded : Boolean := False;
+ -- True when at least one file has been recorded
- File_Name_Recorded : Boolean := False;
-
- begin
- if Osint.File_Names_Case_Sensitive then
- Canonical_File_Name := File_Name;
- Canonical_Path_Name := Path_Name;
- else
- Get_Name_String (File_Name);
- Canonical_Case_File_Name (Name_Buffer (1 .. Name_Len));
- Canonical_File_Name := Name_Find;
+ procedure Record_Unit
+ (Unit_Name : Name_Id;
+ Unit_Ind : Int := 0;
+ Unit_Kind : Spec_Or_Body;
+ Needs_Pragma : Boolean);
+ -- Register of the units contained in the source file (there is in
+ -- general a single such unit except when exceptions to the naming
+ -- scheme indicate there are several such units)
- declare
- Canonical_Path : constant String :=
- Normalize_Pathname
- (Get_Name_String (Path_Name),
- Directory => Current_Dir,
- Resolve_Links => Opt.Follow_Links_For_Files,
- Case_Sensitive => False);
- begin
- Name_Len := 0;
- Add_Str_To_Name_Buffer (Canonical_Path);
- Canonical_Path_Name := Name_Find;
- end;
- end if;
+ -----------------
+ -- Record_Unit --
+ -----------------
- -- Find out the unit name, the unit kind and if it needs
- -- a specific SFN pragma.
+ procedure Record_Unit
+ (Unit_Name : Name_Id;
+ Unit_Ind : Int := 0;
+ Unit_Kind : Spec_Or_Body;
+ Needs_Pragma : Boolean)
+ is
+ UData : constant Unit_Index :=
+ Units_Htable.Get (In_Tree.Units_HT, Unit_Name);
+ -- ??? Add_Source will look it up again, can we do that only once ?
- Get_Unit
- (In_Tree => In_Tree,
- Canonical_File_Name => Canonical_File_Name,
- Naming => Data.Naming,
- Exception_Id => Exception_Id,
- Unit_Name => Unit_Name,
- Unit_Kind => Unit_Kind,
- Needs_Pragma => Needs_Pragma);
+ Source : Source_Id;
+ To_Record : Boolean := False;
+ The_Location : Source_Ptr := Location;
+ Unit_Prj : Project_Id;
- if Exception_Id = No_Ada_Naming_Exception
- and then Unit_Name = No_Name
- then
+ begin
if Current_Verbosity = High then
- Write_Str (" """);
- Write_Str (Get_Name_String (Canonical_File_Name));
- Write_Line (""" is not a valid source file name (ignored).");
+ Write_Str (" Putting ");
+ Write_Str (Get_Name_String (Unit_Name));
+ Write_Line (" in the unit list.");
end if;
- else
- -- Check to see if the source has been hidden by an exception,
- -- but only if it is not an exception.
+ -- 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 UData /= No_Unit_Index then
+ if UData.File_Names (Unit_Kind) = null
+ or else
+ (UData.File_Names (Unit_Kind).File = Canonical_File
+ and then UData.File_Names (Unit_Kind).Locally_Removed)
+ or else Is_Extending
+ (Project.Extends, UData.File_Names (Unit_Kind).Project)
+ then
+ To_Record := True;
- if not Needs_Pragma then
- Except_Name :=
- Reverse_Ada_Naming_Exceptions.Get
- ((Unit_Kind, Unit_Name, No_Ada_Naming_Exception));
+ -- If the same file is already in the list, do not add it again
- 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).");
+ elsif UData.File_Names (Unit_Kind).Project = Project
+ and then
+ (Project.Known_Order_Of_Source_Dirs
+ or else
+ UData.File_Names (Unit_Kind).Path.Name = Canonical_Path)
+ then
+ To_Record := False;
+
+ -- Else, same unit but not same file => It is an error to have two
+ -- units with the same name and the same kind (spec or body).
+
+ else
+ if The_Location = No_Location then
+ The_Location := Project.Location;
end if;
- -- The file is not included in the source of the project since
- -- it is hidden by the exception. So, nothing else to do.
+ Err_Vars.Error_Msg_Name_1 := Unit_Name;
+ Error_Msg
+ (Project, In_Tree, "duplicate unit %%", The_Location);
- return;
- end if;
- end if;
+ Err_Vars.Error_Msg_Name_1 :=
+ UData.File_Names (Unit_Kind).Project.Name;
+ Err_Vars.Error_Msg_File_1 :=
+ File_Name_Type (UData.File_Names (Unit_Kind).Path.Name);
+ Error_Msg
+ (Project, In_Tree,
+ "\ project file %%, {", The_Location);
- 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_Ind := Name_Index.Index;
- Unit_Kind := Info.Kind;
- end if;
+ Err_Vars.Error_Msg_Name_1 := Project.Name;
+ Err_Vars.Error_Msg_File_1 := File_Name_Type (Canonical_Path);
+ Error_Msg
+ (Project, In_Tree, "\ project file %%, {", The_Location);
- -- Put the file name in the list of sources of the project
-
- String_Element_Table.Increment_Last (In_Tree.String_Elements);
- In_Tree.String_Elements.Table
- (String_Element_Table.Last (In_Tree.String_Elements)) :=
- (Value => Name_Id (Canonical_File_Name),
- Display_Value => Name_Id (File_Name),
- Location => No_Location,
- Flag => False,
- Next => Nil_String,
- Index => Unit_Ind);
-
- if Current_Source = Nil_String then
- Data.Ada_Sources :=
- String_Element_Table.Last (In_Tree.String_Elements);
- else
- In_Tree.String_Elements.Table (Current_Source).Next :=
- String_Element_Table.Last (In_Tree.String_Elements);
+ To_Record := False;
end if;
- Current_Source :=
- String_Element_Table.Last (In_Tree.String_Elements);
+ -- It is a new unit, create a new record
- -- Put the unit in unit list
+ else
+ -- First, check if there is no other unit with this file name in
+ -- another project. If it is, report error but note we do that
+ -- only for the first unit in the source file.
- declare
- The_Unit : Unit_Index :=
- Units_Htable.Get (In_Tree.Units_HT, Unit_Name);
+ Unit_Prj := Files_Htable.Get (Proc_Data.Units, Canonical_File);
- The_Unit_Data : Unit_Data;
+ if not File_Recorded
+ and then Unit_Prj /= No_Project
+ then
+ Error_Msg_File_1 := File_Name;
+ Error_Msg_Name_1 := Unit_Prj.Name;
+ Error_Msg
+ (Project, In_Tree,
+ "{ is already a source of project %%",
+ Location);
- begin
- if Current_Verbosity = High then
- Write_Str ("Putting ");
- Write_Str (Get_Name_String (Unit_Name));
- Write_Line (" in the unit list.");
- end if;
+ else
+ To_Record := True;
+ end if;
+ 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 To_Record then
+ Files_Htable.Set (Proc_Data.Units, Canonical_File, Project);
+ Add_Source
+ (Id => Source,
+ In_Tree => In_Tree,
+ Project => Project,
+ Lang_Id => Ada_Language,
+ File_Name => Canonical_File,
+ Display_File => File_Name,
+ Unit => Unit_Name,
+ Path => (Canonical_Path, Path_Name),
+ Naming_Exception => Needs_Pragma,
+ Kind => Unit_Kind,
+ Index => Unit_Ind);
+ Source_Recorded := True;
+ end if;
+ end Record_Unit;
- if The_Unit /= No_Unit_Index then
- The_Unit_Data := In_Tree.Units.Table (The_Unit);
+ Exception_Id : Ada_Naming_Exception_Id;
+ Unit_Name : Name_Id;
+ Unit_Kind : Spec_Or_Body;
+ Unit_Ind : Int := 0;
+ Info : Unit_Info;
+ Name_Index : Name_And_Index;
+ Except_Name : Name_And_Index := No_Name_And_Index;
+ Needs_Pragma : Boolean;
- if (The_Unit_Data.File_Names (Unit_Kind).Name =
- Canonical_File_Name
- and then
- The_Unit_Data.File_Names
- (Unit_Kind).Path.Name = Slash)
- or else The_Unit_Data.File_Names (Unit_Kind).Name = No_File
- or else Project_Extends
- (Data.Extends,
- The_Unit_Data.File_Names (Unit_Kind).Project,
- In_Tree)
- then
- if
- The_Unit_Data.File_Names (Unit_Kind).Path.Name = Slash
- then
- Remove_Forbidden_File_Name
- (The_Unit_Data.File_Names (Unit_Kind).Name);
- end if;
+ begin
+ Canonical_File := Canonical_Case_File_Name (Name_Id (File_Name));
+ Canonical_Path :=
+ Path_Name_Type (Canonical_Case_File_Name (Name_Id (Path_Name)));
- -- Record the file name in the hash table Files_Htable
-
- Unit_Prj := (Unit => The_Unit, Project => Project);
- Files_Htable.Set
- (In_Tree.Files_HT,
- Canonical_File_Name,
- Unit_Prj);
-
- The_Unit_Data.File_Names (Unit_Kind) :=
- (Name => Canonical_File_Name,
- Index => Unit_Ind,
- Display_Name => File_Name,
- Path => (Canonical_Path_Name, Path_Name),
- Project => Project,
- Needs_Pragma => Needs_Pragma);
- In_Tree.Units.Table (The_Unit) := The_Unit_Data;
- Source_Recorded := True;
-
- elsif The_Unit_Data.File_Names (Unit_Kind).Project = Project
- and then (Data.Known_Order_Of_Source_Dirs
- or else
- The_Unit_Data.File_Names
- (Unit_Kind).Path.Name = Canonical_Path_Name)
- then
- if Previous_Source = Nil_String then
- Data.Ada_Sources := Nil_String;
- else
- In_Tree.String_Elements.Table (Previous_Source).Next :=
- Nil_String;
- String_Element_Table.Decrement_Last
- (In_Tree.String_Elements);
- end if;
+ -- Check the naming scheme to get extra file properties
- Current_Source := Previous_Source;
+ Get_Unit
+ (In_Tree => In_Tree,
+ Canonical_File_Name => Canonical_File,
+ Project => Project,
+ Exception_Id => Exception_Id,
+ Unit_Name => Unit_Name,
+ Unit_Kind => Unit_Kind);
- else
- -- It is an error to have two units with the same name
- -- and the same kind (spec or body).
+ Needs_Pragma := Exception_Id /= No_Ada_Naming_Exception;
- if The_Location = No_Location then
- The_Location :=
- In_Tree.Projects.Table (Project).Location;
- end if;
+ 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 (Canonical_File));
+ Write_Line (""" is not a valid source file name (ignored).");
+ end if;
+ return;
+ end if;
- Err_Vars.Error_Msg_Name_1 := Unit_Name;
- Error_Msg
- (Project, In_Tree, "duplicate unit %%", The_Location);
-
- Err_Vars.Error_Msg_Name_1 :=
- In_Tree.Projects.Table
- (The_Unit_Data.File_Names (Unit_Kind).Project).Name;
- Err_Vars.Error_Msg_File_1 :=
- File_Name_Type
- (The_Unit_Data.File_Names (Unit_Kind).Path.Name);
- Error_Msg
- (Project, In_Tree,
- "\ project file %%, {", The_Location);
+ -- Check to see if the source has been hidden by an exception,
+ -- but only if it is not an exception.
- Err_Vars.Error_Msg_Name_1 :=
- In_Tree.Projects.Table (Project).Name;
- Err_Vars.Error_Msg_File_1 :=
- File_Name_Type (Canonical_Path_Name);
- Error_Msg
- (Project, In_Tree,
- "\ project file %%, {", The_Location);
- end if;
+ if not Needs_Pragma then
+ Except_Name :=
+ Reverse_Ada_Naming_Exceptions.Get
+ ((Unit_Kind, Unit_Name, No_Ada_Naming_Exception));
- -- It is a new unit, create a new record
+ if Except_Name /= No_Name_And_Index then
+ if Current_Verbosity = High then
+ Write_Str (" """);
+ Write_Str (Get_Name_String (Canonical_File));
+ Write_Str (""" contains a unit that is found in """);
+ Write_Str (Get_Name_String (Except_Name.Name));
+ Write_Line (""" (ignored).");
+ end if;
- else
- -- First, check if there is no other unit with this file
- -- name in another project. If it is, report error but note
- -- we do that only for the first unit in the source file.
+ -- The file is not included in the source of the project since it
+ -- is hidden by the exception. So, nothing else to do.
- Unit_Prj :=
- Files_Htable.Get (In_Tree.Files_HT, Canonical_File_Name);
+ return;
+ end if;
+ end if;
- if not File_Name_Recorded and then
- Unit_Prj /= No_Unit_Project
- then
- Error_Msg_File_1 := File_Name;
- Error_Msg_Name_1 :=
- In_Tree.Projects.Table (Unit_Prj.Project).Name;
- Error_Msg
- (Project, In_Tree,
- "{ is already a source of project %%",
- Location);
+ -- The following loop registers the unit in the appropriate table. It
+ -- will be executed multiple times when the file is a multi-unit file,
+ -- in which case Exception_Id initially points to the first file and
+ -- then to each other unit in the file.
- else
- Unit_Table.Increment_Last (In_Tree.Units);
- The_Unit := Unit_Table.Last (In_Tree.Units);
- Units_Htable.Set
- (In_Tree.Units_HT, Unit_Name, The_Unit);
- Unit_Prj := (Unit => The_Unit, Project => Project);
- Files_Htable.Set
- (In_Tree.Files_HT,
- Canonical_File_Name,
- Unit_Prj);
- The_Unit_Data.Name := Unit_Name;
- The_Unit_Data.File_Names (Unit_Kind) :=
- (Name => Canonical_File_Name,
- Index => Unit_Ind,
- Display_Name => File_Name,
- Path => (Canonical_Path_Name, Path_Name),
- Project => Project,
- Needs_Pragma => Needs_Pragma);
- In_Tree.Units.Table (The_Unit) := The_Unit_Data;
- Source_Recorded := True;
- end if;
- end if;
- end;
+ 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_Ind := Name_Index.Index;
+ Unit_Kind := Info.Kind;
+ end if;
- exit when Exception_Id = No_Ada_Naming_Exception;
- File_Name_Recorded := True;
- end loop;
- end if;
+ Record_Unit (Unit_Name, Unit_Ind, Unit_Kind, Needs_Pragma);
+ File_Recorded := True;
+
+ exit when Exception_Id = No_Ada_Naming_Exception;
+ end loop;
end Record_Ada_Source;
-------------------
procedure Remove_Source
(Id : Source_Id;
- Replaced_By : Source_Id;
- Project : Project_Id;
- Data : in out Project_Data;
- In_Tree : Project_Tree_Ref)
+ Replaced_By : Source_Id)
is
- Src_Data : constant Source_Data := In_Tree.Sources.Table (Id);
- Source : Source_Id;
+ Source : Source_Id;
begin
if Current_Verbosity = High then
- Write_Str ("Removing source #");
- Write_Line (Id'Img);
+ Write_Str ("Removing source ");
+ Write_Line (Get_Name_String (Id.File));
end if;
if Replaced_By /= No_Source then
- In_Tree.Sources.Table (Id).Replaced_By := Replaced_By;
- In_Tree.Sources.Table (Replaced_By).Declared_In_Interfaces :=
- In_Tree.Sources.Table (Id).Declared_In_Interfaces;
- end if;
-
- -- Remove the source from the global source list
-
- Source := In_Tree.First_Source;
-
- if Source = Id then
- In_Tree.First_Source := Src_Data.Next_In_Sources;
-
- else
- while In_Tree.Sources.Table (Source).Next_In_Sources /= Id loop
- Source := In_Tree.Sources.Table (Source).Next_In_Sources;
- end loop;
-
- In_Tree.Sources.Table (Source).Next_In_Sources :=
- Src_Data.Next_In_Sources;
+ Id.Replaced_By := Replaced_By;
+ Replaced_By.Declared_In_Interfaces := Id.Declared_In_Interfaces;
end if;
- -- Remove the source from the project list
-
- if Src_Data.Project = Project then
- Source := Data.First_Source;
-
- if Source = Id then
- Data.First_Source := Src_Data.Next_In_Project;
-
- if Src_Data.Next_In_Project = No_Source then
- Data.Last_Source := No_Source;
- end if;
-
- else
- while In_Tree.Sources.Table (Source).Next_In_Project /= Id loop
- Source := In_Tree.Sources.Table (Source).Next_In_Project;
- end loop;
-
- In_Tree.Sources.Table (Source).Next_In_Project :=
- Src_Data.Next_In_Project;
-
- if Src_Data.Next_In_Project = No_Source then
- In_Tree.Projects.Table (Src_Data.Project).Last_Source := Source;
- end if;
- end if;
-
- else
- Source := In_Tree.Projects.Table (Src_Data.Project).First_Source;
-
- if Source = Id then
- In_Tree.Projects.Table (Src_Data.Project).First_Source :=
- Src_Data.Next_In_Project;
-
- if Src_Data.Next_In_Project = No_Source then
- In_Tree.Projects.Table (Src_Data.Project).Last_Source :=
- No_Source;
- end if;
-
- else
- while In_Tree.Sources.Table (Source).Next_In_Project /= Id loop
- Source := In_Tree.Sources.Table (Source).Next_In_Project;
- end loop;
-
- In_Tree.Sources.Table (Source).Next_In_Project :=
- Src_Data.Next_In_Project;
-
- if Src_Data.Next_In_Project = No_Source then
- In_Tree.Projects.Table (Src_Data.Project).Last_Source := Source;
- end if;
- end if;
- end if;
+ Id.In_Interfaces := False;
+ Id.Locally_Removed := True;
- -- Remove source from the language list
+ -- ??? Should we remove the source from the unit ? The file is not used,
+ -- so probably should not be referenced from the unit. On the other hand
+ -- it might give useful additional info
+ -- if Id.Unit /= null then
+ -- Id.Unit.File_Names (Id.Kind) := null;
+ -- end if;
- Source := In_Tree.Languages_Data.Table (Src_Data.Language).First_Source;
+ Source := Id.Language.First_Source;
if Source = Id then
- In_Tree.Languages_Data.Table (Src_Data.Language).First_Source :=
- Src_Data.Next_In_Lang;
+ Id.Language.First_Source := Id.Next_In_Lang;
else
- while In_Tree.Sources.Table (Source).Next_In_Lang /= Id loop
- Source := In_Tree.Sources.Table (Source).Next_In_Lang;
+ while Source.Next_In_Lang /= Id loop
+ Source := Source.Next_In_Lang;
end loop;
- In_Tree.Sources.Table (Source).Next_In_Lang :=
- Src_Data.Next_In_Lang;
+ Source.Next_In_Lang := Id.Next_In_Lang;
end if;
end Remove_Source;
Error_Msg_Warn := When_No_Sources = Warning;
if Continuation then
- Error_Msg
- (Project, In_Tree, "\" & Msg, Location);
-
+ Error_Msg (Project, In_Tree, "\" & Msg, Location);
else
- Error_Msg
- (Project, In_Tree, Msg, Location);
+ Error_Msg (Project, In_Tree, Msg, Location);
end if;
end;
end case;
----------------------
procedure Show_Source_Dirs
- (Data : Project_Data;
+ (Project : Project_Id;
In_Tree : Project_Tree_Ref)
is
Current : String_List_Id;
begin
Write_Line ("Source_Dirs:");
- Current := Data.Source_Dirs;
+ Current := Project.Source_Dirs;
while Current /= Nil_String loop
Element := In_Tree.String_Elements.Table (Current);
Write_Str (" ");
is
Conv : Array_Element_Id;
Unit : Name_Id;
- The_Unit_Id : Unit_Index;
- The_Unit_Data : Unit_Data;
+ The_Unit_Data : Unit_Index;
Location : Source_Ptr;
begin
Get_Name_String (Unit);
To_Lower (Name_Buffer (1 .. Name_Len));
Unit := Name_Find;
- The_Unit_Id := Units_Htable.Get (In_Tree.Units_HT, Unit);
+ The_Unit_Data := Units_Htable.Get (In_Tree.Units_HT, Unit);
Location := In_Tree.Array_Elements.Table (Conv).Value.Location;
- if The_Unit_Id = No_Unit_Index then
+ if The_Unit_Data = No_Unit_Index then
Error_Msg (Project, In_Tree, "?unknown unit %%", Location);
else
- The_Unit_Data := In_Tree.Units.Table (The_Unit_Id);
Error_Msg_Name_2 :=
In_Tree.Array_Elements.Table (Conv).Value.Value;
if Specs then
if not Check_Project
- (The_Unit_Data.File_Names (Specification).Project,
- Project, In_Tree, Extending)
+ (The_Unit_Data.File_Names (Spec).Project,
+ Project, Extending)
then
Error_Msg
(Project, In_Tree,
"?source of spec of unit %% (%%)" &
- " cannot be found in this project",
+ " not found in this project",
Location);
end if;
else
- if not Check_Project
- (The_Unit_Data.File_Names (Body_Part).Project,
- Project, In_Tree, Extending)
+ if The_Unit_Data.File_Names (Impl) = null
+ or else not Check_Project
+ (The_Unit_Data.File_Names (Impl).Project,
+ Project, Extending)
then
Error_Msg
(Project, In_Tree,
"?source of body of unit %% (%%)" &
- " cannot be found in this project",
+ " not found in this project",
Location);
end if;
end if;
OSDN Git Service
