[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

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 0180787f9d6a577383204d72fd1483505c648214..63b1ea071162b11e445422e5db7ed0ed990f1e0e 100644 (file)
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,8 @@
+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.

diff --git a/gcc/ada/gnat_rm.texi b/gcc/ada/gnat_rm.texi
index e08b14d531aa8fc953aac04d7e7f000d50c01b4a..cbba19bc1ec8219cd898e9b95103a901e9a7d19d 100644 (file)
--- 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 f7cd336bb40b4fdc44a5d6736e589ec96441d80b..a4c8ce04b3aac8483aa39efaf5eebb57500821cc 100644 (file)
--- 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 :=