[lex,cpp] Adjust index entries around 'macro' and 'point of'.

Author: jensmaurer

source/basic.tex

@@ -815,9 +815,12 @@
 
 \rSec2[basic.scope.pdecl]{Point of declaration}
 
+\indextext{declaration!point of|(}%
+
 \pnum
-\indextext{name!point of declaration}%
-The \defn{point of declaration} for a name is immediately after its
+\indextext{name!point of declaration|see{declaration, point of}}%
+\indextext{point of!declaration|see{declaration, point of}}%
+The \defnx{point of declaration}{declaration!point of} for a name is immediately after its
 complete declarator\iref{dcl.decl} and before its
 \grammarterm{initializer} (if any), except as noted below. \begin{example}
 
@@ -967,6 +970,7 @@
 For point of instantiation of a template, see~\ref{temp.point}.
 \end{note}
 \indextext{scope!declarations and|)}
+\indextext{declaration!point of|)}
 
 \rSec2[basic.scope.block]{Block scope}
 

source/preprocessor.tex

@@ -671,7 +671,7 @@
 
 \rSec1[cpp.import]{Header unit importation}
 \indextext{header unit!preprocessing}%
-\indextext{macro import|(}%
+\indextext{macro!import|(}%
 
 \begin{bnf}
 \nontermdef{pp-import}\br
@@ -691,7 +691,8 @@
 instructs the preprocessor to import macros
 from the header unit\iref{module.import}
 denoted by the \grammarterm{header-name}.
-The \defnadj{point of}{macro import} for the
+\indextext{point of!macro import|see{macro, point of import}}%
+The \defnx{point of macro import}{macro!point of import} for the
 first two forms of \grammarterm{pp-import} is
 immediately after the \grammarterm{new-line} terminating
 the \grammarterm{pp-import}.
@@ -715,14 +716,15 @@
 \pnum
 Each \tcode{\#define} directive encountered when preprocessing
 each translation unit in a program results in a distinct
-\defn{macro definition}.
+\defnx{macro definition}{macro!definition}.
 Importing macros from a header unit makes macro definitions
 from a translation unit visible in other translation units.
 Each macro definition has at most one point of definition in
 each translation unit and at most one point of undefinition, as follows:
 \begin{itemize}
 \item
-The \defnx{point of definition}{macro definition!point of definition}
+\indextext{point of!macro definition|see{macro, point of definition}}%
+The \defnx{point of definition}{macro!point of definition}
 of a macro definition within a translation unit
 is the point at which its \tcode{\#define} directive occurs (in the translation
 unit containing the \tcode{\#define} directive), or,
@@ -733,7 +735,8 @@
 macro definition, if any (in any other translation unit).
 
 \item
-The \defnx{point of undefinition}{macro definition!point of undefinition}
+\indextext{point of!macro undefinition|see{macro, point of undefinition}}%
+The \defnx{point of undefinition}{macro!point of undefinition}
 of a macro definition within a translation unit
 is the first point at which a \tcode{\#undef} directive naming the macro occurs
 after its point of definition, or the first point
@@ -742,7 +745,8 @@
 \end{itemize}
 
 \pnum
-A macro directive is \defnx{active}{macro definition!active} at a source location
+\indextext{active macro directive|see{macro, active}}%
+A macro directive is \defnx{active}{macro!active} at a source location
 if it has a point of definition in that translation unit preceding the location,
 and does not have a point of undefinition in that translation unit preceding
 the location.
@@ -783,8 +787,7 @@
 int c = Z;      // error: active macro definitions \#2 and \#3 are not valid redefinitions of \tcode{Z}
 \end{codeblocktu}
 \end{example}
-
-\indextext{macro import|)}%
+\indextext{macro!import|)}
 
 \rSec1[cpp.glob.frag]{Global module fragment}
 
@@ -844,15 +847,13 @@
 
 \pnum
 An identifier currently defined as an
-\indextext{object-like macro|see{macro, object-like}}%
 \indextext{macro!object-like}%
 object-like macro (see below) may be redefined by another
 \tcode{\#define}
 preprocessing directive provided that the second definition is an
 object-like macro definition and the two replacement lists
 are identical, otherwise the program is ill-formed.
 Likewise, an identifier currently defined as a
-\indextext{function-like macro|see{macro, function-like}}%
 \indextext{macro!function-like}%
 function-like macro (see below) may be redefined by another
 \tcode{\#define}
@@ -920,7 +921,7 @@
 \end{ncsimplebnf}
 
 defines an
-\defnx{object-like macro}{macro!object-like} that
+\defnadj{object-like}{macro} 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
@@ -941,7 +942,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}
-defines a \defnx{function-like macro}{macro!function-like}
+defines a \defnadj{function-like}{macro}
 with parameters, whose use is
 similar syntactically to a function call.
 The parameters