-- --
-- B o d y --
-- --
--- Copyright (C) 1992-2005 Free Software Foundation, Inc. --
+-- Copyright (C) 1992-2007, Free Software Foundation, Inc. --
-- --
-- GNAT is free software; you can redistribute it and/or modify it under --
-- terms of the GNU General Public License as published by the Free Soft- --
-- or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License --
-- for more details. You should have received a copy of the GNU General --
-- Public License distributed with GNAT; see file COPYING. If not, write --
--- to the Free Software Foundation, 59 Temple Place - Suite 330, Boston, --
--- MA 02111-1307, USA. --
+-- to the Free Software Foundation, 51 Franklin Street, Fifth Floor, --
+-- Boston, MA 02110-1301, USA. --
-- --
-- GNAT was originally developed by the GNAT team at New York University. --
-- Extensive contributions were provided by Ada Core Technologies Inc. --
with Errout; use Errout;
with Fname; use Fname;
with Fname.UF; use Fname.UF;
-with Namet; use Namet;
with Nlists; use Nlists;
with Nmake; use Nmake;
with Opt; use Opt;
-- Local Subprograms --
-----------------------
+ function From_Limited_With_Chain (Lim : Boolean) return Boolean;
+ -- Check whether a possible circular dependence includes units that
+ -- have been loaded through limited_with clauses, in which case there
+ -- is no real circularity.
+
function Spec_Is_Irrelevant
(Spec_Unit : Unit_Number_Type;
Body_Unit : Unit_Number_Type) return Boolean;
-- This procedure is used to generate error message info lines that
-- trace the current dependency chain when a load error occurs.
+ ------------------------------
+ -- Change_Main_Unit_To_Spec --
+ ------------------------------
+
+ procedure Change_Main_Unit_To_Spec is
+ U : Unit_Record renames Units.Table (Main_Unit);
+ N : File_Name_Type;
+ X : Source_File_Index;
+
+ begin
+ -- Get name of unit body
+
+ Get_Name_String (U.Unit_File_Name);
+
+ -- Note: for the following we should really generalize and consult the
+ -- file name pattern data, but for now we just deal with the common
+ -- naming cases, which is probably good enough in practice ???
+
+ -- Change .adb to .ads
+
+ if Name_Len >= 5
+ and then Name_Buffer (Name_Len - 3 .. Name_Len) = ".adb"
+ then
+ Name_Buffer (Name_Len) := 's';
+
+ -- Change .2.ada to .1.ada (Rational convention)
+
+ elsif Name_Len >= 7
+ and then Name_Buffer (Name_Len - 5 .. Name_Len) = ".2.ada"
+ then
+ Name_Buffer (Name_Len - 4) := '1';
+
+ -- Change .ada to _.ada (DEC convention)
+
+ elsif Name_Len >= 5
+ and then Name_Buffer (Name_Len - 3 .. Name_Len) = ".ada"
+ then
+ Name_Buffer (Name_Len - 3 .. Name_Len + 1) := "_.ada";
+ Name_Len := Name_Len + 1;
+
+ -- No match, don't make the change
+
+ else
+ return;
+ end if;
+
+ -- Try loading the spec
+
+ N := Name_Find;
+ X := Load_Source_File (N);
+
+ -- No change if we did not find the spec
+
+ if X = No_Source_File then
+ return;
+ end if;
+
+ -- Otherwise modify Main_Unit entry to point to spec
+
+ U.Unit_File_Name := N;
+ U.Source_Index := X;
+ end Change_Main_Unit_To_Spec;
+
-------------------------------
-- Create_Dummy_Package_Unit --
-------------------------------
return Unum;
end Create_Dummy_Package_Unit;
+ -----------------------------
+ -- From_Limited_With_Chain --
+ -----------------------------
+
+ function From_Limited_With_Chain (Lim : Boolean) return Boolean is
+ begin
+ -- True if the current load operation is through a limited_with clause
+
+ if Lim then
+ return True;
+
+ -- Examine the Load_Stack to locate any previous Limited_with clause
+
+ elsif Load_Stack.Last - 1 > Load_Stack.First then
+ for U in Load_Stack.First .. Load_Stack.Last - 1 loop
+ if Load_Stack.Table (U).From_Limited_With then
+ return True;
+ end if;
+ end loop;
+ end if;
+
+ return False;
+ end From_Limited_With_Chain;
+
----------------
-- Initialize --
----------------
----------------------
procedure Load_Main_Source is
- Fname : File_Name_Type;
+ Fname : File_Name_Type;
+ Version : Word := 0;
begin
Load_Stack.Increment_Last;
- Load_Stack.Table (Load_Stack.Last) := Main_Unit;
+ Load_Stack.Table (Load_Stack.Last) := (Main_Unit, False);
-- Initialize unit table entry for Main_Unit. Note that we don't know
-- the unit name yet, that gets filled in when the parser parses the
Main_Source_File := Load_Source_File (Fname);
Current_Error_Source_File := Main_Source_File;
+ if Main_Source_File /= No_Source_File then
+ Version := Source_Checksum (Main_Source_File);
+ end if;
+
Units.Table (Main_Unit) := (
Cunit => Empty,
Cunit_Entity => Empty,
Dependency_Num => 0,
Dynamic_Elab => False,
Error_Location => No_Location,
- Expected_Unit => No_Name,
+ Expected_Unit => No_Unit_Name,
Fatal_Error => False,
Generate_Code => False,
Has_RACW => False,
Serial_Number => 0,
Source_Index => Main_Source_File,
Unit_File_Name => Fname,
- Unit_Name => No_Name,
- Version => Source_Checksum (Main_Source_File));
+ Unit_Name => No_Unit_Name,
+ Version => Version);
end if;
end Load_Main_Source;
-- If parent is a renaming, then we use the renamed package as
-- the actual parent for the subsequent load operation.
- if Nkind (Parent (Cunit_Entity (Unump))) =
- N_Package_Renaming_Declaration
- then
+ if Nkind (Unit (Cunit (Unump))) = N_Package_Renaming_Declaration then
Uname_Actual :=
New_Child
- (Load_Name,
- Get_Unit_Name (Name (Parent (Cunit_Entity (Unump)))));
+ (Load_Name, Get_Unit_Name (Name (Unit (Cunit (Unump)))));
-- Save the renaming entity, to establish its visibility when
-- installing the context. The implicit with is on this entity,
-- Note: Unit_Name (Main_Unit) is not set if we are parsing gnat.adc.
if Present (Error_Node)
- and then Unit_Name (Main_Unit) /= No_Name
+ and then Unit_Name (Main_Unit) /= No_Unit_Name
then
-- It seems like In_Extended_Main_Source_Unit (Error_Node) would
-- do the trick here, but that's wrong, it is much too early to
-- If the load is called from a with_type clause, the error
-- node is correct.
- elsif Nkind (Parent (Error_Node)) = N_With_Type_Clause then
- Load_Msg_Sloc := Sloc (Error_Node);
-
-- Otherwise, check for the subunit case, and if so, consider
-- we have a match if one name is a prefix of the other name.
-- We skip this test in multiple unit per file mode since in this
-- case we can have multiple units from the same source file.
- if Unum > Units.Last and then Multiple_Unit_Index = 0 then
+ if Unum > Units.Last and then Get_Unit_Index (Uname_Actual) = 0 then
for J in Units.First .. Units.Last loop
if Fname = Units.Table (J).Unit_File_Name then
if Debug_Flag_L then
if Present (Error_Node) then
if Is_Predefined_File_Name (Fname) then
- Error_Msg_Name_1 := Uname_Actual;
+ Error_Msg_Unit_1 := Uname_Actual;
Error_Msg
- ("% is not a language defined unit", Load_Msg_Sloc);
+ ("$$ is not a language defined unit", Load_Msg_Sloc);
else
- Error_Msg_Name_1 := Fname;
+ Error_Msg_File_1 := Fname;
Error_Msg_Unit_1 := Uname_Actual;
- Error_Msg
- ("File{ does not contain unit$", Load_Msg_Sloc);
+ Error_Msg ("File{ does not contain unit$", Load_Msg_Sloc);
end if;
Write_Dependency_Chain;
end loop;
end if;
- -- If we are proceeding with load, then make load stack entry
+ -- If we are proceeding with load, then make load stack entry,
+ -- and indicate the kind of with_clause responsible for the load.
Load_Stack.Increment_Last;
- Load_Stack.Table (Load_Stack.Last) := Unum;
+ Load_Stack.Table (Load_Stack.Last) := (Unum, From_Limited_With);
-- Case of entry already in table
or else Acts_As_Spec (Units.Table (Unum).Cunit))
and then (Nkind (Error_Node) /= N_With_Clause
or else not Limited_Present (Error_Node))
- and then not From_Limited_With
+ and then not From_Limited_With_Chain (From_Limited_With)
then
if Debug_Flag_L then
Write_Str (" circular dependency encountered");
if Corr_Body /= No_Unit
and then Spec_Is_Irrelevant (Unum, Corr_Body)
then
- Error_Msg_Name_1 := Unit_File_Name (Corr_Body);
+ Error_Msg_File_1 := Unit_File_Name (Corr_Body);
Error_Msg
- ("cannot compile subprogram in file {!",
- Load_Msg_Sloc);
- Error_Msg_Name_1 := Unit_File_Name (Unum);
+ ("cannot compile subprogram in file {!", Load_Msg_Sloc);
+ Error_Msg_File_1 := Unit_File_Name (Unum);
Error_Msg
- ("incorrect spec in file { must be removed first!",
+ ("\incorrect spec in file { must be removed first!",
Load_Msg_Sloc);
return No_Unit;
end if;
Check_Restricted_Unit (Load_Name, Error_Node);
- Error_Msg_Name_1 := Uname_Actual;
+ Error_Msg_Unit_1 := Uname_Actual;
Error_Msg
- ("% is not a predefined library unit", Load_Msg_Sloc);
+ ("$$ is not a predefined library unit", Load_Msg_Sloc);
else
- Error_Msg_Name_1 := Fname;
+ Error_Msg_File_1 := Fname;
Error_Msg ("file{ not found", Load_Msg_Sloc);
end if;
if Load_Stack.Last - 1 > Load_Stack.First then
for U in Load_Stack.First .. Load_Stack.Last - 1 loop
- Error_Msg_Unit_1 := Unit_Name (Load_Stack.Table (U));
- Error_Msg_Unit_2 := Unit_Name (Load_Stack.Table (U + 1));
+ Error_Msg_Unit_1 :=
+ Unit_Name (Load_Stack.Table (U).Unit_Number);
+ Error_Msg_Unit_2 :=
+ Unit_Name (Load_Stack.Table (U + 1).Unit_Number);
Error_Msg ("$ depends on $!", Load_Msg_Sloc);
end loop;
end if;
OSDN Git Service
