-- --
-- B o d y --
-- --
--- Copyright (C) 2004 Free Software Foundation, Inc. --
+-- Copyright (C) 2004-2009, Free Software Foundation, Inc. --
-- --
-- GNAT is free software; you can redistribute it and/or modify it under --
-- terms of the GNU General Public License as published by the Free Soft- --
--- ware Foundation; either version 2, or (at your option) any later ver- --
+-- ware Foundation; either version 3, or (at your option) any later ver- --
-- sion. GNAT is distributed in the hope that it will be useful, but WITH- --
-- OUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY --
-- or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License --
-- for more details. You should have received a copy of the GNU General --
--- Public License distributed with GNAT; see file COPYING. If not, write --
--- to the Free Software Foundation, 59 Temple Place - Suite 330, Boston, --
--- MA 02111-1307, USA. --
+-- Public License distributed with GNAT; see file COPYING3. If not, go to --
+-- http://www.gnu.org/licenses for a complete copy of the license. --
-- --
-- GNAT was originally developed by the GNAT team at New York University. --
-- Extensive contributions were provided by Ada Core Technologies Inc. --
-- --
------------------------------------------------------------------------------
-with Namet; use Namet;
-with Prj; use Prj;
+with ALI; use ALI;
+with Debug;
+with Fname;
+with Osint; use Osint;
+with Output; use Output;
+with Opt; use Opt;
with Prj.Ext;
with Prj.Util;
-with Snames; use Snames;
+with Snames; use Snames;
with Table;
-with Types; use Types;
+
+with Ada.Command_Line; use Ada.Command_Line;
+
+with GNAT.Directory_Operations; use GNAT.Directory_Operations;
+
+with System.Case_Util; use System.Case_Util;
+with System.HTable;
package body Makeutl is
+ type Mark_Key is record
+ File : File_Name_Type;
+ Index : Int;
+ end record;
+ -- Identify either a mono-unit source (when Index = 0) or a specific unit
+ -- (index = 1's origin index of unit) in a multi-unit source.
+
+ -- There follow many global undocumented declarations, comments needed ???
+
+ Max_Mask_Num : constant := 2048;
+
+ subtype Mark_Num is Union_Id range 0 .. Max_Mask_Num - 1;
+
+ function Hash (Key : Mark_Key) return Mark_Num;
+
+ package Marks is new System.HTable.Simple_HTable
+ (Header_Num => Mark_Num,
+ Element => Boolean,
+ No_Element => False,
+ Key => Mark_Key,
+ Hash => Hash,
+ Equal => "=");
+ -- A hash table to keep tracks of the marked units
+
type Linker_Options_Data is record
Project : Project_Id;
Options : String_List_Id;
procedure Add_Linker_Option (Option : String);
+ ---------
+ -- Add --
+ ---------
+
+ procedure Add
+ (Option : String_Access;
+ To : in out String_List_Access;
+ Last : in out Natural)
+ is
+ begin
+ if Last = To'Last then
+ declare
+ New_Options : constant String_List_Access :=
+ new String_List (1 .. To'Last * 2);
+
+ begin
+ New_Options (To'Range) := To.all;
+
+ -- Set all elements of the original options to null to avoid
+ -- deallocation of copies.
+
+ To.all := (others => null);
+
+ Free (To);
+ To := New_Options;
+ end;
+ end if;
+
+ Last := Last + 1;
+ To (Last) := Option;
+ end Add;
+
+ procedure Add
+ (Option : String;
+ To : in out String_List_Access;
+ Last : in out Natural)
+ is
+ begin
+ Add (Option => new String'(Option), To => To, Last => Last);
+ end Add;
+
-----------------------
-- Add_Linker_Option --
-----------------------
if Last_Linker_Option = Linker_Options_Buffer'Last then
declare
New_Buffer : constant String_List_Access :=
- new String_List
- (1 .. Linker_Options_Buffer'Last +
- Linker_Option_Initial_Count);
+ new String_List
+ (1 .. Linker_Options_Buffer'Last +
+ Linker_Option_Initial_Count);
begin
New_Buffer (Linker_Options_Buffer'Range) :=
Linker_Options_Buffer.all;
end if;
end Add_Linker_Option;
+ -------------------------
+ -- Base_Name_Index_For --
+ -------------------------
+
+ function Base_Name_Index_For
+ (Main : String;
+ Main_Index : Int;
+ Index_Separator : Character) return File_Name_Type
+ is
+ Result : File_Name_Type;
+
+ begin
+ Name_Len := 0;
+ Add_Str_To_Name_Buffer (Base_Name (Main));
+
+ -- Remove the extension, if any, that is the last part of the base name
+ -- starting with a dot and following some characters.
+
+ for J in reverse 2 .. Name_Len loop
+ if Name_Buffer (J) = '.' then
+ Name_Len := J - 1;
+ exit;
+ end if;
+ end loop;
+
+ -- Add the index info, if index is different from 0
+
+ if Main_Index > 0 then
+ Add_Char_To_Name_Buffer (Index_Separator);
+
+ declare
+ Img : constant String := Main_Index'Img;
+ begin
+ Add_Str_To_Name_Buffer (Img (2 .. Img'Last));
+ end;
+ end if;
+
+ Result := Name_Find;
+ return Result;
+ end Base_Name_Index_For;
+
+ ------------------------------
+ -- Check_Source_Info_In_ALI --
+ ------------------------------
+
+ function Check_Source_Info_In_ALI (The_ALI : ALI_Id) return Boolean is
+ Unit_Name : Name_Id;
+
+ begin
+ -- Loop through units
+
+ for U in ALIs.Table (The_ALI).First_Unit ..
+ ALIs.Table (The_ALI).Last_Unit
+ loop
+ -- Check if the file name is one of the source of the unit
+
+ Get_Name_String (Units.Table (U).Uname);
+ Name_Len := Name_Len - 2;
+ Unit_Name := Name_Find;
+
+ if File_Not_A_Source_Of (Unit_Name, Units.Table (U).Sfile) then
+ return False;
+ end if;
+
+ -- Loop to do same check for each of the withed units
+
+ for W in Units.Table (U).First_With .. Units.Table (U).Last_With loop
+ declare
+ WR : ALI.With_Record renames Withs.Table (W);
+
+ begin
+ if WR.Sfile /= No_File then
+ Get_Name_String (WR.Uname);
+ Name_Len := Name_Len - 2;
+ Unit_Name := Name_Find;
+
+ if File_Not_A_Source_Of (Unit_Name, WR.Sfile) then
+ return False;
+ end if;
+ end if;
+ end;
+ end loop;
+ end loop;
+
+ -- Loop to check subunits
+
+ for D in ALIs.Table (The_ALI).First_Sdep ..
+ ALIs.Table (The_ALI).Last_Sdep
+ loop
+ declare
+ SD : Sdep_Record renames Sdep.Table (D);
+
+ begin
+ Unit_Name := SD.Subunit_Name;
+
+ if Unit_Name /= No_Name then
+
+ -- For separates, the file is no longer associated with the
+ -- unit ("proc-sep.adb" is not associated with unit "proc.sep")
+ -- so we need to check whether the source file still exists in
+ -- the source tree: it will if it matches the naming scheme
+ -- (and then will be for the same unit).
+
+ if Find_Source
+ (In_Tree => Project_Tree,
+ Project => No_Project,
+ Base_Name => SD.Sfile) = No_Source
+ then
+ -- If this is not a runtime file or if, when gnatmake switch
+ -- -a is used, we are not able to find this subunit in the
+ -- source directories, then recompilation is needed.
+
+ if not Fname.Is_Internal_File_Name (SD.Sfile)
+ or else
+ (Check_Readonly_Files
+ and then Full_Source_Name (SD.Sfile) = No_File)
+ then
+ if Verbose_Mode then
+ Write_Line
+ ("While parsing ALI file, file "
+ & Get_Name_String (SD.Sfile)
+ & " is indicated as containing subunit "
+ & Get_Name_String (Unit_Name)
+ & " but this does not match what was found while"
+ & " parsing the project. Will recompile");
+ end if;
+
+ return False;
+ end if;
+ end if;
+ end if;
+ end;
+ end loop;
+
+ return True;
+ end Check_Source_Info_In_ALI;
+
+ -----------------
+ -- Create_Name --
+ -----------------
+
+ function Create_Name (Name : String) return File_Name_Type is
+ begin
+ Name_Len := 0;
+ Add_Str_To_Name_Buffer (Name);
+ return Name_Find;
+ end Create_Name;
+
+ function Create_Name (Name : String) return Name_Id is
+ begin
+ Name_Len := 0;
+ Add_Str_To_Name_Buffer (Name);
+ return Name_Find;
+ end Create_Name;
+
+ function Create_Name (Name : String) return Path_Name_Type is
+ begin
+ Name_Len := 0;
+ Add_Str_To_Name_Buffer (Name);
+ return Name_Find;
+ end Create_Name;
+
+ ----------------------
+ -- Delete_All_Marks --
+ ----------------------
+
+ procedure Delete_All_Marks is
+ begin
+ Marks.Reset;
+ end Delete_All_Marks;
+
+ ----------------------------
+ -- Executable_Prefix_Path --
+ ----------------------------
+
+ function Executable_Prefix_Path return String is
+ Exec_Name : constant String := Command_Name;
+
+ function Get_Install_Dir (S : String) return String;
+ -- S is the executable name preceded by the absolute or relative path,
+ -- e.g. "c:\usr\bin\gcc.exe". Returns the absolute directory where "bin"
+ -- lies (in the example "C:\usr"). If the executable is not in a "bin"
+ -- directory, return "".
+
+ ---------------------
+ -- Get_Install_Dir --
+ ---------------------
+
+ function Get_Install_Dir (S : String) return String is
+ Exec : String := S;
+ Path_Last : Integer := 0;
+
+ begin
+ for J in reverse Exec'Range loop
+ if Exec (J) = Directory_Separator then
+ Path_Last := J - 1;
+ exit;
+ end if;
+ end loop;
+
+ if Path_Last >= Exec'First + 2 then
+ To_Lower (Exec (Path_Last - 2 .. Path_Last));
+ end if;
+
+ if Path_Last < Exec'First + 2
+ or else Exec (Path_Last - 2 .. Path_Last) /= "bin"
+ or else (Path_Last - 3 >= Exec'First
+ and then Exec (Path_Last - 3) /= Directory_Separator)
+ then
+ return "";
+ end if;
+
+ return Normalize_Pathname
+ (Exec (Exec'First .. Path_Last - 4),
+ Resolve_Links => Opt.Follow_Links_For_Dirs)
+ & Directory_Separator;
+ end Get_Install_Dir;
+
+ -- Beginning of Executable_Prefix_Path
+
+ begin
+ -- First determine if a path prefix was placed in front of the
+ -- executable name.
+
+ for J in reverse Exec_Name'Range loop
+ if Exec_Name (J) = Directory_Separator then
+ return Get_Install_Dir (Exec_Name);
+ end if;
+ end loop;
+
+ -- If we get here, the user has typed the executable name with no
+ -- directory prefix.
+
+ declare
+ Path : String_Access := Locate_Exec_On_Path (Exec_Name);
+ begin
+ if Path = null then
+ return "";
+ else
+ declare
+ Dir : constant String := Get_Install_Dir (Path.all);
+ begin
+ Free (Path);
+ return Dir;
+ end;
+ end if;
+ end;
+ end Executable_Prefix_Path;
+
+ --------------------------
+ -- File_Not_A_Source_Of --
+ --------------------------
+
+ function File_Not_A_Source_Of
+ (Uname : Name_Id;
+ Sfile : File_Name_Type) return Boolean
+ is
+ Unit : constant Unit_Index :=
+ Units_Htable.Get (Project_Tree.Units_HT, Uname);
+
+ At_Least_One_File : Boolean := False;
+
+ begin
+ if Unit /= No_Unit_Index then
+ for F in Unit.File_Names'Range loop
+ if Unit.File_Names (F) /= null then
+ At_Least_One_File := True;
+ if Unit.File_Names (F).File = Sfile then
+ return False;
+ end if;
+ end if;
+ end loop;
+
+ if not At_Least_One_File then
+
+ -- The unit was probably created initially for a separate unit
+ -- (which are initially created as IMPL when both suffixes are the
+ -- same). Later on, Override_Kind changed the type of the file,
+ -- and the unit is no longer valid in fact.
+
+ return False;
+ end if;
+
+ Verbose_Msg (Uname, "sources do not include ", Name_Id (Sfile));
+ return True;
+ end if;
+
+ return False;
+ end File_Not_A_Source_Of;
+
+ ----------
+ -- Hash --
+ ----------
+
+ function Hash (Key : Mark_Key) return Mark_Num is
+ begin
+ return Union_Id (Key.File) mod Max_Mask_Num;
+ end Hash;
+
+ ------------
+ -- Inform --
+ ------------
+
+ procedure Inform (N : File_Name_Type; Msg : String) is
+ begin
+ Inform (Name_Id (N), Msg);
+ end Inform;
+
+ procedure Inform (N : Name_Id := No_Name; Msg : String) is
+ begin
+ Osint.Write_Program_Name;
+
+ Write_Str (": ");
+
+ if N /= No_Name then
+ Write_Str ("""");
+
+ declare
+ Name : constant String := Get_Name_String (N);
+ begin
+ if Debug.Debug_Flag_F and then Is_Absolute_Path (Name) then
+ Write_Str (File_Name (Name));
+ else
+ Write_Str (Name);
+ end if;
+ end;
+
+ Write_Str (""" ");
+ end if;
+
+ Write_Str (Msg);
+ Write_Eol;
+ end Inform;
+
----------------------------
-- Is_External_Assignment --
----------------------------
- function Is_External_Assignment (Argv : String) return Boolean is
+ function Is_External_Assignment
+ (Tree : Prj.Tree.Project_Node_Tree_Ref;
+ Argv : String) return Boolean
+ is
Start : Positive := 3;
Finish : Natural := Argv'Last;
- Equal_Pos : Natural;
+
+ pragma Assert (Argv'First = 1);
+ pragma Assert (Argv (1 .. 2) = "-X");
begin
if Argv'Last < 5 then
end if;
end if;
- Equal_Pos := Start;
-
- while Equal_Pos <= Finish and then Argv (Equal_Pos) /= '=' loop
- Equal_Pos := Equal_Pos + 1;
- end loop;
+ return Prj.Ext.Check
+ (Tree => Tree,
+ Declaration => Argv (Start .. Finish));
+ end Is_External_Assignment;
- if Equal_Pos = Start
- or else Equal_Pos >= Finish
- then
- return False;
+ ---------------
+ -- Is_Marked --
+ ---------------
- else
- Prj.Ext.Add
- (External_Name => Argv (Start .. Equal_Pos - 1),
- Value => Argv (Equal_Pos + 1 .. Finish));
- return True;
- end if;
- end Is_External_Assignment;
+ function Is_Marked
+ (Source_File : File_Name_Type;
+ Index : Int := 0) return Boolean
+ is
+ begin
+ return Marks.Get (K => (File => Source_File, Index => Index));
+ end Is_Marked;
-----------------------------
-- Linker_Options_Switches --
-----------------------------
function Linker_Options_Switches
- (Project : Project_Id)
- return String_List
+ (Project : Project_Id;
+ In_Tree : Project_Tree_Ref) return String_List
is
+ procedure Recursive_Add (Proj : Project_Id; Dummy : in out Boolean);
+ -- The recursive routine used to add linker options
- ----------------------------------
- -- Recursive_Add_Linker_Options --
- ----------------------------------
+ -------------------
+ -- Recursive_Add --
+ -------------------
- procedure Recursive_Add_Linker_Options (Proj : Project_Id);
+ procedure Recursive_Add (Proj : Project_Id; Dummy : in out Boolean) is
+ pragma Unreferenced (Dummy);
- procedure Recursive_Add_Linker_Options (Proj : Project_Id) is
- Data : Project_Data;
Linker_Package : Package_Id;
- Options : Variable_Value;
- Imported : Project_List;
+ Options : Variable_Value;
+
begin
- if Proj /= No_Project then
- Data := Projects.Table (Proj);
-
- if not Data.Seen then
- Projects.Table (Proj).Seen := True;
- Imported := Data.Imported_Projects;
-
- while Imported /= Empty_Project_List loop
- Recursive_Add_Linker_Options
- (Project_Lists.Table (Imported).Project);
- Imported := Project_Lists.Table (Imported).Next;
- end loop;
-
- if Proj /= Project then
- Linker_Package :=
- Prj.Util.Value_Of
- (Name => Name_Linker,
- In_Packages => Data.Decl.Packages);
- Options :=
- Prj.Util.Value_Of
- (Name => Name_Ada,
- Attribute_Or_Array_Name => Name_Linker_Options,
- In_Package => Linker_Package);
-
- -- If attribute is present, add the project with
- -- the attribute to table Linker_Opts.
-
- if Options /= Nil_Variable_Value then
- Linker_Opts.Increment_Last;
- Linker_Opts.Table (Linker_Opts.Last) :=
- (Project => Proj, Options => Options.Values);
- end if;
- end if;
- end if;
+ Linker_Package :=
+ Prj.Util.Value_Of
+ (Name => Name_Linker,
+ In_Packages => Proj.Decl.Packages,
+ In_Tree => In_Tree);
+
+ Options :=
+ Prj.Util.Value_Of
+ (Name => Name_Ada,
+ Index => 0,
+ Attribute_Or_Array_Name => Name_Linker_Options,
+ In_Package => Linker_Package,
+ In_Tree => In_Tree);
+
+ -- If attribute is present, add the project with
+ -- the attribute to table Linker_Opts.
+
+ if Options /= Nil_Variable_Value then
+ Linker_Opts.Increment_Last;
+ Linker_Opts.Table (Linker_Opts.Last) :=
+ (Project => Proj, Options => Options.Values);
end if;
- end Recursive_Add_Linker_Options;
+ end Recursive_Add;
+
+ procedure For_All_Projects is
+ new For_Every_Project_Imported (Boolean, Recursive_Add);
+
+ Dummy : Boolean := False;
+
+ -- Start of processing for Linker_Options_Switches
begin
Linker_Opts.Init;
- for Index in 1 .. Projects.Last loop
- Projects.Table (Index).Seen := False;
- end loop;
-
- Recursive_Add_Linker_Options (Project);
+ For_All_Projects (Project, Dummy, Imported_First => True);
Last_Linker_Option := 0;
for Index in reverse 1 .. Linker_Opts.Last loop
declare
- Options : String_List_Id := Linker_Opts.Table (Index).Options;
+ Options : String_List_Id;
Proj : constant Project_Id :=
- Linker_Opts.Table (Index).Project;
+ Linker_Opts.Table (Index).Project;
Option : Name_Id;
+ Dir_Path : constant String :=
+ Get_Name_String (Proj.Directory.Name);
begin
- -- If Dir_Path has not been computed for this project, do it now
+ Options := Linker_Opts.Table (Index).Options;
+ while Options /= Nil_String loop
+ Option := In_Tree.String_Elements.Table (Options).Value;
+ Get_Name_String (Option);
- if Projects.Table (Proj).Dir_Path = null then
- Projects.Table (Proj).Dir_Path :=
- new String'
- (Get_Name_String (Projects.Table (Proj). Directory));
- end if;
+ -- Do not consider empty linker options
- while Options /= Nil_String loop
- Option := String_Elements.Table (Options).Value;
- Options := String_Elements.Table (Options).Next;
- Add_Linker_Option (Get_Name_String (Option));
-
- -- Object files and -L switches specified with
- -- relative paths and must be converted to
- -- absolute paths.
-
- Test_If_Relative_Path
- (Switch =>
- Linker_Options_Buffer (Last_Linker_Option),
- Parent => Projects.Table (Proj).Dir_Path,
- Including_L_Switch => True);
+ if Name_Len /= 0 then
+ Add_Linker_Option (Name_Buffer (1 .. Name_Len));
+
+ -- Object files and -L switches specified with relative
+ -- paths must be converted to absolute paths.
+
+ Test_If_Relative_Path
+ (Switch => Linker_Options_Buffer (Last_Linker_Option),
+ Parent => Dir_Path,
+ Including_L_Switch => True);
+ end if;
+
+ Options := In_Tree.String_Elements.Table (Options).Next;
end loop;
end;
end loop;
package body Mains is
+ type File_And_Loc is record
+ File_Name : File_Name_Type;
+ Index : Int := 0;
+ Location : Source_Ptr := No_Location;
+ end record;
+
package Names is new Table.Table
- (Table_Component_Type => File_Name_Type,
+ (Table_Component_Type => File_And_Loc,
Table_Index_Type => Integer,
Table_Low_Bound => 1,
Table_Initial => 10,
Name_Len := 0;
Add_Str_To_Name_Buffer (Name);
Names.Increment_Last;
- Names.Table (Names.Last) := Name_Find;
+ Names.Table (Names.Last) := (Name_Find, 0, No_Location);
end Add_Main;
------------
procedure Delete is
begin
Names.Set_Last (0);
- Reset;
+ Mains.Reset;
end Delete;
---------------
+ -- Get_Index --
+ ---------------
+
+ function Get_Index return Int is
+ begin
+ if Current in Names.First .. Names.Last then
+ return Names.Table (Current).Index;
+ else
+ return 0;
+ end if;
+ end Get_Index;
+
+ ------------------
+ -- Get_Location --
+ ------------------
+
+ function Get_Location return Source_Ptr is
+ begin
+ if Current in Names.First .. Names.Last then
+ return Names.Table (Current).Location;
+ else
+ return No_Location;
+ end if;
+ end Get_Location;
+
+ ---------------
-- Next_Main --
---------------
begin
if Current >= Names.Last then
return "";
-
else
Current := Current + 1;
- return Get_Name_String (Names.Table (Current));
+ return Get_Name_String (Names.Table (Current).File_Name);
end if;
end Next_Main;
Current := 0;
end Reset;
+ ---------------
+ -- Set_Index --
+ ---------------
+
+ procedure Set_Index (Index : Int) is
+ begin
+ if Names.Last > 0 then
+ Names.Table (Names.Last).Index := Index;
+ end if;
+ end Set_Index;
+
+ ------------------
+ -- Set_Location --
+ ------------------
+
+ procedure Set_Location (Location : Source_Ptr) is
+ begin
+ if Names.Last > 0 then
+ Names.Table (Names.Last).Location := Location;
+ end if;
+ end Set_Location;
+
+ -----------------
+ -- Update_Main --
+ -----------------
+
+ procedure Update_Main (Name : String) is
+ begin
+ if Current in Names.First .. Names.Last then
+ Name_Len := 0;
+ Add_Str_To_Name_Buffer (Name);
+ Names.Table (Current).File_Name := Name_Find;
+ end if;
+ end Update_Main;
end Mains;
+ ----------
+ -- Mark --
+ ----------
+
+ procedure Mark (Source_File : File_Name_Type; Index : Int := 0) is
+ begin
+ Marks.Set (K => (File => Source_File, Index => Index), E => True);
+ end Mark;
+
+ -----------------------
+ -- Path_Or_File_Name --
+ -----------------------
+
+ function Path_Or_File_Name (Path : Path_Name_Type) return String is
+ Path_Name : constant String := Get_Name_String (Path);
+ begin
+ if Debug.Debug_Flag_F then
+ return File_Name (Path_Name);
+ else
+ return Path_Name;
+ end if;
+ end Path_Or_File_Name;
+
---------------------------
-- Test_If_Relative_Path --
---------------------------
procedure Test_If_Relative_Path
- (Switch : in out String_Access;
- Parent : String_Access;
- Including_L_Switch : Boolean := True)
+ (Switch : in out String_Access;
+ Parent : String;
+ Including_L_Switch : Boolean := True;
+ Including_Non_Switch : Boolean := True;
+ Including_RTS : Boolean := False)
is
begin
if Switch /= null then
-
declare
- Sw : String (1 .. Switch'Length);
+ Sw : String (1 .. Switch'Length);
Start : Positive;
begin
if Sw (1) = '-' then
if Sw'Length >= 3
and then (Sw (2) = 'A'
- or else Sw (2) = 'I'
- or else (Including_L_Switch and then Sw (2) = 'L'))
+ or else Sw (2) = 'I'
+ or else (Including_L_Switch and then Sw (2) = 'L'))
then
Start := 3;
elsif Sw'Length >= 4
and then (Sw (2 .. 3) = "aL"
- or else Sw (2 .. 3) = "aO"
- or else Sw (2 .. 3) = "aI")
+ or else Sw (2 .. 3) = "aO"
+ or else Sw (2 .. 3) = "aI")
then
Start := 4;
+ elsif Including_RTS
+ and then Sw'Length >= 7
+ and then Sw (2 .. 6) = "-RTS="
+ then
+ Start := 7;
+
else
return;
end if;
-- Because relative path arguments to --RTS= may be relative
-- to the search directory prefix, those relative path
- -- arguments are not converted.
+ -- arguments are converted only when they include directory
+ -- information.
if not Is_Absolute_Path (Sw (Start .. Sw'Last)) then
- if Parent = null or else Parent'Length = 0 then
+ if Parent'Length = 0 then
Do_Fail
- ("relative search path switches (""",
- Sw,
- """) are not allowed");
+ ("relative search path switches ("""
+ & Sw
+ & """) are not allowed");
+
+ elsif Including_RTS then
+ for J in Start .. Sw'Last loop
+ if Sw (J) = Directory_Separator then
+ Switch :=
+ new String'
+ (Sw (1 .. Start - 1) &
+ Parent &
+ Directory_Separator &
+ Sw (Start .. Sw'Last));
+ return;
+ end if;
+ end loop;
else
Switch :=
new String'
(Sw (1 .. Start - 1) &
- Parent.all &
+ Parent &
Directory_Separator &
Sw (Start .. Sw'Last));
end if;
end if;
- else
+ elsif Including_Non_Switch then
if not Is_Absolute_Path (Sw) then
- if Parent = null or else Parent'Length = 0 then
+ if Parent'Length = 0 then
Do_Fail
- ("relative paths (""", Sw, """) are not allowed");
-
+ ("relative paths (""" & Sw & """) are not allowed");
else
- Switch :=
- new String'(Parent.all & Directory_Separator & Sw);
+ Switch := new String'(Parent & Directory_Separator & Sw);
end if;
end if;
end if;
end if;
end Test_If_Relative_Path;
+ -------------------
+ -- Unit_Index_Of --
+ -------------------
+
+ function Unit_Index_Of (ALI_File : File_Name_Type) return Int is
+ Start : Natural;
+ Finish : Natural;
+ Result : Int := 0;
+
+ begin
+ Get_Name_String (ALI_File);
+
+ -- First, find the last dot
+
+ Finish := Name_Len;
+
+ while Finish >= 1 and then Name_Buffer (Finish) /= '.' loop
+ Finish := Finish - 1;
+ end loop;
+
+ if Finish = 1 then
+ return 0;
+ end if;
+
+ -- Now check that the dot is preceded by digits
+
+ Start := Finish;
+ Finish := Finish - 1;
+
+ while Start >= 1 and then Name_Buffer (Start - 1) in '0' .. '9' loop
+ Start := Start - 1;
+ end loop;
+
+ -- If there are no digits, or if the digits are not preceded by the
+ -- character that precedes a unit index, this is not the ALI file of
+ -- a unit in a multi-unit source.
+
+ if Start > Finish
+ or else Start = 1
+ or else Name_Buffer (Start - 1) /= Multi_Unit_Index_Character
+ then
+ return 0;
+ end if;
+
+ -- Build the index from the digit(s)
+
+ while Start <= Finish loop
+ Result := Result * 10 +
+ Character'Pos (Name_Buffer (Start)) - Character'Pos ('0');
+ Start := Start + 1;
+ end loop;
+
+ return Result;
+ end Unit_Index_Of;
+
+ -----------------
+ -- Verbose_Msg --
+ -----------------
+
+ procedure Verbose_Msg
+ (N1 : Name_Id;
+ S1 : String;
+ N2 : Name_Id := No_Name;
+ S2 : String := "";
+ Prefix : String := " -> ";
+ Minimum_Verbosity : Opt.Verbosity_Level_Type := Opt.Low)
+ is
+ begin
+ if not Opt.Verbose_Mode
+ or else Minimum_Verbosity > Opt.Verbosity_Level
+ then
+ return;
+ end if;
+
+ Write_Str (Prefix);
+ Write_Str ("""");
+ Write_Name (N1);
+ Write_Str (""" ");
+ Write_Str (S1);
+
+ if N2 /= No_Name then
+ Write_Str (" """);
+ Write_Name (N2);
+ Write_Str (""" ");
+ end if;
+
+ Write_Str (S2);
+ Write_Eol;
+ end Verbose_Msg;
+
+ procedure Verbose_Msg
+ (N1 : File_Name_Type;
+ S1 : String;
+ N2 : File_Name_Type := No_File;
+ S2 : String := "";
+ Prefix : String := " -> ";
+ Minimum_Verbosity : Opt.Verbosity_Level_Type := Opt.Low)
+ is
+ begin
+ Verbose_Msg
+ (Name_Id (N1), S1, Name_Id (N2), S2, Prefix, Minimum_Verbosity);
+ end Verbose_Msg;
+
end Makeutl;
OSDN Git Service
