[over] Replace \term with \defnx to add index entries

Author: jensmaurer

source/overloading.tex

@@ -23,9 +23,7 @@
 of the arguments at the point of use with the types of the parameters
 in the overloaded declarations that are visible at the point of use.
 This function selection process is called
-\term{overload resolution}
-and
-is defined in~\ref{over.match}.
+\defn{overload resolution} and is defined in~\ref{over.match}.
 \begin{example}
 
 \indextext{overloading!example of}%
@@ -396,7 +394,7 @@
 Overload resolution is a mechanism for selecting the best
 function to call given a list of expressions that are to be the
 arguments of the call and a set of
-\term{candidate functions}
+\defnx{candidate functions}{candidate function}
 that can
 be called based on the context of the call.
 The selection
@@ -831,7 +829,7 @@
 of ($\tcode{P}_1, \dotsc, \tcode{P}_n$) returning \tcode{R}'',
 or the type
 ``reference to function of ($\tcode{P}_1, \dotsc, \tcode{P}_n$)
-returning \tcode{R}'', a \term{surrogate call function} with the unique name
+returning \tcode{R}'', a \defn{surrogate call function} with the unique name
 \placeholder{call-function}
 and having the form
 
@@ -982,10 +980,9 @@
 and a right operand of a type whose cv-unqualified version is
 \tcode{T2},
 three sets of candidate functions, designated
-\term{member candidates},
-\term{non-member candidates}
-and
-\term{built-in candidates},
+\defnx{member candidates}{member candidate},
+\defnx{non-member candidates}{non-member candidate}
+and \defnx{built-in candidates}{built-in candidate},
 are constructed as follows:
 \begin{itemize}
 \item
@@ -1592,7 +1589,7 @@
 \tcode{F}
 to be a viable function, there shall exist for each
 argument an
-\term{implicit conversion sequence}\iref{over.best.ics} that
+implicit conversion sequence\iref{over.best.ics} that
 converts that argument to the corresponding parameter of
 \tcode{F}.
 If the parameter has reference type, the implicit conversion sequence
@@ -1639,7 +1636,7 @@
 \tcode{F1}
 is defined
 to be a
-\term{better}
+\defnx{better}{overloading!resolution!better viable function}
 function than another viable function
 \tcode{F2}
 if
@@ -1910,11 +1907,10 @@
 
 \rSec3[over.best.ics]{Implicit conversion sequences}%
 \indextext{overloading!resolution!implicit conversions and|(}
+\indextext{implicit conversion sequence|see{conversion sequence, implicit}}
 
 \pnum
-An
-\term{implicit conversion sequence}
-\indextext{sequence!implicit conversion}%
+An \defnx{implicit conversion sequence}{conversion sequence!implicit}
 is a sequence of conversions used
 to convert an argument in a function call to the type of the
 corresponding parameter of the function being called.
@@ -1944,14 +1940,11 @@
 
 \begin{itemize}
 \item
-a
-\term{standard conversion sequence}\iref{over.ics.scs},
+a standard conversion sequence\iref{over.ics.scs},
 \item
-a
-\term{user-defined conversion sequence}\iref{over.ics.user}, or
+a user-defined conversion sequence\iref{over.ics.user}, or
 \item
-an
-\term{ellipsis conversion sequence}\iref{over.ics.ellipsis}.
+an ellipsis conversion sequence\iref{over.ics.ellipsis}.
 \end{itemize}
 
 \pnum
@@ -2050,8 +2043,7 @@
 convert the argument to the parameter type, the implicit
 conversion sequence associated with the parameter is defined to be
 the unique conversion sequence designated the
-\term{ambiguous conversion sequence}.
-\indextext{sequence!ambiguous conversion}%
+\defnx{ambiguous conversion sequence}{conversion sequence!ambiguous}.
 For the purpose of ranking implicit conversion sequences as described
 in~\ref{over.ics.rank}, the ambiguous conversion sequence is treated
 as a user-defined conversion sequence that is indistinguishable from any
@@ -2484,18 +2476,18 @@
 \pnum
 This subclause defines a partial ordering of implicit conversion
 sequences based on the relationships
-\term{better conversion sequence}
+\defnx{better conversion sequence}{conversion sequence!better}
 and
-\term{better conversion}.
+\defnx{better conversion}{conversion!better}.
 If an implicit conversion sequence S1 is
 defined by these rules to be a better conversion sequence than
 S2, then it is also the case that S2 is a
-\term{worse conversion sequence}
+\defnx{worse conversion sequence}{conversion sequence!worse}
 than S1.
 If conversion sequence S1 is neither better
 than nor worse than conversion sequence S2, S1 and S2 are said to
 be
-\term{indistinguishable conversion sequences}.
+\defnx{indistinguishable conversion sequences}{conversion sequence!indistinguishable}.
 
 \pnum
 When comparing the basic forms of implicit conversion sequences
@@ -3049,17 +3041,16 @@
 
 \pnum
 \indextext{operator!overloaded}%
-\indextext{function!operator}%
 A function declaration having one of the following
 \grammarterm{operator-function-id}{s}
 as its name declares an
-\term{operator function}.
+\defnx{operator function}{function!operator}.
 A function template declaration having one of the
 following \grammarterm{operator-function-id}{s} as its name
-declares an \term{operator function template}. A specialization
+declares an \defnx{operator function template}{function!operator!template}. A specialization
 of an operator function template is also an operator function.
 An operator function is said to
-\term{implement}
+\defnx{implement}{operator!implementation}
 the operator named in its
 \grammarterm{operator-function-id}.
 
@@ -3484,7 +3475,7 @@
 implicit terminating \tcode{'\textbackslash 0'}.
 The \grammarterm{ud-suffix} of the \grammarterm{user-defined-string-literal} or
 the \grammarterm{identifier} in a \grammarterm{literal-operator-id} is called a
-\term{literal suffix identifier}.
+\defnx{literal suffix identifier}{literal!suffix identifier}.
 Some literal suffix identifiers are reserved for future standardization;
 see~\ref{usrlit.suffix}.  A declaration whose \grammarterm{literal-operator-id} uses
 such a literal suffix identifier is ill-formed, no diagnostic required.
@@ -3495,9 +3486,9 @@
 function or function template (it could be a friend
 function\iref{class.friend}), an explicit instantiation or specialization of a
 function template, or a \grammarterm{using-declaration}\iref{namespace.udecl}.
-A function declared with a \grammarterm{literal-operator-id} is a \term{literal
-operator}. A function template declared with a \grammarterm{literal-operator-id}
-is a \term{literal operator template}.
+A function declared with a \grammarterm{literal-operator-id} is a \defnx{literal
+operator}{literal!operator}. A function template declared with a \grammarterm{literal-operator-id}
+is a \defnx{literal operator template}{literal!operator!template}.
 
 \pnum
 The declaration of a literal operator shall have a
@@ -3521,7 +3512,7 @@
 ill-formed.
 
 \pnum
-A \term{raw literal operator} is a literal operator with a single parameter
+A \defnx{raw literal operator}{literal!operator!raw} is a literal operator with a single parameter
 whose type is \tcode{const char*}.
 
 \pnum