Skip to content

[ranges] make indentation consistent #5811

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.

Sign up for GitHub

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 5 commits into from
Sep 15, 2022
Merged

[ranges] make indentation consistent #5811

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c9c5384
[view.interface.general] Fix indent
hewillk Sep 4, 2022
18ba6a5
Update ranges.tex
hewillk Sep 8, 2022
2fd3e9a
Update ranges.tex
hewillk Sep 12, 2022
8b4acd4
Merge branch 'cplusplus:main' into main-view
hewillk Sep 15, 2022
67e4ce2
Update ranges.tex
hewillk Sep 15, 2022
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
44 changes: 22 additions & 22 deletions source/ranges.tex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1695,16 +1695,16 @@
}

constexpr auto cbegin() {
return ranges::cbegin(@\exposid{derived}@());
return ranges::cbegin(@\exposid{derived}@());
}
constexpr auto cbegin() const requires @\libconcept{range}@<const D> {
return ranges::cbegin(@\exposid{derived}@());
return ranges::cbegin(@\exposid{derived}@());
}
constexpr auto cend() {
return ranges::cend(@\exposid{derived}@());
return ranges::cend(@\exposid{derived}@());
}
constexpr auto cend() const requires @\libconcept{range}@<const D> {
return ranges::cend(@\exposid{derived}@());
return ranges::cend(@\exposid{derived}@());
}

constexpr explicit operator bool()
Expand Down Expand Up @@ -4481,9 +4481,9 @@
constexpr V base() && { return std::move(@\exposid{base_}@); }

constexpr auto begin() requires (!@\exposconcept{simple-view}@<V>)
{ return move_iterator(ranges::begin(@\exposid{base_}@)); }
{ return move_iterator(ranges::begin(@\exposid{base_}@)); }
constexpr auto begin() const requires @\libconcept{range}@<const V>
{ return move_iterator(ranges::begin(@\exposid{base_}@)); }
{ return move_iterator(ranges::begin(@\exposid{base_}@)); }

constexpr auto end() requires (!@\exposconcept{simple-view}@<V>) {
if constexpr (@\libconcept{common_range}@<V>) {
Expand Down Expand Up @@ -7039,28 +7039,28 @@

@\exposid{iterator}@() requires @\libconcept{default_initializable}@<@\exposid{OuterIter}@> = default;
constexpr @\exposid{iterator}@(@\exposid{iterator}@<!Const> i)
requires Const && @\libconcept{convertible_to}@<iterator_t<V>, @\exposid{OuterIter}@> &&
@\libconcept{convertible_to}@<iterator_t<@\exposid{InnerRng}@>, @\exposid{InnerIter}@> &&
@\libconcept{convertible_to}@<iterator_t<Pattern>, @\exposid{PatternIter}@>;
requires Const && @\libconcept{convertible_to}@<iterator_t<V>, @\exposid{OuterIter}@> &&
@\libconcept{convertible_to}@<iterator_t<@\exposid{InnerRng}@>, @\exposid{InnerIter}@> &&
@\libconcept{convertible_to}@<iterator_t<Pattern>, @\exposid{PatternIter}@>;

constexpr decltype(auto) operator*() const;

constexpr @\exposid{iterator}@& operator++();
constexpr void operator++(int);
constexpr @\exposid{iterator}@ operator++(int)
requires @\exposid{ref-is-glvalue}@ && @\libconcept{forward_iterator}@<@\exposid{OuterIter}@> &&
@\libconcept{forward_iterator}@<@\exposid{InnerIter}@>;
requires @\exposid{ref-is-glvalue}@ && @\libconcept{forward_iterator}@<@\exposid{OuterIter}@> &&
@\libconcept{forward_iterator}@<@\exposid{InnerIter}@>;

constexpr @\exposid{iterator}@& operator--()
requires @\exposid{ref-is-glvalue}@ && @\libconcept{bidirectional_range}@<@\exposid{Base}@> &&
@\exposconcept{bidirectional-common}@<@\exposid{InnerBase}@> && @\exposconcept{bidirectional-common}@<@\exposid{PatternBase}@>;
requires @\exposid{ref-is-glvalue}@ && @\libconcept{bidirectional_range}@<@\exposid{Base}@> &&
@\exposconcept{bidirectional-common}@<@\exposid{InnerBase}@> && @\exposconcept{bidirectional-common}@<@\exposid{PatternBase}@>;
constexpr @\exposid{iterator}@ operator--(int)
requires @\exposid{ref-is-glvalue}@ && @\libconcept{bidirectional_range}@<@\exposid{Base}@> &&
@\exposconcept{bidirectional-common}@<@\exposid{InnerBase}@> && @\exposconcept{bidirectional-common}@<@\exposid{PatternBase}@>;
requires @\exposid{ref-is-glvalue}@ && @\libconcept{bidirectional_range}@<@\exposid{Base}@> &&
@\exposconcept{bidirectional-common}@<@\exposid{InnerBase}@> && @\exposconcept{bidirectional-common}@<@\exposid{PatternBase}@>;

friend constexpr bool operator==(const @\exposid{iterator}@& x, const @\exposid{iterator}@& y)
requires @\exposid{ref-is-glvalue}@ && @\libconcept{equality_comparable}@<@\exposid{OuterIter}@> &&
@\libconcept{equality_comparable}@<@\exposid{InnerIter}@>;
requires @\exposid{ref-is-glvalue}@ && @\libconcept{equality_comparable}@<@\exposid{OuterIter}@> &&
@\libconcept{equality_comparable}@<@\exposid{InnerIter}@>;

friend constexpr decltype(auto) iter_move(const @\exposid{iterator}@& x) {
using rvalue_reference = common_reference_t<
Expand All @@ -7070,7 +7070,7 @@
}

friend constexpr void iter_swap(const @\exposid{iterator}@& x, const @\exposid{iterator}@& y)
requires @\libconcept{indirectly_swappable}@<@\exposid{InnerIter}@, @\exposid{PatternIter}@> {
requires @\libconcept{indirectly_swappable}@<@\exposid{InnerIter}@, @\exposid{PatternIter}@> {
visit(ranges::iter_swap, x.@\exposid{inner_it_}@, y.@\exposid{inner_it_}@);
}
};
Expand Down Expand Up @@ -11197,9 +11197,9 @@
\begin{codeblock}
namespace std::ranges {
template<@\libconcept{forward_range}@ V, @\libconcept{move_constructible}@ F, size_t N>
requires @\libconcept{view}@<V> && (N > 0) && is_object_v<F> &&
@\libconcept{regular_invocable}@<F&, @\exposid{REPEAT}@(range_reference_t<V>, N)...> &&
@\exposconcept{can-reference}@<invoke_result_t<F&, @\exposid{REPEAT}@(range_reference_t<V>, N)...>>
requires @\libconcept{view}@<V> && (N > 0) && is_object_v<F> &&
@\libconcept{regular_invocable}@<F&, @\exposid{REPEAT}@(range_reference_t<V>, N)...> &&
@\exposconcept{can-reference}@<invoke_result_t<F&, @\exposid{REPEAT}@(range_reference_t<V>, N)...>>
class adjacent_transform_view : public view_interface<adjacent_transform_view<V, F, N>> {
@\exposidnc{movable-box}@<F> @\exposid{fun_}@; // \expos
adjacent_view<V, N> @\exposid{inner_}@; // \expos
Expand Down Expand Up @@ -13803,7 +13803,7 @@
requires @\libconcept{random_access_range}@<@\exposid{Base}@>;

friend constexpr auto operator<=>(const @\exposid{iterator}@& x, const @\exposid{iterator}@& y)
requires @\libconcept{random_access_range}@<@\exposid{Base}@> && @\libconcept{three_way_comparable}@<iterator_t<@\exposid{Base}@>>;
requires @\libconcept{random_access_range}@<@\exposid{Base}@> && @\libconcept{three_way_comparable}@<iterator_t<@\exposid{Base}@>>;

friend constexpr @\exposid{iterator}@ operator+(const @\exposid{iterator}@& x, difference_type n)
requires @\libconcept{random_access_range}@<@\exposid{Base}@>;
Expand Down