|
7745 | 7745 |
|
7746 | 7746 | \pnum
|
7747 | 7747 | \tcode{\exposid{iterator}::iterator_category} is present
|
7748 |
| -if and only if \tcode{@\exposconcept{all-forward}@<Const, Views...>} is modeled. |
| 7748 | +if and only if \tcode{\exposconcept{all-forward}<Const, Views...>} is modeled. |
7749 | 7749 |
|
7750 | 7750 | \pnum
|
7751 | 7751 | If the invocation of any non-const member function of \exposid{iterator}
|
7752 | 7752 | exits via an exception,
|
7753 | 7753 | the iterator acquires a singular value.
|
7754 | 7754 |
|
7755 | 7755 | \begin{itemdecl}
|
7756 |
| -constexpr explicit iterator(@\exposid{tuple-or-pair}@<iterator_t<@\exposid{maybe-const}@<Const, Views>>...> current); |
| 7756 | +constexpr explicit @\exposid{iterator}@(@\exposid{tuple-or-pair}@<iterator_t<@\exposid{maybe-const}@<Const, Views>>...> current); |
7757 | 7757 | \end{itemdecl}
|
7758 | 7758 |
|
7759 | 7759 | \begin{itemdescr}
|
|
7812 | 7812 | \end{itemdescr}
|
7813 | 7813 |
|
7814 | 7814 | \begin{itemdecl}
|
7815 |
| -constexpr iterator operator++(int) requires @\exposconcept{all-forward}@<Const, Views...>; |
| 7815 | +constexpr @\exposid{iterator}@ operator++(int) requires @\exposconcept{all-forward}@<Const, Views...>; |
7816 | 7816 | \end{itemdecl}
|
7817 | 7817 |
|
7818 | 7818 | \begin{itemdescr}
|
|
7827 | 7827 | \end{itemdescr}
|
7828 | 7828 |
|
7829 | 7829 | \begin{itemdecl}
|
7830 |
| -constexpr iterator& operator--() requires @\exposconcept{all-bidirectional}@<Const, Views...>; |
| 7830 | +constexpr @\exposid{iterator}@& operator--() requires @\exposconcept{all-bidirectional}@<Const, Views...>; |
7831 | 7831 | \end{itemdecl}
|
7832 | 7832 |
|
7833 | 7833 | \begin{itemdescr}
|
|
7841 | 7841 | \end{itemdescr}
|
7842 | 7842 |
|
7843 | 7843 | \begin{itemdecl}
|
7844 |
| -constexpr iterator operator--(int) requires @\exposconcept{all-bidirectional}@<Const, Views...>; |
| 7844 | +constexpr @\exposid{iterator}@ operator--(int) requires @\exposconcept{all-bidirectional}@<Const, Views...>; |
7845 | 7845 | \end{itemdecl}
|
7846 | 7846 |
|
7847 | 7847 | \begin{itemdescr}
|
|
7871 | 7871 | \end{itemdescr}
|
7872 | 7872 |
|
7873 | 7873 | \begin{itemdecl}
|
7874 |
| -constexpr iterator& operator-=(difference_type x) |
| 7874 | +constexpr @\exposid{iterator}@& operator-=(difference_type x) |
7875 | 7875 | requires @\exposconcept{all-random-access}@<Const, Views...>;
|
7876 | 7876 | \end{itemdecl}
|
7877 | 7877 |
|
|
7961 | 7961 | \end{itemdescr}
|
7962 | 7962 |
|
7963 | 7963 | \begin{itemdecl}
|
7964 |
| -friend constexpr bool operator>=(const iterator& x, const iterator& y) |
| 7964 | +friend constexpr bool operator>=(const @\exposid{iterator}@& x, const @\exposid{iterator}@& y) |
7965 | 7965 | requires all-random-access<Const, Views...>;
|
7966 | 7966 | \end{itemdecl}
|
7967 | 7967 |
|
|
8204 | 8204 | to the $M^\textrm{th}$ elements of all views.
|
8205 | 8205 |
|
8206 | 8206 | \pnum
|
8207 |
| -\indexlibraryglobal{zip_transform}{views}% |
| 8207 | +\indexlibrarymember{zip_transform}{views}% |
8208 | 8208 | The name \tcode{views::zip_transform} denotes
|
8209 | 8209 | a customization point object\iref{customization.point.object}.
|
8210 | 8210 | Let \tcode{F} be a subexpression, and
|
|
8447 | 8447 | \begin{itemdescr}
|
8448 | 8448 | \pnum
|
8449 | 8449 | \effects
|
8450 |
| -Initializes \exposid{parent_} with i.\exposid{parent_} and |
| 8450 | +Initializes \exposid{parent_} with \tcode{i.\exposid{parent_}} and |
8451 | 8451 | \exposid{inner_} with \tcode{std::move(i.inner_)}.
|
8452 | 8452 | \end{itemdescr}
|
8453 | 8453 |
|
|
8858 | 8858 | using @\exposid{Base}@ = @\exposid{maybe-const}@<Const, V>; // \expos
|
8859 | 8859 | array<iterator_t<@\exposid{Base}@>, N> @\exposid{current_}@ = array<iterator_t<@\exposid{Base}@>, N>(); // \expos
|
8860 | 8860 | constexpr @\exposid{iterator}@(iterator_t<@\exposid{Base}@> first, sentinel_t<@\exposid{Base}@> last); // \expos
|
8861 |
| - constexpr iterator(@\exposid{as-sentinel}@, iterator_t<@\exposid{Base}@> first, iterator_t<@\exposid{Base}@> last); |
| 8861 | + constexpr @\exposid{iterator}@(@\exposid{as-sentinel}@, iterator_t<@\exposid{Base}@> first, iterator_t<@\exposid{Base}@> last); |
8862 | 8862 | // \expos
|
8863 | 8863 | public:
|
8864 | 8864 | using iterator_category = input_iterator_tag;
|
|
8992 | 8992 | \begin{itemdescr}
|
8993 | 8993 | \pnum
|
8994 | 8994 | \expects
|
8995 |
| -\exposid{current_}.back() is incrementable. |
| 8995 | +\tcode{\exposid{current_}.back()} is incrementable. |
8996 | 8996 |
|
8997 | 8997 | \pnum
|
8998 | 8998 | \ensures
|
|
9246 | 9246 | \begin{itemdescr}
|
9247 | 9247 | \pnum
|
9248 | 9248 | \expects
|
9249 |
| -None of the iterators in l.\exposid{current_} is equal to |
9250 |
| -an iterator in r.\exposid{current_}. |
| 9249 | +None of the iterators in \tcode{l.\exposid{current_}} is equal to |
| 9250 | +an iterator in \tcode{r.\exposid{current_}}. |
9251 | 9251 |
|
9252 | 9252 | \pnum
|
9253 | 9253 | \effects
|
|
9473 | 9473 | \exposid{inner_} with \tcode{std::move(base)}.
|
9474 | 9474 | \end{itemdescr}
|
9475 | 9475 |
|
9476 |
| -\rSec3[range.adjacent.transform.iterator]{Class template \tcode{adjacent_transform_view::@\exposid{iterator}@}} |
| 9476 | +\rSec3[range.adjacent.transform.iterator]{Class template \tcode{adjacent_transform_view::\exposid{iterator}}} |
9477 | 9477 |
|
9478 | 9478 | \begin{codeblock}
|
9479 | 9479 | namespace std::ranges {
|
|
9541 | 9541 | \end{codeblock}
|
9542 | 9542 |
|
9543 | 9543 | \pnum
|
9544 |
| -The member \grammarterm{typedef-name} \tcode{iterator::iterator_category} |
| 9544 | +The member \grammarterm{typedef-name} \tcode{\exposid{iterator}::iterator_category} |
9545 | 9545 | is defined as follows:
|
9546 | 9546 | \begin{itemize}
|
9547 | 9547 | \item
|
|
9591 | 9591 | \begin{itemdescr}
|
9592 | 9592 | \pnum
|
9593 | 9593 | \effects
|
9594 |
| -Initializes \exposid{parent_} with i.\exposid{parent_} and |
9595 |
| -\exposid{inner_} with std::move(i.\exposid{inner_}). |
| 9594 | +Initializes \exposid{parent_} with \tcode{i.\exposid{parent_}} and |
| 9595 | +\exposid{inner_} with \tcode{std::move(i.\exposid{inner_})}. |
9596 | 9596 | \end{itemdescr}
|
9597 | 9597 |
|
9598 | 9598 | \begin{itemdecl}
|
|
9619 | 9619 | \end{itemdescr}
|
9620 | 9620 |
|
9621 | 9621 | \begin{itemdecl}
|
9622 |
| -constexpr iterator& operator++(); |
| 9622 | +constexpr @\exposid{iterator}@& operator++(); |
9623 | 9623 | \end{itemdecl}
|
9624 | 9624 |
|
9625 | 9625 | \begin{itemdescr}
|
|
9633 | 9633 | \end{itemdescr}
|
9634 | 9634 |
|
9635 | 9635 | \begin{itemdecl}
|
9636 |
| -constexpr iterator operator++(int); |
| 9636 | +constexpr @\exposid{iterator}@ operator++(int); |
9637 | 9637 | \end{itemdecl}
|
9638 | 9638 |
|
9639 | 9639 | \begin{itemdescr}
|
9640 | 9640 | \pnum
|
9641 | 9641 | \effects
|
9642 | 9642 | Equivalent to:
|
9643 | 9643 | \begin{codeblock}
|
9644 |
| -Equivalent to: |
9645 |
| -\begin{codeblock} |
9646 | 9644 | auto tmp = *this;
|
9647 | 9645 | ++*this;
|
9648 | 9646 | return tmp;
|
9649 | 9647 | \end{codeblock}
|
9650 | 9648 | \end{itemdescr}
|
9651 | 9649 |
|
9652 | 9650 | \begin{itemdecl}
|
9653 |
| -constexpr iterator& operator--() requires @\libconcept{bidirectional_range}@<@\exposid{Base}@>; |
| 9651 | +constexpr @\exposid{iterator}@& operator--() requires @\libconcept{bidirectional_range}@<@\exposid{Base}@>; |
9654 | 9652 | \end{itemdecl}
|
9655 | 9653 |
|
9656 | 9654 | \begin{itemdescr}
|
|
9701 | 9699 | \effects
|
9702 | 9700 | Equivalent to:
|
9703 | 9701 | \begin{codeblock}
|
9704 |
| -inner_ -= x; |
| 9702 | +@\exposid{inner_}@ -= x; |
9705 | 9703 | return *this;
|
9706 | 9704 | \end{codeblock}
|
9707 | 9705 | \end{itemdescr}
|
|
9717 | 9715 | Equivalent to:
|
9718 | 9716 | \begin{codeblock}
|
9719 | 9717 | return apply([&](const auto&... iters) -> decltype(auto) {
|
9720 |
| - return invoke(*@\exposid{parent_}@->fun_, iters[n]...); |
| 9718 | + return invoke(*@\exposid{parent_}@->@\exposid{fun_}@, iters[n]...); |
9721 | 9719 | }, @\exposid{inner_}@.@\exposid{current_}@);
|
9722 | 9720 | \end{codeblock}
|
9723 | 9721 | \end{itemdescr}
|
|
9738 | 9736 |
|
9739 | 9737 | \begin{itemdescr}
|
9740 | 9738 | \pnum
|
9741 |
| -Let $op$ be the operator. |
| 9739 | +Let \placeholder{op} be the operator. |
9742 | 9740 |
|
9743 | 9741 | \pnum
|
9744 | 9742 | \effects
|
9745 |
| -Equivalent to: \tcode{return x.\exposid{inner_} $op$ y.\exposid{inner_};} |
| 9743 | +Equivalent to: \tcode{return x.\exposid{inner_} \placeholder{op} y.\exposid{inner_};} |
9746 | 9744 | \end{itemdescr}
|
9747 | 9745 |
|
9748 | 9746 | \begin{itemdecl}
|
|
9759 | 9757 | \end{itemdescr}
|
9760 | 9758 |
|
9761 | 9759 | \begin{itemdecl}
|
9762 |
| -friend constexpr iterator operator-(const @\exposid{iterator}@& i, difference_type n) |
| 9760 | +friend constexpr @\exposid{iterator}@ operator-(const @\exposid{iterator}@& i, difference_type n) |
9763 | 9761 | requires @\libconcept{random_access_range}@<@\exposid{Base}@>;
|
9764 | 9762 | \end{itemdecl}
|
9765 | 9763 |
|
|
0 commit comments