[Ada] Documentation of Img attribute out of date

2019-07-10  Justin Squirek  <squirek@adacore.com>

gcc/ada/

	* doc/gnat_rm/implementation_defined_attributes.rst: Add mention
	of 'Image attribute with 'Img's entry to mention additional
	added 2012 usage of Obj'Image.
	* doc/gnat_rm/implementation_defined_pragmas.rst: Correct
	mispelling of Async_Writers.
	* gnat_rm.texi: Regenerate.
	* sem_prag.adb (Analyze_Pragma): Correct mispelling of
	Async_Writers.
	* sem_util.adb (State_Has_Enabled_Property): Correct mispelling
	of Async_Writers.

From-SVN: r273344

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 7e609bdc04932ccc9d6d057d09dd4bb9d85978ed..9e9e19ddb1011d4a24f9ebe45503dd7397c82eb5 100644 (file)
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,16 @@
+2019-07-10  Justin Squirek  <squirek@adacore.com>
+
+       * doc/gnat_rm/implementation_defined_attributes.rst: Add mention
+       of 'Image attribute with 'Img's entry to mention additional
+       added 2012 usage of Obj'Image.
+       * doc/gnat_rm/implementation_defined_pragmas.rst: Correct
+       mispelling of Async_Writers.
+       * gnat_rm.texi: Regenerate.
+       * sem_prag.adb (Analyze_Pragma): Correct mispelling of
+       Async_Writers.
+       * sem_util.adb (State_Has_Enabled_Property): Correct mispelling
+       of Async_Writers.
+
 2019-07-10  Simon Buist  <buist@adacore.com>
 
        * sem_util.ads (Child_Prefix): New constant.

diff --git a/gcc/ada/doc/gnat_rm/implementation_defined_attributes.rst b/gcc/ada/doc/gnat_rm/implementation_defined_attributes.rst
index c75d9948ae8f29269b49d998f6ae1fd1cc04074b..db75ea73d8b0e1380a32eb433cc31f82e26dd1c2 100644 (file)
--- a/gcc/ada/doc/gnat_rm/implementation_defined_attributes.rst
+++ b/gcc/ada/doc/gnat_rm/implementation_defined_attributes.rst
@@ -479,17 +479,17 @@ Attribute Img
 =============
 .. index:: Img
 
-The ``Img`` attribute differs from ``Image`` in that it is applied
-directly to an object, and yields the same result as
-``Image`` for the subtype of the object.  This is convenient for
-debugging:
+The ``Img`` attribute differs from ``Image`` in that, while both can be
+applied directly to an object, ``Img`` cannot be applied to types.
+
+Example usage of the attribute:
 
 .. code-block:: ada
 
   Put_Line ("X = " & X'Img);
 
 
-has the same meaning as the more verbose:
+which has the same meaning as the more verbose:
 
 .. code-block:: ada
 

diff --git a/gcc/ada/doc/gnat_rm/implementation_defined_pragmas.rst b/gcc/ada/doc/gnat_rm/implementation_defined_pragmas.rst
index dff7798ed7d571f026c96b29c1161671305250f7..04b0def1a3a379166495f23b0e70b2f2285260e8 100644 (file)
--- a/gcc/ada/doc/gnat_rm/implementation_defined_pragmas.rst
+++ b/gcc/ada/doc/gnat_rm/implementation_defined_pragmas.rst
@@ -719,7 +719,7 @@ Syntax:
 
 .. code-block:: ada
 
-  pragma Asynch_Readers [ (boolean_EXPRESSION) ];
+  pragma Async_Readers [ (boolean_EXPRESSION) ];
 
 For the semantics of this pragma, see the entry for aspect ``Async_Readers`` in
 the SPARK 2014 Reference Manual, section 7.1.2.
@@ -733,7 +733,7 @@ Syntax:
 
 .. code-block:: ada
 
-  pragma Asynch_Writers [ (boolean_EXPRESSION) ];
+  pragma Async_Writers [ (boolean_EXPRESSION) ];
 
 For the semantics of this pragma, see the entry for aspect ``Async_Writers`` in
 the SPARK 2014 Reference Manual, section 7.1.2.

diff --git a/gcc/ada/gnat_rm.texi b/gcc/ada/gnat_rm.texi
index 77f91b0d1598c97ae81b2603d5a1bc37cf14a1d4..257c3948b8f43136a4f58b04ba6ae8d6dc25452b 100644 (file)
--- a/gcc/ada/gnat_rm.texi
+++ b/gcc/ada/gnat_rm.texi
@@ -2104,7 +2104,7 @@ case, and it is recommended that these two options not be used together.
 Syntax:
 
 @example
-pragma Asynch_Readers [ (boolean_EXPRESSION) ];
+pragma Async_Readers [ (boolean_EXPRESSION) ];
 @end example
 
 For the semantics of this pragma, see the entry for aspect @code{Async_Readers} in
@@ -2118,7 +2118,7 @@ the SPARK 2014 Reference Manual, section 7.1.2.
 Syntax:
 
 @example
-pragma Asynch_Writers [ (boolean_EXPRESSION) ];
+pragma Async_Writers [ (boolean_EXPRESSION) ];
 @end example
 
 For the semantics of this pragma, see the entry for aspect @code{Async_Writers} in
@@ -10713,16 +10713,16 @@ indicates whether or not the corresponding actual type has discriminants.
 
 @geindex Img
 
-The @code{Img} attribute differs from @code{Image} in that it is applied
-directly to an object, and yields the same result as
-@code{Image} for the subtype of the object.  This is convenient for
-debugging:
+The @code{Img} attribute differs from @code{Image} in that, while both can be
+applied directly to an object, @code{Img} cannot be applied to types.
+
+Example usage of the attribute:
 
 @example
 Put_Line ("X = " & X'Img);
 @end example
 
-has the same meaning as the more verbose:
+which has the same meaning as the more verbose:
 
 @example
 Put_Line ("X = " & T'Image (X));

diff --git a/gcc/ada/sem_prag.adb b/gcc/ada/sem_prag.adb
index 7a4857ff108f532eb3584a46eccfee9f83a8ac0e..969820ee6f28cd6679bfc2eeb998a2870f9c4c49 100644 (file)
--- a/gcc/ada/sem_prag.adb
+++ b/gcc/ada/sem_prag.adb
@@ -13620,8 +13620,8 @@ package body Sem_Prag is
          -- Async_Readers/Async_Writers/Effective_Reads/Effective_Writes --
          ------------------------------------------------------------------
 
-         --  pragma Asynch_Readers   [ (boolean_EXPRESSION) ];
-         --  pragma Asynch_Writers   [ (boolean_EXPRESSION) ];
+         --  pragma Async_Readers    [ (boolean_EXPRESSION) ];
+         --  pragma Async_Writers    [ (boolean_EXPRESSION) ];
          --  pragma Effective_Reads  [ (boolean_EXPRESSION) ];
          --  pragma Effective_Writes [ (boolean_EXPRESSION) ];
 

diff --git a/gcc/ada/sem_util.adb b/gcc/ada/sem_util.adb
index 448eea15e6d0e622bba3d2bcaec568e029de6303..b6a31e6a9c846666270db82133c4e5b8f68a7464 100644 (file)
--- a/gcc/ada/sem_util.adb
+++ b/gcc/ada/sem_util.adb
@@ -10813,8 +10813,8 @@ package body Sem_Util is
          --  Simple option Synchronous
          --
          --    enables                disables
-         --       Asynch_Readers         Effective_Reads
-         --       Asynch_Writers         Effective_Writes
+         --       Async_Readers          Effective_Reads
+         --       Async_Writers          Effective_Writes
          --
          --  Note that both forms of External have higher precedence than
          --  Synchronous (SPARK RM 7.1.4(9)).