aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorArnaud Charlet <charlet@gcc.gnu.org>2014-07-30 12:04:05 +0200
committerArnaud Charlet <charlet@gcc.gnu.org>2014-07-30 12:04:05 +0200
commiteb16ddf8ed7f0b7ec30c86895a16f0fa7c7c6e26 (patch)
tree10a3171287a91012cfa11f8661ba4ae01e604615 /gcc
parent66288b9c114af04fb3c726c20a96c6baf1d84236 (diff)
downloadgcc-eb16ddf8ed7f0b7ec30c86895a16f0fa7c7c6e26.zip
gcc-eb16ddf8ed7f0b7ec30c86895a16f0fa7c7c6e26.tar.gz
gcc-eb16ddf8ed7f0b7ec30c86895a16f0fa7c7c6e26.tar.bz2
[multiple changes]
2014-07-30 Vincent Celier <celier@adacore.com> * prj-strt.adb: Minor comment update. 2014-07-30 Robert Dewar <dewar@adacore.com> * gnat_rm.texi: Document additional implementation-defined use of Constrained. From-SVN: r213239
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ada/ChangeLog5
-rw-r--r--gcc/ada/gnat_rm.texi17
-rw-r--r--gcc/ada/prj-strt.adb6
3 files changed, 26 insertions, 2 deletions
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 0180787..63b1ea0 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,5 +1,10 @@
2014-07-30 Robert Dewar <dewar@adacore.com>
+ * gnat_rm.texi: Document additional implementation-defined use
+ of Constrained.
+
+2014-07-30 Robert Dewar <dewar@adacore.com>
+
* prj-proc.adb, prj-strt.adb: Update comments.
2014-07-30 Gary Dismukes <dismukes@adacore.com>
diff --git a/gcc/ada/gnat_rm.texi b/gcc/ada/gnat_rm.texi
index e08b14d..cbba19b 100644
--- a/gcc/ada/gnat_rm.texi
+++ b/gcc/ada/gnat_rm.texi
@@ -347,6 +347,7 @@ Implementation Defined Attributes
* Attribute Bit_Position::
* Attribute Code_Address::
* Attribute Compiler_Version::
+* Attribute Constrained::
* Attribute Default_Bit_Order::
* Attribute Descriptor_Size::
* Attribute Elaborated::
@@ -8584,6 +8585,7 @@ consideration, you should minimize the use of these attributes.
* Attribute Bit_Position::
* Attribute Code_Address::
* Attribute Compiler_Version::
+* Attribute Constrained::
* Attribute Default_Bit_Order::
* Attribute Descriptor_Size::
* Attribute Elaborated::
@@ -8808,7 +8810,20 @@ attribute.
@code{Standard'Compiler_Version} (@code{Standard} is the only allowed
prefix) yields a static string identifying the version of the compiler
being used to compile the unit containing the attribute reference. A
-typical result would be something like "@value{EDITION} @value{gnat_version} (20090221)".
+typical result would be something like
+"@value{EDITION} @value{gnat_version} (20090221)".
+
+@node Attribute Constrained
+@unnumberedsec Attribute Constrained
+@findex Constrained
+@noindent
+In addition to the usage of this attribute in the Ada RM, @code{GNAT}
+also permits the use of the @code{'Constrained} attribute
+in a generic template
+for any type, including types without discriminants. The value of this
+attribute in the generic instance when applied to a type without
+discriminants is always @code{True}. This usage is compatible with
+older Ada compilers, including notably DEC Ada.
@node Attribute Default_Bit_Order
@unnumberedsec Attribute Default_Bit_Order
diff --git a/gcc/ada/prj-strt.adb b/gcc/ada/prj-strt.adb
index f7cd336..a4c8ce0 100644
--- a/gcc/ada/prj-strt.adb
+++ b/gcc/ada/prj-strt.adb
@@ -1182,7 +1182,11 @@ package body Prj.Strt is
exit when Present (Current_Variable);
- -- Please document this new test ???
+ -- If the current project is a child project, check if
+ -- the variable is declared in its parent. Otherwise, if
+ -- the current project extends another project, check if
+ -- the variable is declared in one of the projects the
+ -- current project extends.
if No (Parent_Project_Of (Proj, In_Tree)) then
Proj :=