Skip to content

Commit 467c2d4

Browse files
Apply suggestions from code review
Co-authored-by: timsong-cpp <rs2740@gmail.com>
1 parent 035ba8f commit 467c2d4

File tree

2 files changed

+27
-29
lines changed

2 files changed

+27
-29
lines changed

source/ranges.tex

Lines changed: 25 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -7745,15 +7745,15 @@
77457745

77467746
\pnum
77477747
\tcode{\exposid{iterator}::iterator_category} is present
7748-
if and only if \tcode{@\exposconcept{all-forward}@<Const, Views...>} is modeled.
7748+
if and only if \tcode{\exposconcept{all-forward}<Const, Views...>} is modeled.
77497749

77507750
\pnum
77517751
If the invocation of any non-const member function of \exposid{iterator}
77527752
exits via an exception,
77537753
the iterator acquires a singular value.
77547754

77557755
\begin{itemdecl}
7756-
constexpr explicit iterator(@\exposid{tuple-or-pair}@<iterator_t<@\exposid{maybe-const}@<Const, Views>>...> current);
7756+
constexpr explicit @\exposid{iterator}@(@\exposid{tuple-or-pair}@<iterator_t<@\exposid{maybe-const}@<Const, Views>>...> current);
77577757
\end{itemdecl}
77587758

77597759
\begin{itemdescr}
@@ -7812,7 +7812,7 @@
78127812
\end{itemdescr}
78137813

78147814
\begin{itemdecl}
7815-
constexpr iterator operator++(int) requires @\exposconcept{all-forward}@<Const, Views...>;
7815+
constexpr @\exposid{iterator}@ operator++(int) requires @\exposconcept{all-forward}@<Const, Views...>;
78167816
\end{itemdecl}
78177817

78187818
\begin{itemdescr}
@@ -7827,7 +7827,7 @@
78277827
\end{itemdescr}
78287828

78297829
\begin{itemdecl}
7830-
constexpr iterator& operator--() requires @\exposconcept{all-bidirectional}@<Const, Views...>;
7830+
constexpr @\exposid{iterator}@& operator--() requires @\exposconcept{all-bidirectional}@<Const, Views...>;
78317831
\end{itemdecl}
78327832

78337833
\begin{itemdescr}
@@ -7841,7 +7841,7 @@
78417841
\end{itemdescr}
78427842

78437843
\begin{itemdecl}
7844-
constexpr iterator operator--(int) requires @\exposconcept{all-bidirectional}@<Const, Views...>;
7844+
constexpr @\exposid{iterator}@ operator--(int) requires @\exposconcept{all-bidirectional}@<Const, Views...>;
78457845
\end{itemdecl}
78467846

78477847
\begin{itemdescr}
@@ -7871,7 +7871,7 @@
78717871
\end{itemdescr}
78727872

78737873
\begin{itemdecl}
7874-
constexpr iterator& operator-=(difference_type x)
7874+
constexpr @\exposid{iterator}@& operator-=(difference_type x)
78757875
requires @\exposconcept{all-random-access}@<Const, Views...>;
78767876
\end{itemdecl}
78777877

@@ -7961,7 +7961,7 @@
79617961
\end{itemdescr}
79627962

79637963
\begin{itemdecl}
7964-
friend constexpr bool operator>=(const iterator& x, const iterator& y)
7964+
friend constexpr bool operator>=(const @\exposid{iterator}@& x, const @\exposid{iterator}@& y)
79657965
requires all-random-access<Const, Views...>;
79667966
\end{itemdecl}
79677967

@@ -8204,7 +8204,7 @@
82048204
to the $M^\textrm{th}$ elements of all views.
82058205

82068206
\pnum
8207-
\indexlibraryglobal{zip_transform}{views}%
8207+
\indexlibrarymember{zip_transform}{views}%
82088208
The name \tcode{views::zip_transform} denotes
82098209
a customization point object\iref{customization.point.object}.
82108210
Let \tcode{F} be a subexpression, and
@@ -8447,7 +8447,7 @@
84478447
\begin{itemdescr}
84488448
\pnum
84498449
\effects
8450-
Initializes \exposid{parent_} with i.\exposid{parent_} and
8450+
Initializes \exposid{parent_} with \tcode{i.\exposid{parent_}} and
84518451
\exposid{inner_} with \tcode{std::move(i.inner_)}.
84528452
\end{itemdescr}
84538453

@@ -8858,7 +8858,7 @@
88588858
using @\exposid{Base}@ = @\exposid{maybe-const}@<Const, V>; // \expos
88598859
array<iterator_t<@\exposid{Base}@>, N> @\exposid{current_}@ = array<iterator_t<@\exposid{Base}@>, N>(); // \expos
88608860
constexpr @\exposid{iterator}@(iterator_t<@\exposid{Base}@> first, sentinel_t<@\exposid{Base}@> last); // \expos
8861-
constexpr iterator(@\exposid{as-sentinel}@, iterator_t<@\exposid{Base}@> first, iterator_t<@\exposid{Base}@> last);
8861+
constexpr @\exposid{iterator}@(@\exposid{as-sentinel}@, iterator_t<@\exposid{Base}@> first, iterator_t<@\exposid{Base}@> last);
88628862
// \expos
88638863
public:
88648864
using iterator_category = input_iterator_tag;
@@ -8992,7 +8992,7 @@
89928992
\begin{itemdescr}
89938993
\pnum
89948994
\expects
8995-
\exposid{current_}.back() is incrementable.
8995+
\tcode{\exposid{current_}.back()} is incrementable.
89968996

89978997
\pnum
89988998
\ensures
@@ -9246,8 +9246,8 @@
92469246
\begin{itemdescr}
92479247
\pnum
92489248
\expects
9249-
None of the iterators in l.\exposid{current_} is equal to
9250-
an iterator in r.\exposid{current_}.
9249+
None of the iterators in \tcode{l.\exposid{current_}} is equal to
9250+
an iterator in \tcode{r.\exposid{current_}}.
92519251

92529252
\pnum
92539253
\effects
@@ -9473,7 +9473,7 @@
94739473
\exposid{inner_} with \tcode{std::move(base)}.
94749474
\end{itemdescr}
94759475

9476-
\rSec3[range.adjacent.transform.iterator]{Class template \tcode{adjacent_transform_view::@\exposid{iterator}@}}
9476+
\rSec3[range.adjacent.transform.iterator]{Class template \tcode{adjacent_transform_view::\exposid{iterator}}}
94779477

94789478
\begin{codeblock}
94799479
namespace std::ranges {
@@ -9541,7 +9541,7 @@
95419541
\end{codeblock}
95429542

95439543
\pnum
9544-
The member \grammarterm{typedef-name} \tcode{iterator::iterator_category}
9544+
The member \grammarterm{typedef-name} \tcode{\exposid{iterator}::iterator_category}
95459545
is defined as follows:
95469546
\begin{itemize}
95479547
\item
@@ -9591,8 +9591,8 @@
95919591
\begin{itemdescr}
95929592
\pnum
95939593
\effects
9594-
Initializes \exposid{parent_} with i.\exposid{parent_} and
9595-
\exposid{inner_} with std::move(i.\exposid{inner_}).
9594+
Initializes \exposid{parent_} with \tcode{i.\exposid{parent_}} and
9595+
\exposid{inner_} with \tcode{std::move(i.\exposid{inner_})}.
95969596
\end{itemdescr}
95979597

95989598
\begin{itemdecl}
@@ -9619,7 +9619,7 @@
96199619
\end{itemdescr}
96209620

96219621
\begin{itemdecl}
9622-
constexpr iterator& operator++();
9622+
constexpr @\exposid{iterator}@& operator++();
96239623
\end{itemdecl}
96249624

96259625
\begin{itemdescr}
@@ -9633,24 +9633,22 @@
96339633
\end{itemdescr}
96349634

96359635
\begin{itemdecl}
9636-
constexpr iterator operator++(int);
9636+
constexpr @\exposid{iterator}@ operator++(int);
96379637
\end{itemdecl}
96389638

96399639
\begin{itemdescr}
96409640
\pnum
96419641
\effects
96429642
Equivalent to:
96439643
\begin{codeblock}
9644-
Equivalent to:
9645-
\begin{codeblock}
96469644
auto tmp = *this;
96479645
++*this;
96489646
return tmp;
96499647
\end{codeblock}
96509648
\end{itemdescr}
96519649

96529650
\begin{itemdecl}
9653-
constexpr iterator& operator--() requires @\libconcept{bidirectional_range}@<@\exposid{Base}@>;
9651+
constexpr @\exposid{iterator}@& operator--() requires @\libconcept{bidirectional_range}@<@\exposid{Base}@>;
96549652
\end{itemdecl}
96559653

96569654
\begin{itemdescr}
@@ -9701,7 +9699,7 @@
97019699
\effects
97029700
Equivalent to:
97039701
\begin{codeblock}
9704-
inner_ -= x;
9702+
@\exposid{inner_}@ -= x;
97059703
return *this;
97069704
\end{codeblock}
97079705
\end{itemdescr}
@@ -9717,7 +9715,7 @@
97179715
Equivalent to:
97189716
\begin{codeblock}
97199717
return apply([&](const auto&... iters) -> decltype(auto) {
9720-
return invoke(*@\exposid{parent_}@->fun_, iters[n]...);
9718+
return invoke(*@\exposid{parent_}@->@\exposid{fun_}@, iters[n]...);
97219719
}, @\exposid{inner_}@.@\exposid{current_}@);
97229720
\end{codeblock}
97239721
\end{itemdescr}
@@ -9738,11 +9736,11 @@
97389736

97399737
\begin{itemdescr}
97409738
\pnum
9741-
Let $op$ be the operator.
9739+
Let \placeholder{op} be the operator.
97429740

97439741
\pnum
97449742
\effects
9745-
Equivalent to: \tcode{return x.\exposid{inner_} $op$ y.\exposid{inner_};}
9743+
Equivalent to: \tcode{return x.\exposid{inner_} \placeholder{op} y.\exposid{inner_};}
97469744
\end{itemdescr}
97479745

97489746
\begin{itemdecl}
@@ -9759,7 +9757,7 @@
97599757
\end{itemdescr}
97609758

97619759
\begin{itemdecl}
9762-
friend constexpr iterator operator-(const @\exposid{iterator}@& i, difference_type n)
9760+
friend constexpr @\exposid{iterator}@ operator-(const @\exposid{iterator}@& i, difference_type n)
97639761
requires @\libconcept{random_access_range}@<@\exposid{Base}@>;
97649762
\end{itemdecl}
97659763

source/utilities.tex

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1761,9 +1761,9 @@
17611761
\item
17621762
\tcode{sizeof...(Types)} is 2,
17631763
\item
1764-
\tcode{is_constructible_v<$\tcode{T}_0$, decltype(get<0>(FWD(u)))>} is \tcode{true}, and
1764+
\tcode{is_constructible_v<$\tcode{T}_0$, decltype(get<0>(\exposid{FWD}(u)))>} is \tcode{true}, and
17651765
\item
1766-
\tcode{is_constructible_v<$\tcode{T}_1$, decltype(get<1>(FWD(u)))>} is \tcode{true}.
1766+
\tcode{is_constructible_v<$\tcode{T}_1$, decltype(get<1>(\exposid{FWD}(u)))>} is \tcode{true}.
17671767
\end{itemize}
17681768

17691769
\pnum

0 commit comments

Comments
 (0)