CWG2642 Inconsistent use of T and C

Author: burblebee

source/basic.tex

@@ -1514,18 +1514,18 @@
 
 \pnum
 \indextext{scope!search}%
-A \defn{search} in a scope $X$ for a name $N$ from a program point $P$
-is a single search in $X$ for $N$ from $P$
+A \defn{search} in a scope $X$ for a name $M$ from a program point $P$
+is a single search in $X$ for $M$ from $P$
 unless $X$ is the scope of a class or class template $T$, in which case the
 following steps define the result of the search.
 \begin{note}
 The result differs only
-if $N$ is a \grammarterm{conversion-function-id} or
+if $M$ is a \grammarterm{conversion-function-id} or
 if the single search would find nothing.
 \end{note}
 
 \pnum
-The \defn{lookup set} for $N$ in $C$, called $S(N,C)$,
+The \defn{lookup set} for a name $N$ in a class or class template $C$, called $S(N,C)$,
 consists of two component sets:
 the \term{declaration set}, a set of members named $N$; and
 the \term{subobject set},
@@ -1550,10 +1550,10 @@
 in each direct non-dependent\iref{temp.dep.type} base class subobject $B_i$, and
 merge each such lookup set $S(N,B_i)$ in turn into $S(N,C)$.
 \begin{note}
-If $T$ is incomplete,
+If $C$ is incomplete,
 only base classes whose \grammarterm{base-specifier} appears before $P$
 are considered.
-If $T$ is an instantiated class, its base classes are not dependent.
+If $C$ is an instantiated class, its base classes are not dependent.
 \end{note}
 
 \pnum
@@ -1579,9 +1579,9 @@
 \end{itemize}
 
 \pnum
-The result of the search is the declaration set of $S(N,T)$.
+The result of the search is the declaration set of $S(M,T)$.
 If it is an invalid set, the program is ill-formed.
-If it differs from the result of a search in $T$ for $N$
+If it differs from the result of a search in $T$ for $M$
 in a complete-class context\iref{class.mem} of $T$,
 the program is ill-formed, no diagnostic required.
 \begin{example}
@@ -1604,7 +1604,7 @@
 \end{example}
 
 \pnum
-If $N$ is a non-dependent \grammarterm{conversion-function-id},
+If $M$ is a non-dependent \grammarterm{conversion-function-id},
 conversion function templates that are members of $T$ are considered.
 For each such template $F$, the lookup set $S(t,T)$ is constructed,
 considering a function template declaration to have the name $t$