boostorg/iterator
1
0
Fork 1
mirror of https://github.com/boostorg/iterator.git synced 2025-07-21 16:42:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

Made what I thought were the right fixes

Browse Source 
[SVN r23519]
This commit is contained in:
Dave Abrahams
2004-07-14 01:19:14 +00:00
parent edb7528136
commit 539add7de6
1 changed files with 34 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
doc/new-iter-concepts.rst
View File

@ -431,10 +431,13 @@ iterator.
|``*a`` | ``T&`` |``T`` is *cv* | |``*a`` | ``T&`` |``T`` is *cv* |
| | |``iterator_traits<X>::value_type`` | | | |``iterator_traits<X>::value_type`` |
| | |where *cv* is an optional | | | |where *cv* is an optional |
| | |cv-qualification. | | | |cv-qualification. pre: ``a`` is |
| | |pre: ``a`` is | | | |dereferenceable. If ``X`` is a |
| | |dereferenceable. ``a == b`` if and | | | |*Writable Iterator* then ``a == b``|
| | |only if ``*a`` is the same object | | | |if and only if ``*a`` is the same |
| | |object as ``*b``. If ``X`` is a |
| | |*Readable Iterator* then ``a == b``|
| | |implies ``*a`` is the same object |
| | |as ``*b``. | | | |as ``*b``. |
+-------------+-----------+-----------------------------------+ +-------------+-----------+-----------------------------------+
@ -458,26 +461,31 @@ Constructible, the following expressions are valid and respect the
stated semantics. stated semantics.
+-----------------------------------------------------------------------------------------------------------+ +----------------------------------------------------------------------------------------+
|Incrementable Iterator Requirements (in addition to Assignable, Copy Constructible) | |Incrementable Iterator Requirements (in addition to Assignable, Copy Constructible) |
| | | |
+--------------------------------+----------------------------------+---------------------------------------+ +--------------------------------+-------------------------------+-----------------------+
|Expression |Return Type |Assertion/Semantics | |Expression |Return Type |Assertion/Semantics |
+================================+==================================+=======================================+ +================================+===============================+=======================+
|``++r`` |``X&`` |``&r == &++r`` | |``++r`` |``X&`` |``&r == &++r`` |
+--------------------------------+----------------------------------+---------------------------------------+ +--------------------------------+-------------------------------+-----------------------+
|``r++`` |if ``X`` is a *Writable Iterator* |if ``X`` is a *Writable Iterator* then | |``r++`` |convertible to ``const X&`` |``X a(r++);`` is |
| |then convertible to ``const X&`` |``X a(r++);`` is equivalent to | | | |equivalent to ``X a(r);|
| | |``X a(r); ++r;`` otherwise ``r++`` | | | |++r;`` |
| | |is equivalent to ``++r`` | +--------------------------------+-------------------------------+-----------------------+
+--------------------------------+----------------------------------+---------------------------------------+ |``*r++`` |if ``X`` is a *Readable |If ``X`` is a *Readable|
|``*r++`` |if ``X`` is a *Readable Iterator* |if ``X`` is a *Readable Iterator* then | | |Iterator* then ``T`` |Iterator* then ``T |
| |then ``T`` |``T z(*r++);`` is equivalent to | | | |z(*r++);`` is |
| | |``T z(*r); ++r;`` | | | |equivalent to ``T |
+--------------------------------+----------------------------------+---------------------------------------+ | | |z(*r); ++r;``. If ``X``|
| | |is a *Writable |
| | |Iterator* then ``*r++ =|
| | |o`` is equivalent to |
| | |``*r = o; ++r``. |
+--------------------------------+-------------------------------+-----------------------+
|``iterator_traversal<X>::type`` |Convertible to | | |``iterator_traversal<X>::type`` |Convertible to | |
| |``incrementable_traversal_tag`` | | | |``incrementable_traversal_tag``| |
+--------------------------------+----------------------------------+---------------------------------------+ +--------------------------------+-------------------------------+-----------------------+
.. TR1: incrementable_iterator_tag changed to .. TR1: incrementable_iterator_tag changed to
incrementable_traversal_tag for consistency. incrementable_traversal_tag for consistency.
@ -521,12 +529,7 @@ Forward Traversal Iterators [lib.forward.traversal.iterators]
A class or built-in type ``X`` models the *Forward Traversal Iterator* A class or built-in type ``X`` models the *Forward Traversal Iterator*
concept if, in addition to ``X`` meeting the requirements of Default concept if, in addition to ``X`` meeting the requirements of Default
Constructible and Single Pass Iterator, the following expressions are Constructible and Single Pass Iterator, the following expressions are
valid and respect the stated semantics. Also, if ``X`` is a *Readable valid and respect the stated semantics.
Iterator* with ``a`` and ``b`` dereferenceable, then ``a == b`` if and
only if ``*a`` and ``*b`` are the same object. If ``X`` is a
*Writable Iterator*, then ``a == b`` if and only if ``*a = o`` and
``*b = o`` write ``o`` to the same location.
+--------------------------------------------------------------------------------------------------------+ +--------------------------------------------------------------------------------------------------------+
|Forward Traversal Iterator Requirements (in addition to Default Constructible and Single Pass Iterator) | |Forward Traversal Iterator Requirements (in addition to Default Constructible and Single Pass Iterator) |