Skip to content

Commit 42bb140

Browse files
tkoeppetkoeppe
committed
[ranges] Tweak whitespace, comment alignment, italic correction
1 parent 3a9f398 commit 42bb140

File tree

1 file changed

+60
-45
lines changed

1 file changed

+60
-45
lines changed

‎source/ranges.tex

Lines changed: 60 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -2213,8 +2213,10 @@
22132213
private:
22142214
// \ref{range.iota.iterator}, class \tcode{iota_view::\exposid{iterator}}
22152215
struct @\exposidnc{iterator}@; // \expos
2216+
22162217
// \ref{range.iota.sentinel}, class \tcode{iota_view::\exposid{sentinel}}
22172218
struct @\exposidnc{sentinel}@; // \expos
2219+
22182220
W @\exposid{value_}@ = W(); // \expos
22192221
Bound @\exposid{bound_}@ = Bound(); // \expos
22202222

@@ -3525,6 +3527,7 @@
35253527

35263528
// \ref{range.filter.iterator}, class \tcode{filter_view::\exposid{iterator}}
35273529
class @\exposid{iterator}@; // \expos
3530+
35283531
// \ref{range.filter.sentinel}, class \tcode{filter_view::\exposid{sentinel}}
35293532
class @\exposid{sentinel}@; // \expos
35303533

@@ -3948,6 +3951,7 @@
39483951
private:
39493952
// \ref{range.transform.iterator}, class template \tcode{transform_view::\exposid{iterator}}
39503953
template<bool> struct @\exposid{iterator}@; // \expos
3954+
39513955
// \ref{range.transform.sentinel}, class template \tcode{transform_view::\exposid{sentinel}}
39523956
template<bool> struct @\exposid{sentinel}@; // \expos
39533957

@@ -4681,8 +4685,10 @@
46814685
private:
46824686
V @\exposid{base_}@ = V(); // \expos
46834687
range_difference_t<V> @\exposid{count_}@ = 0; // \expos
4688+
46844689
// \ref{range.take.sentinel}, class template \tcode{take_view::\exposid{sentinel}}
46854690
template<bool> struct @\exposid{sentinel}@; // \expos
4691+
46864692
public:
46874693
take_view() requires @\libconcept{default_initializable}@<V> = default;
46884694
constexpr take_view(V base, range_difference_t<V> count);
@@ -6396,8 +6402,10 @@
63966402
private:
63976403
V @\exposid{base_}@ = V(); // \expos
63986404
Pattern @\exposid{pattern_}@ = Pattern(); // \expos
6405+
63996406
// \ref{range.split.iterator}, class \tcode{split_view::\exposid{iterator}}
64006407
struct @\exposid{iterator}@; // \expos
6408+
64016409
// \ref{range.split.sentinel}, class \tcode{split_view::\exposid{sentinel}}
64026410
struct @\exposid{sentinel}@; // \expos
64036411

@@ -7084,8 +7092,10 @@
70847092
private:
70857093
// \ref{range.elements.iterator}, class template \tcode{elements_view::\exposid{iterator}}
70867094
template<bool> struct @\exposid{iterator}@; // \expos
7095+
70877096
// \ref{range.elements.sentinel}, class template \tcode{elements_view::\exposid{sentinel}}
70887097
template<bool> struct @\exposid{sentinel}@; // \expos
7098+
70897099
V @\exposid{base_}@ = V(); // \expos
70907100
};
70917101
}
@@ -7689,12 +7699,13 @@
76897699
template<@\libconcept{input_range}@... Views>
76907700
requires (@\libconcept{view}@<Views> && ...) && (sizeof...(Views) > 0)
76917701
class zip_view : public view_interface<zip_view<Views...>> {
7692-
tuple<Views...> @\exposid{views_}@; // \expos
7702+
tuple<Views...> @\exposid{views_}@; // \expos
76937703

76947704
// \ref{range.zip.iterator}, class template \tcode{zip_view::\exposid{iterator}}
7695-
template<bool> class @\exposid{iterator}@; // \expos
7705+
template<bool> class @\exposidnc{iterator}@; // \expos
7706+
76967707
// \ref{range.zip.sentinel}, class template \tcode{zip_view::\exposid{sentinel}}
7697-
template<bool> class @\exposid{sentinel}@; // \expos
7708+
template<bool> class @\exposidnc{sentinel}@; // \expos
76987709

76997710
public:
77007711
zip_view() = default;
@@ -7790,21 +7801,21 @@
77907801
\begin{codeblock}
77917802
namespace std::ranges {
77927803
template<bool Const, class... Views>
7793-
concept @\defexposconcept{all-random-access}@ = // \expos
7804+
concept @\defexposconceptnc{all-random-access}@ = // \expos
77947805
(@\libconcept{random_access_range}@<@\exposid{maybe-const}@<Const, Views>> && ...);
77957806
template<bool Const, class... Views>
7796-
concept @\defexposconcept{all-bidirectional}@ = // \expos
7807+
concept @\defexposconceptnc{all-bidirectional}@ = // \expos
77977808
(@\libconcept{bidirectional_range}@<@\exposid{maybe-const}@<Const, Views>> && ...);
77987809
template<bool Const, class... Views>
7799-
concept @\defexposconcept{all-forward}@ = // \expos
7810+
concept @\defexposconceptnc{all-forward}@ = // \expos
78007811
(@\libconcept{forward_range}@<@\exposid{maybe-const}@<Const, Views>> && ...);
78017812

78027813
template<@\libconcept{input_range}@... Views>
78037814
requires (@\libconcept{view}@<Views> && ...) && (sizeof...(Views) > 0)
78047815
template<bool Const>
78057816
class zip_view<Views...>::@\exposid{iterator}@ {
7806-
@\exposid{tuple-or-pair}@<iterator_t<@\exposid{maybe-const}@<Const, Views>>...> @\exposid{current_}@; // \expos
7807-
constexpr explicit @\exposid{iterator}@(@\exposid{tuple-or-pair}@<iterator_t<@\exposid{maybe-const}@<Const, Views>>...>);
7817+
@\exposid{tuple-or-pair}@<iterator_t<@\exposidnc{maybe-const}@<Const, Views>>...> @\exposid{current_}@;@\itcorr[-1]@ // \expos
7818+
constexpr explicit @\exposidnc{iterator}@(@\exposid{tuple-or-pair}@<iterator_t<@\exposidnc{maybe-const}@<Const, Views>>...>);
78087819
// \expos
78097820
public:
78107821
using iterator_category = input_iterator_tag; // not always present
@@ -8230,8 +8241,8 @@
82308241
requires (@\libconcept{view}@<Views> && ...) && (sizeof...(Views) > 0)
82318242
template<bool Const>
82328243
class zip_view<Views...>::@\exposid{sentinel}@ {
8233-
@\exposid{tuple-or-pair}@<sentinel_t<@\exposid{maybe-const}@<Const, Views>>...> @\exposid{end_}@; // \expos
8234-
constexpr explicit @\exposid{sentinel}@(@\exposid{tuple-or-pair}@<sentinel_t<@\exposid{maybe-const}@<Const, Views>>...> end);
8244+
@\exposid{tuple-or-pair}@<sentinel_t<@\exposidnc{maybe-const}@<Const, Views>>...> @\exposid{end_}@;@\itcorr[-1]@ // \expos
8245+
constexpr explicit @\exposidnc{sentinel}@(@\exposid{tuple-or-pair}@<sentinel_t<@\exposidnc{maybe-const}@<Const, Views>>...> end);
82358246
// \expos
82368247
public:
82378248
@\exposid{sentinel}@() = default;
@@ -8396,19 +8407,20 @@
83968407
@\libconcept{regular_invocable}@<F&, range_reference_t<Views>...> &&
83978408
@\exposconcept{can-reference}@<invoke_result_t<F&, range_reference_t<Views>...>>
83988409
class zip_transform_view : public view_interface<zip_transform_view<F, Views...>> {
8399-
@\exposid{copyable-box}@<F> @\exposid{fun_}@; // \expos
8400-
zip_view<Views...> @\exposid{zip_}@; // \expos
8410+
@\exposidnc{copyable-box}@<F> @\exposid{fun_}@; // \expos
8411+
zip_view<Views...> @\exposid{zip_}@; // \expos
84018412

8402-
using @\exposid{InnerView}@ = zip_view<Views...>; // \expos
8413+
using @\exposidnc{InnerView}@ = zip_view<Views...>; // \expos
84038414
template<bool Const>
8404-
using @\exposid{ziperator}@ = iterator_t<@\exposid{maybe-const}@<Const, @\exposid{InnerView}@>>; // \expos
8415+
using @\exposidnc{ziperator}@ = iterator_t<@\exposidnc{maybe-const}@<Const, @\exposidnc{InnerView}@>>; // \expos
84058416
template<bool Const>
8406-
using @\exposid{zentinel}@ = sentinel_t<@\exposid{maybe-const}@<Const, @\exposid{InnerView}@>>; // \expos
8417+
using @\exposidnc{zentinel}@ = sentinel_t<@\exposidnc{maybe-const}@<Const, @\exposidnc{InnerView}@>>; // \expos
84078418

84088419
// \ref{range.zip.transform.iterator}, class template \tcode{zip_transform_view::\exposid{iterator}}
8409-
template<bool> class @\exposid{iterator}@; // \expos
8420+
template<bool> class @\exposidnc{iterator}@; // \expos
8421+
84108422
// \ref{range.zip.transform.sentinel}, class template \tcode{zip_transform_view::\exposid{sentinel}}
8411-
template<bool> class @\exposid{sentinel}@; // \expos
8423+
template<bool> class @\exposidnc{sentinel}@; // \expos
84128424

84138425
public:
84148426
zip_transform_view() = default;
@@ -8477,15 +8489,15 @@
84778489
@\exposconcept{can-reference}@<invoke_result_t<F&, range_reference_t<Views>...>>
84788490
template<bool Const>
84798491
class zip_transform_view<F, Views...>::@\exposid{iterator}@ {
8480-
using @\exposid{Parent}@ = @\exposid{maybe-const}@<Const, zip_transform_view>; // \expos
8481-
using @\exposid{Base}@ = @\exposid{maybe-const}@<Const, @\exposid{InnerView}@>; // \expos
8482-
@\exposid{Parent}@* @\exposid{parent_}@ = nullptr; // \expos
8483-
@\exposid{ziperator}@<Const> @\exposid{inner_}@; // \expos
8492+
using @\exposidnc{Parent}@ = @\exposidnc{maybe-const}@<Const, zip_transform_view>; // \expos
8493+
using @\exposidnc{Base}@ = @\exposidnc{maybe-const}@<Const, @\exposidnc{InnerView}@>; // \expos
8494+
@\exposidnc{Parent}@* @\exposid{parent_}@ = nullptr; // \expos
8495+
@\exposid{ziperator}@<Const> @\exposid{inner_}@;@\itcorr[-1]@ // \expos
84848496

8485-
constexpr @\exposid{iterator}@(@\exposid{Parent}@& parent, @\exposid{ziperator}@<Const> inner); // \expos
8497+
constexpr @\exposid{iterator}@(@\exposid{Parent}@& parent, @\exposid{ziperator}@<Const> inner); // \expos
84868498

84878499
public:
8488-
using iterator_category = @\seebelow@; // not always present
8500+
using iterator_category = @\seebelownc@; // not always present
84898501
using iterator_concept = typename @\exposid{ziperator}@<Const>::iterator_concept;
84908502
using value_type =
84918503
remove_cvref_t<invoke_result_t<@\exposid{maybe-const}@<Const, F>&,
@@ -8805,8 +8817,9 @@
88058817
@\exposconcept{can-reference}@<invoke_result_t<F&, range_reference_t<Views>...>>
88068818
template<bool Const>
88078819
class zip_transform_view<F, Views...>::@\exposid{sentinel}@ {
8808-
@\exposid{zentinel}@<Const> @\exposid{inner_}@; // \expos
8809-
constexpr explicit @\exposid{sentinel}@(@\exposid{zentinel}@<Const> inner); // \expos
8820+
@\exposidnc{zentinel}@<Const> @\exposid{inner_}@; // \expos
8821+
constexpr explicit @\exposidnc{sentinel}@(@\exposidnc{zentinel}@<Const> inner); // \expos
8822+
88108823
public:
88118824
@\exposid{sentinel}@() = default;
88128825
constexpr @\exposid{sentinel}@(@\exposid{sentinel}@<!Const> i)
@@ -8933,11 +8946,12 @@
89338946
V @\exposid{base_}@ = V(); // \expos
89348947

89358948
// \ref{range.adjacent.iterator}, class template \tcode{adjacent_view::\exposid{iterator}}
8936-
template<bool> class @\exposid{iterator}@; // \expos
8949+
template<bool> class @\exposidnc{iterator}@; // \expos
8950+
89378951
// \ref{range.adjacent.sentinel}, class template \tcode{adjacent_view::\exposid{sentinel}}
8938-
template<bool> class @\exposid{sentinel}@; // \expos
8952+
template<bool> class @\exposidnc{sentinel}@; // \expos
89398953

8940-
struct @\exposid{as-sentinel}@{}; // \expos
8954+
struct @\exposidnc{as-sentinel}@{}; // \expos
89418955

89428956
public:
89438957
adjacent_view() requires @\libconcept{default_initializable}@<V> = default;
@@ -9009,10 +9023,10 @@
90099023
requires @\libconcept{view}@<V> && (N > 0)
90109024
template<bool Const>
90119025
class adjacent_view<V, N>::@\exposid{iterator}@ {
9012-
using @\exposid{Base}@ = @\exposid{maybe-const}@<Const, V>; // \expos
9013-
array<iterator_t<@\exposid{Base}@>, N> @\exposid{current_}@ = array<iterator_t<@\exposid{Base}@>, N>(); // \expos
9014-
constexpr @\exposid{iterator}@(iterator_t<@\exposid{Base}@> first, sentinel_t<@\exposid{Base}@> last); // \expos
9015-
constexpr @\exposid{iterator}@(@\exposid{as-sentinel}@, iterator_t<@\exposid{Base}@> first, iterator_t<@\exposid{Base}@> last);
9026+
using @\exposidnc{Base}@ = @\exposidnc{maybe-const}@<Const, V>; // \expos
9027+
array<iterator_t<@\exposidnc{Base}@>, N> @\exposid{current_}@ = array<iterator_t<@\exposidnc{Base}@>, N>(); // \expos
9028+
constexpr @\exposidnc{iterator}@(iterator_t<@\exposidnc{Base}@> first, sentinel_t<@\exposidnc{Base}@> last); // \expos
9029+
constexpr @\exposidnc{iterator}@(@\exposidnc{as-sentinel}@, iterator_t<@\exposidnc{Base}@> first, iterator_t<@\exposidnc{Base}@> last);
90169030
// \expos
90179031
public:
90189032
using iterator_category = input_iterator_tag;
@@ -9566,19 +9580,20 @@
95669580
@\libconcept{regular_invocable}@<F&, @\exposid{REPEAT}@(range_reference_t<V>, N)...> &&
95679581
@\exposconcept{can-reference}@<invoke_result_t<F&, @\exposid{REPEAT}@(range_reference_t<V>, N)...>>
95689582
class adjacent_transform_view : public view_interface<adjacent_transform_view<V, F, N>> {
9569-
@\exposid{copyable-box}@<F> @\exposid{fun_}@; // \expos
9583+
@\exposidnc{copyable-box}@<F> @\exposid{fun_}@; // \expos
95709584
adjacent_view<V, N> @\exposid{inner_}@; // \expos
95719585

9572-
using @\exposid{InnerView}@ = adjacent_view<V, N>; // \expos
9586+
using @\exposidnc{InnerView}@ = adjacent_view<V, N>; // \expos
95739587
template<bool Const>
9574-
using @\exposid{inner-iterator}@ = iterator_t<@\exposid{maybe-const}@<Const, @\exposid{InnerView}@>>; // \expos
9588+
using @\exposid{inner-iterator}@ = iterator_t<@\exposid{maybe-const}@<Const, @\exposid{InnerView}@>>; // \expos
95759589
template<bool Const>
9576-
using @\exposid{inner-sentinel}@ = sentinel_t<@\exposid{maybe-const}@<Const, @\exposid{InnerView}@>>; // \expos
9590+
using @\exposid{inner-sentinel}@ = sentinel_t<@\exposid{maybe-const}@<Const, @\exposid{InnerView}@>>; // \expos
95779591

95789592
// \ref{range.adjacent.transform.iterator}, class template \tcode{adjacent_transform_view::\exposid{iterator}}
9579-
template<bool> class @\exposid{iterator}@; // \expos
9593+
template<bool> class @\exposidnc{iterator}@; // \expos
9594+
95809595
// \ref{range.adjacent.transform.sentinel}, class template \tcode{adjacent_transform_view::\exposid{sentinel}}
9581-
template<bool> class @\exposid{sentinel}@; // \expos
9596+
template<bool> class @\exposidnc{sentinel}@; // \expos
95829597

95839598
public:
95849599
adjacent_transform_view() = default;
@@ -9645,12 +9660,12 @@
96459660
@\exposconcept{can-reference}@<invoke_result_t<F&, @\exposid{REPEAT}@(range_reference_t<V>, N)...>>
96469661
template<bool Const>
96479662
class adjacent_transform_view<F, V...>::@\exposid{iterator}@ {
9648-
using @\exposid{Parent}@ = @\exposid{maybe-const}@<Const, adjacent_transform_view>; // \expos
9649-
using @\exposid{Base}@ = @\exposid{maybe-const}@<Const, V>; // \expos
9650-
@\exposid{Parent}@* @\exposid{parent_}@ = nullptr; // \expos
9651-
@\exposid{inner-iterator}@<Const> @\exposid{inner_}@; // \expos
9663+
using @\exposidnc{Parent}@ = @\exposidnc{maybe-const}@<Const, adjacent_transform_view>; // \expos
9664+
using @\exposidnc{Base}@ = @\exposidnc{maybe-const}@<Const, V>; // \expos
9665+
@\exposidnc{Parent}@* @\exposid{parent_}@ = nullptr; // \expos
9666+
@\exposidnc{inner-iterator}@<Const> @\exposid{inner_}@; // \expos
96529667

9653-
constexpr @\exposid{iterator}@(@\exposid{Parent}@& parent, @\exposid{inner-iterator}@<Const> inner); // \expos
9668+
constexpr @\exposidnc{iterator}@(@\exposidnc{Parent}@& parent, @\exposidnc{inner-iterator}@<Const> inner); // \expos
96549669

96559670
public:
96569671
using iterator_category = @\seebelow@;
@@ -9948,8 +9963,8 @@
99489963
@\exposconcept{can-reference}@<invoke_result_t<F&, @\exposid{REPEAT}@(range_reference_t<V>, N)...>>
99499964
template<bool Const>
99509965
class adjacent_transform_view<V, F, N>::@\exposid{sentinel}@ {
9951-
@\exposid{inner-sentinel}@<Const> @\exposid{inner_}@; // \expos
9952-
constexpr explicit @\exposid{sentinel}@(@\exposid{inner-sentinel}@<Const> inner); // \expos
9966+
@\exposidnc{inner-sentinel}@<Const> @\exposid{inner_}@; // \expos
9967+
constexpr explicit @\exposidnc{sentinel}@(@\exposidnc{inner-sentinel}@<Const> inner); // \expos
99539968

99549969
public:
99559970
@\exposid{sentinel}@() = default;

0 commit comments

Comments
 (0)