Skip to content

Commit deb9fb1

Browse files
AlisdairMtkoeppe
authored andcommitted
Consistent comma after e.g. and i.e.
After grepping to determine the preferred idiom, it seems clear that the standard prefers to follow both e.g. and i.e. with a comma, rather than omit it. This patch applies that rule to the few places that were missing the comma.
1 parent e1b92d6 commit deb9fb1

File tree

6 files changed

+16
-12
lines changed

6 files changed

+16
-12
lines changed

source/declarators.tex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2251,7 +2251,7 @@
22512251
\end{example}
22522252

22532253
\begin{example}
2254-
One can make a class uncopyable, i.e. move-only, by using deleted
2254+
One can make a class uncopyable, i.e., move-only, by using deleted
22552255
definitions of the copy constructor and copy assignment operator, and then
22562256
providing defaulted definitions of the move constructor and move assignment operator.
22572257
\begin{codeblock}

source/iostreams.tex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
\pnum
4141
Figure~\ref{fig:streampos} illustrates relationships among various types
4242
described in this clause. A line from \textbf{A} to \textbf{B} indicates that \textbf{A}
43-
is an alias (e.g. a typedef) for \textbf{B} or that \textbf{A} is defined in terms of
43+
is an alias (e.g., a typedef) for \textbf{B} or that \textbf{A} is defined in terms of
4444
\textbf{B}.
4545

4646
\begin{importgraphic}

source/lib-intro.tex

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2668,13 +2668,17 @@
26682668
\begin{note}
26692669
If the parameter is a generic parameter of the form \tcode{T\&\&} and an lvalue of type
26702670
\tcode{A} is bound, the argument binds to an lvalue reference\iref{temp.deduct.call}
2671-
and thus is not covered by the previous sentence. \end{note} \begin{note} If a program casts
2672-
an lvalue to an xvalue while passing that lvalue to a library function (e.g. by calling the function
2673-
with the argument \tcode{std::move(x)}), the program
2671+
and thus is not covered by the previous sentence.
2672+
\end{note}
2673+
\begin{note}
2674+
If a program casts
2675+
an lvalue to an xvalue while passing that lvalue to a library function
2676+
(e.g., by calling the function with the argument \tcode{std::move(x)}), the program
26742677
is effectively asking that function to treat that lvalue as a temporary object.
26752678
The implementation
26762679
is free to optimize away aliasing checks which might be needed if the argument was
2677-
an lvalue. \end{note}
2680+
an lvalue.
2681+
\end{note}
26782682
\end{itemize}
26792683

26802684
\rSec3[res.on.objects]{Library object access}

source/templates.tex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -850,7 +850,7 @@
850850
the \grammarterm{template-id}. \begin{note} The second \tcode{>}
851851
token produced by this replacement rule may terminate an enclosing
852852
\grammarterm{template-id} construct or it may be part of a different
853-
construct (e.g. a cast).\end{note}
853+
construct (e.g., a cast).\end{note}
854854
\begin{example}
855855

856856
\begin{codeblock}

source/threads.tex

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -99,13 +99,13 @@
9999

100100
\begin{itemize}
101101
\item
102-
if $C_a > C_t$, the waiting function should wake as soon as possible, i.e. $C_a + D_i + D_m$,
102+
if $C_a > C_t$, the waiting function should wake as soon as possible, i.e., $C_a + D_i + D_m$,
103103
since the timeout is already satisfied. \begin{note} This specification may result in the total
104104
duration of the wait decreasing when measured against a steady clock. \end{note}
105105

106106
\item
107107
if $C_a \leq C_t$, the waiting function should not time out until \tcode{Clock::now()} returns a
108-
time $C_n \geq C_t$, i.e. waking at $C_t + D_i + D_m$. \begin{note} When the clock is adjusted
108+
time $C_n \geq C_t$, i.e., waking at $C_t + D_i + D_m$. \begin{note} When the clock is adjusted
109109
backwards, this specification may result in the total duration of the wait increasing when
110110
measured against a steady clock. When the clock is adjusted forwards, this specification may
111111
result in the total duration of the wait decreasing when measured against a steady clock.
@@ -147,7 +147,7 @@
147147
An \defn{execution agent} is an entity such as a thread that may perform work in parallel with
148148
other execution agents. \begin{note} Implementations or users may introduce other kinds of
149149
agents such as processes or thread-pool tasks. \end{note} The calling agent is determined by
150-
context, e.g. the calling thread that contains the call, and so on.
150+
context, e.g., the calling thread that contains the call, and so on.
151151

152152
\pnum
153153
\begin{note} Some lockable objects are ``agent oblivious'' in that they work for any

source/utilities.tex

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4858,7 +4858,7 @@
48584858
\pnum
48594859
\complexity
48604860
For \tcode{sizeof...(Variants) <= 1}, the invocation of the callable object is
4861-
implemented in constant time, i.e. it does not depend on \tcode{sizeof...(Types).}
4861+
implemented in constant time, i.e., it does not depend on \tcode{sizeof...(Types).}
48624862
For \tcode{sizeof...(Variants) > 1}, the invocation of the callable object has
48634863
no complexity requirements.
48644864
\end{itemdescr}
@@ -4987,7 +4987,7 @@
49874987
\pnum
49884988
\begin{note}
49894989
The discriminated type may contain values of different types but does not attempt conversion between them,
4990-
i.e. \tcode{5} is held strictly as an \tcode{int} and is not implicitly convertible either to \tcode{"5"} or to \tcode{5.0}.
4990+
i.e., \tcode{5} is held strictly as an \tcode{int} and is not implicitly convertible either to \tcode{"5"} or to \tcode{5.0}.
49914991
This indifference to interpretation but awareness of type effectively allows safe, generic containers of single values, with no scope for surprises from ambiguous conversions.
49924992
\end{note}
49934993

0 commit comments

Comments
 (0)