Skip to content

Commit c4b120d

Browse files
jensmaurertkoeppe
authored andcommitted
[dcl.dcl] Replace \term with \defn or \defnx (#1941)
1 parent 1fe02a2 commit c4b120d

File tree

1 file changed

+13
-13
lines changed

1 file changed

+13
-13
lines changed

source/declarations.tex

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -207,14 +207,14 @@
207207

208208
\pnum
209209
If the \grammarterm{decl-specifier-seq} contains the \tcode{typedef}
210-
specifier, the declaration is called a \term{typedef declaration} and the name
210+
specifier, the declaration is called a \defnx{typedef declaration}{declaration!typedef} and the name
211211
of each \grammarterm{init-declarator}
212212
is declared to be a \grammarterm{typedef-name}, synonymous with its
213213
associated type\iref{dcl.typedef}. If the
214214
\grammarterm{decl-specifier-seq} contains no \tcode{typedef} specifier, the
215-
declaration is called a \term{function declaration} if
215+
declaration is called a \defnx{function declaration}{declaration!function} if
216216
the type associated with the name is a function type\iref{dcl.fct} and
217-
an \term{object declaration} otherwise.
217+
an \defnx{object declaration}{declaration!object} otherwise.
218218

219219
\pnum
220220
\indextext{definition!declaration as}%
@@ -978,7 +978,7 @@
978978
\indextext{inline function}%
979979
A function declaration~(\ref{dcl.fct}, \ref{class.mfct},
980980
\ref{class.friend}) with an \tcode{inline} specifier declares an
981-
\term{inline function}. The inline specifier indicates to
981+
\defnx{inline function}{function!inline}. The inline specifier indicates to
982982
the implementation that inline substitution of the function body at the
983983
point of call is to be preferred to the usual function call mechanism.
984984
An implementation is not required to perform this inline substitution at
@@ -988,7 +988,7 @@
988988

989989
\pnum
990990
A variable declaration with an \tcode{inline} specifier declares an
991-
\term{inline variable}.
991+
\defnx{inline variable}{variable!inline}.
992992

993993
\pnum
994994
A function defined within a class definition is an inline function.
@@ -1994,11 +1994,11 @@
19941994
\indextext{enumeration}%
19951995
The enumeration type declared with an \grammarterm{enum-key}
19961996
of only \tcode{enum} is an \defnx{unscoped enumeration}{enumeration!unscoped},
1997-
and its \grammarterm{enumerator}{s} are \term{unscoped enumerators}.
1997+
and its \grammarterm{enumerator}{s} are \defnx{unscoped enumerators}{enumerator!unscoped}.
19981998
The \grammarterm{enum-key}{s} \tcode{enum class} and
19991999
\tcode{enum struct} are semantically equivalent; an enumeration
20002000
type declared with one of these is a \defnx{scoped enumeration}{enumeration!scoped},
2001-
and its \grammarterm{enumerator}{s} are \term{scoped enumerators}.
2001+
and its \grammarterm{enumerator}{s} are \defnx{scoped enumerators}{enumerator!scoped}.
20022002
The optional \grammarterm{identifier} shall not be omitted in the declaration of a scoped enumeration.
20032003
The \grammarterm{type-specifier-seq} of an \grammarterm{enum-base}
20042004
shall name an integral type; any cv-qualification is ignored.
@@ -2332,7 +2332,7 @@
23322332
\end{example}
23332333

23342334
\pnum
2335-
The \term{enclosing namespaces} of a declaration are those
2335+
The \defnx{enclosing namespaces}{namespace!enclosing} of a declaration are those
23362336
namespaces in which the declaration lexically appears, except for a
23372337
redeclaration of a namespace member outside its original namespace
23382338
(e.g., a definition as specified in~\ref{namespace.memdef}). Such a
@@ -2357,7 +2357,7 @@
23572357
\pnum
23582358
If the optional initial \tcode{inline} keyword appears in a
23592359
\grammarterm{namespace-definition} for a particular namespace, that namespace is
2360-
declared to be an \term{inline namespace}. The \tcode{inline} keyword may be
2360+
declared to be an \defnx{inline namespace}{namespace!inline}. The \tcode{inline} keyword may be
23612361
used on a \grammarterm{namespace-definition} that extends a namespace
23622362
only if it was previously used on the \grammarterm{namespace-definition}
23632363
that initially declared the \grammarterm{namespace-name} for that namespace.
@@ -2387,9 +2387,9 @@
23872387
These properties are transitive: if a namespace \tcode{N} contains an inline namespace
23882388
\tcode{M}, which in turn contains an inline namespace \tcode{O}, then the members of
23892389
\tcode{O} can be used as though they were members of \tcode{M} or \tcode{N}.
2390-
The \term{inline namespace set} of \tcode{N} is the transitive closure of all
2390+
The \defn{inline namespace set} of \tcode{N} is the transitive closure of all
23912391
inline namespaces in \tcode{N}.
2392-
The \term{enclosing namespace set} of \tcode{O} is the set of namespaces
2392+
The \defn{enclosing namespace set} of \tcode{O} is the set of namespaces
23932393
consisting of the innermost non-inline namespace enclosing
23942394
an inline namespace \tcode{O}, together with any intervening inline namespaces.
23952395

@@ -2674,7 +2674,7 @@
26742674
\end{note}
26752675
\indextext{inheritance!\idxgram{using-declaration} and}%
26762676
If the \grammarterm{using-declarator} names a constructor,
2677-
it declares that the class \term{inherits} the set of constructor declarations
2677+
it declares that the class \defnx{inherits}{constructor!inherited} the set of constructor declarations
26782678
introduced by the \grammarterm{using-declarator} from the nominated base class.
26792679

26802680
\pnum
@@ -3355,7 +3355,7 @@
33553355

33563356
\pnum
33573357
All function types, function names with external linkage, and variable
3358-
names with external linkage have a \term{language linkage}.
3358+
names with external linkage have a \defn{language linkage}.
33593359
\begin{note}
33603360
Some of the properties associated with an entity with language linkage
33613361
are specific to each implementation and are not described here. For

0 commit comments

Comments
 (0)