Skip to content

Commit 9b02df2

Browse files
committed
P3828R1 Rename the to_input view to as_input
1 parent b536020 commit 9b02df2

2 files changed

Lines changed: 39 additions & 39 deletions

File tree

source/ranges.tex

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -562,16 +562,16 @@
562562

563563
namespace views { inline constexpr @\unspec@ cache_latest = @\unspec@; }
564564

565-
// \ref{range.to.input}, to input view
565+
// \ref{range.as.input}, as input view
566566
template<@\libconcept{input_range}@ V>
567567
requires @\libconcept{view}@<V>
568-
class to_input_view;
568+
class as_input_view;
569569

570570
template<class V>
571-
constexpr bool enable_borrowed_range<to_input_view<V>> =
571+
constexpr bool enable_borrowed_range<as_input_view<V>> =
572572
enable_borrowed_range<V>;
573573

574-
namespace views { inline constexpr @\unspec@ to_input = @\unspec@; }
574+
namespace views { inline constexpr @\unspec@ as_input = @\unspec@; }
575575
}
576576

577577
namespace std {
@@ -17752,12 +17752,12 @@
1775217752
\tcode{x.\exposid{end_} - y.\exposid{current_}}.
1775317753
\end{itemdescr}
1775417754

17755-
\rSec2[range.to.input]{To input view}
17755+
\rSec2[range.as.input]{As input view}
1775617756

17757-
\rSec3[range.to.input.overview]{Overview}
17757+
\rSec3[range.as.input.overview]{Overview}
1775817758

1775917759
\pnum
17760-
\tcode{to_input_view} presents a view of an underlying sequence
17760+
\tcode{as_input_view} presents a view of an underlying sequence
1776117761
as an input-only non-common range.
1776217762
\begin{note}
1776317763
This is useful to avoid overhead
@@ -17766,36 +17766,36 @@
1776617766
\end{note}
1776717767

1776817768
\pnum
17769-
The name \tcode{views::to_input} denotes
17769+
The name \tcode{views::as_input} denotes
1777017770
a range adaptor object\iref{range.adaptor.object}.
1777117771
Let \tcode{E} be an expression and let \tcode{T} be \tcode{decltype((E))}.
17772-
The expression \tcode{views::to_input(E)} is expression-equivalent to:
17772+
The expression \tcode{views::as_input(E)} is expression-equivalent to:
1777317773
\begin{itemize}
1777417774
\item
1777517775
\tcode{views::all(E)}
1777617776
if \tcode{T} models \libconcept{input_range},
1777717777
does not satisfy \libconcept{common_range}, and
1777817778
does not satisfy \libconcept{forward_range}.
1777917779
\item
17780-
Otherwise, \tcode{to_input_view(E)}.
17780+
Otherwise, \tcode{as_input_view(E)}.
1778117781
\end{itemize}
1778217782

17783-
\rSec3[range.to.input.view]{Class template \tcode{to_input_view}}
17783+
\rSec3[range.as.input.view]{Class template \tcode{as_input_view}}
1778417784

17785-
\indexlibraryglobal{to_input_view}%
17785+
\indexlibraryglobal{as_input_view}%
1778617786
\begin{codeblock}
1778717787
namespace std::ranges {
1778817788
template<@\libconcept{input_range}@ V>
1778917789
requires @\libconcept{view}@<V>
17790-
class to_input_view : public view_interface<to_input_view<V>> {
17790+
class as_input_view : public view_interface<as_input_view<V>> {
1779117791
V @\exposid{base_}@ = V(); // \expos
1779217792

17793-
// \ref{range.to.input.iterator}, class template \tcode{to_input_view::\exposid{iterator}}
17793+
// \ref{range.as.input.iterator}, class template \tcode{as_input_view::\exposid{iterator}}
1779417794
template<bool Const> class @\exposid{iterator}@; // \expos
1779517795

1779617796
public:
17797-
to_input_view() requires @\libconcept{default_initializable}@<V> = default;
17798-
constexpr explicit to_input_view(V base);
17797+
as_input_view() requires @\libconcept{default_initializable}@<V> = default;
17798+
constexpr explicit as_input_view(V base);
1779917799

1780017800
constexpr V base() const & requires @\libconcept{copy_constructible}@<V> { return @\exposid{base_}@; }
1780117801
constexpr V base() && { return std::move(@\exposid{base_}@); }
@@ -17814,13 +17814,13 @@
1781417814
};
1781517815

1781617816
template<class R>
17817-
to_input_view(R&&) -> to_input_view<views::all_t<R>>;
17817+
as_input_view(R&&) -> as_input_view<views::all_t<R>>;
1781817818
}
1781917819
\end{codeblock}
1782017820

17821-
\indexlibraryctor{to_input_view}%
17821+
\indexlibraryctor{as_input_view}%
1782217822
\begin{itemdecl}
17823-
constexpr explicit to_input_view(V base);
17823+
constexpr explicit as_input_view(V base);
1782417824
\end{itemdecl}
1782517825

1782617826
\begin{itemdescr}
@@ -17829,7 +17829,7 @@
1782917829
Initializes \exposid{base_} with \tcode{std::move(base)}.
1783017830
\end{itemdescr}
1783117831

17832-
\indexlibrarymember{begin}{to_input_view}%
17832+
\indexlibrarymember{begin}{as_input_view}%
1783317833
\begin{itemdecl}
1783417834
constexpr auto begin() requires (!@\exposconcept{simple-view}@<V>);
1783517835
\end{itemdecl}
@@ -17840,7 +17840,7 @@
1784017840
Equivalent to: \tcode{return \exposid{iterator}<false>(ranges::begin(\exposid{base_}));}
1784117841
\end{itemdescr}
1784217842

17843-
\indexlibrarymember{begin}{to_input_view}%
17843+
\indexlibrarymember{begin}{as_input_view}%
1784417844
\begin{itemdecl}
1784517845
constexpr auto begin() const requires @\libconcept{range}@<const V>;
1784617846
\end{itemdecl}
@@ -17851,7 +17851,7 @@
1785117851
Equivalent to: \tcode{return \exposid{iterator}<true>(ranges::begin(\exposid{base_}));}
1785217852
\end{itemdescr}
1785317853

17854-
\indexlibrarymember{end}{to_input_view}%
17854+
\indexlibrarymember{end}{as_input_view}%
1785517855
\begin{itemdecl}
1785617856
constexpr auto end() requires (!@\exposconcept{simple-view}@<V>);
1785717857
constexpr auto end() const requires @\libconcept{range}@<const V>;
@@ -17863,7 +17863,7 @@
1786317863
Equivalent to: \tcode{return ranges::end(\exposid{base_});}
1786417864
\end{itemdescr}
1786517865

17866-
\indexlibrarymember{size}{to_input_view}%
17866+
\indexlibrarymember{size}{as_input_view}%
1786717867
\begin{itemdecl}
1786817868
constexpr auto size() requires @\libconcept{sized_range}@<V>;
1786917869
constexpr auto size() const requires @\libconcept{sized_range}@<const V>;
@@ -17875,7 +17875,7 @@
1787517875
Equivalent to: \tcode{return ranges::size(\exposid{base_});}
1787617876
\end{itemdescr}
1787717877

17878-
\indexlibrarymember{reserve_hint}{to_input_view}%
17878+
\indexlibrarymember{reserve_hint}{as_input_view}%
1787917879
\begin{itemdecl}
1788017880
constexpr auto reserve_hint() requires @\libconcept{approximately_sized_range}@<V>;
1788117881
constexpr auto reserve_hint() const requires @\libconcept{approximately_sized_range}@<const V>;
@@ -17887,15 +17887,15 @@
1788717887
Equivalent to: \tcode{return ranges::reserve_hint(\exposid{base_});}
1788817888
\end{itemdescr}
1788917889

17890-
\rSec3[range.to.input.iterator]{Class template \tcode{to_input_view::\exposid{iterator}}}
17890+
\rSec3[range.as.input.iterator]{Class template \tcode{as_input_view::\exposid{iterator}}}
1789117891

17892-
\indexlibraryglobal{to_input_view::\exposid{iterator}}%
17892+
\indexlibraryglobal{as_input_view::\exposid{iterator}}%
1789317893
\begin{codeblock}
1789417894
namespace std::ranges {
1789517895
template<@\libconcept{input_range}@ V>
1789617896
requires @\libconcept{view}@<V>
1789717897
template<bool Const>
17898-
class to_input_view<V>::@\exposid{iterator}@ {
17898+
class as_input_view<V>::@\exposid{iterator}@ {
1789917899
using @\exposid{Base}@ = @\exposid{maybe-const}@<Const, V>; // \expos
1790017900

1790117901
iterator_t<@\exposid{Base}@> @\exposid{current_}@ = iterator_t<@\exposid{Base}@>(); // \expos
@@ -17940,7 +17940,7 @@
1794017940
}
1794117941
\end{codeblock}
1794217942

17943-
\indexlibraryctor{to_input_view::\exposid{iterator}}%
17943+
\indexlibraryctor{as_input_view::\exposid{iterator}}%
1794417944
\begin{itemdecl}
1794517945
constexpr explicit @\exposid{iterator}@(iterator_t<@\exposid{Base}@> current);
1794617946
\end{itemdecl}
@@ -17951,7 +17951,7 @@
1795117951
Initializes \exposid{current_} with \tcode{std::move(current)}.
1795217952
\end{itemdescr}
1795317953

17954-
\indexlibraryctor{to_input_view::\exposid{iterator}}%
17954+
\indexlibraryctor{as_input_view::\exposid{iterator}}%
1795517955
\begin{itemdecl}
1795617956
constexpr @\exposid{iterator}@(@\exposid{iterator}@<!Const> i)
1795717957
requires Const && @\libconcept{convertible_to}@<iterator_t<V>, iterator_t<@\exposid{Base}@>>;
@@ -17963,7 +17963,7 @@
1796317963
Initializes \exposid{current_} with \tcode{std::move(i.\exposid{current_})}.
1796417964
\end{itemdescr}
1796517965

17966-
\indexlibrarymember{base}{to_input_view::\exposid{iterator}}%
17966+
\indexlibrarymember{base}{as_input_view::\exposid{iterator}}%
1796717967
\begin{itemdecl}
1796817968
constexpr iterator_t<@\exposid{Base}@> base() &&;
1796917969
\end{itemdecl}
@@ -17974,7 +17974,7 @@
1797417974
\tcode{std::move(\exposid{current_})}.
1797517975
\end{itemdescr}
1797617976

17977-
\indexlibrarymember{base}{to_input_view::\exposid{iterator}}%
17977+
\indexlibrarymember{base}{as_input_view::\exposid{iterator}}%
1797817978
\begin{itemdecl}
1797917979
constexpr const iterator_t<@\exposid{Base}@>& base() const & noexcept;
1798017980
\end{itemdecl}
@@ -17985,7 +17985,7 @@
1798517985
\exposid{current_}.
1798617986
\end{itemdescr}
1798717987

17988-
\indexlibrarymember{operator++}{to_input_view::\exposid{iterator}}%
17988+
\indexlibrarymember{operator++}{as_input_view::\exposid{iterator}}%
1798917989
\begin{itemdecl}
1799017990
constexpr @\exposid{iterator}@& operator++();
1799117991
\end{itemdecl}
@@ -18000,7 +18000,7 @@
1800018000
\end{codeblock}
1800118001
\end{itemdescr}
1800218002

18003-
\indexlibrarymember{operator++}{to_input_view::\exposid{iterator}}%
18003+
\indexlibrarymember{operator++}{as_input_view::\exposid{iterator}}%
1800418004
\begin{itemdecl}
1800518005
constexpr void operator++(int);
1800618006
\end{itemdecl}
@@ -18011,7 +18011,7 @@
1801118011
Equivalent to: \tcode{++*this;}
1801218012
\end{itemdescr}
1801318013

18014-
\indexlibrarymember{operator==}{to_input_view::\exposid{iterator}}%
18014+
\indexlibrarymember{operator==}{as_input_view::\exposid{iterator}}%
1801518015
\begin{itemdecl}
1801618016
friend constexpr bool operator==(const @\exposid{iterator}@& x, const sentinel_t<@\exposid{Base}@>& y);
1801718017
\end{itemdecl}
@@ -18022,7 +18022,7 @@
1802218022
\tcode{x.\exposid{current_} == y}.
1802318023
\end{itemdescr}
1802418024

18025-
\indexlibrarymember{operator-}{to_input_view::\exposid{iterator}}%
18025+
\indexlibrarymember{operator-}{as_input_view::\exposid{iterator}}%
1802618026
\begin{itemdecl}
1802718027
friend constexpr difference_type operator-(const sentinel_t<@\exposid{Base}@>& y, const @\exposid{iterator}@& x)
1802818028
requires @\libconcept{sized_sentinel_for}@<sentinel_t<@\exposid{Base}@>, iterator_t<@\exposid{Base}@>>;
@@ -18034,7 +18034,7 @@
1803418034
\tcode{y - x.\exposid{current_}}.
1803518035
\end{itemdescr}
1803618036

18037-
\indexlibrarymember{operator-}{to_input_view::\exposid{iterator}}%
18037+
\indexlibrarymember{operator-}{as_input_view::\exposid{iterator}}%
1803818038
\begin{itemdecl}
1803918039
friend constexpr difference_type operator-(const @\exposid{iterator}@& x, const sentinel_t<@\exposid{Base}@>& y)
1804018040
requires @\libconcept{sized_sentinel_for}@<sentinel_t<@\exposid{Base}@>, iterator_t<@\exposid{Base}@>>;
@@ -18046,7 +18046,7 @@
1804618046
\tcode{x.\exposid{current_} - y}.
1804718047
\end{itemdescr}
1804818048

18049-
\indexlibrarymember{iter_move}{to_input_view::\exposid{iterator}}%
18049+
\indexlibrarymember{iter_move}{as_input_view::\exposid{iterator}}%
1805018050
\begin{itemdecl}
1805118051
friend constexpr range_rvalue_reference_t<@\exposid{Base}@> iter_move(const @\exposid{iterator}@& i)
1805218052
noexcept(noexcept(ranges::iter_move(i.@\exposid{current_}@)));
@@ -18058,7 +18058,7 @@
1805818058
Equivalent to: \tcode{return ranges::iter_move(i.\exposid{current_});}
1805918059
\end{itemdescr}
1806018060

18061-
\indexlibrarymember{iter_swap}{to_input_view::\exposid{iterator}}%
18061+
\indexlibrarymember{iter_swap}{as_input_view::\exposid{iterator}}%
1806218062
\begin{itemdecl}
1806318063
friend constexpr void iter_swap(const @\exposid{iterator}@& x, const @\exposid{iterator}@& y)
1806418064
noexcept(noexcept(ranges::iter_swap(x.@\exposid{current_}@, y.@\exposid{current_}@)))

source/support.tex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -809,7 +809,7 @@
809809
#define @\defnlibxname{cpp_lib_ranges_starts_ends_with}@ 202106L // freestanding, also in \libheader{algorithm}
810810
#define @\defnlibxname{cpp_lib_ranges_stride}@ 202207L // freestanding, also in \libheader{ranges}
811811
#define @\defnlibxname{cpp_lib_ranges_to_container}@ 202202L // freestanding, also in \libheader{ranges}
812-
#define @\defnlibxname{cpp_lib_ranges_to_input}@ 202502L // freestanding, also in \libheader{ranges}
812+
#define @\defnlibxname{cpp_lib_ranges_as_input}@ 202502L // freestanding, also in \libheader{ranges}
813813
#define @\defnlibxname{cpp_lib_ranges_zip}@ 202110L
814814
// freestanding, also in \libheader{ranges}, \libheader{tuple}, \libheader{utility}
815815
#define @\defnlibxname{cpp_lib_ratio}@ 202306L // freestanding, also in \libheader{ratio}

0 commit comments

Comments
 (0)