Skip to content

Commit 1ca2b45

Browse files
committed
fixup burblebee
1 parent 63dd5d1 commit 1ca2b45

File tree

2 files changed

+20
-26
lines changed

2 files changed

+20
-26
lines changed

source/ranges.tex

Lines changed: 19 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -7811,9 +7811,9 @@
78117811
class zip_view<Views...>::@\exposid{iterator}@ {
78127812
@\exposid{tuple-or-pair}@<iterator_t<@\exposid{maybe-const}@<Const, Views>>...> @\exposid{current_}@; // \expos
78137813
constexpr explicit @\exposid{iterator}@(@\exposid{tuple-or-pair}@<iterator_t<@\exposid{maybe-const}@<Const, Views>>...>);
7814-
// \expos
7814+
// \expos
78157815
public:
7816-
using iterator_category = input_iterator_tag; // not always present
7816+
using iterator_category = input_iterator_tag; // not always present
78177817
using iterator_concept = @\seebelow@;
78187818
using value_type = @\exposid{tuple-or-pair}@<range_value_t<@\exposid{maybe-const}@<Const, Views>>...>;
78197819
using difference_type = common_type_t<range_difference_t<@\exposid{maybe-const}@<Const, Views>>...>;
@@ -7862,13 +7862,11 @@
78627862
requires @\exposconcept{all-random-access}@<Const, Views...>;
78637863
friend constexpr difference_type operator-(const @\exposid{iterator}@& x, const @\exposid{iterator}@& y)
78647864
requires (@\libconcept{sized_sentinel_for}@<iterator_t<@\exposid{maybe-const}@<Const, Views>>,
7865-
iterator_t<@\exposid{maybe-const}@<Const, Views>>> && ...);
7865+
iterator_t<@\exposid{maybe-const}@<Const, Views>>> && ...);
78667866

7867-
friend constexpr auto iter_move(const @\exposid{iterator}@& i)
7868-
noexcept(@\seebelow@);
7867+
friend constexpr auto iter_move(const @\exposid{iterator}@& i) noexcept(@\seebelow@);
78697868

7870-
friend constexpr void iter_swap(const @\exposid{iterator}@& l, const @\exposid{iterator}@& r)
7871-
noexcept(@\seebelow@)
7869+
friend constexpr void iter_swap(const @\exposid{iterator}@& l, const @\exposid{iterator}@& r) noexcept(@\seebelow@)
78727870
requires (@\libconcept{indirectly_swappable}@<iterator_t<@\exposid{maybe-const}@<Const, Views>>> && ...);
78737871
};
78747872
}
@@ -7914,7 +7912,7 @@
79147912
\begin{itemdecl}
79157913
constexpr @\exposid{iterator}@(@\exposid{iterator}@<!Const> i)
79167914
requires Const &&
7917-
(@\libconcept{convertible_to}@<iterator_t<Views>, iterator_t<@\exposid{maybe-const}@<Const, Views>>> && ...);
7915+
(@\libconcept{convertible_to}@<iterator_t<Views>, iterator_t<@\exposid{maybe-const}@<Const, Views>>> && ...);
79187916
\end{itemdecl}
79197917

79207918
\begin{itemdescr}
@@ -8183,8 +8181,7 @@
81838181
\end{itemdescr}
81848182

81858183
\begin{itemdecl}
8186-
friend constexpr auto iter_move(const @\exposid{iterator}@& i)
8187-
noexcept(@\seebelow@);
8184+
friend constexpr auto iter_move(const @\exposid{iterator}@& i) noexcept(@\seebelow@);
81888185
\end{itemdecl}
81898186

81908187
\begin{itemdescr}
@@ -8197,7 +8194,7 @@
81978194

81988195
\pnum
81998196
\remarks
8200-
The exception specification is equivalent to
8197+
The exception specification is equivalent to:
82018198
\begin{codeblock}
82028199
(noexcept(ranges::iter_move(declval<const iterator_t<@\exposid{maybe-const}@<Const,
82038200
Views>>&>())) && ...) &&
@@ -8215,9 +8212,9 @@
82158212
\pnum
82168213
\effects
82178214
For every integer $0 \leq i < \tcode{sizeof...(Views)}$,
8218-
performs
8215+
performs:
82198216
\begin{codeblock}
8220-
ranges::iter_swap(std::get<@$i$@>(l.@\exposid{current_}@), std::get<@$i$@>(r.@\exposid{current_}@))}
8217+
ranges::iter_swap(std::get<@$i$@>(l.@\exposid{current_}@), std::get<@$i$@>(r.@\exposid{current_}@))
82218218
\end{codeblock}
82228219

82238220
\pnum
@@ -8246,7 +8243,7 @@
82468243
@\exposid{sentinel}@() = default;
82478244
constexpr @\exposid{sentinel}@(@\exposid{sentinel}@<!Const> i)
82488245
requires Const &&
8249-
(@\libconcept{convertible_to}@<sentinel_t<Views>, sentinel_t<@\exposid{maybe-const}@<Const, Views>>> && ...);
8246+
(@\libconcept{convertible_to}@<sentinel_t<Views>, sentinel_t<@\exposid{maybe-const}@<Const, Views>>> && ...);
82508247

82518248
template<bool OtherConst>
82528249
requires (@\libconcept{sentinel_for}@<sentinel_t<@\exposid{maybe-const}@<Const, Views>>,
@@ -8281,7 +8278,7 @@
82818278
\begin{itemdecl}
82828279
constexpr @\exposid{sentinel}@(@\exposid{sentinel}@<!Const> i)
82838280
requires Const &&
8284-
(@\libconcept{convertible_to}@<sentinel_t<Views>, sentinel_t<@\exposid{maybe-const}@<Const, Views>>> && ...);
8281+
(@\libconcept{convertible_to}@<sentinel_t<Views>, sentinel_t<@\exposid{maybe-const}@<Const, Views>>> && ...);
82858282
\end{itemdecl}
82868283

82878284
\begin{itemdescr}
@@ -8624,7 +8621,7 @@
86248621
\pnum
86258622
\remarks
86268623
Let \tcode{Is} be the pack \tcode{0, 1, \ldots, \tcode{(sizeof...(Views)-1)}}.
8627-
The exception specification is equivalent to
8624+
The exception specification is equivalent to:
86288625
\tcode{noexcept(invoke(*\exposid{parent_}->\exposid{fun_}, *std::get<Is>(\exposid{inner_}.\exposid{current_})...))}.
86298626
\end{itemdescr}
86308627

@@ -8940,7 +8937,7 @@
89408937
namespace std::ranges {
89418938
template<@\libconcept{forward_range}@ V, size_t N>
89428939
requires @\libconcept{view}@<V> && (N > 0)
8943-
class adjacent_view : public view_interface<adjacent_view<V, N>>{
8940+
class adjacent_view : public view_interface<adjacent_view<V, N>> {
89448941
V @\exposid{base_}@ = V(); // \expos
89458942

89468943
// \ref{range.adjacent.iterator}, class template \tcode{adjacent_view::\exposid{iterator}}
@@ -8962,7 +8959,7 @@
89628959
return @\exposid{iterator}@<true>(ranges::begin(@\exposid{base_}@), ranges::end(@\exposid{base_}@));
89638960
}
89648961

8965-
constexpr auto end() requires (!@\libconcept{simple-view}@<V>) {
8962+
constexpr auto end() requires (!@\exposconcept{simple-view}@<V>) {
89668963
if constexpr (@\libconcept{common_range}@<V>) {
89678964
return @\exposid{iterator}@<false>(@\exposid{as-sentinel}@{}, ranges::begin(@\exposid{base_}@), ranges::end(@\exposid{base_}@));
89688965
} else {
@@ -9051,7 +9048,6 @@
90519048
requires @\libconcept{random_access_range}@<@\exposid{Base}@>;
90529049

90539050
friend constexpr bool operator==(const @\exposid{iterator}@& x, const @\exposid{iterator}@& y);
9054-
90559051
friend constexpr bool operator<(const @\exposid{iterator}@& x, const @\exposid{iterator}@& y)
90569052
requires @\libconcept{random_access_range}@<@\exposid{Base}@>;
90579053
friend constexpr bool operator>(const @\exposid{iterator}@& x, const @\exposid{iterator}@& y)
@@ -9396,7 +9392,7 @@
93969392

93979393
\pnum
93989394
\remarks
9399-
The exception specification is equivalent to
9395+
The exception specification is equivalent to:
94009396
\begin{codeblock}
94019397
noexcept(ranges::iter_move(declval<const iterator_t<@\exposid{Base}@>&>())) &&
94029398
is_nothrow_move_constructible_v<range_rvalue_reference_t<@\exposid{Base}@>>
@@ -9440,6 +9436,7 @@
94409436
using @\exposid{Base}@ = @\exposid{maybe-const}@<Const, V>; // \expos
94419437
sentinel_t<@\exposid{Base}@> @\exposid{end_}@ = sentinel_t<@\exposid{Base}@>(); // \expos
94429438
constexpr explicit @\exposid{sentinel}@(sentinel_t<@\exposid{Base}@> end); // \expos
9439+
94439440
public:
94449441
@\exposid{sentinel}@() = default;
94459442
constexpr @\exposid{sentinel}@(@\exposid{sentinel}@<!Const> i)
@@ -9593,7 +9590,6 @@
95939590

95949591
public:
95959592
adjacent_transform_view() = default;
9596-
95979593
constexpr explicit adjacent_transform_view(V base, F fun);
95989594

95999595
constexpr auto begin() {
@@ -9679,18 +9675,15 @@
96799675
constexpr decltype(auto) operator*() const noexcept(@\seebelow@);
96809676
constexpr @\exposid{iterator}@& operator++();
96819677
constexpr @\exposid{iterator}@ operator++(int);
9682-
96839678
constexpr @\exposid{iterator}@& operator--() requires @\libconcept{bidirectional_range}@<@\exposid{Base}@>;
96849679
constexpr @\exposid{iterator}@ operator--(int) requires @\libconcept{bidirectional_range}@<@\exposid{Base}@>;
9685-
96869680
constexpr @\exposid{iterator}@& operator+=(difference_type x) requires @\libconcept{random_access_range}@<@\exposid{Base}@>;
96879681
constexpr @\exposid{iterator}@& operator-=(difference_type x) requires @\libconcept{random_access_range}@<@\exposid{Base}@>;
96889682

96899683
constexpr decltype(auto) operator[](difference_type n) const
96909684
requires @\libconcept{random_access_range}@<@\exposid{Base}@>;
96919685

96929686
friend constexpr bool operator==(const @\exposid{iterator}@& x, const @\exposid{iterator}@& y);
9693-
96949687
friend constexpr bool operator<(const @\exposid{iterator}@& x, const @\exposid{iterator}@& y)
96959688
requires @\libconcept{random_access_range}@<@\exposid{Base}@>;
96969689
friend constexpr bool operator>(const @\exposid{iterator}@& x, const @\exposid{iterator}@& y)
@@ -9786,7 +9779,7 @@
97869779
\pnum
97879780
\remarks
97889781
Let \tcode{Is} be the pack \tcode{0, 1, \ldots, (N-1)}.
9789-
The exception specification is equivalent to
9782+
The exception specification is equivalent to:
97909783
\begin{codeblock}
97919784
noexcept(invoke(*@\exposid{parent_}@->@\exposid{fun_}@, *std::get<Is>(@\exposid{inner_}@.@\exposid{current_}@)...))
97929785
\end{codeblock}
@@ -9965,6 +9958,7 @@
99659958
class adjacent_transform_view<V, F, N>::@\exposid{sentinel}@ {
99669959
@\exposid{inner-sentinel}@<Const> @\exposid{inner_}@; // \expos
99679960
constexpr explicit @\exposid{sentinel}@(@\exposid{inner-sentinel}@<Const> inner); // \expos
9961+
99689962
public:
99699963
@\exposid{sentinel}@() = default;
99709964
constexpr @\exposid{sentinel}@(@\exposid{sentinel}@<!Const> i)

source/utilities.tex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1759,7 +1759,7 @@
17591759

17601760
\pnum
17611761
\remarks
1762-
The expression inside \keyword{explicit} is equivalent to
1762+
The expression inside \keyword{explicit} is equivalent to:
17631763
\begin{codeblock}
17641764
!(is_convertible_v<decltype(get<I>(@\exposid{FWD}@(u))), Types> && ...)
17651765
\end{codeblock}

0 commit comments

Comments
 (0)