Skip to content

Commit 26370f6

Browse files
Eeliszygoloid
authored andcommitted
[std] Use \defnadj to improve/add many index entries.
1 parent 751924f commit 26370f6

File tree

7 files changed

+31
-49
lines changed

7 files changed

+31
-49
lines changed

source/basic.tex

Lines changed: 12 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1015,7 +1015,7 @@
10151015
\defnx{block scope}{block (statement)!scope}.
10161016
Its potential scope begins at its point of
10171017
declaration\iref{basic.scope.pdecl} and ends at the end of its block.
1018-
A variable declared at block scope is a \defn{local variable}.
1018+
A variable declared at block scope is a \defnadj{local}{variable}.
10191019

10201020
\pnum
10211021
\indextext{scope!exception declaration}%
@@ -2634,15 +2634,12 @@
26342634
\end{bnf}
26352635

26362636
\pnum
2637-
\indextext{linkage}%
26382637
\indextext{translation unit}%
2639-
\indextext{linkage!internal}%
2640-
\indextext{linkage!external}%
26412638
A name is said to have \defn{linkage} when it might denote the same
26422639
object, reference, function, type, template, namespace or value as a
26432640
name introduced by a declaration in another scope:
26442641
\begin{itemize}
2645-
\item When a name has \indextext{linkage!external}\defn{external linkage},
2642+
\item When a name has \defnadj{external}{linkage},
26462643
the entity it denotes
26472644
can be referred to by names from scopes of other translation units or
26482645
from other scopes of the same translation unit.
@@ -2652,7 +2649,7 @@
26522649
can be referred to by names from other scopes of the same module unit\iref{module.unit} or
26532650
from scopes of other module units of that same module.
26542651

2655-
\item When a name has \indextext{linkage!internal}\defn{internal linkage},
2652+
\item When a name has \defnadj{internal}{linkage},
26562653
the entity it denotes
26572654
can be referred to by names from other scopes in the same translation
26582655
unit.
@@ -3399,8 +3396,7 @@
33993396
\indextext{object lifetime|(}%
34003397
The \defn{lifetime} of an object or reference is a runtime property of the
34013398
object or reference.
3402-
\indextext{initialization!vacuous}%
3403-
A variable is said to have \defn{vacuous initialization}
3399+
A variable is said to have \defnadj{vacuous}{initialization}
34043400
if it is default-initialized and,
34053401
if it is of class type or a (possibly multi-dimensional) array thereof,
34063402
that class type has a trivial default constructor.
@@ -4114,7 +4110,7 @@
41144110
\end{itemize}
41154111

41164112
\pnum
4117-
A pointer value is a \defn{safely-derived pointer} to an object with dynamic storage duration
4113+
A pointer value is a \defnadj{safely-derived}{pointer} to an object with dynamic storage duration
41184114
only if the pointer value has an object pointer type
41194115
and is one of the following:
41204116
\begin{itemize}
@@ -4211,8 +4207,7 @@
42114207
using the alignment specifier\iref{dcl.align}.
42124208

42134209
\pnum
4214-
\indextext{alignment!fundamental}%
4215-
A \defn{fundamental alignment} is represented by an alignment
4210+
A \defnadj{fundamental}{alignment} is represented by an alignment
42164211
less than or equal to the greatest alignment supported by the implementation in
42174212
all contexts, which is equal to
42184213
\tcode{alignof(std::max_align_t)}\iref{support.types}.
@@ -4234,10 +4229,7 @@
42344229
requirement of the type in the complete-object case.
42354230

42364231
\pnum
4237-
\indextext{alignment!extended}%
4238-
\indextext{alignment!new-extended}%
4239-
\indextext{over-aligned type|see{type, over-aligned}}%
4240-
An \defn{extended alignment} is represented by an alignment
4232+
An \defnadj{extended}{alignment} is represented by an alignment
42414233
greater than \tcode{alignof(std::max_align_t)}. It is \impldef{support for extended alignments}
42424234
whether any extended alignments are supported and the contexts in which they are
42434235
supported\iref{dcl.align}. A type having an extended alignment
@@ -4246,7 +4238,7 @@
42464238
Every over-aligned type is or contains a class type
42474239
to which extended alignment applies (possibly through a non-static data member).
42484240
\end{note}
4249-
A \defn{new-extended alignment} is represented by
4241+
A \defnadj{new-extended}{alignment} is represented by
42504242
an alignment greater than \mname{STDCPP_DEFAULT_NEW_ALIGNMENT}\iref{cpp.predefined}.
42514243

42524244
\pnum
@@ -4836,7 +4828,7 @@
48364828
are collectively called \defnadjx{implicit-lifetime}{types}{type}.
48374829

48384830
\pnum
4839-
A type is a \defn{literal type} if it is:
4831+
A type is a \defnadj{literal}{type} if it is:
48404832
\begin{itemize}
48414833
\item \cv{}~\tcode{void}; or
48424834
\item a scalar type; or
@@ -5001,9 +4993,8 @@
50014993
\defnx{extended integer types}{extended integer type}.
50024994

50034995
\pnum
5004-
\indextext{underlying type|see{type, underlying}}%
50054996
A fundamental type specified to have
5006-
a signed or unsigned integer type as its \defn{underlying type} has
4997+
a signed or unsigned integer type as its \defnadj{underlying}{type} has
50074998
the same object representation,
50084999
value representation,
50095000
alignment requirements\iref{basic.align}, and
@@ -6537,9 +6528,8 @@
65376528
storage duration\iref{basic.stc.static} or thread storage
65386529
duration\iref{basic.stc.thread} is zero-initialized\iref{dcl.init}.
65396530
Together, zero-initialization and constant initialization are called
6540-
\indextext{initialization!dynamic}%
6541-
\defn{static initialization};
6542-
all other initialization is \defn{dynamic initialization}.
6531+
\defnadj{static}{initialization};
6532+
all other initialization is \defnadj{dynamic}{initialization}.
65436533
All static initialization strongly happens before\iref{intro.races}
65446534
any dynamic initialization.
65456535
\begin{note}

source/classes.tex

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -498,7 +498,7 @@
498498
\indextext{definition!class}%
499499
The \grammarterm{member-specification} in a class definition declares the
500500
full set of members of the class; no member can be added elsewhere.
501-
A \defn{direct member} of a class \tcode{X} is a member of \tcode{X}
501+
A \defnadj{direct}{member} of a class \tcode{X} is a member of \tcode{X}
502502
that was first declared within the \grammarterm{member-specification} of \tcode{X},
503503
including anonymous union objects\iref{class.union.anon} and direct members thereof.
504504
Members of a class are data members, member
@@ -539,19 +539,16 @@
539539
The enumerators of an unscoped enumeration\iref{dcl.enum} defined in the class
540540
are members of the class.
541541

542-
\indextext{member!static}%
543-
\indextext{member function!static}%
544-
\indextext{data member!static}%
545542
\pnum
546543
A data member or member function
547544
may be declared \tcode{static} in its \grammarterm{member-declaration},
548-
in which case it is a \defn{static member} (see~\ref{class.static})
549-
(a \defn{static data member}\iref{class.static.data} or
550-
\defn{static member function}\iref{class.static.mfct}, respectively)
545+
in which case it is a \defnadj{static}{member} (see~\ref{class.static})
546+
(a \defnadj{static}{data member}\iref{class.static.data} or
547+
\defnadj{static}{member function}\iref{class.static.mfct}, respectively)
551548
of the class.
552-
Any other data member or member function is a \defn{non-static member}
553-
(a \defn{non-static data member} or
554-
\defn{non-static member function}~(\ref{class.mfct.non-static}), respectively).
549+
Any other data member or member function is a \defnadj{non-static}{member}
550+
(a \defnadj{non-static}{data member} or
551+
\defnadj{non-static}{member function}~(\ref{class.mfct.non-static}), respectively).
555552
\begin{note}
556553
A non-static data member of non-reference
557554
type is a member subobject of a class object\iref{intro.object}.
@@ -3005,7 +3002,6 @@
30053002

30063003
\rSec2[class.nest]{Nested class declarations}%
30073004
\indextext{definition!nested class}%
3008-
\indextext{class!nested|see{nested class}}
30093005

30103006
\pnum
30113007
A class can be declared within another class. A class declared within
@@ -3347,9 +3343,8 @@
33473343
\end{note}
33483344

33493345
\pnum
3350-
\indextext{class!union-like}%
33513346
\indextext{class!variant member of}%
3352-
A \defn{union-like class} is a union or a class that has an anonymous union as a direct
3347+
A \defnadj{union-like}{class} is a union or a class that has an anonymous union as a direct
33533348
member. A union-like class \tcode{X} has a set of \defnx{variant members}{variant member}.
33543349
If \tcode{X} is a union, a non-static data member of \tcode{X} that is not an anonymous
33553350
union is a variant member of \tcode{X}. In addition, a non-static data member of an

source/declarations.tex

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -817,7 +817,7 @@
817817
declares that function to be
818818
a \defnx{constexpr function}{specifier!\idxcode{constexpr}!function}.
819819
A function or constructor declared with the \tcode{consteval} specifier
820-
is called an \defn{immediate function}.
820+
is called an \defnadj{immediate}{function}.
821821
A destructor, an allocation function, or a deallocation function
822822
shall not be declared with the \tcode{consteval} specifier.
823823

@@ -3614,7 +3614,7 @@
36143614
\end{note}
36153615

36163616
\pnum
3617-
A \term{non-template function} is a function that is not a function template
3617+
A \defnadj{non-template}{function} is a function that is not a function template
36183618
specialization.
36193619
\begin{note}
36203620
A function template is not a function.
@@ -5823,10 +5823,7 @@
58235823
\end{note}
58245824

58255825
\pnum
5826-
A
5827-
\indextext{narrowing conversion}%
5828-
\indextext{conversion!narrowing}%
5829-
\term{narrowing conversion} is an implicit conversion
5826+
A \defnadj{narrowing}{conversion} is an implicit conversion
58305827
\begin{itemize}
58315828
\item from a floating-point type to an integer type, or
58325829

@@ -6136,8 +6133,8 @@
61366133
\grammarterm{function-body}
61376134
is of the form
61386135
\tcode{= delete ;}
6139-
is called a \term{deleted definition}. A function with a
6140-
deleted definition is also called a \term{deleted function}.
6136+
is called a \defnadj{deleted}{definition}. A function with a
6137+
deleted definition is also called a \defnadj{deleted}{function}.
61416138

61426139
\pnum
61436140
A program that refers to a deleted function implicitly or explicitly, other

source/iostreams.tex

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11728,11 +11728,11 @@
1172811728
operating system dependent\iref{fs.conform.os}.
1172911729

1173011730
\pnum
11731-
An \defn{absolute path} is a path that unambiguously
11731+
An \defnadj{absolute}{path} is a path that unambiguously
1173211732
identifies the location of a file without reference to an additional starting
1173311733
location. The elements of a path that determine if it is absolute are
1173411734
operating system dependent.
11735-
A \defn{relative path} is
11735+
A \defnadj{relative}{path} is
1173611736
a path that is not absolute, and as such, only unambiguously
1173711737
identifies the location of a file when resolved relative to
1173811738
an implied starting location. The elements of a path that determine if it is

source/lib-intro.tex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2165,7 +2165,7 @@
21652165
or an instantiation
21662166
of a standard library function template.
21672167
Unless \tcode{\placeholder{F}} is designated
2168-
an \defn{addressable function},
2168+
an \defnadj{addressable}{function},
21692169
the behavior of a \Cpp{} program is unspecified (possibly ill-formed)
21702170
if it explicitly or implicitly attempts
21712171
to form a pointer

source/templates.tex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1608,7 +1608,7 @@
16081608
\rSec3[temp.constr.atomic]{Atomic constraints}
16091609

16101610
\pnum
1611-
An \defn{atomic constraint} is formed from
1611+
An \defnadj{atomic}{constraint} is formed from
16121612
an expression \tcode{E}
16131613
and a mapping from the template parameters
16141614
that appear within \tcode{E} to

source/threads.tex

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

60046004
\pnum
60056005
An \defn{asynchronous return object} is an object that reads results from a
6006-
shared state. A \defn{waiting function} of an asynchronous return object is one
6006+
shared state. A \defnadj{waiting}{function} of an asynchronous return object is one
60076007
that potentially blocks to wait for the shared state to be made
60086008
ready.
60096009
If a waiting function can return before the state is made ready because of a
@@ -7123,7 +7123,7 @@
71237123
stores \tcode{\placeholdernc{decay-copy}(std::forward<F>(f))} and
71247124
\tcode{\placeholdernc{decay-\brk{}copy}(std::forward<Args>(args))...}
71257125
in the shared state. These copies of \tcode{f} and \tcode{args} constitute
7126-
a \defn{deferred function}. Invocation of the deferred function evaluates
7126+
a \defnadj{deferred}{function}. Invocation of the deferred function evaluates
71277127
\tcode{invoke(std::move(g), std::move(xyz))} where \tcode{g} is the stored value of
71287128
\tcode{\placeholdernc{decay-copy}(std::forward<F>(f))} and \tcode{xyz} is the stored copy of
71297129
\tcode{\placeholdernc{decay-copy}(std::forward<Args>(args))...}.

0 commit comments

Comments
 (0)