aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Brosgol <brosgol@adacore.com>2018-01-11 08:52:55 +0000
committerPierre-Marie de Rodat <pmderodat@gcc.gnu.org>2018-01-11 08:52:55 +0000
commitf5c31a469e156fdaf989ac327904ee523ec05df9 (patch)
treea9fd72489886abfeaf7d2fabac8e2e93258e296f
parent07733aa11e136aa6e1fa24e12e662489a9225bf2 (diff)
downloadgcc-f5c31a469e156fdaf989ac327904ee523ec05df9.zip
gcc-f5c31a469e156fdaf989ac327904ee523ec05df9.tar.gz
gcc-f5c31a469e156fdaf989ac327904ee523ec05df9.tar.bz2
[Ada] Minor type/wording corrections
2018-01-11 Ben Brosgol <brosgol@adacore.com> gcc/ada/ * doc/gnat_rm/implementation_defined_aspects.rst: Minor type/wording corrections. * gnat_rm.texi: Regenerate. From-SVN: r256505
-rw-r--r--gcc/ada/ChangeLog6
-rw-r--r--gcc/ada/doc/gnat_rm/implementation_defined_aspects.rst6
-rw-r--r--gcc/ada/gnat_rm.texi11
3 files changed, 12 insertions, 11 deletions
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index ec9eeaa..538bd90 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,9 @@
+2018-01-11 Ben Brosgol <brosgol@adacore.com>
+
+ * doc/gnat_rm/implementation_defined_aspects.rst: Minor type/wording
+ corrections.
+ * gnat_rm.texi: Regenerate.
+
2018-01-11 Ed Schonberg <schonberg@adacore.com>
* sem_ch12.adb (Check_Fixed_Point_Type): Do not apply check if the
diff --git a/gcc/ada/doc/gnat_rm/implementation_defined_aspects.rst b/gcc/ada/doc/gnat_rm/implementation_defined_aspects.rst
index c601822..0fa4476 100644
--- a/gcc/ada/doc/gnat_rm/implementation_defined_aspects.rst
+++ b/gcc/ada/doc/gnat_rm/implementation_defined_aspects.rst
@@ -302,14 +302,14 @@ Aspect Iterable
This aspect provides a light-weight mechanism for loops and quantified
expressions over container types, without the overhead imposed by the tampering
checks of standard Ada 2012 iterators. The value of the aspect is an aggregate
-with six named components, or which the last three are optional: ``First``,
- ``Next``, ``Has_Element``,``Element``, ``Last``, and ``Previous``.
+with six named components, of which the last three are optional: ``First``,
+``Next``, ``Has_Element``, ``Element``, ``Last``, and ``Previous``.
When only the first three components are specified, only the
``for .. in`` form of iteration over cursors is available. When ``Element``
is specified, both this form and the ``for .. of`` form of iteration over
elements are available. If the last two components are specified, reverse
iterations over the container can be specified (analogous to what can be done
-over predefined containers that support the Reverse_Iterator interface).
+over predefined containers that support the ``Reverse_Iterator`` interface).
The following is a typical example of use:
.. code-block:: ada
diff --git a/gcc/ada/gnat_rm.texi b/gcc/ada/gnat_rm.texi
index 50eac85..4c14cae 100644
--- a/gcc/ada/gnat_rm.texi
+++ b/gcc/ada/gnat_rm.texi
@@ -9415,19 +9415,14 @@ that it is separately controllable using pragma @code{Assertion_Policy}.
This aspect provides a light-weight mechanism for loops and quantified
expressions over container types, without the overhead imposed by the tampering
checks of standard Ada 2012 iterators. The value of the aspect is an aggregate
-with six named components, or which the last three are optional: @code{First},
-
-@quotation
-
-@code{Next}, @code{Has_Element},`@w{`}Element`@w{`}, @code{Last}, and @code{Previous}.
-@end quotation
-
+with six named components, of which the last three are optional: @code{First},
+@code{Next}, @code{Has_Element}, @code{Element}, @code{Last}, and @code{Previous}.
When only the first three components are specified, only the
@code{for .. in} form of iteration over cursors is available. When @code{Element}
is specified, both this form and the @code{for .. of} form of iteration over
elements are available. If the last two components are specified, reverse
iterations over the container can be specified (analogous to what can be done
-over predefined containers that support the Reverse_Iterator interface).
+over predefined containers that support the @code{Reverse_Iterator} interface).
The following is a typical example of use:
@example