Skip to content

Commit 3a9f398

Browse files
committed
[ranges] Tweak use of braces and whitespace
For example: * Use braces symmetrically in if+else statements. * Consistently spell empty blocks as "{}", on the same line. * Indent required-clauses consistently. * Avoid unnecessary line breaks.
1 parent ed7cb02 commit 3a9f398

File tree

1 file changed

+38
-44
lines changed

1 file changed

+38
-44
lines changed

source/ranges.tex

Lines changed: 38 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@
8585
template<class T>
8686
inline constexpr bool enable_view = @\seebelow@;
8787

88-
struct view_base { };
88+
struct view_base {};
8989

9090
template<class T>
9191
concept view = @\seebelow@;
@@ -1638,8 +1638,7 @@
16381638
@\libconcept{convertible_to}@<sentinel_t<R>, S>
16391639
constexpr subrange(R&& r, @\placeholdernc{make-unsigned-like-t}@<iter_difference_t<I>> n)
16401640
requires (K == subrange_kind::sized)
1641-
: subrange{ranges::begin(r), ranges::end(r), n}
1642-
{}
1641+
: subrange{ranges::begin(r), ranges::end(r), n} {}
16431642

16441643
template<@\exposconcept{different-from}@<subrange> PairLike>
16451644
requires @\exposconcept{pair-like-convertible-from}@<PairLike, const I&, const S&>
@@ -1947,7 +1946,7 @@
19471946
namespace std::ranges {
19481947
struct dangling {
19491948
constexpr dangling() noexcept = default;
1950-
constexpr dangling(auto&&...) noexcept { }
1949+
constexpr dangling(auto&&...) noexcept {}
19511950
};
19521951
}
19531952
\end{codeblock}
@@ -2968,8 +2967,7 @@
29682967
public:
29692968
constexpr explicit basic_istream_view(basic_istream<CharT, Traits>& stream);
29702969

2971-
constexpr auto begin()
2972-
{
2970+
constexpr auto begin() {
29732971
*@\exposid{stream_}@ >> @\exposid{value_}@;
29742972
return @\exposid{iterator}@{*this};
29752973
}
@@ -3215,8 +3213,7 @@
32153213
\begin{codeblock}
32163214
constexpr @\exposid{copyable-box}@() noexcept(is_nothrow_default_constructible_v<T>)
32173215
requires @\libconcept{default_initializable}@<T>
3218-
: @\exposid{copyable-box}@{in_place}
3219-
{ }
3216+
: @\exposid{copyable-box}@{in_place} {}
32203217
\end{codeblock}
32213218

32223219
\item If \tcode{\libconcept{copyable}<T>} is not
@@ -3267,7 +3264,7 @@
32673264
\item
32683265
The copy constructor is equivalent to:
32693266
\begin{codeblock}
3270-
constexpr @\exposid{non-propagating-cache}@(const @\exposid{non-propagating-cache}@&) noexcept { }
3267+
constexpr @\exposid{non-propagating-cache}@(const @\exposid{non-propagating-cache}@&) noexcept {}
32713268
\end{codeblock}
32723269
\item
32733270
The move constructor is equivalent to:
@@ -3394,6 +3391,7 @@
33943391
constexpr auto data() const requires @\libconcept{contiguous_range}@<R>
33953392
{ return ranges::data(*@\exposid{r_}@); }
33963393
};
3394+
33973395
template<class R>
33983396
ref_view(R&) -> ref_view<R>;
33993397
}
@@ -3457,11 +3455,9 @@
34573455
constexpr auto end() const requires @\libconcept{range}@<const R>
34583456
{ return ranges::end(@\exposid{r_}@); }
34593457

3460-
constexpr bool empty()
3461-
requires requires { ranges::empty(@\exposid{r_}@); }
3458+
constexpr bool empty() requires requires { ranges::empty(@\exposid{r_}@); }
34623459
{ return ranges::empty(@\exposid{r_}@); }
3463-
constexpr bool empty() const
3464-
requires requires { ranges::empty(@\exposid{r_}@); }
3460+
constexpr bool empty() const requires requires { ranges::empty(@\exposid{r_}@); }
34653461
{ return ranges::empty(@\exposid{r_}@); }
34663462

34673463
constexpr auto size() requires @\libconcept{sized_range}@<R>
@@ -4696,26 +4692,28 @@
46964692

46974693
constexpr auto begin() requires (!@\exposconcept{simple-view}@<V>) {
46984694
if constexpr (@\libconcept{sized_range}@<V>) {
4699-
if constexpr (@\libconcept{random_access_range}@<V>)
4695+
if constexpr (@\libconcept{random_access_range}@<V>) {
47004696
return ranges::begin(@\exposid{base_}@);
4701-
else {
4697+
} else {
47024698
auto sz = range_difference_t<V>(size());
47034699
return counted_iterator(ranges::begin(@\exposid{base_}@), sz);
47044700
}
4705-
} else
4701+
} else {
47064702
return counted_iterator(ranges::begin(@\exposid{base_}@), @\exposid{count_}@);
4703+
}
47074704
}
47084705

47094706
constexpr auto begin() const requires @\libconcept{range}@<const V> {
47104707
if constexpr (@\libconcept{sized_range}@<const V>) {
4711-
if constexpr (@\libconcept{random_access_range}@<const V>)
4708+
if constexpr (@\libconcept{random_access_range}@<const V>) {
47124709
return ranges::begin(@\exposid{base_}@);
4713-
else {
4710+
} else {
47144711
auto sz = range_difference_t<const V>(size());
47154712
return counted_iterator(ranges::begin(@\exposid{base_}@), sz);
47164713
}
4717-
} else
4714+
} else {
47184715
return counted_iterator(ranges::begin(@\exposid{base_}@), @\exposid{count_}@);
4716+
}
47194717
}
47204718

47214719
constexpr auto end() requires (!@\exposconcept{simple-view}@<V>) {
@@ -4724,8 +4722,9 @@
47244722
return ranges::begin(@\exposid{base_}@) + range_difference_t<V>(size());
47254723
else
47264724
return default_sentinel;
4727-
} else
4725+
} else {
47284726
return @\exposid{sentinel}@<false>{ranges::end(@\exposid{base_}@)};
4727+
}
47294728
}
47304729

47314730
constexpr auto end() const requires @\libconcept{range}@<const V> {
@@ -4734,8 +4733,9 @@
47344733
return ranges::begin(@\exposid{base_}@) + range_difference_t<const V>(size());
47354734
else
47364735
return default_sentinel;
4737-
} else
4736+
} else {
47384737
return @\exposid{sentinel}@<true>{ranges::end(@\exposid{base_}@)};
4738+
}
47394739
}
47404740

47414741
constexpr auto size() requires @\libconcept{sized_range}@<V> {
@@ -5120,29 +5120,24 @@
51205120
constexpr auto begin() const
51215121
requires @\libconcept{random_access_range}@<const V> && @\libconcept{sized_range}@<const V>;
51225122

5123-
constexpr auto end()
5124-
requires (!@\exposconcept{simple-view}@<V>)
5123+
constexpr auto end() requires (!@\exposconcept{simple-view}@<V>)
51255124
{ return ranges::end(@\exposid{base_}@); }
51265125

5127-
constexpr auto end() const
5128-
requires @\libconcept{range}@<const V>
5126+
constexpr auto end() const requires @\libconcept{range}@<const V>
51295127
{ return ranges::end(@\exposid{base_}@); }
51305128

5131-
constexpr auto size()
5132-
requires @\libconcept{sized_range}@<V>
5133-
{
5129+
constexpr auto size() requires @\libconcept{sized_range}@<V> {
51345130
const auto s = ranges::size(@\exposid{base_}@);
51355131
const auto c = static_cast<decltype(s)>(@\exposid{count_}@);
51365132
return s < c ? 0 : s - c;
51375133
}
51385134

5139-
constexpr auto size() const
5140-
requires @\libconcept{sized_range}@<const V>
5141-
{
5135+
constexpr auto size() const requires @\libconcept{sized_range}@<const V> {
51425136
const auto s = ranges::size(@\exposid{base_}@);
51435137
const auto c = static_cast<decltype(s)>(@\exposid{count_}@);
51445138
return s < c ? 0 : s - c;
51455139
}
5140+
51465141
private:
51475142
V @\exposid{base_}@ = V(); // \expos
51485143
range_difference_t<V> @\exposid{count_}@ = 0; // \expos
@@ -5248,8 +5243,7 @@
52485243

52495244
constexpr auto begin();
52505245

5251-
constexpr auto end()
5252-
{ return ranges::end(@\exposid{base_}@); }
5246+
constexpr auto end() { return ranges::end(@\exposid{base_}@); }
52535247

52545248
private:
52555249
V @\exposid{base_}@ = V(); // \expos
@@ -5378,10 +5372,9 @@
53785372
}
53795373

53805374
constexpr auto begin() const
5381-
requires @\libconcept{input_range}@<const V> &&
5382-
is_reference_v<range_reference_t<const V>> {
5383-
return @\exposid{iterator}@<true>{*this, ranges::begin(@\exposid{base_}@)};
5384-
}
5375+
requires @\libconcept{input_range}@<const V> &&
5376+
is_reference_v<range_reference_t<const V>>
5377+
{ return @\exposid{iterator}@<true>{*this, ranges::begin(@\exposid{base_}@)}; }
53855378

53865379
constexpr auto end() {
53875380
if constexpr (@\libconcept{forward_range}@<V> &&
@@ -5393,8 +5386,8 @@
53935386
}
53945387

53955388
constexpr auto end() const
5396-
requires @\libconcept{input_range}@<const V> &&
5397-
is_reference_v<range_reference_t<const V>> {
5389+
requires @\libconcept{input_range}@<const V> &&
5390+
is_reference_v<range_reference_t<const V>> {
53985391
if constexpr (@\libconcept{forward_range}@<const V> &&
53995392
@\libconcept{forward_range}@<range_reference_t<const V>> &&
54005393
@\libconcept{common_range}@<const V> &&
@@ -5444,6 +5437,7 @@
54445437
@\exposidnc{Parent}@* @\exposid{parent_}@ = nullptr; // \expos
54455438

54465439
constexpr void @\exposidnc{satisfy}@(); // \expos
5440+
54475441
public:
54485442
using iterator_concept = @\seebelow@;
54495443
using iterator_category = @\seebelow@; // not always present
@@ -5750,6 +5744,7 @@
57505744
using @\exposid{Parent}@ = @\exposid{maybe-const}@<Const, join_view>; // \expos
57515745
using @\exposid{Base}@ = @\exposid{maybe-const}@<Const, V>; // \expos
57525746
sentinel_t<@\exposid{Base}@> @\exposid{end_}@ = sentinel_t<@\exposid{Base}@>(); // \expos
5747+
57535748
public:
57545749
@\exposid{sentinel}@() = default;
57555750

@@ -5879,10 +5874,10 @@
58795874
constexpr V base() && { return std::move(@\exposid{base_}@); }
58805875

58815876
constexpr auto begin() {
5882-
if constexpr (@\libconcept{forward_range}@<V>)
5877+
if constexpr (@\libconcept{forward_range}@<V>) {
58835878
return @\exposid{outer-iterator}@<@\exposconcept{simple-view}@<V> && @\exposconcept{simple-view}@<Pattern>>
58845879
{*this, ranges::begin(@\exposid{base_}@)};
5885-
else {
5880+
} else {
58865881
@\exposid{current_}@ = ranges::begin(@\exposid{base_}@);
58875882
return @\exposid{outer-iterator}@<false>{*this};
58885883
}
@@ -6900,6 +6895,7 @@
69006895
constexpr auto size() requires @\libconcept{sized_range}@<V> {
69016896
return ranges::size(@\exposid{base_}@);
69026897
}
6898+
69036899
constexpr auto size() const requires @\libconcept{sized_range}@<const V> {
69046900
return ranges::size(@\exposid{base_}@);
69056901
}
@@ -8419,9 +8415,7 @@
84198415

84208416
constexpr explicit zip_transform_view(F fun, Views... views);
84218417

8422-
constexpr auto begin() {
8423-
return @\exposid{iterator}@<false>(*this, @\exposid{zip_}@.begin());
8424-
}
8418+
constexpr auto begin() { return @\exposid{iterator}@<false>(*this, @\exposid{zip_}@.begin()); }
84258419

84268420
constexpr auto begin() const
84278421
requires @\libconcept{range}@<const @\exposid{InnerView}@> &&

0 commit comments

Comments
 (0)