-- --
-- B o d y --
-- --
--- Copyright (C) 1992-2008, Free Software Foundation, Inc. --
+-- Copyright (C) 1992-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- --
-- the latter case it is critical to make a call to Set_RTU_Loaded to
-- ensure that the entry in this table reflects the load.
- -- Withed is True if an implicit with_clause has been added from some unit
- -- other than the main unit to this unit. Withed_By_Main is the same,
- -- except from the main unit.
+ -- A unit retrieved through rtsfind may end up in the context of several
+ -- other units, in addition to the main unit. These additional with_clauses
+ -- are needed to generate a proper traversal order for Inspector. To
+ -- minimize somewhat the redundancy created by numerous calls to rtsfind
+ -- from different units, we keep track of the list of implicit with_clauses
+ -- already created for the current loaded unit.
type RT_Unit_Table_Record is record
- Entity : Entity_Id;
- Uname : Unit_Name_Type;
- Unum : Unit_Number_Type;
- Withed : Boolean;
- Withed_By_Main : Boolean;
+ Entity : Entity_Id;
+ Uname : Unit_Name_Type;
+ First_Implicit_With : Node_Id;
+ Unum : Unit_Number_Type;
end record;
RT_Unit_Table : array (RTU_Id) of RT_Unit_Table_Record;
-- When a unit is implicitly loaded as a result of a call to RTE, it is
-- necessary to create one or two implicit with_clauses. We add such
-- with_clauses to the extended main unit if needed, and also to whatever
- -- unit first needs them, which is not necessarily the main unit. The
- -- former ensures that the object is correctly loaded by the binder. The
- -- latter is necessary for SofCheck Inspector.
+ -- unit needs them, which is not necessarily the main unit. The former
+ -- ensures that the object is correctly loaded by the binder. The latter
+ -- is necessary for SofCheck Inspector.
- -- The flags Withed and Withed_By_Main in the unit table record are used to
- -- avoid duplicates.
+ -- The field First_Implicit_With in the unit table record are used to
+ -- avoid creating duplicate with_clauses.
-----------------------
-- Local Subprograms --
-- "had semantic errors"
--
-- The "not found" case is treated specially in that it is considered
- -- a normal situation in configurable run-time mode (and the message in
- -- this case is suppressed unless we are operating in All_Errors_Mode).
+ -- a normal situation in configurable run-time mode, and generates
+ -- a warning, but is otherwise ignored.
procedure Load_RTU
(U_Id : RTU_Id;
Id : RE_Id := RE_Null;
Use_Setting : Boolean := False);
-- Load the unit whose Id is given if not already loaded. The unit is
- -- loaded, analyzed, and added to the WITH list, and the entry in
- -- RT_Unit_Table is updated to reflect the load. Use_Setting is used to
- -- indicate the initial setting for the Is_Potentially_Use_Visible flag of
- -- the entity for the loaded unit (if it is indeed loaded). A value of
- -- False means nothing special need be done. A value of True indicates that
- -- this flag must be set to True. It is needed only in the Text_IO_Kludge
- -- procedure, which may materialize an entity of Text_IO (or
- -- [Wide_]Wide_Text_IO) that was previously unknown. Id is the RE_Id value
- -- of the entity which was originally requested. Id is used only for error
- -- message detail, and if it is RE_Null, then the attempt to output the
- -- entity name is ignored.
-
- function Make_Unit_Name (E : RE_Id; N : Node_Id) return Node_Id;
+ -- loaded and analyzed, and the entry in RT_Unit_Table is updated to
+ -- reflect the load. Use_Setting is used to indicate the initial setting
+ -- for the Is_Potentially_Use_Visible flag of the entity for the loaded
+ -- unit (if it is indeed loaded). A value of False means nothing special
+ -- need be done. A value of True indicates that this flag must be set to
+ -- True. It is needed only in the Text_IO_Kludge procedure, which may
+ -- materialize an entity of Text_IO (or [Wide_]Wide_Text_IO) that was
+ -- previously unknown. Id is the RE_Id value of the entity which was
+ -- originally requested. Id is used only for error message detail, and if
+ -- it is RE_Null, then the attempt to output the entity name is ignored.
+
+ function Make_Unit_Name
+ (U : RT_Unit_Table_Record;
+ N : Node_Id) return Node_Id;
-- If the unit is a child unit, build fully qualified name for use in
-- With_Clause.
- procedure Maybe_Add_With (E : RE_Id; U : in out RT_Unit_Table_Record);
+ procedure Maybe_Add_With (U : in out RT_Unit_Table_Record);
-- If necessary, add an implicit with_clause from the current unit to the
- -- one represented by E and U.
+ -- one represented by U.
procedure Output_Entity_Name (Id : RE_Id; Msg : String);
-- Output continuation error message giving qualified name of entity
elsif U_Id in Ada_Streams_Child then
Name_Buffer (12) := '.';
+ elsif U_Id in Ada_Strings_Child then
+ Name_Buffer (12) := '.';
+
elsif U_Id in Ada_Text_IO_Child then
Name_Buffer (12) := '.';
-- Output file name and reason string
- if S /= "not found"
- or else not Configurable_Run_Time_Mode
- or else All_Errors_Mode
- then
- M (1 .. 6) := "\file ";
- P := 6;
+ M (1 .. 6) := "\file ";
+ P := 6;
- Get_Name_String
- (Get_File_Name (RT_Unit_Table (U_Id).Uname, Subunit => False));
- M (P + 1 .. P + Name_Len) := Name_Buffer (1 .. Name_Len);
- P := P + Name_Len;
+ Get_Name_String
+ (Get_File_Name (RT_Unit_Table (U_Id).Uname, Subunit => False));
+ M (P + 1 .. P + Name_Len) := Name_Buffer (1 .. Name_Len);
+ P := P + Name_Len;
- M (P + 1) := ' ';
- P := P + 1;
+ M (P + 1) := ' ';
+ P := P + 1;
- M (P + 1 .. P + S'Length) := S;
- P := P + S'Length;
+ M (P + 1 .. P + S'Length) := S;
+ P := P + S'Length;
- RTE_Error_Msg (M (1 .. P));
+ RTE_Error_Msg (M (1 .. P));
- -- Output entity name
+ -- Output entity name
- Output_Entity_Name (Id, "not available");
- end if;
+ Output_Entity_Name (Id, "not available");
-- In configurable run time mode, we raise RE_Not_Available, and the
-- caller is expected to deal gracefully with this. In the case of a
-- Otherwise we need to load the unit, First build unit name
-- from the enumeration literal name in type RTU_Id.
- U.Uname := Get_Unit_Name (U_Id);
- U.Withed := False;
- U.Withed_By_Main := False;
+ U.Uname := Get_Unit_Name (U_Id);
+ U. First_Implicit_With := Empty;
-- Now do the load call, note that setting Error_Node to Empty is
-- a signal to Load_Unit that we will regard a failure to find the
-- Make_Unit_Name --
--------------------
- function Make_Unit_Name (E : RE_Id; N : Node_Id) return Node_Id is
- U_Id : constant RTU_Id := RE_Unit_Table (E);
- U : RT_Unit_Table_Record renames RT_Unit_Table (U_Id);
+ function Make_Unit_Name
+ (U : RT_Unit_Table_Record;
+ N : Node_Id) return Node_Id is
+
Nam : Node_Id;
Scop : Entity_Id;
-- Maybe_Add_With --
--------------------
- procedure Maybe_Add_With (E : RE_Id; U : in out RT_Unit_Table_Record) is
- Is_Main : constant Boolean :=
- In_Extended_Main_Code_Unit (Cunit_Entity (Current_Sem_Unit));
-
+ procedure Maybe_Add_With (U : in out RT_Unit_Table_Record) is
begin
-- We do not need to generate a with_clause for a call issued from
- -- RTE_Component_Available.
+ -- RTE_Component_Available. However, for CodePeer, we need these
+ -- additional with's, because for a sequence like "if RTE_Available (X)
+ -- then ... RTE (X)" the RTE call fails to create some necessary
+ -- with's.
- if RTE_Available_Call then
+ if RTE_Available_Call and then not Generate_SCIL then
return;
end if;
- -- If the current unit is the main one, add the with_clause unless it's
- -- already been done.
-
- if Is_Main then
- if U.Withed_By_Main then
- return;
- else
- U.Withed_By_Main := True;
- end if;
+ -- Avoid creating directly self-referential with clauses
- -- If the current unit is not the main one, add the with_clause unless
- -- it's already been done for some non-main unit.
-
- else
- if U.Withed then
- return;
- else
- U.Withed := True;
- end if;
+ if Current_Sem_Unit = U.Unum then
+ return;
end if;
- -- Here if we've decided to add the with_clause
+ -- Add the with_clause, if not already in the context of the
+ -- current compilation unit.
declare
LibUnit : constant Node_Id := Unit (Cunit (U.Unum));
- Withn : constant Node_Id :=
- Make_With_Clause (Standard_Location,
- Name =>
- Make_Unit_Name
- (E, Defining_Unit_Name (Specification (LibUnit))));
+ Clause : Node_Id;
+ Withn : Node_Id;
begin
- Set_Library_Unit (Withn, Cunit (U.Unum));
- Set_Corresponding_Spec (Withn, U.Entity);
- Set_First_Name (Withn, True);
- Set_Implicit_With (Withn, True);
+ Clause := U.First_Implicit_With;
+ while Present (Clause) loop
+ if Parent (Clause) = Cunit (Current_Sem_Unit) then
+ return;
+ end if;
+
+ Clause := Next_Implicit_With (Clause);
+ end loop;
+
+ Withn :=
+ Make_With_Clause (Standard_Location,
+ Name =>
+ Make_Unit_Name
+ (U, Defining_Unit_Name (Specification (LibUnit))));
+
+ Set_Library_Unit (Withn, Cunit (U.Unum));
+ Set_Corresponding_Spec (Withn, U.Entity);
+ Set_First_Name (Withn, True);
+ Set_Implicit_With (Withn, True);
+ Set_Next_Implicit_With (Withn, U.First_Implicit_With);
+
+ U.First_Implicit_With := Withn;
Mark_Rewrite_Insertion (Withn);
Append (Withn, Context_Items (Cunit (Current_Sem_Unit)));
RE_Image : constant String := RE_Id'Image (Id);
begin
- if Id = RE_Null or else not All_Errors_Mode then
+ if Id = RE_Null then
return;
end if;
-- and it prevents spurious visibility conflicts between use-visible
-- user entities, and entities in run-time packages.
- -- In configurable run-time mode, subprograms marked Inline_Always must
- -- be inlined, so in the case we retain the Front_End_Inlining mode.
-
Save_Front_End_Inlining : Boolean;
procedure Check_RPC;
end if;
Save_Front_End_Inlining := Front_End_Inlining;
- Front_End_Inlining := Configurable_Run_Time_Mode;
+ Front_End_Inlining := False;
-- Load unit if unit not previously loaded
end if;
<<Found>>
- Maybe_Add_With (E, U);
+ Maybe_Add_With (U);
Front_End_Inlining := Save_Front_End_Inlining;
return Check_CRT (E, RE_Table (E));
-- is both efficient, and it prevents spurious visibility conflicts
-- between use-visible user entities, and entities in run-time packages.
- -- In configurable run-time mode, subprograms marked Inline_Always must
- -- be inlined, so in the case we retain the Front_End_Inlining mode.
-
Save_Front_End_Inlining : Boolean;
begin
-- declarations.
Save_Front_End_Inlining := Front_End_Inlining;
- Front_End_Inlining := Configurable_Run_Time_Mode;
+ Front_End_Inlining := False;
-- Load unit if unit not previously loaded
-- If we didn't find the entity we want, something is wrong. The
-- appropriate action will be taken by Check_CRT when we exit.
- Maybe_Add_With (E, U);
+ Maybe_Add_With (U);
Front_End_Inlining := Save_Front_End_Inlining;
return Check_CRT (E, Found_E);
-- The RT_Unit_Table entry that may need updating
begin
- -- If entry is not set, set it now
+ -- If entry is not set, set it now, and indicate that it
+ -- was loaded through an explicit context clause..
if No (U.Entity) then
- U := (Entity => E,
- Uname => Get_Unit_Name (U_Id),
- Unum => Unum,
- Withed => False,
- Withed_By_Main => False);
+ U := (Entity => E,
+ Uname => Get_Unit_Name (U_Id),
+ Unum => Unum,
+ First_Implicit_With => Empty);
end if;
return;
Name_Integer_IO => Ada_Wide_Wide_Text_IO_Integer_IO,
Name_Modular_IO => Ada_Wide_Wide_Text_IO_Modular_IO);
+ To_Load : RTU_Id;
+ -- Unit to be loaded, from one of the above maps
+
begin
- -- Nothing to do if name is not identifier or a selected component
- -- whose selector_name is not an identifier.
+ -- Nothing to do if name is not an identifier or a selected component
+ -- whose selector_name is an identifier.
if Nkind (Nam) = N_Identifier then
Chrs := Chars (Nam);
-- they are visible.
if Name_Buffer (1 .. 12) = "a-textio.ads" then
- Load_RTU
- (Name_Map (Chrs),
- Use_Setting => In_Use (Cunit_Entity (U)));
- Set_Is_Visible_Child_Unit
- (RT_Unit_Table (Name_Map (Chrs)).Entity);
+ To_Load := Name_Map (Chrs);
elsif Name_Buffer (1 .. 12) = "a-witeio.ads" then
- Load_RTU
- (Wide_Name_Map (Chrs),
- Use_Setting => In_Use (Cunit_Entity (U)));
- Set_Is_Visible_Child_Unit
- (RT_Unit_Table (Wide_Name_Map (Chrs)).Entity);
+ To_Load := Wide_Name_Map (Chrs);
elsif Name_Buffer (1 .. 12) = "a-ztexio.ads" then
- Load_RTU
- (Wide_Wide_Name_Map (Chrs),
- Use_Setting => In_Use (Cunit_Entity (U)));
- Set_Is_Visible_Child_Unit
- (RT_Unit_Table (Wide_Wide_Name_Map (Chrs)).Entity);
+ To_Load := Wide_Wide_Name_Map (Chrs);
+
+ else
+ goto Continue;
end if;
+
+ Load_RTU (To_Load, Use_Setting => In_Use (Cunit_Entity (U)));
+ Set_Is_Visible_Child_Unit (RT_Unit_Table (To_Load).Entity);
+
+ -- Prevent creation of an implicit 'with' from (for example)
+ -- Ada.Wide_Text_IO.Integer_IO to Ada.Text_IO.Integer_IO,
+ -- because these could create cycles. First check whether the
+ -- simple names match ("integer_io" = "integer_io"), and then
+ -- check whether the parent is indeed one of the
+ -- [[Wide_]Wide_]Text_IO packages.
+
+ if Chrs = Chars (Cunit_Entity (Current_Sem_Unit)) then
+ declare
+ Parent_Name : constant Unit_Name_Type :=
+ Get_Parent_Spec_Name
+ (Unit_Name (Current_Sem_Unit));
+
+ begin
+ if Parent_Name /= No_Unit_Name then
+ Get_Name_String (Parent_Name);
+
+ declare
+ P : String renames Name_Buffer (1 .. Name_Len);
+ begin
+ if P = "ada.text_io%s" or else
+ P = "ada.wide_text_io%s" or else
+ P = "ada.wide_wide_text_io%s"
+ then
+ goto Continue;
+ end if;
+ end;
+ end if;
+ end;
+ end if;
+
+ -- Add an implicit with clause from the current unit to the
+ -- [[Wide_]Wide_]Text_IO child (if necessary).
+
+ Maybe_Add_With (RT_Unit_Table (To_Load));
end if;
+
+ <<Continue>> null;
end loop;
end if;
OSDN Git Service
