Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
141 changes: 14 additions & 127 deletions source/iterators.tex
Original file line number Diff line number Diff line change
Expand Up @@ -4289,10 +4289,10 @@

constexpr basic_const_iterator& operator++();
constexpr void operator++(int);
constexpr basic_const_iterator operator++(int) requires @\libconcept{forward_iterator}@<Iterator>;
basic_const_iterator operator++(int) requires @\libconcept{forward_iterator}@<Iterator> = default;

constexpr basic_const_iterator& operator--() requires @\libconcept{bidirectional_iterator}@<Iterator>;
constexpr basic_const_iterator operator--(int) requires @\libconcept{bidirectional_iterator}@<Iterator>;
basic_const_iterator operator--(int) requires @\libconcept{bidirectional_iterator}@<Iterator> = default;

constexpr basic_const_iterator& operator+=(difference_type n)
requires @\libconcept{random_access_iterator}@<Iterator>;
Expand Down Expand Up @@ -4522,22 +4522,6 @@
Equivalent to: \tcode{++\exposid{current_};}
\end{itemdescr}

\indexlibrarymember{operator++}{basic_const_iterator}%
\begin{itemdecl}
constexpr basic_const_iterator operator++(int) requires @\libconcept{forward_iterator}@<Iterator>;
\end{itemdecl}

\begin{itemdescr}
\pnum
\effects
Equivalent to:
\begin{codeblock}
auto tmp = *this;
++*this;
return tmp;
\end{codeblock}
\end{itemdescr}

\indexlibrarymember{operator--}{basic_const_iterator}%
\begin{itemdecl}
constexpr basic_const_iterator& operator--() requires @\libconcept{bidirectional_iterator}@<Iterator>;
Expand All @@ -4553,22 +4537,6 @@
\end{codeblock}
\end{itemdescr}

\indexlibrarymember{operator--}{basic_const_iterator}%
\begin{itemdecl}
constexpr basic_const_iterator operator--(int) requires @\libconcept{bidirectional_iterator}@<Iterator>;
\end{itemdecl}

\begin{itemdescr}
\pnum
\effects
Equivalent to:
\begin{codeblock}
auto tmp = *this;
--*this;
return tmp;
\end{codeblock}
\end{itemdescr}

\indexlibrarymember{operator+=}{basic_const_iterator}%
\indexlibrarymember{operator-=}{basic_const_iterator}%
\begin{itemdecl}
Expand Down Expand Up @@ -4828,9 +4796,10 @@
constexpr reference operator*() const;

constexpr move_iterator& operator++();
constexpr auto operator++(int);
constexpr void operator++(int);
move_iterator operator++(int) requires @\libconcept{forward_iterator}@<Iterator> = default;
constexpr move_iterator& operator--();
constexpr move_iterator operator--(int);
move_iterator operator--(int) = default;

constexpr move_iterator operator+(difference_type n) const;
constexpr move_iterator& operator+=(difference_type n);
Expand Down Expand Up @@ -5041,19 +5010,13 @@

\indexlibrarymember{operator++}{move_iterator}%
\begin{itemdecl}
constexpr auto operator++(int);
constexpr void operator++(int);
\end{itemdecl}

\begin{itemdescr}
\pnum
\effects
If \tcode{Iterator} models \libconcept{forward_iterator}, equivalent to:
\begin{codeblock}
move_iterator tmp = *this;
++current;
return tmp;
\end{codeblock}
Otherwise, equivalent to \tcode{++current}.
Equivalent to \tcode{++current}.
\end{itemdescr}

\indexlibrarymember{operator--}{move_iterator}%
Expand All @@ -5071,22 +5034,6 @@
\tcode{*this}.
\end{itemdescr}

\indexlibrarymember{operator--}{move_iterator}%
\begin{itemdecl}
constexpr move_iterator operator--(int);
\end{itemdecl}

\begin{itemdescr}
\pnum
\effects
As if by:
\begin{codeblock}
move_iterator tmp = *this;
--current;
return tmp;
\end{codeblock}
\end{itemdescr}

\indexlibrarymember{operator+}{move_iterator}%
\begin{itemdecl}
constexpr move_iterator operator+(difference_type n) const;
Expand Down Expand Up @@ -5491,6 +5438,7 @@

constexpr common_iterator& operator++();
constexpr decltype(auto) operator++(int);
common_iterator operator++(int) requires @\libconcept{forward_iterator}@<I> = default;

template<class I2, @\libconcept{sentinel_for}@<I> S2>
requires @\libconcept{sentinel_for}@<S, I2>
Expand Down Expand Up @@ -5741,14 +5689,7 @@

\pnum
\effects
If \tcode{I} models \libconcept{forward_iterator}, equivalent to:
\begin{codeblock}
common_iterator tmp = *this;
++*this;
return tmp;
\end{codeblock}
Otherwise, if
\tcode{requires(I\& i) \{ \{ *i++ \} -> \exposconceptnc{can-reference}; \}}
If \tcode{requires(I\& i) \{ \{ *i++ \} -> \exposconceptnc{can-reference}; \}}
is \tcode{true} or
\begin{codeblock}
@\libconcept{indirectly_readable}@<I> && @\libconcept{constructible_from}@<iter_value_t<I>, iter_reference_t<I>> &&
Expand Down Expand Up @@ -5967,12 +5908,12 @@

constexpr counted_iterator& operator++();
constexpr decltype(auto) operator++(int);
constexpr counted_iterator operator++(int)
requires @\libconcept{forward_iterator}@<I>;
counted_iterator operator++(int)
requires @\libconcept{forward_iterator}@<I> = default;
constexpr counted_iterator& operator--()
requires @\libconcept{bidirectional_iterator}@<I>;
constexpr counted_iterator operator--(int)
requires @\libconcept{bidirectional_iterator}@<I>;
counted_iterator operator--(int)
requires @\libconcept{bidirectional_iterator}@<I> = default;

constexpr counted_iterator operator+(iter_difference_t<I> n) const
requires @\libconcept{random_access_iterator}@<I>;
Expand Down Expand Up @@ -6202,23 +6143,6 @@
\end{codeblock}
\end{itemdescr}

\indexlibrarymember{operator++}{counted_iterator}%
\begin{itemdecl}
constexpr counted_iterator operator++(int)
requires @\libconcept{forward_iterator}@<I>;
\end{itemdecl}

\begin{itemdescr}
\pnum
\effects
Equivalent to:
\begin{codeblock}
counted_iterator tmp = *this;
++*this;
return tmp;
\end{codeblock}
\end{itemdescr}

\indexlibrarymember{operator--}{counted_iterator}%
\begin{itemdecl}
constexpr counted_iterator& operator--()
Expand All @@ -6236,23 +6160,6 @@
\end{codeblock}
\end{itemdescr}

\indexlibrarymember{operator--}{counted_iterator}%
\begin{itemdecl}
constexpr counted_iterator operator--(int)
requires @\libconcept{bidirectional_iterator}@<I>;
\end{itemdecl}

\begin{itemdescr}
\pnum
\effects
Equivalent to:
\begin{codeblock}
counted_iterator tmp = *this;
--*this;
return tmp;
\end{codeblock}
\end{itemdescr}

\indexlibrarymember{operator+}{counted_iterator}%
\begin{itemdecl}
constexpr counted_iterator operator+(iter_difference_t<I> n) const
Expand Down Expand Up @@ -6560,7 +6467,7 @@
const T& operator*() const;
const T* operator->() const;
istream_iterator& operator++();
istream_iterator operator++(int);
istream_iterator operator++(int) = default;

friend bool operator==(const istream_iterator& i, default_sentinel_t);

Expand Down Expand Up @@ -6701,26 +6608,6 @@
\tcode{*this}.
\end{itemdescr}

\indexlibrarymember{operator++}{istream_iterator}%
\begin{itemdecl}
istream_iterator operator++(int);
\end{itemdecl}

\begin{itemdescr}
\pnum
\expects
\tcode{in_stream != nullptr} is \tcode{true}.

\pnum
\effects
Equivalent to:
\begin{codeblock}
istream_iterator tmp = *this;
++*this;
return tmp;
\end{codeblock}
\end{itemdescr}

\indexlibrarymember{operator==}{istream_iterator}%
\begin{itemdecl}
template<class T, class charT, class traits, class Distance>
Expand Down
Loading
Loading