Skip to content

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

prj.adb, [...] (Language_Index): renamed to Language_Ptr to better reflect its new implementation. 

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

	* prj.adb, prj.ads, prj-nmsc.adb, prj-env.adb (Language_Index): renamed
	to Language_Ptr to better reflect its new implementation.
	(Project_Data.First_Languages_Processing): renamed to Languages now
	that the field with that name is no longer used
	(Project_Data.Languages): removed, no longer used, and duplicates
	information already available through First_Language_Processing.
	(Prj.Language_Index): now an actual pointer, instead of an index into
	a table. This makes the list somewhat more obvious, but more importantly
	removes the need to pass a pointer to the project_tree_data in a few
	places, and makes accessing the attributes of a languages more
	efficient.

From-SVN: r146684
parent e762c6f4
Showing with 81 additions and 101 deletions
gcc/ada/ChangeLog
2009-04-24 Emmanuel Briot <briot@adacore.com>
* prj.adb, prj.ads, prj-nmsc.adb, prj-env.adb (Language_Index): renamed
to Language_Ptr to better reflect its new implementation.
(Project_Data.First_Languages_Processing): renamed to Languages now
that the field with that name is no longer used
(Project_Data.Languages): removed, no longer used, and duplicates
information already available through First_Language_Processing.
(Prj.Language_Index): now an actual pointer, instead of an index into
a table. This makes the list somewhat more obvious, but more importantly
removes the need to pass a pointer to the project_tree_data in a few
places, and makes accessing the attributes of a languages more
efficient.
2009-04-24 Richard Kenner <kenner@vlsi1.ultra.nyu.edu>
Thomas Quinot <quinot@adacore.com>
......
gcc/ada/prj-env.adb
......@@ -1204,8 +1204,7 @@ package body Prj.Env is
while Source /= No_Source loop
Src_Data := In_Tree.Sources.Table (Source);
if In_Tree.Languages_Data.Table
(In_Tree.Sources.Table (Source).Language).Name = Language
if In_Tree.Sources.Table (Source).Language.Name = Language
and then not Src_Data.Locally_Removed
and then Src_Data.Replaced_By = No_Source
and then Src_Data.Path.Name /= No_Path
......@@ -1215,12 +1214,10 @@ package body Prj.Env is
if Src_Data.Kind = Spec then
Suffix :=
In_Tree.Languages_Data.Table
(Src_Data.Language).Config.Mapping_Spec_Suffix;
Src_Data.Language.Config.Mapping_Spec_Suffix;
else
Suffix :=
In_Tree.Languages_Data.Table
(Src_Data.Language).Config.Mapping_Body_Suffix;
Src_Data.Language.Config.Mapping_Body_Suffix;
end if;
if Suffix /= No_File then
......
gcc/ada/prj.adb
......@@ -86,7 +86,6 @@ package body Prj is
(Qualifier => Unspecified,
Externally_Built => False,
Config => Default_Project_Config,
Languages => No_Name_List,
Name => No_Name,
Display_Name => No_Name,
Path => No_Path_Information,
......@@ -124,7 +123,7 @@ package body Prj is
Extends => No_Project,
Extended_By => No_Project,
Naming => Std_Naming_Data,
First_Language_Processing => No_Language_Index,
Languages => No_Language_Index,
Decl => No_Declarations,
Imported_Projects => Empty_Project_List,
All_Imported_Projects => Empty_Project_List,
......@@ -156,6 +155,9 @@ package body Prj is
procedure Free (Project : in out Project_Data);
-- Free memory allocated for Project
procedure Free_List (Languages : in out Language_Ptr);
-- Free memory allocated for the list of languages
-------------------
-- Add_To_Buffer --
-------------------
......@@ -225,7 +227,7 @@ package body Prj is
Element_Id : Array_Element_Id;
Element : Array_Element;
Suffix : File_Name_Type := No_File;
Lang : Language_Index;
Lang : Language_Ptr;
begin
-- ??? This seems to be only for Ada_Only mode...
......@@ -243,14 +245,12 @@ package body Prj is
if Current_Mode = Multi_Language then
Lang := In_Tree.First_Language;
while Lang /= No_Language_Index loop
if In_Tree.Languages_Data.Table (Lang).Name = Language_Id then
Suffix :=
In_Tree.Languages_Data.Table
(Lang).Config.Naming_Data.Body_Suffix;
if Lang.Name = Language_Id then
Suffix := Lang.Config.Naming_Data.Body_Suffix;
exit;
end if;
Lang := In_Tree.Languages_Data.Table (Lang).Next;
Lang := Lang.Next;
end loop;
end if;
......@@ -270,7 +270,7 @@ package body Prj is
Element_Id : Array_Element_Id;
Element : Array_Element;
Suffix : File_Name_Type := No_File;
Lang : Language_Index;
Lang : Language_Ptr;
begin
Name_Len := 0;
......@@ -292,15 +292,12 @@ package body Prj is
if Current_Mode = Multi_Language then
Lang := In_Tree.First_Language;
while Lang /= No_Language_Index loop
if In_Tree.Languages_Data.Table (Lang).Name = Language_Id then
Suffix :=
File_Name_Type
(In_Tree.Languages_Data.Table
(Lang).Config.Naming_Data.Body_Suffix);
if Lang.Name = Language_Id then
Suffix := File_Name_Type (Lang.Config.Naming_Data.Body_Suffix);
exit;
end if;
Lang := In_Tree.Languages_Data.Table (Lang).Next;
Lang := Lang.Next;
end loop;
if Suffix /= No_File then
......@@ -377,11 +374,10 @@ package body Prj is
---------------------------
procedure Display_Language_Name
(In_Tree : Project_Tree_Ref;
Language : Language_Index)
(Language : Language_Ptr)
is
begin
Get_Name_String (In_Tree.Languages_Data.Table (Language).Display_Name);
Get_Name_String (Language.Display_Name);
Write_Str (Name_Buffer (1 .. Name_Len));
end Display_Language_Name;
......@@ -600,41 +596,18 @@ package body Prj is
-------------------
function Is_A_Language
(Tree : Project_Tree_Ref;
Data : Project_Data;
(Data : Project_Data;
Language_Name : Name_Id) return Boolean
is
Lang_Ind : Language_Ptr := Data.Languages;
begin
if Get_Mode = Ada_Only then
declare
List : Name_List_Index := Data.Languages;
begin
while List /= No_Name_List loop
if Tree.Name_Lists.Table (List).Name = Language_Name then
return True;
else
List := Tree.Name_Lists.Table (List).Next;
end if;
end loop;
end;
else
declare
Lang_Ind : Language_Index := Data.First_Language_Processing;
Lang_Data : Language_Data;
begin
while Lang_Ind /= No_Language_Index loop
Lang_Data := Tree.Languages_Data.Table (Lang_Ind);
if Lang_Data.Name = Language_Name then
return True;
end if;
while Lang_Ind /= No_Language_Index loop
if Lang_Ind.Name = Language_Name then
return True;
end if;
Lang_Ind := Lang_Data.Next;
end loop;
end;
end if;
Lang_Ind := Lang_Ind.Next;
end loop;
return False;
end Is_A_Language;
......@@ -672,7 +645,7 @@ package body Prj is
In_Tree : Project_Tree_Ref) return Boolean
is
Language_Id : Name_Id;
Lang : Language_Index;
Lang : Language_Ptr;
begin
if Current_Mode = Multi_Language then
......@@ -683,13 +656,11 @@ package body Prj is
Lang := In_Tree.First_Language;
while Lang /= No_Language_Index loop
if In_Tree.Languages_Data.Table (Lang).Name = Language_Id then
return
In_Tree.Languages_Data.Table
(Lang).Config.Object_Generated;
if Lang.Name = Language_Id then
return Lang.Config.Object_Generated;
end if;
Lang := In_Tree.Languages_Data.Table (Lang).Next;
Lang := Lang.Next;
end loop;
end if;
......@@ -842,6 +813,22 @@ package body Prj is
Free (Project.Ada_Objects_Path);
end Free;
---------------
-- Free_List --
---------------
procedure Free_List (Languages : in out Language_Ptr) is
procedure Unchecked_Free is new Ada.Unchecked_Deallocation
(Language_Data, Language_Ptr);
Tmp : Language_Ptr;
begin
while Languages /= null loop
Tmp := Languages.Next;
Unchecked_Free (Languages);
Languages := Tmp;
end loop;
end Free_List;
----------
-- Free --
----------
......@@ -851,7 +838,6 @@ package body Prj is
(Project_Tree_Data, Project_Tree_Ref);
begin
if Tree /= null then
Language_Data_Table.Free (Tree.Languages_Data);
Name_List_Table.Free (Tree.Name_Lists);
String_Element_Table.Free (Tree.String_Elements);
Variable_Element_Table.Free (Tree.Variable_Elements);
......@@ -870,6 +856,7 @@ package body Prj is
for P in Project_Table.First ..
Project_Table.Last (Tree.Projects)
loop
Free_List (Tree.Projects.Table (P).Languages);
Free (Tree.Projects.Table (P));
end loop;
......@@ -899,7 +886,6 @@ package body Prj is
-- Visible tables
Language_Data_Table.Init (Tree.Languages_Data);
Name_List_Table.Init (Tree.Name_Lists);
String_Element_Table.Init (Tree.String_Elements);
Variable_Element_Table.Init (Tree.Variable_Elements);
......@@ -1107,7 +1093,7 @@ package body Prj is
Element_Id : Array_Element_Id;
Element : Array_Element;
Suffix : File_Name_Type := No_File;
Lang : Language_Index;
Lang : Language_Ptr;
begin
Element_Id := Naming.Spec_Suffix;
......@@ -1124,14 +1110,12 @@ package body Prj is
if Current_Mode = Multi_Language then
Lang := In_Tree.First_Language;
while Lang /= No_Language_Index loop
if In_Tree.Languages_Data.Table (Lang).Name = Language_Id then
Suffix :=
In_Tree.Languages_Data.Table
(Lang).Config.Naming_Data.Spec_Suffix;
if Lang.Name = Language_Id then
Suffix := Lang.Config.Naming_Data.Spec_Suffix;
exit;
end if;
Lang := In_Tree.Languages_Data.Table (Lang).Next;
Lang := Lang.Next;
end loop;
end if;
......@@ -1151,7 +1135,7 @@ package body Prj is
Element_Id : Array_Element_Id;
Element : Array_Element;
Suffix : File_Name_Type := No_File;
Lang : Language_Index;
Lang : Language_Ptr;
begin
Name_Len := 0;
......@@ -1173,15 +1157,13 @@ package body Prj is
if Current_Mode = Multi_Language then
Lang := In_Tree.First_Language;
while Lang /= No_Language_Index loop
if In_Tree.Languages_Data.Table (Lang).Name = Language_Id then
if Lang.Name = Language_Id then
Suffix :=
File_Name_Type
(In_Tree.Languages_Data.Table
(Lang).Config.Naming_Data.Spec_Suffix);
File_Name_Type (Lang.Config.Naming_Data.Spec_Suffix);
exit;
end if;
Lang := In_Tree.Languages_Data.Table (Lang).Next;
Lang := Lang.Next;
end loop;
if Suffix /= No_File then
......
gcc/ada/prj.ads
......@@ -307,15 +307,15 @@ package Prj is
Table_Increment => 100);
-- The table that contains all packages
type Language_Index is new Nat;
type Language_Data;
type Language_Ptr is access Language_Data;
-- Index of language data
No_Language_Index : constant Language_Index := 0;
No_Language_Index : constant Language_Ptr := null;
-- Constant indicating that there is no language data
procedure Display_Language_Name
(In_Tree : Project_Tree_Ref;
Language : Language_Index);
(Language : Language_Ptr);
-- Output the name of a language
Max_Header_Num : constant := 6150;
......@@ -596,7 +596,7 @@ package Prj is
First_Source : Source_Id := No_Source;
Mapping_Files : Mapping_Files_Htable.Instance :=
Mapping_Files_Htable.Nil;
Next : Language_Index := No_Language_Index;
Next : Language_Ptr := No_Language_Index;
end record;
No_Language_Data : constant Language_Data :=
......@@ -607,20 +607,12 @@ package Prj is
Mapping_Files => Mapping_Files_Htable.Nil,
Next => No_Language_Index);
package Language_Data_Table is new GNAT.Dynamic_Tables
(Table_Component_Type => Language_Data,
Table_Index_Type => Language_Index,
Table_Low_Bound => 1,
Table_Initial => 10,
Table_Increment => 100);
-- The table for lists of names used in package Language_Processing
type Alternate_Language_Id is new Nat;
No_Alternate_Language : constant Alternate_Language_Id := 0;
type Alternate_Language_Data is record
Language : Language_Index := No_Language_Index;
Language : Language_Ptr := No_Language_Index;
Next : Alternate_Language_Id := No_Alternate_Language;
end record;
......@@ -639,7 +631,7 @@ package Prj is
Project : Project_Id := No_Project;
-- Project of the source
Language : Language_Index := No_Language_Index;
Language : Language_Ptr := No_Language_Index;
-- Index of the language. This is an index into
-- project_tree.languages_data
......@@ -1174,14 +1166,11 @@ package Prj is
-- Languages --
---------------
Languages : Name_List_Index := No_Name_List;
-- The list of languages of the sources of this project
-- mode: Ada_Only
First_Language_Processing : Language_Index := No_Language_Index;
Languages : Language_Ptr := No_Language_Index;
-- First index of the language data in the project.
-- This is an index into the project_tree_data.languages_data
-- mode: Multi_Language
-- This is an index into the project_tree_data.languages_data.
-- Traversing the list gives access to all the languages supported by
-- the project.
--------------
-- Projects --
......@@ -1391,8 +1380,7 @@ package Prj is
-- ??? needs comment
function Is_A_Language
(Tree : Project_Tree_Ref;
Data : Project_Data;
(Data : Project_Data;
Language_Name : Name_Id) return Boolean;
-- Return True when Language_Name (which must be lower case) is one of the
-- languages used for the project.
......@@ -1471,7 +1459,7 @@ package Prj is
record
-- Languages and sources of the project
First_Language : Language_Index := No_Language_Index;
First_Language : Language_Ptr := No_Language_Index;
--
First_Source : Source_Id := No_Source;
......@@ -1479,7 +1467,6 @@ package Prj is
-- Tables
Languages_Data : Language_Data_Table.Instance;
Name_Lists : Name_List_Table.Instance;
String_Elements : String_Element_Table.Instance;
Variable_Elements : Variable_Element_Table.Instance;
......
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