summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/ada/ChangeLog5
-rw-r--r--gcc/ada/prj-attr.ads14
-rw-r--r--gcc/ada/prj-tree.adb4
3 files changed, 21 insertions, 2 deletions
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 29b606b9b17..1f6be285147 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,8 @@
+2009-11-30 Emmanuel Briot <briot@adacore.com>
+
+ * prj-tree.adb (Create_Attribute): Fix handling of VMS and Windows
+ * prj-attr.ads: Minor comment updates
+
2009-11-30 Robert Dewar <dewar@adacore.com>
* gnat_rm.texi: Document pragma Short_Circuit
diff --git a/gcc/ada/prj-attr.ads b/gcc/ada/prj-attr.ads
index a8f9e15412e..6fad3f0a0dc 100644
--- a/gcc/ada/prj-attr.ads
+++ b/gcc/ada/prj-attr.ads
@@ -46,15 +46,27 @@ package Prj.Attr is
type Attribute_Kind is
(Unknown,
+ -- The attribute does not exist
+
Single,
+ -- Single variable attribute (not an associative array)
+
Associative_Array,
+ -- Associative array attribute with a case sensitive index
+
Optional_Index_Associative_Array,
+ -- Associative array attribute with a case sensitive index and an
+ -- optional source index.
+
Case_Insensitive_Associative_Array,
+ -- Associative array attribute with a case insensitive index
+
Optional_Index_Case_Insensitive_Associative_Array);
+ -- Associative array attribute with a case insensitive index and an
+ -- optional source index.
-- Characteristics of an attribute. Optional_Index indicates that there
-- may be an optional index in the index of the associative array, as in
-- for Switches ("files.ada" at 2) use ...
- -- Above character literals should be documented ???
subtype Defined_Attribute_Kind is Attribute_Kind
range Single .. Optional_Index_Case_Insensitive_Associative_Array;
diff --git a/gcc/ada/prj-tree.adb b/gcc/ada/prj-tree.adb
index 27e3520ce70..b35d889962a 100644
--- a/gcc/ada/prj-tree.adb
+++ b/gcc/ada/prj-tree.adb
@@ -3078,7 +3078,9 @@ package body Prj.Tree is
if At_Index /= 0 then
if Attribute_Kind_Of (Start_At) =
- Optional_Index_Associative_Array
+ Optional_Index_Associative_Array
+ or else Attribute_Kind_Of (Start_At) =
+ Optional_Index_Case_Insensitive_Associative_Array
then
-- Results in: for Name ("index" at index) use "value";
-- This is currently only used for executables