diff options
| author | Arnaud Charlet <charlet@gcc.gnu.org> | 2008-08-05 11:14:48 +0200 |
|---|---|---|
| committer | Arnaud Charlet <charlet@gcc.gnu.org> | 2008-08-05 11:14:48 +0200 |
| commit | 0df218a9a7fd4756b2ac9f49f27740cf4c92894d (patch) | |
| tree | cc13f338881f4b355c6a43a0c3d594d7a2e9ccb1 /gcc/ada/prj-util.adb | |
| parent | 9cc014f915575184a59397c619626f221cc9d706 (diff) | |
| download | gcc-0df218a9a7fd4756b2ac9f49f27740cf4c92894d.zip gcc-0df218a9a7fd4756b2ac9f49f27740cf4c92894d.tar.gz gcc-0df218a9a7fd4756b2ac9f49f27740cf4c92894d.tar.bz2 | |
make.adb (Switches_Of): Check for Switches (others), before checking for Default_Switches ("Ada").
2008-08-05 Vincent Celier <celier@adacore.com>
* make.adb (Switches_Of): Check for Switches (others), before checking
for Default_Switches ("Ada").
(Gnatmake): Use Builder'Switches (others) in preference to
Builder'Default_Switches ("Ada") if there are several mains.
* prj-attr-pm.adb:
(Add_Attribute): Add component Others_Allowed in Attribute_Record
aggregate.
* prj-attr.adb:
Add markers to indicates that attributes Switches allow others as index
(Others_Allowed_For): New Boolean function, returning True for
attributes with the mark.
(Initialize): Recognize optional letter 'O' as the marker for
associative array attributes where others is allowed as the index.
* prj-attr.ads:
(Others_Allowed_For): New Boolean function
(Attribute_Record): New Boolean component Others_Allowed
* prj-dect.adb:
(Parse_Attribute_Declaration): For associative array attribute where
others is allowed as the index, allow others as an index.
* prj-nmsc.adb:
(Process_Binder): Skip associative array attributes with index others
(Process_Compiler): Ditto
* prj-util.adb:
(Value_Of (Index, In_Array)): Make no attempt to put in lower case when
index is All_Other_Names.
* prj.ads:
(All_Other_Names): New constant
From-SVN: r138683
Diffstat (limited to 'gcc/ada/prj-util.adb')
| -rw-r--r-- | gcc/ada/prj-util.adb | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/gcc/ada/prj-util.adb b/gcc/ada/prj-util.adb index 2f953a3..5894e4d 100644 --- a/gcc/ada/prj-util.adb +++ b/gcc/ada/prj-util.adb @@ -600,9 +600,11 @@ package body Prj.Util is Real_Index_1 := Index; if not Element.Index_Case_Sensitive or Force_Lower_Case_Index then - Get_Name_String (Index); - To_Lower (Name_Buffer (1 .. Name_Len)); - Real_Index_1 := Name_Find; + if Index /= All_Other_Names then + Get_Name_String (Index); + To_Lower (Name_Buffer (1 .. Name_Len)); + Real_Index_1 := Name_Find; + end if; end if; while Current /= No_Array_Element loop @@ -610,9 +612,11 @@ package body Prj.Util is Real_Index_2 := Element.Index; if not Element.Index_Case_Sensitive or Force_Lower_Case_Index then - Get_Name_String (Element.Index); - To_Lower (Name_Buffer (1 .. Name_Len)); - Real_Index_2 := Name_Find; + if Element.Index /= All_Other_Names then + Get_Name_String (Element.Index); + To_Lower (Name_Buffer (1 .. Name_Len)); + Real_Index_2 := Name_Find; + end if; end if; if Real_Index_1 = Real_Index_2 and then |