Skip to content

Commit 5619b65

Browse files
committed
Update [intro.defs] and [definitions] to use (roughly) substitutable
phrases as definitions. In particular, such phrases should not begin with an article. However, for definitions of adjectives, a noun phrase is still used, because the English language is not compatible with ISO's requirements.
1 parent a31fa79 commit 5619b65

File tree

2 files changed

+28
-29
lines changed

2 files changed

+28
-29
lines changed

source/intro.tex

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

100100
\indexdefn{access}%
101101
\definition{access}{defns.access}
102-
\defncontext{execution-time action} to read or modify the value of an object
102+
\defncontext{execution-time action} read or modify the value of an object
103103

104104
\indexdefn{argument}%
105105
\indexdefn{argument!function call expression}
@@ -116,7 +116,7 @@
116116
\indexdefn{argument}%
117117
\indexdefn{argument!throw expression}%
118118
\definition{argument}{defns.argument.throw}
119-
\defncontext{throw expression} the operand of \tcode{throw}\iref{expr.throw}
119+
\defncontext{throw expression} operand of \tcode{throw}\iref{expr.throw}
120120

121121
\indexdefn{argument}%
122122
\indexdefn{argument!template instantiation}%
@@ -129,9 +129,9 @@
129129

130130
\indexdefn{block}%
131131
\definition{block}{defns.block}
132-
a thread of execution that blocks is waiting for some condition (other than
133-
for the implementation to execute its execution steps) to be satisfied before
134-
it can continue execution past the blocking operation
132+
wait for some condition (other than for the implementation to execute
133+
the execution steps of the thread of execution) to be satisfied before
134+
continuing execution past the blocking operation
135135

136136
\indexdefn{behavior!conditionally-supported}%
137137
\definition{conditionally-supported}{defns.cond.supp}

source/lib-intro.tex

Lines changed: 23 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -134,14 +134,14 @@
134134

135135
\definition{arbitrary-positional stream}{defns.arbitrary.stream}
136136
\indexdefn{stream!arbitrary-positional}%
137-
a stream (described in \ref{input.output}) that can seek to any integral position within
137+
stream (described in \ref{input.output}) that can seek to any integral position within
138138
the length of the stream\\
139139
\begin{note} Every arbitrary-positional stream is also a repositional stream. \end{note}
140140

141141
\definition{character}{defns.character}
142142
\indexdefn{character}%
143143
\defncontext{\ref{strings}, \ref{localization}, \ref{input.output}, and~\ref{re}}
144-
any object which,
144+
object which,
145145
when treated sequentially,
146146
can represent text\\
147147
\begin{note}
@@ -158,9 +158,8 @@
158158

159159
\definition{character container type}{defns.character.container}
160160
\indexdefn{type!character container}%
161-
a class or a type used to
162-
represent a
163-
\term{character}\\
161+
class or a type used to
162+
represent a character\\
164163
\begin{note}
165164
It is used for one of the template parameters of the string,
166165
iostream, and regular expression class templates.
@@ -169,12 +168,12 @@
169168

170169
\definition{comparison function}{defns.comparison}
171170
\indexdefn{function!comparison}%
172-
an operator function\iref{over.oper} for any of the equality\iref{expr.eq} or
171+
operator function\iref{over.oper} for any of the equality\iref{expr.eq} or
173172
relational\iref{expr.rel} operators
174173

175174
\definition{component}{defns.component}
176175
\indexdefn{component}%
177-
a group of library entities directly related as members, parameters, or
176+
group of library entities directly related as members, parameters, or
178177
return types\\
179178
\begin{note}
180179
For example, the class template
@@ -188,40 +187,40 @@
188187

189188
\definition{constant subexpression}{defns.const.subexpr}
190189
\indexdefn{constant subexpression}%
191-
an expression whose evaluation as subexpression of a
190+
expression whose evaluation as subexpression of a
192191
\grammarterm{conditional-expression}
193192
\tcode{CE}\iref{expr.cond} would not prevent \tcode{CE}
194193
from being a core constant expression\iref{expr.const}
195194

196195
\definition{deadlock}{defns.deadlock}
197196
\indexdefn{deadlock}%
197+
situation wherein
198198
one or more threads are unable to continue execution because each is
199199
blocked waiting for one or more of the others to satisfy some condition
200200

201201
\definition{default behavior}{defns.default.behavior.impl}
202202
\indexdefn{behavior!default}%
203203
\defncontext{implementation}
204-
any specific behavior provided by the implementation,
204+
specific behavior provided by the implementation,
205205
within the scope of the
206206
\term{required behavior}
207207

208208
\definition{default behavior}{defns.default.behavior.func}
209209
\indexdefn{behavior!default}%
210210
\defncontext{specification}
211-
a description of
211+
description of
212212
\term{replacement function}
213213
and
214214
\term{handler function}
215215
semantics
216216

217217
\definition{direct-non-list-initialization}{defns.direct-non-list-init}
218218
\indexdefn{direct-non-list-initialization}%
219-
a direct-initialization\iref{dcl.init}
219+
direct-initialization\iref{dcl.init}
220220
that is not list-initialization\iref{dcl.init.list}
221221

222222
\definition{handler function}{defns.handler}
223223
\indexdefn{function!handler}%
224-
a
225224
\term{non-reserved function}
226225
whose definition may be provided by a \Cpp program\\
227226
\begin{note}
@@ -251,7 +250,7 @@
251250

252251
\definition{modifier function}{defns.modifier}
253252
\indexdefn{function!modifier}%
254-
a class member function\iref{class.mfct} other than a constructor,
253+
class member function\iref{class.mfct} other than a constructor,
255254
assignment operator, or destructor
256255
that alters the state of an object of the class
257256

@@ -266,15 +265,15 @@
266265
\definition{NTCTS}{defns.ntcts}
267266
\indexdefn{NTCTS}%
268267
\indexdefn{string!null-terminated character type}%
269-
a sequence of values that have
270-
\term{character type}
268+
sequence of values that have
269+
character type
271270
that precede the terminating null character type
272271
value
273272
\tcode{charT()}
274273

275274
\definition{observer function}{defns.observer}
276275
\indexdefn{function!observer}%
277-
a class member function\iref{class.mfct} that accesses the state of an object of the class
276+
class member function\iref{class.mfct} that accesses the state of an object of the class
278277
but does not alter that state\\
279278
\begin{note}
280279
Observer functions are specified as
@@ -284,15 +283,15 @@
284283

285284
\definition{referenceable type}{defns.referenceable}
286285
\indexdefn{type!referenceable}%
286+
type that is either an
287287
an object type, a function type that does not have cv-qualifiers or a
288288
\grammarterm{ref-qualifier}, or a reference type
289289
\begin{note} The term describes a type to which a reference can be created,
290290
including reference types. \end{note}
291291

292292
\definition{replacement function}{defns.replacement}
293293
\indexdefn{function!replacement}%
294-
a
295-
\term{non-reserved function}
294+
non-reserved function
296295
whose definition is provided by a \Cpp program\\
297296
\begin{note}
298297
Only one definition for such a function is in effect for the duration of the program's
@@ -302,12 +301,12 @@
302301

303302
\definition{repositional stream}{defns.repositional.stream}
304303
\indexdefn{stream!repositional}%
305-
a stream (described in \ref{input.output}) that can seek to a position that was
304+
stream (described in \ref{input.output}) that can seek to a position that was
306305
previously encountered
307306

308307
\definition{required behavior}{defns.required.behavior}
309308
\indexdefn{behavior!required}%
310-
a description of
309+
description of
311310
\term{replacement function}
312311
and
313312
\term{handler function}
@@ -322,7 +321,7 @@
322321

323322
\definition{reserved function}{defns.reserved.function}
324323
\indexdefn{function!reserved}%
325-
a function, specified as part of the \Cpp standard library, that must be defined by the
324+
function, specified as part of the \Cpp standard library, that must be defined by the
326325
implementation\\
327326
\begin{note}
328327
If a \Cpp program provides a definition for any reserved function, the results are undefined.%
@@ -332,18 +331,18 @@
332331
\definition{stable algorithm}{defns.stable}
333332
\indexdefn{algorithm!stable}%
334333
\indexdefn{stable algorithm}%
335-
an algorithm that preserves, as appropriate to the particular algorithm, the order
334+
algorithm that preserves, as appropriate to the particular algorithm, the order
336335
of elements\\
337336
\begin{note} Requirements for stable algorithms are given in~\ref{algorithm.stable}. \end{note}
338337

339338
\definition{traits class}{defns.traits}
340339
\indexdefn{traits}%
341-
a class that encapsulates a set of types and functions necessary for class templates and
340+
class that encapsulates a set of types and functions necessary for class templates and
342341
function templates to manipulate objects of types for which they are instantiated
343342

344343
\definition{valid but unspecified state}{defns.valid}
345344
\indexdefn{valid but unspecified state}%
346-
a value of an object that is not specified except that the object's invariants are
345+
value of an object that is not specified except that the object's invariants are
347346
met and operations on the object behave as specified for its type\\
348347
\begin{example} If an object \tcode{x} of type \tcode{std::vector<int>} is in a
349348
valid but unspecified state, \tcode{x.empty()} can be called unconditionally,

0 commit comments

Comments
 (0)