Skip to content

R
riscv-gcc-1
Commit 5eed512d by Emmanuel Briot Committed by Arnaud Charlet
Options

2009-04-24 Emmanuel Briot <briot@adacore.com> 

	* prj-proc.adb, prj.adb, prj.ads, prj-nmsc.adb, prj-env.adb
	(Source_Iterator): new type.
        This removes the need for having the sources on three different
        lists at the project tree, project and language level. They are now
        on a single list.

From-SVN: r146689
parent 5876578b
Showing with 306 additions and 235 deletions
gcc/ada/ChangeLog
2009-04-24 Emmanuel Briot <briot@adacore.com> 2009-04-24 Emmanuel Briot <briot@adacore.com>
* prj-proc.adb, prj.adb, prj.ads, prj-nmsc.adb, prj-env.adb
(Source_Iterator): new type.
This removes the need for having the sources on three different
lists at the project tree, project and language level. They are now
on a single list.
2009-04-24 Emmanuel Briot <briot@adacore.com>
* gnatcmd.adb, prj.adb, prj.ads: Remove unused entities * gnatcmd.adb, prj.adb, prj.ads: Remove unused entities
2009-04-24 Ed Schonberg <schonberg@adacore.com> 2009-04-24 Ed Schonberg <schonberg@adacore.com>
......
gcc/ada/prj-env.adb
...@@ -1054,6 +1054,7 @@ package body Prj.Env is ...@@ -1054,6 +1054,7 @@ package body Prj.Env is
Suffix : File_Name_Type; Suffix : File_Name_Type;
The_Unit_Data : Unit_Data; The_Unit_Data : Unit_Data;
Data : File_Name_Data; Data : File_Name_Data;
Iter : Source_Iterator;
procedure Put_Name_Buffer; procedure Put_Name_Buffer;
-- Put the line contained in the Name_Buffer in the mapping file -- Put the line contained in the Name_Buffer in the mapping file
...@@ -1200,8 +1201,12 @@ package body Prj.Env is ...@@ -1200,8 +1201,12 @@ package body Prj.Env is
for Proj in Present'Range loop for Proj in Present'Range loop
if Present (Proj) then if Present (Proj) then
Source := In_Tree.Projects.Table (Proj).First_Source;
while Source /= No_Source loop Iter := For_Each_Source (In_Tree, Proj);
loop
Source := Prj.Element (Iter);
exit when Source = No_Source;
Src_Data := In_Tree.Sources.Table (Source); Src_Data := In_Tree.Sources.Table (Source);
if In_Tree.Sources.Table (Source).Language.Name = Language if In_Tree.Sources.Table (Source).Language.Name = Language
...@@ -1234,7 +1239,7 @@ package body Prj.Env is ...@@ -1234,7 +1239,7 @@ package body Prj.Env is
Put_Name_Buffer; Put_Name_Buffer;
end if; end if;
Source := Src_Data.Next_In_Project; Next (Iter);
end loop; end loop;
end if; end if;
end loop; end loop;
......
gcc/ada/prj-nmsc.adb
...@@ -218,18 +218,15 @@ package body Prj.Nmsc is ...@@ -218,18 +218,15 @@ package body Prj.Nmsc is
procedure Load_Naming_Exceptions procedure Load_Naming_Exceptions
(Project : Project_Id; (Project : Project_Id;
In_Tree : Project_Tree_Ref; In_Tree : Project_Tree_Ref);
Data : in out Project_Data);
-- All source files in Data.First_Source are considered as naming -- All source files in Data.First_Source are considered as naming
-- exceptions, and copied into the Source_Names and Unit_Exceptions tables -- exceptions, and copied into the Source_Names and Unit_Exceptions tables
-- as appropriate. -- as appropriate.
procedure Add_Source procedure Add_Source
(Id : out Source_Id; (Id : out Source_Id;
Data : in out Project_Data;
In_Tree : Project_Tree_Ref; In_Tree : Project_Tree_Ref;
Project : Project_Id; Project : Project_Id;
Lang : Name_Id;
Lang_Id : Language_Ptr; Lang_Id : Language_Ptr;
Kind : Source_Kind; Kind : Source_Kind;
File_Name : File_Name_Type; File_Name : File_Name_Type;
...@@ -582,8 +579,6 @@ package body Prj.Nmsc is ...@@ -582,8 +579,6 @@ package body Prj.Nmsc is
procedure Remove_Source procedure Remove_Source
(Id : Source_Id; (Id : Source_Id;
Replaced_By : Source_Id; Replaced_By : Source_Id;
Project : Project_Id;
Data : in out Project_Data;
In_Tree : Project_Tree_Ref); In_Tree : Project_Tree_Ref);
-- ??? needs comment -- ??? needs comment
...@@ -687,10 +682,8 @@ package body Prj.Nmsc is ...@@ -687,10 +682,8 @@ package body Prj.Nmsc is
procedure Add_Source procedure Add_Source
(Id : out Source_Id; (Id : out Source_Id;
Data : in out Project_Data;
In_Tree : Project_Tree_Ref; In_Tree : Project_Tree_Ref;
Project : Project_Id; Project : Project_Id;
Lang : Name_Id;
Lang_Id : Language_Ptr; Lang_Id : Language_Ptr;
Kind : Source_Kind; Kind : Source_Kind;
File_Name : File_Name_Type; File_Name : File_Name_Type;
...@@ -705,7 +698,6 @@ package body Prj.Nmsc is ...@@ -705,7 +698,6 @@ package body Prj.Nmsc is
Index : Int := 0; Index : Int := 0;
Source_To_Replace : Source_Id := No_Source) Source_To_Replace : Source_Id := No_Source)
is is
Source : constant Source_Id := Data.Last_Source;
Src_Data : Source_Data := No_Source_Data; Src_Data : Source_Data := No_Source_Data;
Config : constant Language_Config := Lang_Id.Config; Config : constant Language_Config := Lang_Id.Config;
...@@ -722,8 +714,14 @@ package body Prj.Nmsc is ...@@ -722,8 +714,14 @@ package body Prj.Nmsc is
Write_Str (Get_Name_String (File_Name)); Write_Str (Get_Name_String (File_Name));
if Lang_Kind = Unit_Based then if Lang_Kind = Unit_Based then
Write_Str (", Unit : "); Write_Str (" Unit: ");
Write_Str (Get_Name_String (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; end if;
Write_Eol; Write_Eol;
...@@ -772,21 +770,6 @@ package body Prj.Nmsc is ...@@ -772,21 +770,6 @@ package body Prj.Nmsc is
Unit_Sources_Htable.Set (In_Tree.Unit_Sources_HT, Unit, Id); Unit_Sources_Htable.Set (In_Tree.Unit_Sources_HT, Unit, Id);
end if; end if;
-- Add the source to the global list
Src_Data.Next_In_Sources := In_Tree.First_Source;
In_Tree.First_Source := Id;
-- Add the source to the project list
if Source = No_Source then
Data.First_Source := Id;
else
In_Tree.Sources.Table (Source).Next_In_Project := Id;
end if;
Data.Last_Source := Id;
-- Add the source to the language list -- Add the source to the language list
Src_Data.Next_In_Lang := Lang_Id.First_Source; Src_Data.Next_In_Lang := Lang_Id.First_Source;
...@@ -795,7 +778,7 @@ package body Prj.Nmsc is ...@@ -795,7 +778,7 @@ package body Prj.Nmsc is
In_Tree.Sources.Table (Id) := Src_Data; In_Tree.Sources.Table (Id) := Src_Data;
if Source_To_Replace /= No_Source then if Source_To_Replace /= No_Source then
Remove_Source (Source_To_Replace, Id, Project, Data, In_Tree); Remove_Source (Source_To_Replace, Id, In_Tree);
end if; end if;
end Add_Source; end Add_Source;
...@@ -846,7 +829,7 @@ package body Prj.Nmsc is ...@@ -846,7 +829,7 @@ package body Prj.Nmsc is
When_No_Sources : Error_Warning; When_No_Sources : Error_Warning;
Current_Dir : String) Current_Dir : String)
is is
Data : Project_Data := In_Tree.Projects.Table (Project); Data : Project_Data renames In_Tree.Projects.Table (Project);
Extending : Boolean := False; Extending : Boolean := False;
begin begin
...@@ -929,42 +912,53 @@ package body Prj.Nmsc is ...@@ -929,42 +912,53 @@ package body Prj.Nmsc is
Alt_Lang : Alternate_Language_Id; Alt_Lang : Alternate_Language_Id;
Alt_Lang_Data : Alternate_Language_Data; Alt_Lang_Data : Alternate_Language_Data;
Continuation : Boolean := False; Continuation : Boolean := False;
Iter : Source_Iterator;
begin begin
Language := Data.Languages; Language := Data.Languages;
while Language /= No_Language_Index loop while Language /= No_Language_Index loop
Source := Data.First_Source; -- If there are no sources for this language, check whether
Source_Loop : while Source /= No_Source loop -- there are sources for which this is an alternate
declare -- language
Src_Data : Source_Data renames
In_Tree.Sources.Table (Source);
begin if Language.First_Source = No_Source then
exit Source_Loop when Src_Data.Language = Language; Iter := For_Each_Source (In_Tree => In_Tree,
Project => Project);
Source_Loop : loop
Source := Element (Iter);
exit Source_Loop when Source = No_Source;
Alt_Lang := Src_Data.Alternate_Languages; declare
Src_Data : Source_Data renames
In_Tree.Sources.Table (Source);
Alternate_Loop : begin
while Alt_Lang /= No_Alternate_Language loop exit Source_Loop when Src_Data.Language = Language;
Alt_Lang_Data :=
In_Tree.Alt_Langs.Table (Alt_Lang); Alt_Lang := Src_Data.Alternate_Languages;
exit Source_Loop
when Alt_Lang_Data.Language = Language; Alternate_Loop :
Alt_Lang := Alt_Lang_Data.Next; while Alt_Lang /= No_Alternate_Language loop
end loop Alternate_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;
end;
Source := Src_Data.Next_In_Project; Next (Iter);
end; end loop Source_Loop;
end loop Source_Loop;
if Source = No_Source then if Source = No_Source then
Report_No_Sources Report_No_Sources
(Project, (Project,
Get_Name_String (Language.Display_Name), Get_Name_String (Language.Display_Name),
In_Tree, In_Tree,
Data.Location, Data.Location,
Continuation); Continuation);
Continuation := True; Continuation := True;
end if;
end if; end if;
Language := Language.Next; Language := Language.Next;
...@@ -2543,11 +2537,9 @@ package body Prj.Nmsc is ...@@ -2543,11 +2537,9 @@ package body Prj.Nmsc is
List : String_List_Id; List : String_List_Id;
Element : String_Element; Element : String_Element;
Name : File_Name_Type; Name : File_Name_Type;
Iter : Source_Iterator;
Source : Source_Id; Source : Source_Id;
Project_2 : Project_Id; Project_2 : Project_Id;
Data_2 : Project_Data;
begin begin
if not Interfaces.Default then if not Interfaces.Default then
...@@ -2556,24 +2548,17 @@ package body Prj.Nmsc is ...@@ -2556,24 +2548,17 @@ package body Prj.Nmsc is
-- later for the sources in the Interfaces list. -- later for the sources in the Interfaces list.
Project_2 := Project; Project_2 := Project;
Data_2 := Data; while Project_2 /= No_Project loop
loop Iter := For_Each_Source (In_Tree, Project_2);
Source := Data_2.First_Source;
while Source /= No_Source loop
declare
Src_Data : Source_Data renames
In_Tree.Sources.Table (Source);
begin
Src_Data.In_Interfaces := False;
Source := Src_Data.Next_In_Project;
end;
end loop;
Project_2 := Data_2.Extends;
exit when Project_2 = No_Project; loop
Source := Prj.Element (Iter);
exit when Source = No_Source;
In_Tree.Sources.Table (Source).In_Interfaces := False;
Next (Iter);
end loop;
Data_2 := In_Tree.Projects.Table (Project_2); Project_2 := In_Tree.Projects.Table (Project_2).Extends;
end loop; end loop;
List := Interfaces.Values; List := Interfaces.Values;
...@@ -2582,11 +2567,14 @@ package body Prj.Nmsc is ...@@ -2582,11 +2567,14 @@ package body Prj.Nmsc is
Name := Canonical_Case_File_Name (Element.Value); Name := Canonical_Case_File_Name (Element.Value);
Project_2 := Project; Project_2 := Project;
Data_2 := Data;
Big_Loop : Big_Loop :
loop while Project_2 /= No_Project loop
Source := Data_2.First_Source; Iter := For_Each_Source (In_Tree, Project_2);
while Source /= No_Source loop
loop
Source := Prj.Element (Iter);
exit when Source = No_Source;
declare declare
Src_Data : Source_Data renames Src_Data : Source_Data renames
In_Tree.Sources.Table (Source); In_Tree.Sources.Table (Source);
...@@ -2615,15 +2603,11 @@ package body Prj.Nmsc is ...@@ -2615,15 +2603,11 @@ package body Prj.Nmsc is
exit Big_Loop; exit Big_Loop;
end if; end if;
Source := Src_Data.Next_In_Project; Next (Iter);
end; end;
end loop; end loop;
Project_2 := Data_2.Extends; Project_2 := In_Tree.Projects.Table (Project_2).Extends;
exit Big_Loop when Project_2 = No_Project;
Data_2 := In_Tree.Projects.Table (Project_2);
end loop Big_Loop; end loop Big_Loop;
if Source = No_Source then if Source = No_Source then
...@@ -2648,8 +2632,11 @@ package body Prj.Nmsc is ...@@ -2648,8 +2632,11 @@ package body Prj.Nmsc is
In_Tree.Projects.Table (Data.Extends).Interfaces_Defined; In_Tree.Projects.Table (Data.Extends).Interfaces_Defined;
if Data.Interfaces_Defined then if Data.Interfaces_Defined then
Source := Data.First_Source; Iter := For_Each_Source (In_Tree, Project);
while Source /= No_Source loop loop
Source := Prj.Element (Iter);
exit when Source = No_Source;
declare declare
Src_Data : Source_Data renames Src_Data : Source_Data renames
In_Tree.Sources.Table (Source); In_Tree.Sources.Table (Source);
...@@ -2658,9 +2645,9 @@ package body Prj.Nmsc is ...@@ -2658,9 +2645,9 @@ package body Prj.Nmsc is
if not Src_Data.Declared_In_Interfaces then if not Src_Data.Declared_In_Interfaces then
Src_Data.In_Interfaces := False; Src_Data.In_Interfaces := False;
end if; end if;
Source := Src_Data.Next_In_Project;
end; end;
Next (Iter);
end loop; end loop;
end if; end if;
end if; end if;
...@@ -2913,6 +2900,7 @@ package body Prj.Nmsc is ...@@ -2913,6 +2900,7 @@ package body Prj.Nmsc is
Element : String_Element; Element : String_Element;
File_Name : File_Name_Type; File_Name : File_Name_Type;
Source : Source_Id; Source : Source_Id;
Iter : Source_Iterator;
begin begin
case Kind is case Kind is
...@@ -2942,20 +2930,19 @@ package body Prj.Nmsc is ...@@ -2942,20 +2930,19 @@ package body Prj.Nmsc is
Element := In_Tree.String_Elements.Table (Element_Id); Element := In_Tree.String_Elements.Table (Element_Id);
File_Name := Canonical_Case_File_Name (Element.Value); File_Name := Canonical_Case_File_Name (Element.Value);
Source := Data.First_Source; Iter := For_Each_Source (In_Tree, Project);
while Source /= No_Source
and then In_Tree.Sources.Table (Source).File /= File_Name
loop loop
Source := In_Tree.Sources.Table (Source).Next_In_Project; Source := Prj.Element (Iter);
exit when Source = No_Source
or else In_Tree.Sources.Table (Source).File = File_Name;
Next (Iter);
end loop; end loop;
if Source = No_Source then if Source = No_Source then
Add_Source Add_Source
(Id => Source, (Id => Source,
Data => Data,
In_Tree => In_Tree, In_Tree => In_Tree,
Project => Project, Project => Project,
Lang => Lang,
Lang_Id => Lang_Id, Lang_Id => Lang_Id,
Kind => Kind, Kind => Kind,
File_Name => File_Name, File_Name => File_Name,
...@@ -3011,6 +2998,7 @@ package body Prj.Nmsc is ...@@ -3011,6 +2998,7 @@ package body Prj.Nmsc is
Source_To_Replace : Source_Id := No_Source; Source_To_Replace : Source_Id := No_Source;
Other_Project : Project_Id; Other_Project : Project_Id;
Other_Part : Source_Id := No_Source; Other_Part : Source_Id := No_Source;
Iter : Source_Iterator;
begin begin
case Kind is case Kind is
...@@ -3071,14 +3059,16 @@ package body Prj.Nmsc is ...@@ -3071,14 +3059,16 @@ package body Prj.Nmsc is
-- Check if the source already exists -- Check if the source already exists
Source := In_Tree.First_Source;
Source_To_Replace := No_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 loop
Source := In_Tree.Sources.Table (Source).Next_In_Sources; 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);
Next (Iter);
end loop; end loop;
if Source /= No_Source then if Source /= No_Source then
...@@ -3086,8 +3076,8 @@ package body Prj.Nmsc is ...@@ -3086,8 +3076,8 @@ package body Prj.Nmsc is
Other_Part := Source; Other_Part := Source;
loop loop
Source := Next (Iter);
In_Tree.Sources.Table (Source).Next_In_Sources; Source := Prj.Element (Iter);
exit when Source = No_Source or else exit when Source = No_Source or else
(In_Tree.Sources.Table (Source).Unit = Unit (In_Tree.Sources.Table (Source).Unit = Unit
...@@ -3124,10 +3114,8 @@ package body Prj.Nmsc is ...@@ -3124,10 +3114,8 @@ package body Prj.Nmsc is
if Source = No_Source then if Source = No_Source then
Add_Source Add_Source
(Id => Source, (Id => Source,
Data => Data,
In_Tree => In_Tree, In_Tree => In_Tree,
Project => Project, Project => Project,
Lang => Lang,
Lang_Id => Lang_Id, Lang_Id => Lang_Id,
Kind => Kind, Kind => Kind,
File_Name => File_Name, File_Name => File_Name,
...@@ -3478,6 +3466,7 @@ package body Prj.Nmsc is ...@@ -3478,6 +3466,7 @@ package body Prj.Nmsc is
procedure Check_Library (Proj : Project_Id; Extends : Boolean) is procedure Check_Library (Proj : Project_Id; Extends : Boolean) is
Proj_Data : Project_Data; Proj_Data : Project_Data;
Src_Id : Source_Id; Src_Id : Source_Id;
Iter : Source_Iterator;
begin begin
if Proj /= No_Project then if Proj /= No_Project then
...@@ -3489,15 +3478,18 @@ package body Prj.Nmsc is ...@@ -3489,15 +3478,18 @@ package body Prj.Nmsc is
-- have no sources. However, header files from non-Ada -- have no sources. However, header files from non-Ada
-- languages are OK, as there is nothing to compile. -- languages are OK, as there is nothing to compile.
Src_Id := Proj_Data.First_Source; Iter := For_Each_Source (In_Tree, Proj);
while Src_Id /= No_Source loop loop
Src_Id := Prj.Element (Iter);
exit when Src_Id = No_Source;
declare declare
Src : Source_Data renames In_Tree.Sources.Table (Src_Id); Src : Source_Data renames In_Tree.Sources.Table (Src_Id);
begin begin
exit when Src.Lang_Kind /= File_Based exit when Src.Lang_Kind /= File_Based
or else Src.Kind /= Spec; or else Src.Kind /= Spec;
Src_Id := Src.Next_In_Project;
end; end;
Next (Iter);
end loop; end loop;
if Src_Id /= No_Source then if Src_Id /= No_Source then
...@@ -4622,6 +4614,7 @@ package body Prj.Nmsc is ...@@ -4622,6 +4614,7 @@ package body Prj.Nmsc is
OK : Boolean := True; OK : Boolean := True;
Source : Source_Id; Source : Source_Id;
Next_Proj : Project_Id; Next_Proj : Project_Id;
Iter : Source_Iterator;
begin begin
if Get_Mode = Multi_Language then if Get_Mode = Multi_Language then
...@@ -4815,21 +4808,22 @@ package body Prj.Nmsc is ...@@ -4815,21 +4808,22 @@ package body Prj.Nmsc is
-- Multi_Language mode -- Multi_Language mode
Next_Proj := Data.Extends; Next_Proj := Data.Extends;
Source := Data.First_Source;
Iter := For_Each_Source (In_Tree, Project);
loop loop
while Source /= No_Source and then while Prj.Element (Iter) /= No_Source and then
In_Tree.Sources.Table (Source).Unit /= Unit In_Tree.Sources.Table (Prj.Element (Iter)).Unit /=
Unit
loop loop
Source := Next (Iter);
In_Tree.Sources.Table (Source).Next_In_Project;
end loop; end loop;
Source := Prj.Element (Iter);
exit when Source /= No_Source or else exit when Source /= No_Source or else
Next_Proj = No_Project; Next_Proj = No_Project;
Source := Iter := For_Each_Source (In_Tree, Next_Proj);
In_Tree.Projects.Table (Next_Proj).First_Source;
Next_Proj := Next_Proj :=
In_Tree.Projects.Table (Next_Proj).Extends; In_Tree.Projects.Table (Next_Proj).Extends;
end loop; end loop;
...@@ -7289,10 +7283,14 @@ package body Prj.Nmsc is ...@@ -7289,10 +7283,14 @@ package body Prj.Nmsc is
declare declare
Source : Source_Id; Source : Source_Id;
Iter : Source_Iterator;
begin begin
Source := Data.First_Source; Iter := For_Each_Source (In_Tree, Project);
while Source /= No_Source loop loop
Source := Prj.Element (Iter);
exit when Source = No_Source;
declare declare
Src_Data : Source_Data renames Src_Data : Source_Data renames
In_Tree.Sources.Table (Source); In_Tree.Sources.Table (Source);
...@@ -7310,11 +7308,11 @@ package body Prj.Nmsc is ...@@ -7310,11 +7308,11 @@ package body Prj.Nmsc is
No_Location); No_Location);
end if; end if;
Remove_Source (Source, No_Source, Project, Data, In_Tree); Remove_Source (Source, No_Source, In_Tree);
end if; end if;
Source := Src_Data.Next_In_Project;
end; end;
Next (Iter);
end loop; end loop;
end; end;
...@@ -7666,6 +7664,7 @@ package body Prj.Nmsc is ...@@ -7666,6 +7664,7 @@ package body Prj.Nmsc is
Display_Language_Name : Name_Id; Display_Language_Name : Name_Id;
Lang_Kind : Language_Kind; Lang_Kind : Language_Kind;
Kind : Source_Kind := Spec; Kind : Source_Kind := Spec;
Iter : Source_Iterator;
begin begin
Name_Len := Display_Path'Length; Name_Len := Display_Path'Length;
...@@ -7761,9 +7760,12 @@ package body Prj.Nmsc is ...@@ -7761,9 +7760,12 @@ package body Prj.Nmsc is
else else
-- Check if the same file name or unit is used in the prj tree -- 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; Add_Src := True;
while Source /= No_Source loop loop
Source := Prj.Element (Iter);
exit when Source = No_Source;
declare declare
Src_Data : Source_Data renames Src_Data : Source_Data renames
In_Tree.Sources.Table (Source); In_Tree.Sources.Table (Source);
...@@ -7850,17 +7852,15 @@ package body Prj.Nmsc is ...@@ -7850,17 +7852,15 @@ package body Prj.Nmsc is
end if; end if;
end if; end if;
Source := Src_Data.Next_In_Sources;
end; end;
Next (Iter);
end loop; end loop;
if Add_Src then if Add_Src then
Add_Source Add_Source
(Id => Source, (Id => Source,
Data => Data,
In_Tree => In_Tree, In_Tree => In_Tree,
Project => Project, Project => Project,
Lang => Language_Name,
Lang_Id => Language, Lang_Id => Language,
Lang_Kind => Lang_Kind, Lang_Kind => Lang_Kind,
Kind => Kind, Kind => Kind,
...@@ -8013,18 +8013,21 @@ package body Prj.Nmsc is ...@@ -8013,18 +8013,21 @@ package body Prj.Nmsc is
procedure Load_Naming_Exceptions procedure Load_Naming_Exceptions
(Project : Project_Id; (Project : Project_Id;
In_Tree : Project_Tree_Ref; In_Tree : Project_Tree_Ref)
Data : in out Project_Data)
is is
Source : Source_Id; Source : Source_Id;
File : File_Name_Type; File : File_Name_Type;
Unit : Name_Id; Unit : Name_Id;
Iter : Source_Iterator;
begin begin
Unit_Exceptions.Reset; Unit_Exceptions.Reset;
Source := Data.First_Source; Iter := For_Each_Source (In_Tree, Project);
while Source /= No_Source loop loop
Source := Prj.Element (Iter);
exit when Source = No_Source;
File := In_Tree.Sources.Table (Source).File; File := In_Tree.Sources.Table (Source).File;
Unit := In_Tree.Sources.Table (Source).Unit; Unit := In_Tree.Sources.Table (Source).Unit;
...@@ -8074,7 +8077,7 @@ package body Prj.Nmsc is ...@@ -8074,7 +8077,7 @@ package body Prj.Nmsc is
end; end;
end if; end if;
Source := In_Tree.Sources.Table (Source).Next_In_Project; Next (Iter);
end loop; end loop;
end Load_Naming_Exceptions; end Load_Naming_Exceptions;
...@@ -8088,6 +8091,8 @@ package body Prj.Nmsc is ...@@ -8088,6 +8091,8 @@ package body Prj.Nmsc is
Data : in out Project_Data; Data : in out Project_Data;
Current_Dir : String) Current_Dir : String)
is is
Iter : Source_Iterator;
procedure Process_Sources_In_Multi_Language_Mode; procedure Process_Sources_In_Multi_Language_Mode;
-- Find all source files when in multi language mode -- Find all source files when in multi language mode
...@@ -8183,8 +8188,11 @@ package body Prj.Nmsc is ...@@ -8183,8 +8188,11 @@ package body Prj.Nmsc is
end loop For_Each_Unit; end loop For_Each_Unit;
when Multi_Language => when Multi_Language =>
Source := In_Tree.First_Source; Iter := For_Each_Source (In_Tree);
while Source /= No_Source loop loop
Source := Prj.Element (Iter);
exit when Source = No_Source;
if In_Tree.Sources.Table (Source).File = Excluded.File then if In_Tree.Sources.Table (Source).File = Excluded.File then
Exclude Exclude
(In_Tree.Sources.Table (Source).Project, (In_Tree.Sources.Table (Source).Project,
...@@ -8192,7 +8200,7 @@ package body Prj.Nmsc is ...@@ -8192,7 +8200,7 @@ package body Prj.Nmsc is
exit; exit;
end if; end if;
Source := In_Tree.Sources.Table (Source).Next_In_Sources; Next (Iter);
end loop; end loop;
OK := OK or Excluded.Found; OK := OK or Excluded.Found;
...@@ -8213,6 +8221,7 @@ package body Prj.Nmsc is ...@@ -8213,6 +8221,7 @@ package body Prj.Nmsc is
-------------------------------------------- --------------------------------------------
procedure Process_Sources_In_Multi_Language_Mode is procedure Process_Sources_In_Multi_Language_Mode is
Iter : Source_Iterator;
begin begin
-- Check that two sources of this project do not have the same object -- Check that two sources of this project do not have the same object
-- file name. -- file name.
...@@ -8252,8 +8261,11 @@ package body Prj.Nmsc is ...@@ -8252,8 +8261,11 @@ package body Prj.Nmsc is
begin begin
Object_File_Names.Reset; Object_File_Names.Reset;
Src_Id := In_Tree.First_Source; Iter := For_Each_Source (In_Tree);
while Src_Id /= No_Source loop loop
Src_Id := Prj.Element (Iter);
exit when Src_Id = No_Source;
declare declare
Src_Data : Source_Data renames Src_Data : Source_Data renames
In_Tree.Sources.Table (Src_Id); In_Tree.Sources.Table (Src_Id);
...@@ -8303,9 +8315,9 @@ package body Prj.Nmsc is ...@@ -8303,9 +8315,9 @@ package body Prj.Nmsc is
end case; end case;
end if; end if;
end if; end if;
Src_Id := Src_Data.Next_In_Sources;
end; end;
Next (Iter);
end loop; end loop;
end Check_Object_File_Names; end Check_Object_File_Names;
end Process_Sources_In_Multi_Language_Mode; end Process_Sources_In_Multi_Language_Mode;
...@@ -8321,7 +8333,7 @@ package body Prj.Nmsc is ...@@ -8321,7 +8333,7 @@ package body Prj.Nmsc is
and then Data.Languages /= No_Language_Index) and then Data.Languages /= No_Language_Index)
then then
if Get_Mode = Multi_Language then if Get_Mode = Multi_Language then
Load_Naming_Exceptions (Project, In_Tree, Data); Load_Naming_Exceptions (Project, In_Tree);
end if; end if;
Find_Explicit_Sources (Current_Dir, Project, In_Tree, Data); Find_Explicit_Sources (Current_Dir, Project, In_Tree, Data);
...@@ -8705,8 +8717,6 @@ package body Prj.Nmsc is ...@@ -8705,8 +8717,6 @@ package body Prj.Nmsc is
procedure Remove_Source procedure Remove_Source
(Id : Source_Id; (Id : Source_Id;
Replaced_By : Source_Id; Replaced_By : Source_Id;
Project : Project_Id;
Data : in out Project_Data;
In_Tree : Project_Tree_Ref) In_Tree : Project_Tree_Ref)
is is
Src_Data : constant Source_Data := In_Tree.Sources.Table (Id); Src_Data : constant Source_Data := In_Tree.Sources.Table (Id);
...@@ -8724,75 +8734,6 @@ package body Prj.Nmsc is ...@@ -8724,75 +8734,6 @@ package body Prj.Nmsc is
In_Tree.Sources.Table (Id).Declared_In_Interfaces; In_Tree.Sources.Table (Id).Declared_In_Interfaces;
end if; 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;
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;
-- Remove source from the language list
Source := Src_Data.Language.First_Source; Source := Src_Data.Language.First_Source;
if Source = Id then if Source = Id then
......
gcc/ada/prj-proc.adb
...@@ -291,12 +291,16 @@ package body Prj.Proc is ...@@ -291,12 +291,16 @@ package body Prj.Proc is
Source1 : Source_Id; Source1 : Source_Id;
Name : Name_Id; Name : Name_Id;
Source2 : Source_Id; Source2 : Source_Id;
Iter : Source_Iterator;
begin begin
Unit_Htable.Reset; Unit_Htable.Reset;
Source1 := In_Tree.First_Source; Iter := For_Each_Source (In_Tree);
while Source1 /= No_Source loop loop
Source1 := Prj.Element (Iter);
exit when Source1 = No_Source;
Name := In_Tree.Sources.Table (Source1).Unit; Name := In_Tree.Sources.Table (Source1).Unit;
if Name /= No_Name then if Name /= No_Name then
...@@ -312,7 +316,7 @@ package body Prj.Proc is ...@@ -312,7 +316,7 @@ package body Prj.Proc is
end if; end if;
end if; end if;
Source1 := In_Tree.Sources.Table (Source1).Next_In_Sources; Next (Iter);
end loop; end loop;
end; end;
end Check; end Check;
......
gcc/ada/prj.adb
...@@ -108,8 +108,6 @@ package body Prj is ...@@ -108,8 +108,6 @@ package body Prj is
Ada_Sources_Present => True, Ada_Sources_Present => True,
Other_Sources_Present => True, Other_Sources_Present => True,
Ada_Sources => Nil_String, Ada_Sources => Nil_String,
First_Source => No_Source,
Last_Source => No_Source,
Interfaces_Defined => False, Interfaces_Defined => False,
Imported_Directories_Switches => null, Imported_Directories_Switches => null,
Include_Path => null, Include_Path => null,
...@@ -157,6 +155,10 @@ package body Prj is ...@@ -157,6 +155,10 @@ package body Prj is
procedure Free_List (Languages : in out Language_Ptr); procedure Free_List (Languages : in out Language_Ptr);
-- Free memory allocated for the list of languages -- Free memory allocated for the list of languages
procedure Language_Changed (Iter : in out Source_Iterator);
procedure Project_Changed (Iter : in out Source_Iterator);
-- Called when a new project or language was selected for this iterator.
------------------- -------------------
-- Add_To_Buffer -- -- Add_To_Buffer --
------------------- -------------------
...@@ -388,6 +390,103 @@ package body Prj is ...@@ -388,6 +390,103 @@ package body Prj is
end Extend_Name; end Extend_Name;
---------------------
-- Project_Changed --
---------------------
procedure Project_Changed (Iter : in out Source_Iterator) is
begin
Iter.Language := Iter.In_Tree.Projects.Table (Iter.Project).Languages;
Language_Changed (Iter);
end Project_Changed;
----------------------
-- Language_Changed --
----------------------
procedure Language_Changed (Iter : in out Source_Iterator) is
begin
Iter.Current := No_Source;
if Iter.Language_Name /= No_Name then
while Iter.Language /= null
and then Iter.Language.Name /= Iter.Language_Name
loop
Iter.Language := Iter.Language.Next;
end loop;
end if;
-- If there is no matching language in this project, move to next
if Iter.Language = No_Language_Index then
if Iter.All_Projects then
Iter.Project := Iter.Project + 1;
if Iter.Project > Project_Table.Last (Iter.In_Tree.Projects) then
Iter.Project := No_Project;
else
Project_Changed (Iter);
end if;
else
Iter.Project := No_Project;
end if;
else
Iter.Current := Iter.Language.First_Source;
if Iter.Current = No_Source then
Iter.Language := Iter.Language.Next;
Language_Changed (Iter);
end if;
end if;
end Language_Changed;
---------------------
-- For_Each_Source --
---------------------
function For_Each_Source
(In_Tree : Project_Tree_Ref;
Project : Project_Id := No_Project;
Language : Name_Id := No_Name) return Source_Iterator
is
Iter : Source_Iterator;
begin
Iter := Source_Iterator'
(In_Tree => In_Tree,
Project => Project,
All_Projects => Project = No_Project,
Language_Name => Language,
Language => No_Language_Index,
Current => No_Source);
if Iter.Project = No_Project then
Iter.Project := Project_Table.First;
end if;
Project_Changed (Iter);
return Iter;
end For_Each_Source;
-------------
-- Element --
-------------
function Element (Iter : Source_Iterator) return Source_Id is
begin
return Iter.Current;
end Element;
----------
-- Next --
----------
procedure Next (Iter : in out Source_Iterator) is
begin
Iter.Current := Iter.In_Tree.Sources.Table (Iter.Current).Next_In_Lang;
if Iter.Current = No_Source then
Iter.Language := Iter.Language.Next;
Language_Changed (Iter);
end if;
end Next;
-------------------------------- --------------------------------
-- For_Every_Project_Imported -- -- For_Every_Project_Imported --
-------------------------------- --------------------------------
......
gcc/ada/prj.ads
...@@ -734,14 +734,8 @@ package Prj is ...@@ -734,14 +734,8 @@ package Prj is
Naming_Exception : Boolean := False; Naming_Exception : Boolean := False;
-- True if the source has an exceptional name -- True if the source has an exceptional name
Next_In_Sources : Source_Id := No_Source;
-- Link to another source in the project tree
Next_In_Project : Source_Id := No_Source;
-- Link to another source in the project
Next_In_Lang : Source_Id := No_Source; Next_In_Lang : Source_Id := No_Source;
-- Link to another source of the same language -- Link to another source of the same language in the same project
end record; end record;
No_Source_Data : constant Source_Data := No_Source_Data : constant Source_Data :=
...@@ -779,8 +773,6 @@ package Prj is ...@@ -779,8 +773,6 @@ package Prj is
Switches_Path => No_Path, Switches_Path => No_Path,
Switches_TS => Empty_Time_Stamp, Switches_TS => Empty_Time_Stamp,
Naming_Exception => False, Naming_Exception => False,
Next_In_Sources => No_Source,
Next_In_Project => No_Source,
Next_In_Lang => No_Source); Next_In_Lang => No_Source);
package Source_Data_Table is new GNAT.Dynamic_Tables package Source_Data_Table is new GNAT.Dynamic_Tables
...@@ -1251,6 +1243,8 @@ package Prj is ...@@ -1251,6 +1243,8 @@ package Prj is
------------- -------------
-- Sources -- -- Sources --
------------- -------------
-- In multi-language mode, the sources for all languages including Ada
-- are accessible through the Source_Iterator type
Ada_Sources_Present : Boolean := True; Ada_Sources_Present : Boolean := True;
-- True if there are Ada sources in the project -- True if there are Ada sources in the project
...@@ -1259,11 +1253,7 @@ package Prj is ...@@ -1259,11 +1253,7 @@ package Prj is
-- True if there are non-Ada sources in the project -- True if there are non-Ada sources in the project
Ada_Sources : String_List_Id := Nil_String; Ada_Sources : String_List_Id := Nil_String;
-- The list of all the Ada source file names (gnatmake only) -- The list of all the Ada source file names (gnatmake only).
First_Source : Source_Id := No_Source;
Last_Source : Source_Id := No_Source;
-- Head and tail of the list of sources
Interfaces_Defined : Boolean := False; Interfaces_Defined : Boolean := False;
-- True if attribute Interfaces is declared for the project or any -- True if attribute Interfaces is declared for the project or any
...@@ -1437,15 +1427,23 @@ package Prj is ...@@ -1437,15 +1427,23 @@ package Prj is
type Private_Project_Tree_Data is private; type Private_Project_Tree_Data is private;
-- Data for a project tree that is used only by the Project Manager -- Data for a project tree that is used only by the Project Manager
type Project_Tree_Data is type Source_Iterator is private;
record
-- sources of the project function For_Each_Source
(In_Tree : Project_Tree_Ref;
Project : Project_Id := No_Project;
Language : Name_Id := No_Name) return Source_Iterator;
-- Returns an iterator for all the sources of a project tree, or a specific
-- project, or a specific language.
First_Source : Source_Id := No_Source; function Element (Iter : Source_Iterator) return Source_Id;
-- -- Return the current source (or No_Source if there are no more sources)
-- Tables procedure Next (Iter : in out Source_Iterator);
-- Move on to the next source
type Project_Tree_Data is
record
Name_Lists : Name_List_Table.Instance; Name_Lists : Name_List_Table.Instance;
String_Elements : String_Element_Table.Instance; String_Elements : String_Element_Table.Instance;
Variable_Elements : Variable_Element_Table.Instance; Variable_Elements : Variable_Element_Table.Instance;
...@@ -1572,6 +1570,22 @@ private ...@@ -1572,6 +1570,22 @@ private
-- Empty File_Name_Type (no characters). Initialized in procedure -- Empty File_Name_Type (no characters). Initialized in procedure
-- Initialize. -- Initialize.
type Source_Iterator is record
In_Tree : Project_Tree_Ref;
Project : Project_Id;
All_Projects : Boolean;
-- Current project and whether we should move on to the next
Language : Language_Ptr;
-- Current language processed
Language_Name : Name_Id;
-- Only sources of this language will be returned (or all if No_Name)
Current : Source_Id;
end record;
procedure Add_To_Buffer procedure Add_To_Buffer
(S : String; (S : String;
To : in out String_Access; To : in out String_Access;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment