Skip to content
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.

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

[containers, strings, algorithms, re] Use \range where appropriate #7143

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions source/algorithms.tex
Original file line number Diff line number Diff line change
Expand Up @@ -7584,7 +7584,7 @@
are partitioned with respect to the expressions
\tcode{bool(invoke(comp, invoke(proj, e), value))} and
\tcode{!bool(invoke(comp, value, invoke(proj, e)))}.
Also, for all elements \tcode{e} of \tcode{[first, last)},
Also, for all elements \tcode{e} of \range{first}{last},
\tcode{bool(comp(e, value))} implies \tcode{!bool(comp(\brk{}value, e))}
for the overloads in namespace \tcode{std}.

Expand Down Expand Up @@ -7651,7 +7651,7 @@
are partitioned with respect to the expressions
\tcode{bool(invoke(comp, invoke(proj, e), value))} and
\tcode{!bool(invoke(comp, value, invoke(proj, e)))}.
Also, for all elements \tcode{e} of \tcode{[first, last)},
Also, for all elements \tcode{e} of \range{first}{last},
\tcode{bool(comp(e, value))} implies \tcode{!bool(comp(\brk{}value, e))}
for the overloads in namespace \tcode{std}.

Expand Down Expand Up @@ -10837,7 +10837,7 @@
\pnum
For the overloads with an \tcode{ExecutionPolicy} and a non-empty range,
performs \tcode{*result = *first}.
Then, for every \tcode{d} in \tcode{[1, last - first - 1]},
Then, for every \tcode{d} in \crange{1}{last - first - 1},
performs \tcode{*(result + d) = binary_op(*(first + d), *(first + (d - 1)))}.

\pnum
Expand Down
38 changes: 19 additions & 19 deletions source/containers.tex
Original file line number Diff line number Diff line change
Expand Up @@ -1309,7 +1309,7 @@
denote iterators that meet the \oldconcept{InputIterator} requirements
and refer to elements implicitly convertible to \tcode{value_type},
\item
\tcode{[i, j)} denotes a valid range,
\range{i}{j} denotes a valid range,
\item
\tcode{rg} denotes a value of a type \tcode{R}
that models \tcode{\exposconcept{container-compatible-range}<T>},
Expand All @@ -1322,7 +1322,7 @@
\item
\tcode{q} denotes a valid dereferenceable constant iterator to \tcode{a},
\item
\tcode{[q1, q2)} denotes a valid range of constant iterators in \tcode{a},
\range{q1}{q2} denotes a valid range of constant iterators in \tcode{a},
\item
\tcode{t} denotes an lvalue or a const rvalue of \tcode{X::value_type}, and
\item
Expand Down Expand Up @@ -1384,7 +1384,7 @@

\pnum
\effects
Constructs a sequence container equal to the range \tcode{[i, j)}.
Constructs a sequence container equal to the range \range{i}{j}.
Each iterator in the range \range{i}{j} is dereferenced exactly once.

\pnum
Expand Down Expand Up @@ -1579,7 +1579,7 @@

\pnum
\effects
Inserts copies of elements in \tcode{[i, j)} before \tcode{p}.
Inserts copies of elements in \range{i}{j} before \tcode{p}.
Each iterator in the range \range{i}{j} shall be dereferenced exactly once.

\pnum
Expand Down Expand Up @@ -1676,7 +1676,7 @@

\pnum
\effects
Erases the elements in the range \tcode{[q1, q2)}.
Erases the elements in the range \range{q1}{q2}.

\pnum
\returns
Expand Down Expand Up @@ -1733,7 +1733,7 @@

\pnum
\effects
Replaces elements in \tcode{a} with a copy of \tcode{[i, j)}.
Replaces elements in \tcode{a} with a copy of \range{i}{j}.
Invalidates all references, pointers and iterators
referring to the elements of \tcode{a}.
For \tcode{vector} and \tcode{deque},
Expand Down Expand Up @@ -2691,7 +2691,7 @@
\item
\tcode{r} denotes a valid dereferenceable iterator to \tcode{a},
\item
\tcode{[q1, q2)} denotes a valid range of constant iterators in \tcode{a},
\range{q1}{q2} denotes a valid range of constant iterators in \tcode{a},
\item
\tcode{il} designates an object of type \tcode{initializer_list<value_type>},
\item
Expand Down Expand Up @@ -4180,7 +4180,7 @@
\tcode{i} and \tcode{j} denote input iterators
that refer to \tcode{value_type},
\item
\tcode{[i, j)} denotes a valid range,
\range{i}{j} denotes a valid range,
\item
\tcode{rg} denotes a value of a type \tcode{R}
that models \tcode{\exposconcept{container-compatible-range}<value_type>},
Expand All @@ -4192,7 +4192,7 @@
\item
\tcode{r} denotes a valid dereferenceable iterator to \tcode{a},
\item
\tcode{[q1, q2)} denotes a valid range in \tcode{a},
\range{q1}{q2} denotes a valid range in \tcode{a},
\item
\tcode{il} denotes a value of type \tcode{initializer_list<value_type>},
\item
Expand Down Expand Up @@ -5004,7 +5004,7 @@

\pnum
\effects
Equivalent to \tcode{a.insert(t)} for each element in \tcode{[i,j)}.
Equivalent to \tcode{a.insert(t)} for each element in \range{i}{j}.

\pnum
\complexity
Expand Down Expand Up @@ -5367,7 +5367,7 @@

\pnum
\effects
Erases all elements in the range \tcode{[q1, q2)}.
Erases all elements in the range \range{q1}{q2}.

\pnum
\returns
Expand Down Expand Up @@ -5603,7 +5603,7 @@
The index of the bucket
in which elements with keys equivalent to \tcode{k} would be found,
if any such element existed.
The return value is in the range \tcode{[0, b.bucket_count())}.
The return value is in the range \range{0}{b.bucket_count()}.

\pnum
\complexity
Expand All @@ -5626,7 +5626,7 @@

\pnum
\ensures
The return value is in the range \tcode{[0, a_tran.bucket_count())}.
The return value is in the range \range{0}{a_tran.bucket_count()}.

\pnum
\returns
Expand All @@ -5651,7 +5651,7 @@

\pnum
\expects
\tcode{n} shall be in the range \tcode{[0, b.bucket_count())}.
\tcode{n} shall be in the range \range{0}{b.bucket_count()}.

\pnum
\returns
Expand All @@ -5674,7 +5674,7 @@

\pnum
\expects
\tcode{n} is in the range \tcode{[0, b.bucket_count())}.
\tcode{n} is in the range \range{0}{b.bucket_count()}.

\pnum
\returns
Expand All @@ -5698,7 +5698,7 @@

\pnum
\expects
\tcode{n} is in the range \tcode{[0, b.bucket_count())}.
\tcode{n} is in the range \range{0}{b.bucket_count()}.

\pnum
\returns
Expand All @@ -5721,7 +5721,7 @@

\pnum
\expects
\tcode{n} shall be in the range \tcode{[0, b.bucket_count())}.
\tcode{n} shall be in the range \range{0}{b.bucket_count()}.

\pnum
\returns
Expand All @@ -5745,7 +5745,7 @@

\pnum
\expects
\tcode{n} is in the range \tcode{[0, b.bucket_count())}.
\tcode{n} is in the range \range{0}{b.bucket_count()}.

\pnum
\returns
Expand Down Expand Up @@ -8362,7 +8362,7 @@
\begin{itemdescr}
\pnum
\expects
\tcode{[first, last)} is a valid range in \tcode{x}.
\range{first}{last} is a valid range in \tcode{x}.
\tcode{position} is not an iterator in the range \range{first}{last}.

\pnum
Expand Down
18 changes: 9 additions & 9 deletions source/strings.tex
Original file line number Diff line number Diff line change
Expand Up @@ -139,31 +139,31 @@
whether \tcode{c} is to be treated as less than \tcode{d}. & constant \\ \rowsep
\tcode{X::compare(p,q,n)} & \tcode{int} &
\returns
\tcode{0} if for each \tcode{i} in \tcode{[0,n)}, \tcode{X::eq(p[i],q[i])}
is \tcode{true}; else, a negative value if, for some \tcode{j} in \tcode{[0,n)},
\tcode{X::lt(p[j],q[j])} is \tcode{true} and for each \tcode{i} in \tcode{[0,j)}
\tcode{0} if for each \tcode{i} in \range{0}{n}, \tcode{X::eq(p[i],q[i])}
is \tcode{true}; else, a negative value if, for some \tcode{j} in \range{0}{n},
\tcode{X::lt(p[j],q[j])} is \tcode{true} and for each \tcode{i} in \range{0}{j}
\tcode{X::eq(p[i],q[i])} is \tcode{true}; else a positive value. & linear \\ \rowsep
\tcode{X::length(p)} & \tcode{size_t} &
\returns
the smallest \tcode{i} such that \tcode{X::eq(p[i],charT())} is \tcode{true}. & linear \\ \rowsep
\tcode{X::find(p,n,c)} & \tcode{const X::char_type*} &
\returns
the smallest \tcode{q} in \tcode{[p,p+n)} such that
the smallest \tcode{q} in \range{p}{p+n} such that
\tcode{X::eq(*q,c)} is \tcode{true}, \tcode{nullptr} otherwise. & linear \\ \rowsep
\tcode{X::move(s,p,n)} & \tcode{X::char_type*} &
for each \tcode{i} in \tcode{[0,n)}, performs \tcode{X::assign(s[i],p[i])}.
Copies correctly even where the ranges \tcode{[p,p+n)} and \tcode{[s,s+n)} overlap.\br \returns \tcode{s}. & linear \\ \rowsep
for each \tcode{i} in \range{0}{n}, performs \tcode{X::assign(s[i],p[i])}.
Copies correctly even where the ranges \range{p}{p+n} and \range{s}{s+n} overlap.\br \returns \tcode{s}. & linear \\ \rowsep
\tcode{X::copy(s,p,n)} & \tcode{X::char_type*} &
\expects
The ranges \range{p}{p+n} and \range{s}{s+n} do not overlap.\par
\returns
\tcode{s}.\br
for each \tcode{i} in
\tcode{[0,n)}, performs \tcode{X::assign(s[i],p[i])}. & linear \\ \rowsep
\range{0}{n}, performs \tcode{X::assign(s[i],p[i])}. & linear \\ \rowsep
\tcode{X::assign(r,d)} & (not used) &
assigns \tcode{r=d}. & constant \\ \rowsep
\tcode{X::assign\-(s,n,c)} & \tcode{X::char_type*} &
for each \tcode{i} in \tcode{[0,n)}, performs
for each \tcode{i} in \range{0}{n}, performs
\tcode{X::assign(s[i],c)}.\br
\returns
\tcode{s}. & linear \\ \rowsep
Expand Down Expand Up @@ -3916,7 +3916,7 @@
\pnum
\effects
Removes the characters in the range
\tcode{[first, last)}.
\range{first}{last}.

\pnum
\returns
Expand Down
2 changes: 1 addition & 1 deletion source/text.tex
Original file line number Diff line number Diff line change
Expand Up @@ -12429,7 +12429,7 @@
In all cases in which the call to \tcode{regex_search} returns \tcode{true},
\tcode{match.prefix().first} shall be equal to the previous value of
\tcode{match[0].second}, and for each index \tcode{i} in the half-open range
\tcode{[0, match.size())} for which \tcode{match[i].matched} is \tcode{true},
\range{0}{match.size()} for which \tcode{match[i].matched} is \tcode{true},
\tcode{match.position(i)}
shall return \tcode{distance(begin, match[i].\brk{}first)}.

Expand Down
Loading