Skip to content

Commit 8825604

Browse files
authored
[lib] Harmonize presentation of "The expression in...is equivalent to" (#4108)
1 parent eb367f6 commit 8825604

File tree

2 files changed

+11
-7
lines changed

2 files changed

+11
-7
lines changed

source/ranges.tex

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2259,7 +2259,7 @@
22592259

22602260
\pnum
22612261
\remarks
2262-
The expression in the \grammarterm{requires-clause} is equivalent to
2262+
The expression in the \grammarterm{requires-clause} is equivalent to:
22632263
\begin{codeblock}
22642264
(@\libconcept{same_as}@<W, Bound> && @\exposconcept{advanceable}@<W>) || (integral<W> && integral<Bound>) ||
22652265
@\libconcept{sized_sentinel_for}@<Bound, W>
@@ -3101,7 +3101,7 @@
31013101
void @\placeholder{FUN}@(R&);
31023102
void @\placeholder{FUN}@(R&&) = delete;
31033103
\end{codeblock}
3104-
The expression in the \grammarterm{requires-clause} is equivalent to
3104+
The expression in the \grammarterm{requires-clause} is equivalent to:
31053105
\begin{codeblock}
31063106
@\libconcept{convertible_to}@<T, R&> && requires { @\placeholder{FUN}@(declval<T>()); }
31073107
\end{codeblock}

source/utilities.tex

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -803,7 +803,7 @@
803803

804804
\pnum
805805
\remarks
806-
The expression inside explicit is equivalent to:
806+
The expression inside \tcode{explicit} is equivalent to:
807807
\begin{codeblock}
808808
!is_convertible_v<const U1&, first_type> || !is_convertible_v<const U2&, second_type>
809809
\end{codeblock}
@@ -831,7 +831,7 @@
831831

832832
\pnum
833833
\remarks
834-
The expression inside explicit is equivalent to:
834+
The expression inside \tcode{explicit} is equivalent to:
835835
\begin{codeblock}
836836
!is_convertible_v<U1, first_type> || !is_convertible_v<U2, second_type>
837837
\end{codeblock}
@@ -1587,6 +1587,7 @@
15871587
second element with \tcode{u.second}.
15881588

15891589
\pnum
1590+
\remarks
15901591
The expression inside \tcode{explicit} is equivalent to:
15911592
\begin{codeblock}
15921593
!is_convertible_v<const U1&, @$\tcode{T}_0$@> || !is_convertible_v<const U2&, @$\tcode{T}_1$@>
@@ -1615,6 +1616,7 @@
16151616
second element with \tcode{std::forward<U2>(u.second)}.
16161617

16171618
\pnum
1619+
\remarks
16181620
The expression inside \tcode{explicit} is equivalent to:
16191621
\begin{codeblock}
16201622
!is_convertible_v<U1, @$\tcode{T}_0$@> || !is_convertible_v<U2, @$\tcode{T}_1$@>
@@ -1714,7 +1716,7 @@
17141716

17151717
\pnum
17161718
\remarks
1717-
The expression inside \tcode{noexcept} is equivalent to the logical \textsc{and} of the
1719+
The expression inside \tcode{noexcept} is equivalent to the logical \logop{AND} of the
17181720
following expressions:
17191721

17201722
\begin{codeblock}
@@ -1845,7 +1847,7 @@
18451847
\pnum
18461848
\remarks
18471849
The expression inside \tcode{noexcept} is equivalent to the logical
1848-
\textsc{and} of the following expressions:
1850+
\logop{AND} of the following expressions:
18491851

18501852
\begin{codeblock}
18511853
is_nothrow_swappable_v<@$\mathtt{T}_i$@>
@@ -3186,6 +3188,8 @@
31863188
\begin{codeblock}
31873189
is_nothrow_move_constructible_v<T> && is_nothrow_swappable_v<T>
31883190
\end{codeblock}
3191+
3192+
\pnum
31893193
If any exception is thrown, the results of the expressions \tcode{bool(*this)} and \tcode{bool(rhs)} remain unchanged.
31903194
If an exception is thrown during the call to function \tcode{swap},
31913195
the state of \tcode{*val} and \tcode{*rhs.val} is determined by the exception safety guarantee of \tcode{swap} for lvalues of \tcode{T}.
@@ -4489,7 +4493,7 @@
44894493
\tcode{is_trivially_move_assignable_v<$\tcode{T}_i$> \&\&}
44904494
\tcode{is_trivially_destructible_v<$\tcode{T}_i$>}
44914495
is \tcode{true} for all $i$, this assignment operator is trivial.
4492-
The expression inside \tcode{noexcept} is equivalent to:
4496+
The expression inside \tcode{noexcept} is equivalent to
44934497
\tcode{is_nothrow_move_constructible_v<$\tcode{T}_i$> \&\& is_nothrow_move_assignable_v<$\tcode{T}_i$>} for all $i$.
44944498
\begin{itemize}
44954499
\item If an exception is thrown during the call to $\tcode{T}_j$'s move construction

0 commit comments

Comments
 (0)