Skip to content

[ranges] Index "split_view::{outer,inner}-iterator" correctly. #4255

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 30, 2020
Merged
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
38 changes: 19 additions & 19 deletions source/ranges.tex
Original file line number Diff line number Diff line change
Expand Up @@ -5521,7 +5521,7 @@

\rSec3[range.split.outer]{Class template \tcode{split_view::\exposid{outer-iterator}}}

\indexlibraryglobal{split_view::outer-iterator}%
\indexlibraryglobal{split_view::\exposid{outer-iterator}}%
\begin{codeblock}
namespace std::ranges {
template<@\libconcept{input_range}@ V, @\libconcept{forward_range}@ Pattern>
Expand Down Expand Up @@ -5581,7 +5581,7 @@
\placeholder{current} is equivalent to \exposid{current_} if \tcode{V}
models \libconcept{forward_range}, and \tcode{\exposid{parent_}->\exposid{current_}} otherwise.

\indexlibraryctor{split_view::outer-iterator}%
\indexlibraryctor{split_view::\exposid{outer-iterator}}%
\begin{itemdecl}
constexpr explicit @\exposid{outer-iterator}@(@\exposid{Parent}@& parent)
requires (!@\libconcept{forward_range}@<@\exposid{Base}@>);
Expand All @@ -5593,7 +5593,7 @@
Initializes \exposid{parent_} with \tcode{addressof(parent)}.
\end{itemdescr}

\indexlibraryctor{split_view::outer-iterator}%
\indexlibraryctor{split_view::\exposid{outer-iterator}}%
\begin{itemdecl}
constexpr @\exposid{outer-iterator}@(@\exposid{Parent}@& parent, iterator_t<@\exposid{Base}@> current)
requires @\libconcept{forward_range}@<@\exposid{Base}@>;
Expand All @@ -5606,7 +5606,7 @@
and \exposid{current_} with \tcode{std::move(current)}.
\end{itemdescr}

\indexlibraryctor{split_view::outer-iterator}%
\indexlibraryctor{split_view::\exposid{outer-iterator}}%
\begin{itemdecl}
constexpr @\exposid{outer-iterator}@(@\exposid{outer-iterator}@<!Const> i)
requires Const && @\libconcept{convertible_to}@<iterator_t<V>, iterator_t<@\exposid{Base}@>>;
Expand All @@ -5619,7 +5619,7 @@
\exposid{current_} with \tcode{std::move(i.\exposid{current_})}.
\end{itemdescr}

\indexlibrarymember{operator*}{split_view::outer-iterator}%
\indexlibrarymember{operator*}{split_view::\exposid{outer-iterator}}%
\begin{itemdecl}
constexpr value_type operator*() const;
\end{itemdecl}
Expand All @@ -5630,7 +5630,7 @@
Equivalent to: \tcode{return value_type\{*this\};}
\end{itemdescr}

\indexlibrarymember{operator++}{split_view::outer-iterator}%
\indexlibrarymember{operator++}{split_view::\exposid{outer-iterator}}%
\begin{itemdecl}
constexpr @\exposid{outer-iterator}@& operator++();
\end{itemdecl}
Expand All @@ -5657,7 +5657,7 @@
\end{codeblock}
\end{itemdescr}

\indexlibrarymember{operator==}{split_view::outer-iterator}%
\indexlibrarymember{operator==}{split_view::\exposid{outer-iterator}}%
\begin{itemdecl}
friend constexpr bool operator==(const @\exposid{outer-iterator}@& x, const @\exposid{outer-iterator}@& y)
requires @\libconcept{forward_range}@<@\exposid{Base}@>;
Expand All @@ -5669,7 +5669,7 @@
Equivalent to: \tcode{return x.\exposid{current_} == y.\exposid{current_};}
\end{itemdescr}

\indexlibrarymember{operator==}{split_view::outer-iterator}%
\indexlibrarymember{operator==}{split_view::\exposid{outer-iterator}}%
\begin{itemdecl}
friend constexpr bool operator==(const @\exposid{outer-iterator}@& x, default_sentinel_t);
\end{itemdecl}
Expand All @@ -5682,7 +5682,7 @@

\rSec3[range.split.outer.value]{Class \tcode{split_view::\exposid{outer-iterator}::value_type}}

\indexlibraryglobal{split_view::outer-iterator::value_type}%
\indexlibraryglobal{split_view::\exposid{outer-iterator}::value_type}%
\begin{codeblock}
namespace std::ranges {
template<@\libconcept{input_range}@ V, @\libconcept{forward_range}@ Pattern>
Expand All @@ -5705,7 +5705,7 @@
}
\end{codeblock}

\indexlibraryctor{split_view::outer-iterator::value_type}%
\indexlibraryctor{split_view::\exposid{outer-iterator}::value_type}%
\begin{itemdecl}
constexpr explicit value_type(@\exposid{outer-iterator}@ i);
\end{itemdecl}
Expand All @@ -5716,7 +5716,7 @@
Initializes \exposid{i_} with \tcode{std::move(i)}.
\end{itemdescr}

\indexlibrarymember{begin}{split_view::outer-iterator::value_type}%
\indexlibrarymember{begin}{split_view::\exposid{outer-iterator}::value_type}%
\begin{itemdecl}
constexpr @\exposid{inner-iterator}@<Const> begin() const requires copyable<@\exposid{outer-iterator}@>;
\end{itemdecl}
Expand All @@ -5727,7 +5727,7 @@
Equivalent to: \tcode{return \exposid{inner-iterator}<Const>\{\exposid{i_}\};}
\end{itemdescr}

\indexlibrarymember{begin}{split_view::outer-iterator::value_type}%
\indexlibrarymember{begin}{split_view::\exposid{outer-iterator}::value_type}%
\begin{itemdecl}
constexpr @\exposid{inner-iterator}@<Const> begin() requires (!copyable<@\exposid{outer-iterator}@>);
\end{itemdecl}
Expand All @@ -5737,7 +5737,7 @@
\effects
Equivalent to: \tcode{return \exposid{inner-iterator}<Const>\{std::move(\exposid{i_})\};}
\end{itemdescr}
\indexlibrarymember{end}{split_view::outer-iterator::value_type}%
\indexlibrarymember{end}{split_view::\exposid{outer-iterator}::value_type}%
\begin{itemdecl}
constexpr default_sentinel_t end() const;
\end{itemdecl}
Expand All @@ -5750,7 +5750,7 @@

\rSec3[range.split.inner]{Class template \tcode{split_view::\exposid{inner-iterator}}}

\indexlibraryglobal{split_view::inner-iterator}%
\indexlibraryglobal{split_view::\exposid{inner-iterator}}%
\begin{codeblock}
namespace std::ranges {
template<@\libconcept{input_range}@ V, @\libconcept{forward_range}@ Pattern>
Expand Down Expand Up @@ -5811,7 +5811,7 @@
\item otherwise, \tcode{iterator_traits<iterator_t<\exposid{Base}>>::iterator_category}.
\end{itemize}

\indexlibraryctor{split_view::inner-iterator}%
\indexlibraryctor{split_view::\exposid{inner-iterator}}%
\begin{itemdecl}
constexpr explicit @\exposid{inner-iterator}@(@\exposid{outer-iterator}@<Const> i);
\end{itemdecl}
Expand All @@ -5822,7 +5822,7 @@
Initializes \exposid{i_} with \tcode{std::move(i)}.
\end{itemdescr}

\indexlibrarymember{operator++}{split_view::inner-iterator}%
\indexlibrarymember{operator++}{split_view::\exposid{inner-iterator}}%
\begin{itemdecl}
constexpr @\exposid{inner-iterator}@& operator++();
\end{itemdecl}
Expand All @@ -5843,7 +5843,7 @@
\end{codeblock}
\end{itemdescr}

\indexlibrarymember{operator==}{split_view::inner-iterator}%
\indexlibrarymember{operator==}{split_view::\exposid{inner-iterator}}%
\begin{itemdecl}
friend constexpr bool operator==(const @\exposid{inner-iterator}@& x, const @\exposid{inner-iterator}@& y)
requires @\libconcept{forward_range}@<@\exposid{Base}@>;
Expand All @@ -5855,7 +5855,7 @@
Equivalent to: \tcode{return x.\exposid{i_}.\placeholder{current} == y.\exposid{i_}.\placeholder{current};}
\end{itemdescr}

\indexlibrarymember{operator==}{split_view::inner-iterator}%
\indexlibrarymember{operator==}{split_view::\exposid{inner-iterator}}%
\begin{itemdecl}
friend constexpr bool operator==(const @\exposid{inner-iterator}@& x, default_sentinel_t);
\end{itemdecl}
Expand Down Expand Up @@ -5885,7 +5885,7 @@
\end{codeblock}
\end{itemdescr}

\indexlibrarymember{iter_swap}{split_view::inner-iterator}%
\indexlibrarymember{iter_swap}{split_view::\exposid{inner-iterator}}%
\begin{itemdecl}
friend constexpr void iter_swap(const @\exposid{inner-iterator}@& x, const @\exposid{inner-iterator}@& y)
noexcept(noexcept(ranges::iter_swap(x.@\exposid{i_}@.@\placeholdernc{current}@, y.@\exposid{i_}@.@\placeholdernc{current}@)))
Expand Down