diff --git a/doc/facade-and-adaptor.html b/doc/facade-and-adaptor.html index ca810a4..3750a32 100755 --- a/doc/facade-and-adaptor.html +++ b/doc/facade-and-adaptor.html @@ -3,11 +3,11 @@
- +Iterators play an important role in modern C++ programming. The iterator is the central abstraction of the algorithms of the Standard Library, allowing algorithms to be re-used in in a wide variety of @@ -207,15 +211,15 @@ applies some user-specified function during the dereference of the iterator.
This proposal is purely an addition to the C++ standard library. However, note that this proposal relies on the proposal for New Iterator Concepts.
This proposal is formulated in terms of the new iterator concepts as proposed in n1477, since user-defined and especially adapted iterators suffer from the well known categorization problems that are @@ -225,7 +229,7 @@ is a direct mapping between new and old categories. This proposal could be reformulated using this mapping if n1477 was not accepted.
The question of iterator interoperability is poorly addressed in the current standard. There are currently two defect reports that are concerned with interoperability issues.
@@ -245,7 +249,7 @@ fixes the issues raised in 280. It provides the desired interoperability without introducing unwanted overloads.While the iterator interface is rich, there is a core subset of the interface that is necessary for all the functionality. We have identified the following core behaviors for iterators:
@@ -284,7 +288,7 @@ impossible.The user of iterator_facade derives his iterator class from an instantiation of iterator_facade which takes the derived iterator class as the first template parameter. The order of the other @@ -300,7 +304,7 @@ of the derived iterator type. These member functions are described briefly below and in more detail in the iterator facade requirements.
-+
@@ -347,7 +351,7 @@ Iterator or a more-refined iterator concept, a default constructor is required. -Iterator Core Access
+Iterator Core Access
iterator_facade and the operator implementations need to be able to access the core member functions in the derived class. Making the core member functions public would expose an implementation detail to @@ -381,7 +385,7 @@ open a safety loophole, as every core member function preserves the invariants of the iterator.
-operator[]
+operator[]
The indexing operator for a generalized iterator presents special challenges. A random access iterator's operator[] is only required to return something convertible to its value_type. @@ -402,7 +406,7 @@ iterator class; it will hide the one supplied by
-operator->
+operator->
The reference type of a readable iterator (and today's input iterator) need not in fact be a reference, so long as it is convertible to the iterator's value_type. When the value_type @@ -424,7 +428,7 @@ Patterns, C++ Report, February 1995, pp. 24-27.
-Iterator Adaptor
+Iterator Adaptor
The iterator_adaptor class template adapts some Base 3 type to create a new iterator. Instantiations of iterator_adaptor are derived from a corresponding instantiation of iterator_facade @@ -460,7 +464,7 @@ template parameter may not always be identical to the iterator's assumption.
-Specialized Adaptors
+Specialized Adaptors
This proposal also contains several examples of specialized adaptors which were easily implemented using iterator_adaptor:
@@ -497,9 +501,9 @@ Standard compliant iterators).
-Proposed Text
+Proposed Text
-Header <iterator_helper> synopsis [lib.iterator.helper.synopsis]
+Header <iterator_helper> synopsis [lib.iterator.helper.synopsis]
struct use_default; @@ -560,15 +564,345 @@ class function_output_iterator;-Iterator facade [lib.iterator.facade]
-..include:: iterator_facade_abstract.rst
+Iterator facade [lib.iterator.facade]
+iterator_facade is a base class template that implements the +interface of standard iterators in terms of a few core functions +and associated types, to be supplied by a derived iterator class.
-Class template iterator_facade
-..include:: iterator_facade_ref.rst
+Class template iterator_facade
++template < + class Derived + , class Value + , class AccessCategory + , class TraversalCategory + , class Reference = /* see below */ + , class Difference = ptrdiff_t +> +class iterator_facade { +public: + typedef remove_cv<Value>::type value_type; + typedef Reference reference; + typedef /* see description of operator-> */ pointer; + typedef Difference difference_type; + typedef iterator_tag<AccessCategory, TraversalCategory> iterator_category; + + reference operator*() const; + /* see below */ operator->() const; + /* see below */ operator[](difference_type n) const; + Derived& operator++(); + Derived operator++(int); + Derived& operator--(); + Derived operator--(int); + Derived& operator+=(difference_type n); + Derived& operator-=(difference_type n); + Derived operator-(difference_type n) const; +}; + +// Comparison operators +template <class Dr1, class V1, class AC1, class TC1, class R1, class D1, + class Dr2, class V2, class AC2, class TC2, class R2, class D2> +typename enable_if_interoperable<Dr1, Dr2, bool>::type // exposition +operator ==(iterator_facade<Dr1, V1, AC1, TC1, R1, D1> const& lhs, + iterator_facade<Dr2, V2, AC2, TC2, R2, D2> const& rhs); + +template <class Dr1, class V1, class AC1, class TC1, class R1, class D1, + class Dr2, class V2, class AC2, class TC2, class R2, class D2> +typename enable_if_interoperable<Dr1, Dr2, bool>::type +operator !=(iterator_facade<Dr1, V1, AC1, TC1, R1, D1> const& lhs, + iterator_facade<Dr2, V2, AC2, TC2, R2, D2> const& rhs); + +template <class Dr1, class V1, class AC1, class TC1, class R1, class D1, + class Dr2, class V2, class AC2, class TC2, class R2, class D2> +typename enable_if_interoperable<Dr1, Dr2, bool>::type +operator <(iterator_facade<Dr1, V1, AC1, TC1, R1, D1> const& lhs, + iterator_facade<Dr2, V2, AC2, TC2, R2, D2> const& rhs); + +template <class Dr1, class V1, class AC1, class TC1, class R1, class D1, + class Dr2, class V2, class AC2, class TC2, class R2, class D2> +typename enable_if_interoperable<Dr1, Dr2, bool>::type +operator <=(iterator_facade<Dr1, V1, AC1, TC1, R1, D1> const& lhs, + iterator_facade<Dr2, V2, AC2, TC2, R2, D2> const& rhs); + +template <class Dr1, class V1, class AC1, class TC1, class R1, class D1, + class Dr2, class V2, class AC2, class TC2, class R2, class D2> +typename enable_if_interoperable<Dr1, Dr2, bool>::type +operator >(iterator_facade<Dr1, V1, AC1, TC1, R1, D1> const& lhs, + iterator_facade<Dr2, V2, AC2, TC2, R2, D2> const& rhs); + +template <class Dr1, class V1, class AC1, class TC1, class R1, class D1, + class Dr2, class V2, class AC2, class TC2, class R2, class D2> +typename enable_if_interoperable<Dr1, Dr2, bool>::type +operator >=(iterator_facade<Dr1, V1, AC1, TC1, R1, D1> const& lhs, + iterator_facade<Dr2, V2, AC2, TC2, R2, D2> const& rhs); + +template <class Dr1, class V1, class AC1, class TC1, class R1, class D1, + class Dr2, class V2, class AC2, class TC2, class R2, class D2> +typename enable_if_interoperable<Dr1, Dr2, bool>::type +operator >=(iterator_facade<Dr1, V1, AC1, TC1, R1, D1> const& lhs, + iterator_facade<Dr2, V2, AC2, TC2, R2, D2> const& rhs); + +// Iterator difference +template <class Dr1, class V1, class AC1, class TC1, class R1, class D1, + class Dr2, class V2, class AC2, class TC2, class R2, class D2> +typename enable_if_interoperable<Dr1, Dr2, bool>::type +operator -(iterator_facade<Dr1, V1, AC1, TC1, R1, D1> const& lhs, + iterator_facade<Dr2, V2, AC2, TC2, R2, D2> const& rhs); + +// Iterator addition +template <class Derived, class V, class AC, class TC, class R, class D> +Derived operator+ (iterator_facade<Derived, V, AC, TC, R, D> const&, + typename Derived::difference_type n) ++[Note: The enable_if_interoperable template used above is for exposition +purposes. The member operators should be only be in an overload set +provided the derived types Dr1 and Dr2 are interoperable, by +which we mean they are convertible to each other. The +enable_if_interoperable approach uses SFINAE to take the operators +out of the overload set when the types are not interoperable.]
+ +++iterator_facade requirements
+The Derived template parameter must be a class derived from +iterator_facade.
+The default for the Reference parameter is Value& if the +access category for iterator_facade is implicitly convertible to +writable_iterator_tag, and const Value& otherwise.
+The following table describes the other requirements on the +Derived parameter. Depending on the resulting iterator's +iterator_category, a subset of the expressions listed in the table +are required to be valid. The operations in the first column must be +accessible to member functions of class iterator_core_access.
+In the table below, X is the derived iterator type, a is an +object of type X, b and c are objects of type const X, +n is an object of X::difference_type, y is a constant +object of a single pass iterator type interoperable with X, and z +is a constant object of a random access traversal iterator type +interoperable with X.
++
+ ++ + ++ + + + + + + Expression +Return Type +Assertion/Note +Required to implement +Iterator Concept(s) ++ c.dereference() +X::reference ++ Readable Iterator, Writable +Iterator ++ c.equal(b) +convertible to bool +true iff b and c are +equivalent. +Single Pass Iterator ++ c.equal(y) +convertible to bool +true iff c and y refer to the +same position. Implements c == y +and c != y. +Single Pass Iterator ++ a.advance(n) +unused ++ Random Access Traversal +Iterator ++ a.increment() +unused ++ Incrementable Iterator ++ a.decrement() +unused ++ Bidirectional Traversal +Iterator ++ c.distance_to(b) +convertible to +X::difference_type +equivalent to distance(c, b) +Random Access Traversal +Iterator ++ + c.distance_to(z) +convertible to +X::difference_type +equivalent to distance(c, z). +Implements c - z, c < z, c +<= z, c > z, and c >= c. +Random Access Traversal +Iterator ++iterator_facade operations
+The operations in this section are described in terms of operations on +the core interface of Derived which may be inaccessible +(i.e. private). The implementation should access these operations +through member functions of class iterator_core_access.
+reference operator*() const;
++
++ + + + + Returns: static_cast<Derived const*>(this)->dereference() +operator->() const; (see below)
++
++ + + + + Returns: + If X::reference is a reference type, returns an object +of type X::pointer equal to:
++&static_cast<Derived const*>(this)->dereference() ++Otherwise returns an object of unspecified type such that, given an +object a of type X, a->m is equivalent to (w = *a, +w.m) for some temporary object w of type X::value_type.
+The type X::pointer is Value* if the access category for +X is implicitly convertible to writable_iterator_tag, and +Value const* otherwise.
+unspecified operator[](difference_type n) const;
++
++ + + + + Returns: an object convertible to X::reference and holding a copy +p of a+n such that, for a constant object v of type +X::value_type, X::reference(a[n] = v) is equivalent +to p = v. +Derived& operator++();
++
+ ++ + + + + Effects: + +static_cast<Derived*>(this)->increment(); +return *this; ++Derived operator++(int);
++
++ + + + + Effects: + +Derived tmp(static_cast<Derived const*>(this)); +++*this; +return tmp; ++Derived& operator--();
++
++ + + + + Effects: + +static_cast<Derived*>(this)->decrement(); +return *this; ++Derived operator--(int);
++
++ + + + + Effects: + +Derived tmp(static_cast<Derived const*>(this)); +--*this; +return tmp; ++Derived& operator+=(difference_type n);
++
++ + + + + Effects: + +static_cast<Derived*>(this)->advance(n); +return *this; ++Derived& operator-=(difference_type n);
++
++ + + + + Effects: + +static_cast<Derived*>(this)->advance(-n); +return *this; ++Derived operator-(difference_type n) const;
++
++ + + + Effects: Derived tmp(static_cast<Derived const*>(this)); +return tmp -= n; ++ + Returns: static_cast<Derived const*>(this)->advance(-n); +-Iterator adaptor [lib.iterator.adaptor]
+Iterator adaptor [lib.iterator.adaptor]
The iterator_adaptor is a base class template derived from an instantiation of iterator_facade. The core interface functions expected by iterator_facade are implemented in terms of the @@ -580,7 +914,7 @@ depends on the operations supported by the iterator_facade are redefined in the Derived class.
-Class template iterator_adaptor
+Class template iterator_adaptor
template < class Derived @@ -625,7 +959,7 @@ class iterator_adaptor-iterator_adaptor requirements
+iterator_adaptor requirements
The Derived template parameter must be a derived class of iterator_adaptor. The Base type must implement the expressions involving m_iterator in the specifications of those private member @@ -679,7 +1013,7 @@ else iterator_category = Category; -->
-iterator_adaptor public operations
+iterator_adaptor public operations
iterator_adaptor();
@@ -713,7 +1047,7 @@ else -iterator_adaptor protected member functions
+iterator_adaptor protected member functions
Base const& base_reference() const;
@@ -734,7 +1068,7 @@ else -iterator_adaptor private member functions
+iterator_adaptor private member functions
typename iterator_adaptor::reference dereference() const;
@@ -803,7 +1137,7 @@ typename iterator_adaptor::difference_type distance_to( -Specialized adaptors [lib.iterator.special.adaptors]
+Specialized adaptors [lib.iterator.special.adaptors]
[Note: The enable_if_convertible<X,Y>::type expression used in @@ -814,7 +1148,7 @@ type Y. The -
Indirect iterator
+Indirect iterator
The indirect iterator adapts an iterator by applying an extra dereference inside of operator*(). For example, this iterator adaptor makes it possible to view a container of pointers @@ -823,7 +1157,7 @@ adaptor makes it possible to view a container of pointers
-Class template indirect_iterator
+Class template indirect_iterator
template < class Iterator @@ -858,7 +1192,7 @@ private: // as-if specification-indirect_iterator requirements
+indirect_iterator requirements
The value_type of the Iterator template parameter should itself be dereferenceable. The return type of the operator* for the value_type must be the same type as the Reference template @@ -883,7 +1217,7 @@ iterator will model the most refined standard access concept that is modeled by the value type of Iterator.
-indirect_iterator operations
+indirect_iterator operations
indirect_iterator();
@@ -931,13 +1265,13 @@ indirect_iterator( -Reverse iterator
+Reverse iterator
The reverse iterator adaptor flips the direction of a base iterator's motion. Invoking operator++() moves the base iterator backward and invoking operator--() moves the base iterator forward.
-Class template reverse_iterator
+Class template reverse_iterator
template <class Iterator> class reverse_iterator : @@ -976,7 +1310,7 @@ private: // as-if specification-reverse_iterator requirements
+reverse_iterator requirements
The base Iterator must be a model of Bidirectional Traversal Iterator. The resulting reverse_iterator will be a model of the most refined standard traversal and access concepts that are modeled @@ -1023,14 +1357,14 @@ reverse_iterator(
-Transform iterator
+Transform iterator
The transform iterator adapts an iterator by applying some function object to the result of dereferencing the iterator. In other words, the operator* of the transform iterator first dereferences the base iterator, passes the result of this to the function object, and then returns the result.
-Class template transform_iterator
+Class template transform_iterator
template <class AdaptableUnaryFunction, class Iterator, @@ -1058,7 +1392,7 @@ private:-transform_iterator requirements
+transform_iterator requirements
The type AdaptableUnaryFunction must be Assignable, Copy Constructible, and the expression f(x) must be valid where f is an object of type AdaptableUnaryFunction, x is an object of @@ -1083,7 +1417,7 @@ concept that is modeled by Iterator result_type.
-transform_iterator public operations
+transform_iterator public operations
transform_iterator();
@@ -1132,7 +1466,7 @@ transform_iterator( -transform_iterator private operations
+transform_iterator private operations
typename transform_iterator::value_type dereference() const;
@@ -1145,7 +1479,7 @@ transform_iterator( -Filter iterator
+Filter iterator
The filter iterator adaptor creates a view of an iterator range in which some elements of the range are skipped over. A predicate function object controls which elements are skipped. When the @@ -1157,7 +1491,7 @@ of the underlying range. Therefore the constructor of the filter iterator takes two iterator parameters: the position for the filtered iterator and the end of the range.
-Class template filter_iterator
+Class template filter_iterator
template <class Predicate, class Iterator> class filter_iterator @@ -1199,7 +1533,7 @@ class filter_iterator-filter_iterator requirements
+filter_iterator requirements
The base Iterator parameter must be a model of Readable Iterator and Single Pass Iterator. The resulting filter_iterator will be a model of Forward Traversal Iterator if Iterator is, otherwise the @@ -1215,7 +1549,7 @@ expression p(x) must be valid p(x) must be convertible to bool.
--filter_iterator operations
+filter_iterator operations
filter_iterator();
@@ -1288,14 +1622,14 @@ filter_iterator( -Counting iterator
++Counting iterator
The counting iterator adaptor implements dereference by returning a reference to the base object. The other operations are implemented by the base m_iterator, as per the inheritance from iterator_adaptor.
-Class template counting_iterator
+Class template counting_iterator
template <class Incrementable, class Category = use_default, class Difference = use_default> class counting_iterator @@ -1328,7 +1662,7 @@ the cases when the Incrementable
-counting_iterator requirements
+counting_iterator requirements
The Incrementable type must be Default Constructible, Copy Constructible, and Assignable. The default distance is an implementation defined signed integegral type.
@@ -1356,7 +1690,7 @@ i < j-counting_iterator operations
+counting_iterator operations
counting_iterator();
@@ -1387,7 +1721,7 @@ object copy constructed from x -Function output iterator
+Function output iterator
The function output iterator adaptor makes it easier to create custom output iterators. The adaptor takes a unary function and creates a model of Output Iterator. Each item assigned to the output iterator is @@ -1396,7 +1730,7 @@ iterator is that creating a conforming output iterator is non-trivial, particularly because the proper implementation usually requires a proxy object.
-Class template function_output_iterator
+Class template function_output_iterator
template <class UnaryFunction> class function_output_iterator { @@ -1424,7 +1758,7 @@ public:-function_output_iterator requirements
+function_output_iterator requirements
The UnaryFunction must be Assignable, Copy Constructible, and the expression f(x) must be valid, where f is an object of type UnaryFunction and x is an object of a type accepted by f. @@ -1432,7 +1766,7 @@ The resulting function_output_iterator
-function_output_iterator operations
+function_output_iterator operations
explicit function_output_iterator(const UnaryFunction& f = UnaryFunction());
@@ -1473,7 +1807,7 @@ a copy of the unary function f -function_output_iterator::output_proxy operations
+function_output_iterator::output_proxy operations
output_proxy(UnaryFunction& f);
diff --git a/doc/facade-and-adaptor.rst b/doc/facade-and-adaptor.rst index 886124c..3c6a788 100644 --- a/doc/facade-and-adaptor.rst +++ b/doc/facade-and-adaptor.rst @@ -287,208 +287,22 @@ Header `` `` synopsis [lib.iterator.helper.synopsis] Iterator facade [lib.iterator.facade] ===================================== -..include:: iterator_facade_abstract.rst +.. include:: iterator_facade_abstract.rst Class template ``iterator_facade`` ---------------------------------- -..include:: iterator_facade_ref.rst +.. include:: iterator_facade_ref.rst Iterator adaptor [lib.iterator.adaptor] ======================================= -The ``iterator_adaptor`` is a base class template derived from an -instantiation of ``iterator_facade``. The core interface functions -expected by ``iterator_facade`` are implemented in terms of the -``iterator_adaptor``\ 's ``Base`` template parameter. A class derived -from ``iterator_adaptor`` typically redefines some of the core -interface functions to adapt the behavior of the ``Base`` type. -Whether the derived class models any of the standard iterator concepts -depends on the operations supported by the ``Base`` type and which -core interface functions of ``iterator_facade`` are redefined in the -``Derived`` class. - +.. include:: iterator_adaptor_abstract.rst Class template ``iterator_adaptor`` ----------------------------------- -.. parsed-literal:: - - template < - class Derived - , class Base - , class Value = use_default - , class Category = use_default - , class Reference = use_default - , class Difference = use_default - > - class iterator_adaptor - : public iterator_facade - { - friend class iterator_core_access; - public: - iterator_adaptor(); - explicit iterator_adaptor(Base iter); - Base base() const; - protected: - Base const& base_reference() const; - Base& base_reference(); - private: // Core iterator interface for iterator_facade. - typename iterator_adaptor::reference dereference() const; - - template < - class OtherDerived, class OtherIterator, class V, class C, class R, class D - > - bool equal(iterator_adaptor const& x) const; - - void advance(typename iterator_adaptor::difference_type n); - void increment(); - void decrement(); - - template < - class OtherDerived, class OtherIterator, class V, class C, class R, class D - > - typename iterator_adaptor::difference_type distance_to( - iterator_adaptor const& y) const; - - private: - Base m_iterator; - }; - -__ : - -``iterator_adaptor`` requirements ---------------------------------- - -The ``Derived`` template parameter must be a derived class of -``iterator_adaptor``. The ``Base`` type must implement the expressions -involving ``m_iterator`` in the specifications of those private member -functions of ``iterator_adaptor`` that are not redefined by the -``Derived`` class and that are needed to model the concept -corresponding to the chosen ``Category`` according to the requirements -of ``iterator_facade``. The rest of the template parameters specify -the types for the member typedefs in ``iterator_facade``. The -following pseudo-code specifies the traits types for -``iterator_adaptor``. - -:: - - if (Value == use_default) - value_type = iterator_traits ::value_type; - else - value_type = remove_cv ::type; - - if (Reference == use_default) { - if (Value == use_default) - reference = iterator_traits ::reference; - else - reference = Value&; - } else - reference = Reference; - - if (Distance == use_default) - difference_type = iterator_traits ::difference_type; - else - difference_type = Distance; - - if (Category == use_default) - iterator_category = iterator_tag< - access_category< - iterator< iterator_traits ::iterator_category, - Value, - Distance, - Value*, - Reference > >, - traversal_category< - iterator< iterator_traits ::iterator_category, - Value, - Distance, - Value*, - Reference > > - else - iterator_category = Category; - - -.. Replaced with new semantics --thw - if (Category == use_default) - iterator_category = iterator_traits ::iterator_category; - else - iterator_category = Category; - - - -``iterator_adaptor`` public operations --------------------------------------- - -``iterator_adaptor();`` - -:Requires: The ``Base`` type must be Default Constructible. -:Returns: An instance of ``iterator_adaptor`` with - ``m_iterator`` default constructed. - - -``explicit iterator_adaptor(Base iter);`` - -:Returns: An instance of ``iterator_adaptor`` with - ``m_iterator`` copy constructed from ``iter``. - -``Base base() const;`` - -:Returns: ``m_iterator`` - - -``iterator_adaptor`` protected member functions ------------------------------------------------ - -``Base const& base_reference() const;`` - -:Returns: A const reference to ``m_iterator``. - - -``Base& base_reference();`` - -:Returns: A non-const reference to ``m_iterator``. - - -``iterator_adaptor`` private member functions ---------------------------------------------- - -``typename iterator_adaptor::reference dereference() const;`` - -:Returns: ``*m_iterator`` - -:: - - template < - class OtherDerived, class OtherIterator, class V, class C, class R, class D - > - bool equal(iterator_adaptor const& x) const; - -:Returns: ``m_iterator == x.base()`` - - -``void advance(typename iterator_adaptor::difference_type n);`` - -:Effects: ``m_iterator += n;`` - -``void increment();`` - -:Effects: ``++m_iterator;`` - -``void decrement();`` - -:Effects: ``--m_iterator;`` - -:: - - template < - class OtherDerived, class OtherIterator, class V, class C, class R, class D - > - typename iterator_adaptor::difference_type distance_to( - iterator_adaptor const& y) const; - -:Returns: ``y.base() - m_iterator`` - +.. include:: iterator_adaptor_ref.rst Specialized adaptors [lib.iterator.special.adaptors] diff --git a/doc/index.html b/doc/index.html index b8344c8..6940f28 100755 --- a/doc/index.html +++ b/doc/index.html @@ -3,7 +3,7 @@ - + The Boost Iterator Library Boost diff --git a/doc/iterator_adaptor.rst b/doc/iterator_adaptor.rst index 0c7dd68..d46f4fd 100644 --- a/doc/iterator_adaptor.rst +++ b/doc/iterator_adaptor.rst @@ -14,5 +14,19 @@ .. _`Open Systems Lab`: http://www.osl.iu.edu .. _`Institute for Transport Railway Operation and Construction`: http://www.ive.uni-hannover.de +:abstract: + +.. include:: iterator_adaptor_abstract.rst + +.. contents:: Table of Contents + +Introduction +============ + .. include:: iterator_adaptor_body.rst + +Reference +========= + +.. include:: iterator_adaptor_ref.rst diff --git a/doc/iterator_adaptor_abstract.rst b/doc/iterator_adaptor_abstract.rst new file mode 100644 index 0000000..ee75455 --- /dev/null +++ b/doc/iterator_adaptor_abstract.rst @@ -0,0 +1,10 @@ +The ``iterator_adaptor`` is a base class template derived from an +instantiation of ``iterator_facade``. The core interface functions +expected by ``iterator_facade`` are implemented in terms of the +``iterator_adaptor``\ 's ``Base`` template parameter. A class derived +from ``iterator_adaptor`` typically redefines some of the core +interface functions to adapt the behavior of the ``Base`` type. +Whether the derived class models any of the standard iterator concepts +depends on the operations supported by the ``Base`` type and which +core interface functions of ``iterator_facade`` are redefined in the +``Derived`` class. diff --git a/doc/iterator_adaptor_ref.rst b/doc/iterator_adaptor_ref.rst new file mode 100644 index 0000000..62c1d78 --- /dev/null +++ b/doc/iterator_adaptor_ref.rst @@ -0,0 +1,176 @@ +.. parsed-literal:: + + template < + class Derived + , class Base + , class Value = use_default + , class Category = use_default + , class Reference = use_default + , class Difference = use_default + > + class iterator_adaptor + : public iterator_facade+ { + friend class iterator_core_access; + public: + iterator_adaptor(); + explicit iterator_adaptor(Base iter); + Base base() const; + protected: + Base const& base_reference() const; + Base& base_reference(); + private: // Core iterator interface for iterator_facade. + typename iterator_adaptor::reference dereference() const; + + template < + class OtherDerived, class OtherIterator, class V, class C, class R, class D + > + bool equal(iterator_adaptor const& x) const; + + void advance(typename iterator_adaptor::difference_type n); + void increment(); + void decrement(); + + template < + class OtherDerived, class OtherIterator, class V, class C, class R, class D + > + typename iterator_adaptor::difference_type distance_to( + iterator_adaptor const& y) const; + + private: + Base m_iterator; + }; + +__ : + +``iterator_adaptor`` requirements +--------------------------------- + +The ``Derived`` template parameter must be a derived class of +``iterator_adaptor``. The ``Base`` type must implement the expressions +involving ``m_iterator`` in the specifications of those private member +functions of ``iterator_adaptor`` that are not redefined by the +``Derived`` class and that are needed to model the concept +corresponding to the chosen ``Category`` according to the requirements +of ``iterator_facade``. The rest of the template parameters specify +the types for the member typedefs in ``iterator_facade``. The +following pseudo-code specifies the traits types for +``iterator_adaptor``. + +:: + + if (Value == use_default) + value_type = iterator_traits ::value_type; + else + value_type = remove_cv ::type; + + if (Reference == use_default) { + if (Value == use_default) + reference = iterator_traits ::reference; + else + reference = Value&; + } else + reference = Reference; + + if (Distance == use_default) + difference_type = iterator_traits ::difference_type; + else + difference_type = Distance; + + if (Category == use_default) + iterator_category = iterator_tag< + access_category< + iterator< iterator_traits ::iterator_category, + Value, + Distance, + Value*, + Reference > >, + traversal_category< + iterator< iterator_traits ::iterator_category, + Value, + Distance, + Value*, + Reference > > + else + iterator_category = Category; + + +.. Replaced with new semantics --thw + if (Category == use_default) + iterator_category = iterator_traits ::iterator_category; + else + iterator_category = Category; + + + +``iterator_adaptor`` public operations +-------------------------------------- + +``iterator_adaptor();`` + +:Requires: The ``Base`` type must be Default Constructible. +:Returns: An instance of ``iterator_adaptor`` with + ``m_iterator`` default constructed. + + +``explicit iterator_adaptor(Base iter);`` + +:Returns: An instance of ``iterator_adaptor`` with + ``m_iterator`` copy constructed from ``iter``. + +``Base base() const;`` + +:Returns: ``m_iterator`` + + +``iterator_adaptor`` protected member functions +----------------------------------------------- + +``Base const& base_reference() const;`` + +:Returns: A const reference to ``m_iterator``. + + +``Base& base_reference();`` + +:Returns: A non-const reference to ``m_iterator``. + + +``iterator_adaptor`` private member functions +--------------------------------------------- + +``typename iterator_adaptor::reference dereference() const;`` + +:Returns: ``*m_iterator`` + +:: + + template < + class OtherDerived, class OtherIterator, class V, class C, class R, class D + > + bool equal(iterator_adaptor const& x) const; + +:Returns: ``m_iterator == x.base()`` + + +``void advance(typename iterator_adaptor::difference_type n);`` + +:Effects: ``m_iterator += n;`` + +``void increment();`` + +:Effects: ``++m_iterator;`` + +``void decrement();`` + +:Effects: ``--m_iterator;`` + +:: + + template < + class OtherDerived, class OtherIterator, class V, class C, class R, class D + > + typename iterator_adaptor::difference_type distance_to( + iterator_adaptor const& y) const; + +:Returns: ``y.base() - m_iterator`` diff --git a/doc/iterator_facade_abstract.rst b/doc/iterator_facade_abstract.rst index 70c64cb..f024b9b 100644 --- a/doc/iterator_facade_abstract.rst +++ b/doc/iterator_facade_abstract.rst @@ -1,4 +1,4 @@ -``iterator_facade`` is a base class template which implements the +``iterator_facade`` is a base class template that implements the interface of standard iterators in terms of a few core functions and associated types, to be supplied by a derived iterator class. diff --git a/doc/iterator_facade_ref.rst b/doc/iterator_facade_ref.rst index 9a1a344..04d5150 100644 --- a/doc/iterator_facade_ref.rst +++ b/doc/iterator_facade_ref.rst @@ -106,7 +106,7 @@ out of the overload set when the types are not interoperable.] .. _iterator facade requirements: ``iterator_facade`` requirements -================================ +................................ The ``Derived`` template parameter must be a class derived from ``iterator_facade``. @@ -164,7 +164,7 @@ interoperable with ``X``. ``iterator_facade`` operations -============================== +.............................. The operations in this section are described in terms of operations on the core interface of ``Derived`` which may be inaccessible diff --git a/doc/new-iter-concepts.html b/doc/new-iter-concepts.html index d245d04..fd98e5f 100755 --- a/doc/new-iter-concepts.html +++ b/doc/new-iter-concepts.html @@ -3,7 +3,7 @@ - + New Iterator Concepts @@ -92,7 +92,7 @@ geared towards iterator traversal (hence the category names), while requirements that address value access sneak in at various places. The following table gives a summary of the current value access requirements in the iterator categories. -+
@@ -326,7 +326,7 @@ for the value type T if the fo respect the stated semantics. U is the type of any specified member of type T. -+
@@ -403,7 +403,7 @@ semantics. if the following expressions are valid and respect the stated semantics. -+
@@ -435,7 +435,7 @@ semantics. The Readable Lvalue Iterator concept adds the requirement that the reference type be a reference to the value type of the iterator.
-+
@@ -472,7 +472,7 @@ cv-qualification reference type be a non-const reference to the value type of the iterator. -+
@@ -508,7 +508,7 @@ type X, -+
@@ -545,7 +545,7 @@ semantics. concept if the following expressions are valid and respect the stated semantics. -+
@@ -590,7 +590,7 @@ its domain concept if the following expressions are valid and respect the stated semantics. -+
@@ -636,7 +636,7 @@ the distance between iterators Iterator concept if the following expressions are valid and respect the stated semantics. -+
@@ -680,7 +680,7 @@ the stated semantics. In the table below, iterator_traits<X>::difference_type and n represents a constant object of type Distance. -+