Skip to content

Commit 89846e1

Browse files
[lib] Use \exposid(nc) for components in [expos.only.entity] (#8185)
Affected exposition-only components - decay-copy - synth-three-way - synth-three-way-result Affected sections: - [expos.only.entity] - [utility.syn] - [pairs.spec] - [tuple.syn] - [tuple.rel] - [array.syn] - [deque.syn] - [forward.list.syn] - [list.syn] - [vector.syn] - [associative.map.syn] - [associative.set.syn] - [flat.set.defn] - [flat.multiset.defn] - [range.all.general] - [range.take.overview] - [range.drop.overview]
1 parent bb1af1a commit 89846e1

File tree

4 files changed

+30
-30
lines changed

4 files changed

+30
-30
lines changed

source/containers.tex

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6076,7 +6076,7 @@
60766076
template<class T, size_t N>
60776077
constexpr bool operator==(const array<T, N>& x, const array<T, N>& y);
60786078
template<class T, size_t N>
6079-
constexpr @\placeholder{synth-three-way-result}@<T>
6079+
constexpr @\exposid{synth-three-way-result}@<T>
60806080
operator<=>(const array<T, N>& x, const array<T, N>& y);
60816081

60826082
// \ref{array.special}, specialized algorithms
@@ -6444,7 +6444,7 @@
64446444
template<class T, class Allocator>
64456445
constexpr bool operator==(const deque<T, Allocator>& x, const deque<T, Allocator>& y);
64466446
template<class T, class Allocator>
6447-
constexpr @\placeholder{synth-three-way-result}@<T>
6447+
constexpr @\exposid{synth-three-way-result}@<T>
64486448
operator<=>(const deque<T, Allocator>& x, const deque<T, Allocator>& y);
64496449

64506450
template<class T, class Allocator>
@@ -6940,7 +6940,7 @@
69406940
constexpr bool operator==(const forward_list<T, Allocator>& x,
69416941
const forward_list<T, Allocator>& y);
69426942
template<class T, class Allocator>
6943-
constexpr @\placeholder{synth-three-way-result}@<T>
6943+
constexpr @\exposid{synth-three-way-result}@<T>
69446944
operator<=>(const forward_list<T, Allocator>& x,
69456945
const forward_list<T, Allocator>& y);
69466946

@@ -8995,7 +8995,7 @@
89958995
template<class T, class Allocator>
89968996
constexpr bool operator==(const list<T, Allocator>& x, const list<T, Allocator>& y);
89978997
template<class T, class Allocator>
8998-
constexpr @\placeholder{synth-three-way-result}@<T>
8998+
constexpr @\exposid{synth-three-way-result}@<T>
89998999
operator<=>(const list<T, Allocator>& x, const list<T, Allocator>& y);
90009000

90019001
template<class T, class Allocator>
@@ -9788,7 +9788,7 @@
97889788
template<class T, class Allocator>
97899789
constexpr bool operator==(const vector<T, Allocator>& x, const vector<T, Allocator>& y);
97909790
template<class T, class Allocator>
9791-
constexpr @\placeholder{synth-three-way-result}@<T>
9791+
constexpr @\exposid{synth-three-way-result}@<T>
97929792
operator<=>(const vector<T, Allocator>& x, const vector<T, Allocator>& y);
97939793

97949794
template<class T, class Allocator>
@@ -11420,7 +11420,7 @@
1142011420
constexpr bool operator==(const map<Key, T, Compare, Allocator>& x,
1142111421
const map<Key, T, Compare, Allocator>& y);
1142211422
template<class Key, class T, class Compare, class Allocator>
11423-
constexpr @\placeholder{synth-three-way-result}@<pair<const Key, T>>
11423+
constexpr @\exposid{synth-three-way-result}@<pair<const Key, T>>
1142411424
operator<=>(const map<Key, T, Compare, Allocator>& x,
1142511425
const map<Key, T, Compare, Allocator>& y);
1142611426

@@ -11443,7 +11443,7 @@
1144311443
constexpr bool operator==(const multimap<Key, T, Compare, Allocator>& x,
1144411444
const multimap<Key, T, Compare, Allocator>& y);
1144511445
template<class Key, class T, class Compare, class Allocator>
11446-
constexpr @\placeholder{synth-three-way-result}@<pair<const Key, T>>
11446+
constexpr @\exposid{synth-three-way-result}@<pair<const Key, T>>
1144711447
operator<=>(const multimap<Key, T, Compare, Allocator>& x,
1144811448
const multimap<Key, T, Compare, Allocator>& y);
1144911449

@@ -12585,7 +12585,7 @@
1258512585
constexpr bool operator==(const set<Key, Compare, Allocator>& x,
1258612586
const set<Key, Compare, Allocator>& y);
1258712587
template<class Key, class Compare, class Allocator>
12588-
constexpr @\placeholder{synth-three-way-result}@<Key>
12588+
constexpr @\exposid{synth-three-way-result}@<Key>
1258912589
operator<=>(const set<Key, Compare, Allocator>& x,
1259012590
const set<Key, Compare, Allocator>& y);
1259112591

@@ -12607,7 +12607,7 @@
1260712607
constexpr bool operator==(const multiset<Key, Compare, Allocator>& x,
1260812608
const multiset<Key, Compare, Allocator>& y);
1260912609
template<class Key, class Compare, class Allocator>
12610-
constexpr @\placeholder{synth-three-way-result}@<Key>
12610+
constexpr @\exposid{synth-three-way-result}@<Key>
1261112611
operator<=>(const multiset<Key, Compare, Allocator>& x,
1261212612
const multiset<Key, Compare, Allocator>& y);
1261312613

@@ -19078,7 +19078,7 @@
1907819078

1907919079
friend constexpr bool operator==(const flat_set& x, const flat_set& y);
1908019080

19081-
friend constexpr @\placeholder{synth-three-way-result}@<value_type>
19081+
friend constexpr @\exposid{synth-three-way-result}@<value_type>
1908219082
operator<=>(const flat_set& x, const flat_set& y);
1908319083

1908419084
friend constexpr void swap(flat_set& x, flat_set& y) noexcept { x.swap(y); }
@@ -19749,7 +19749,7 @@
1974919749

1975019750
friend constexpr bool operator==(const flat_multiset& x, const flat_multiset& y);
1975119751

19752-
friend constexpr @\placeholder{synth-three-way-result}@<value_type>
19752+
friend constexpr @\exposid{synth-three-way-result}@<value_type>
1975319753
operator<=>(const flat_multiset& x, const flat_multiset& y);
1975419754

1975519755
friend constexpr void swap(flat_multiset& x, flat_multiset& y) noexcept

source/lib-intro.tex

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -539,16 +539,16 @@
539539
\pnum
540540
The following are defined for exposition only
541541
to aid in the specification of the library:
542-
\indexlibrary{decay-copy@\tcode{\placeholder{decay-copy}}}%
542+
\indexlibrary{decay-copy@\exposid{decay-copy}}%
543543
\begin{codeblock}
544544
namespace std {
545545
template<class T>
546546
requires @\libconcept{convertible_to}@<T, decay_t<T>>
547-
constexpr decay_t<T> @\placeholdernc{decay-copy}@(T&& v) // \expos
547+
constexpr decay_t<T> @\exposidnc{decay-copy}@(T&& v) // \expos
548548
noexcept(is_nothrow_convertible_v<T, decay_t<T>>)
549549
{ return std::forward<T>(v); }
550550

551-
constexpr auto @\placeholdernc{synth-three-way}@ = // \expos
551+
constexpr auto @\exposidnc{synth-three-way}@ = // \expos
552552
[]<class T, class U>(const T& t, const U& u)
553553
requires requires {
554554
{ t < u } -> @\exposconcept{boolean-testable}@;
@@ -565,8 +565,8 @@
565565
};
566566

567567
template<class T, class U = T>
568-
using @\placeholdernc{synth-three-way-result}@ = // \expos
569-
decltype(@\placeholdernc{synth-three-way}@(declval<T&>(), declval<U&>()));
568+
using @\exposidnc{synth-three-way-result}@ = // \expos
569+
decltype(@\exposidnc{synth-three-way}@(declval<T&>(), declval<U&>()));
570570
}
571571
\end{codeblock}
572572

source/ranges.tex

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4513,7 +4513,7 @@
45134513
Given a subexpression \tcode{E}, the expression
45144514
\tcode{views::all(E)} is expression-equivalent to:
45154515
\begin{itemize}
4516-
\item \tcode{\placeholdernc{decay-copy}(E)} if the decayed type of \tcode{E}
4516+
\item \tcode{\exposidnc{decay-copy}(E)} if the decayed type of \tcode{E}
45174517
models \libconcept{view}.
45184518

45194519
\item Otherwise, \tcode{ref_view\{E\}} if that expression is well-formed.
@@ -5894,7 +5894,7 @@
58945894
\item
58955895
If \tcode{T} is a specialization
58965896
of \tcode{empty_view}\iref{range.empty.view},
5897-
then \tcode{((void)F, \placeholdernc{decay-copy}(E))},
5897+
then \tcode{((void)F, \exposidnc{decay-copy}(E))},
58985898
except that the evaluations of \tcode{E} and \tcode{F}
58995899
are indeterminately sequenced.
59005900

@@ -6377,7 +6377,7 @@
63776377
\item
63786378
If \tcode{T} is a specialization of
63796379
\tcode{empty_view}\iref{range.empty.view},
6380-
then \tcode{((void)F, \placeholdernc{decay-copy}(E))},
6380+
then \tcode{((void)F, \exposidnc{decay-copy}(E))},
63816381
except that the evaluations of \tcode{E} and \tcode{F}
63826382
are indeterminately sequenced.
63836383

@@ -6420,7 +6420,7 @@
64206420
\end{codeblock}
64216421
except that \tcode{E} is evaluated only once;
64226422
\item
6423-
otherwise, \tcode{((void)F, \placeholdernc{decay-copy}(E))},
6423+
otherwise, \tcode{((void)F, \exposidnc{decay-copy}(E))},
64246424
except that the evaluations of \tcode{E} and \tcode{F} are indeterminately sequenced.
64256425
\end{itemize}
64266426

source/utilities.tex

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -137,8 +137,8 @@
137137
template<class T1, class T2, class U1, class U2>
138138
constexpr bool operator==(const pair<T1, T2>&, const pair<U1, U2>&);
139139
template<class T1, class T2, class U1, class U2>
140-
constexpr common_comparison_category_t<@\placeholder{synth-three-way-result}@<T1, U1>,
141-
@\placeholder{synth-three-way-result}@<T2, U2>>
140+
constexpr common_comparison_category_t<@\exposid{synth-three-way-result}@<T1, U1>,
141+
@\exposid{synth-three-way-result}@<T2, U2>>
142142
operator<=>(const pair<T1, T2>&, const pair<U1, U2>&);
143143

144144
template<class T1, class T2>
@@ -1318,8 +1318,8 @@
13181318
\indexlibrarymember{operator<=>}{pair}%
13191319
\begin{itemdecl}
13201320
template<class T1, class T2, class U1, class U2>
1321-
constexpr common_comparison_category_t<@\placeholder{synth-three-way-result}@<T1, U1>,
1322-
@\placeholder{synth-three-way-result}@<T2, U2>>
1321+
constexpr common_comparison_category_t<@\exposid{synth-three-way-result}@<T1, U1>,
1322+
@\exposid{synth-three-way-result}@<T2, U2>>
13231323
operator<=>(const pair<T1, T2>& x, const pair<U1, U2>& y);
13241324
\end{itemdecl}
13251325

@@ -1328,8 +1328,8 @@
13281328
\effects
13291329
Equivalent to:
13301330
\begin{codeblock}
1331-
if (auto c = @\placeholdernc{synth-three-way}@(x.first, y.first); c != 0) return c;
1332-
return @\placeholdernc{synth-three-way}@(x.second, y.second);
1331+
if (auto c = @\exposidnc{synth-three-way}@(x.first, y.first); c != 0) return c;
1332+
return @\exposidnc{synth-three-way}@(x.second, y.second);
13331333
\end{codeblock}
13341334
\end{itemdescr}
13351335

@@ -1614,7 +1614,7 @@
16141614
template<class... TTypes, @\exposconceptnc{tuple-like}@ UTuple>
16151615
constexpr bool operator==(const tuple<TTypes...>&, const UTuple&);
16161616
template<class... TTypes, class... UTypes>
1617-
constexpr common_comparison_category_t<@\placeholdernc{synth-three-way-result}@<TTypes, UTypes>...>
1617+
constexpr common_comparison_category_t<@\exposidnc{synth-three-way-result}@<TTypes, UTypes>...>
16181618
operator<=>(const tuple<TTypes...>&, const tuple<UTypes...>&);
16191619
template<class... TTypes, @\exposconceptnc{tuple-like}@ UTuple>
16201620
constexpr @\seebelownc@ operator<=>(const tuple<TTypes...>&, const UTuple&);
@@ -2992,10 +2992,10 @@
29922992
\indexlibrarymember{operator<=>}{tuple}%
29932993
\begin{itemdecl}
29942994
template<class... TTypes, class... UTypes>
2995-
constexpr common_comparison_category_t<@\placeholder{synth-three-way-result}@<TTypes, UTypes>...>
2995+
constexpr common_comparison_category_t<@\exposid{synth-three-way-result}@<TTypes, UTypes>...>
29962996
operator<=>(const tuple<TTypes...>& t, const tuple<UTypes...>& u);
29972997
template<class... TTypes, @\exposconcept{tuple-like}@ UTuple>
2998-
constexpr common_comparison_category_t<@\placeholder{synth-three-way-result}@<TTypes, Elems>...>
2998+
constexpr common_comparison_category_t<@\exposid{synth-three-way-result}@<TTypes, Elems>...>
29992999
operator<=>(const tuple<TTypes...>& t, const UTuple& u);
30003000
\end{itemdecl}
30013001

@@ -3013,7 +3013,7 @@
30133013
returns \tcode{strong_ordering::equal}.
30143014
Otherwise, equivalent to:
30153015
\begin{codeblock}
3016-
if (auto c = @\placeholder{synth-three-way}@(get<0>(t), get<0>(u)); c != 0) return c;
3016+
if (auto c = @\exposid{synth-three-way}@(get<0>(t), get<0>(u)); c != 0) return c;
30173017
return @$\tcode{t}_\mathrm{tail}$@ <=> @$\tcode{u}_\mathrm{tail}$@;
30183018
\end{codeblock}
30193019
where $\tcode{r}_\mathrm{tail}$ for some \tcode{r}

0 commit comments

Comments
 (0)