Skip to content

Commit 6b644d2

Browse files
committed
fixup: various transcription mistakes
1 parent c6089ed commit 6b644d2

File tree

1 file changed

+13
-11
lines changed

1 file changed

+13
-11
lines changed

source/ranges.tex

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5822,7 +5822,7 @@
58225822

58235823
\pnum
58245824
\tcode{join_with_view} takes a \libconcept{view} and a delimiter, and
5825-
flattens the view,
5825+
flattens the \libconcept{view},
58265826
inserting every element of the delimiter
58275827
in between elements of the \libconcept{view}.
58285828
The delimiter can be a single element or a \libconcept{view} of elements.
@@ -5871,7 +5871,9 @@
58715871
// when \tcode{!is_reference_v<\exposid{InnerRng}>}
58725872
Pattern @\exposid{pattern_}@ = Pattern(); // \expos
58735873

5874+
// \ref{range.join.with.iterator}, class template \tcode{join_with_view::\exposid{iterator}}
58745875
template<bool Const> struct @\exposid{iterator}@; // \expos
5876+
// \ref{range.join.with.sentinel}, class template \tcode{join_with_view::\exposid{sentinel}}
58755877
template<bool Const> struct @\exposid{sentinel}@; // \expos
58765878

58775879
public:
@@ -5901,7 +5903,7 @@
59015903

59025904
constexpr auto end() {
59035905
if constexpr (@\libconcept{forward_range}@<V> &&
5904-
is_reference_v<InnerRng> && @\libconcept{forward_range}@<@\exposid{InnerRng}@> &&
5906+
is_reference_v<@\exposid{InnerRng}@> && @\libconcept{forward_range}@<@\exposid{InnerRng}@> &&
59055907
@\libconcept{common_range}@<V> && @\libconcept{common_range}@<@\exposid{InnerRng}@>)
59065908
return @\exposid{iterator}@<@\exposconcept{simple-view}@<V> && @\exposconcept{simple-view}@<Pattern>>{*this, ranges::end(@\exposid{base_}@)};
59075909
else
@@ -5910,9 +5912,9 @@
59105912
constexpr auto end() const
59115913
requires @\libconcept{input_range}@<const V> && @\libconcept{forward_range}@<const Pattern> &&
59125914
is_reference_v<range_reference_t<const V>> {
5913-
using @\exposid{InnerConstRng}@ = range_reference_t<const V>;
5914-
if constexpr (@\libconcept{forward_range}@<const V> && @\libconcept{forward_range}@<@\exposid{InnerConstRng}@> &&
5915-
@\libconcept{common_range}@<const V> && common_range<@\exposid{InnerConstRng}@>)
5915+
using InnerConstRng = range_reference_t<const V>;
5916+
if constexpr (@\libconcept{forward_range}@<const V> && @\libconcept{forward_range}@<InnerConstRng> &&
5917+
@\libconcept{common_range}@<const V> && common_range<InnerConstRng>)
59165918
return @\exposid{iterator}@<true>{*this, ranges::end(@\exposid{base_}@)};
59175919
else
59185920
return @\exposid{sentinel}@<true>{*this};
@@ -5922,7 +5924,7 @@
59225924
template<class R, class P>
59235925
join_with_view(R&&, P&&) -> join_with_view<views::all_t<R>, views::all_t<P>>;
59245926

5925-
template<input_range R>
5927+
template<@\libconcept{input_range}@ R>
59265928
join_with_view(R&&, range_value_t<range_reference_t<R>>)
59275929
-> join_with_view<views::all_t<R>, single_view<range_value_t<range_reference_t<R>>>>;
59285930
}
@@ -5940,7 +5942,7 @@
59405942
\end{itemdescr}
59415943

59425944
\begin{itemdecl}
5943-
template<input_range R>
5945+
template<@\libconcept{input_range}@ R>
59445946
requires @\libconcept{constructible_from}@<V, views::all_t<R>> &&
59455947
@\libconcept{constructible_from}@<Pattern, single_view<range_value_t<@\exposid{InnerRng}@>>>
59465948
constexpr join_with_view(R&& r, range_value_t<@\exposid{InnerRng}@> e);
@@ -6005,7 +6007,7 @@
60056007
requires @\exposid{ref-is-glvalue}@ && @\libconcept{bidirectional_range}@<@\exposid{Base}@> &&
60066008
@\exposconcept{bidirectional-common}@<@\exposid{InnerBase}@> && @\exposconcept{bidirectional-common}@<@\exposid{PatternBase}@>;
60076009
constexpr @\exposid{iterator}@ operator--(int)
6008-
requires @\exposid{ref-is-glvalue}@ && @\libconcept{bidirectional_range}@<Base> &&
6010+
requires @\exposid{ref-is-glvalue}@ && @\libconcept{bidirectional_range}@<@\exposid{Base}@> &&
60096011
@\exposconcept{bidirectional-common}@<@\exposid{InnerBase}@> && @\exposconcept{bidirectional-common}@<@\exposid{PatternBase}@>;
60106012

60116013
friend constexpr bool operator==(const @\exposid{iterator}@& x, const @\exposid{iterator}@& y)
@@ -6123,7 +6125,7 @@
61236125
\effects
61246126
Equivalent to:
61256127
\begin{codeblock}
6126-
if constexpr (ref-is-glvalue)
6128+
if constexpr (@\exposid{ref-is-glvalue}@)
61276129
return *x;
61286130
else
61296131
return *@\exposid{parent_}@->@\exposid{inner_}@;
@@ -6312,7 +6314,7 @@
63126314
\effects
63136315
Equivalent to:
63146316
\begin{codeblock}
6315-
iterator tmp = *this;
6317+
@\exposid{iterator}@ tmp = *this;
63166318
--*this;
63176319
return tmp;
63186320
\end{codeblock}
@@ -6359,7 +6361,7 @@
63596361
\end{codeblock}
63606362

63616363
\begin{itemdecl}
6362-
constexpr explicit sentinel(Parent& parent);
6364+
constexpr explicit @\exposid{sentinel}@(@\exposid{Parent}@& parent);
63636365
\end{itemdecl}
63646366

63656367
\begin{itemdescr}

0 commit comments

Comments
 (0)