OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

2008-08-05 Vincent Celier <celier@adacore.com>

Browse Source 
* prj-proc.adb:
	(Process_Declarative_Items): Skip associative array attribute when index
	is reserved word "others".

From-SVN: r138681
This commit is contained in:
Vincent Celier 2008-08-05 11:14:03 +02:00 committed by Arnaud Charlet
parent 646acd10c8
commit 215aeb6755
1 changed files with 39 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
gcc/ada/prj-proc.adb
View File

@ -1891,51 +1891,53 @@ package body Prj.Proc is
-- Associative array attribute
else
-- Get the string index
Get_Name_String
(Associative_Array_Index_Of
(Current_Item, From_Project_Node_Tree));
-- Put in lower case, if necessary
declare
Lower : Boolean;
begin
Lower :=
Case_Insensitive
Index_Name : Name_Id :=
Associative_Array_Index_Of
(Current_Item, From_Project_Node_Tree);
-- In multi-language mode (gprbuild), the index is
-- always case insensitive if it does not include
-- any dot.
if Get_Mode = Multi_Language and then not Lower then
for J in 1 .. Name_Len loop
if Name_Buffer (J) = '.' then
Lower := False;
exit;
end if;
end loop;
end if;
if Lower then
GNAT.Case_Util.To_Lower
(Name_Buffer (1 .. Name_Len));
end if;
end;
declare
Lower : Boolean;
The_Array : Array_Id;
The_Array_Element : Array_Element_Id :=
No_Array_Element;
Index_Name : constant Name_Id := Name_Find;
-- The name id of the index
begin
if Index_Name /= All_Other_Names then
-- Get the string index
Get_Name_String
(Associative_Array_Index_Of
(Current_Item, From_Project_Node_Tree));
-- Put in lower case, if necessary
Lower :=
Case_Insensitive
(Current_Item, From_Project_Node_Tree);
-- In multi-language mode (gprbuild), the index
-- is always case insensitive if it does not
-- include any dot.
if Get_Mode = Multi_Language
and then not Lower
then
for J in 1 .. Name_Len loop
if Name_Buffer (J) = '.' then
Lower := False;
exit;
end if;
end loop;
end if;
if Lower then
GNAT.Case_Util.To_Lower
(Name_Buffer (1 .. Name_Len));
end if;
Index_Name := Name_Find;
end if;
-- Look for the array in the appropriate list
if Pkg /= No_Package then