[index] Fix various minor indexing problems and in so doing fix all remaining makeindex warnings.

Author: zygoloid

source/conversions.tex

@@ -194,8 +194,8 @@
 
 \pnum
 \indextext{conversion!array-to-pointer}%
-\indextext{decay|see{conversion, array to pointer}}%
-\indextext{decay|see{conversion, function to pointer}}%
+\indextext{decay!array|see{conversion, array to pointer}}%
+\indextext{decay!function|see{conversion, function to pointer}}%
 An lvalue or rvalue of type ``array of \tcode{N} \tcode{T}'' or ``array
 of unknown bound of \tcode{T}'' can be converted to a prvalue of type
 ``pointer to \tcode{T}''.

source/expressions.tex

@@ -4166,8 +4166,8 @@
 \pnum
 \indextext{expression!left-shift-operator}%
 \indextext{expression!right-shift-operator}%
-\indextext{shift operator|see{operator, left shift}}%
-\indextext{shift operator|see{operator, right shift}}%
+\indextext{shift operator!left|see{operator, left shift}}%
+\indextext{shift operator!right|see{operator, right shift}}%
 \indextext{right shift operator|see{operator, right shift}}%
 \indextext{left shift operator|see{operator, left shift}}%
 The shift operators \tcode{<<} and \tcode{>>} group left-to-right.

source/preprocessor.tex

@@ -668,8 +668,7 @@
 \end{ncsimplebnf}
 
 defines an
-\indextext{macro!object-like}%
-\defn{object-like macro} that
+\defnx{object-like macro}{macro!object-like} that
 causes each subsequent instance of the macro name\footnote{Since, by macro-replacement time,
 all character literals and string literals are preprocessing tokens,
 not sequences possibly containing identifier-like subsequences
@@ -690,8 +689,7 @@
 \terminal{\# define} identifier lparen \terminal{...} \terminal{)} replacement-list new-line\br
 \terminal{\# define} identifier lparen identifier-list \terminal{, ...} \terminal{)} replacement-list new-line
 \end{ncsimplebnf}
-\indextext{macro!function-like}%
-defines a \defn{function-like macro}
+defines a \defnx{function-like macro}{macro!function-like}
 with parameters, whose use is
 similar syntactically to a function call.
 The parameters

source/special.tex

@@ -3,11 +3,6 @@
 
 \gramSec[gram.special]{Special member functions}
 
-\indextext{special member function|see{constructor}}%
-\indextext{special member function|see{destructor}}%
-\indextext{special member function|see{inline function}}%
-\indextext{special member function|see{user-defined conversion}}%
-\indextext{special member function|see{virtual function}}%
 \indextext{\idxcode{X(X\&)}|see{constructor, copy}}%
 \indextext{~@\tcode{\tilde}|see{destructor}}%
 \indextext{assignment!copy|see{assignment operator, copy}}%
@@ -73,7 +68,8 @@
 classes are called its \term{potentially constructed subobjects}.
 
 \rSec1[class.ctor]{Constructors}%
-\indextext{constructor}
+\indextext{constructor}%
+\indextext{special member function|see{constructor}}%
 
 \pnum
 Constructors do not have names.
@@ -937,7 +933,8 @@
 \end{example}
 
 \rSec1[class.dtor]{Destructors}%
-\indextext{destructor}
+\indextext{destructor}%
+\indextext{special member function|see{destructor}}%
 
 \pnum
 In a declaration of a destructor, the \grammarterm{declarator} is a
@@ -2398,12 +2395,6 @@
 \indextext{construction|)}%
 
 \rSec1[class.copy]{Copying and moving class objects}%
-\indextext{copy!class object|see{constructor, copy}}%
-\indextext{copy!class object|see{assignment, copy}}%
-\indextext{move!class object|see{constructor, move}}%
-\indextext{move!class object|see{assignment, move}}%
-\indextext{operator!copy assignment|see{assignment, copy}}%
-\indextext{operator!move assignment|see{assignment, move}}
 
 \pnum
 A class object can be copied or moved in two ways:
@@ -2432,6 +2423,8 @@
 \pnum
 \indextext{constructor!copy|(}%
 \indextext{constructor!move|(}%
+\indextext{copy!class object|see{constructor, copy}}%
+\indextext{move!class object|see{constructor, move}}%
 A non-template constructor for class
 \tcode{X}
 is
@@ -2751,6 +2744,11 @@
 \pnum
 \indextext{assignment operator!copy|(}%
 \indextext{assignment operator!move|(}%
+\indextext{special member function|see{assignment operator}}%
+\indextext{copy!class object|see{assignment operator, copy}}%
+\indextext{move!class object|see{assignment operator, move}}%
+\indextext{operator!copy assignment|see{assignment operator, copy}}%
+\indextext{operator!move assignment|see{assignment operator, move}}
 A user-declared \term{copy} assignment operator \tcode{X::operator=} is a
 non-static non-template member function of class \tcode{X} with exactly one
 parameter of type \tcode{X}, \tcode{X\&}, \tcode{const} \tcode{X\&},
@@ -3108,9 +3106,7 @@
 is not executed, there is still one object destroyed for each one constructed.}
 This elision of copy/move operations, called
 \indexdefn{copy elision|see{constructor, copy, elision}}%
-\indexdefn{copy elision|see{constructor, move, elision}}%
 \indexdefn{elision!copy|see{constructor, copy, elision}}%
-\indexdefn{elision!copy|see{constructor, move, elision}}%
 \indexdefn{constructor!copy!elision}\indexdefn{constructor!move!elision}\term{copy elision},
 is permitted in the
 following circumstances (which may be combined to

source/templates.tex

@@ -2681,7 +2681,7 @@
                                                 // was not in scope at the first declaration of \tcode{h()}
 \end{codeblock}
 \end{example}
-\indextext{equivalent!functionally|see{expression, functionally equivalent}}%
+\indextext{equivalent!functionally!expression|see{expression, functionally equivalent}}%
 \indextext{functionally equivalent!expression|see{expression, functionally equivalent}}%
 Two expressions involving template parameters that are not equivalent are
 \defnx{functionally equivalent}{expression!functionally equivalent}
@@ -2697,7 +2697,7 @@
 lists that are equivalent using the rules described above to compare
 expressions involving
 template parameters.
-\indextext{equivalent!functionally|see{template, function, functionally equivalent}}%
+\indextext{equivalent!functionally!function template|see{template, function, functionally equivalent}}%
 \indextext{functionally equivalent!function template|see{template, function, functionally equivalent}}%
 Two function templates are
 \defnx{functionally equivalent}{template!function!functionally equivalent}