Fixup: temp

Author: jensmaurer

source/basic.tex

@@ -1444,6 +1444,7 @@
 A type (but not a \grammarterm{typedef-name} or template)
 is therefore hidden by any other entity in its scope.
 \end{note}
+\indextext{type-only!lookup|see{lookup, type-only}}%
 However, if a lookup is \defnx{type-only}{lookup!type-only},
 only declarations of
 types and templates whose specializations are types are considered;

source/templates.tex

@@ -136,7 +136,7 @@
 A specialization (explicit or implicit) of one template is
 distinct from all specializations of any other template.
 A template, a template explicit specialization\iref{temp.expl.spec}, and a class
-template partial specialization shall not have C linkage.
+template partial specialization shall not have C language linkage.
 \begin{note}
 Default arguments for function templates and for member functions of
 class templates are considered definitions for the purpose of template
@@ -145,7 +145,7 @@
 
 \pnum
 \begin{note}
-A class cannot have the same name as any other
+A template cannot have the same name as any other
 name bound in the same scope\iref{basic.scope.scope}, except
 that a function template can share a name with non-template
 functions\iref{dcl.fct} and/or function templates\iref{temp.over}.
@@ -716,8 +716,8 @@
 \item
 that is a terminal name
 in a \grammarterm{using-declarator}\iref{namespace.udecl},
-a \grammarterm{declarator-id}\iref{dcl.meaning}, or
-a type-only context
+in a \grammarterm{declarator-id}\iref{dcl.meaning}, or
+in a type-only context
 other than a \grammarterm{nested-name-specifier}\iref{temp.res}.
 \end{itemize}
 \begin{note}
@@ -4206,14 +4206,14 @@
 in an unspecified declaration of $T$ that is or is reachable from $D$ and
 from which no other declaration of $T$
 that contains the usage of the name is reachable.
-If the name is dependent (as specified in \ref{temp.dep},
+If the name is dependent (as specified in \ref{temp.dep}),
 it is looked up for each specialization (after substitution)
 because the lookup depends on a template parameter.
 \begin{note}
 Some dependent names are also looked up during parsing to determine
 that they are dependent or to interpret following \tcode{<} tokens.
 Uses of other names might be type-dependent or value-dependent
-(\ref{temp.dep.expr}, \ref{temp.dep.constexpr}.
+(\ref{temp.dep.expr}, \ref{temp.dep.constexpr}).
 A \grammarterm{using-declarator} is never dependent in a specialization and
 is therefore replaced during lookup for that specialization\iref{basic.lookup}.
 \end{note}
@@ -4323,7 +4323,9 @@
 \end{example}
 
 \pnum
-A qualified or unqualified name is said to be in a type-only context
+\indextext{type-only!context|see{context, type-only}}%
+A qualified or unqualified name is said to be in
+a \defnx{type-only context}{context!type-only}
 if it is the terminal name of
 \begin{itemize}
 \item a
@@ -4333,16 +4335,18 @@
 \grammarterm{class-or-decltype}, or
 \item
 a \grammarterm{type-specifier} of a
-\grammarterm{new-type-id},
-\grammarterm{defining-type-id},
-\grammarterm{conversion-type-id},
-\grammarterm{trailing-return-type},
-default argument of a \grammarterm{type-parameter}, or
-\grammarterm{type-id} of a
+\begin{itemize}
+  \item \grammarterm{new-type-id},
+  \item \grammarterm{defining-type-id},
+  \item \grammarterm{conversion-type-id},
+  \item \grammarterm{trailing-return-type},
+  \item default argument of a \grammarterm{type-parameter}, or
+  \item \grammarterm{type-id} of a
 \keyword{static_cast},
 \keyword{const_cast},
 \keyword{reinterpret_cast}, or
 \keyword{dynamic_cast}, or
+\end{itemize}
 \item a \grammarterm{decl-specifier} of the \grammarterm{decl-specifier-seq} of a
 \begin{itemize}
 \item \grammarterm{simple-declaration} or a \grammarterm{function-definition} in namespace scope,
@@ -4666,8 +4670,8 @@
 }
 
 template<class B> template<class C> void N::A<B>::g(C) {
-  B b;                                  // the base class, not the template parameter
-  C c;                                  // the template parameter \tcode{C}, not \tcode{A}'s \tcode{C}
+  B b;                                  // \tcode{B} is the base class, not the template parameter
+  C c;                                  // \tcode{C} is the template parameter, not \tcode{A}'s \tcode{C}
 }
 \end{codeblock}
 \end{example}
@@ -4720,7 +4724,8 @@
 is a \grammarterm{template-id} in which any of the template arguments depends
 on a template parameter.
 \end{itemize}
-The component name of an \grammarterm{unqualified-id} is dependent if
+The component name of an \grammarterm{unqualified-id}\iref{expr.prim.id.unqual}
+is dependent if
 \begin{itemize}
 \item
 it is a \grammarterm{conversion-function-id}
@@ -4787,7 +4792,7 @@
 \item
 in the definition of a partial specialization
 or a member of a partial specialization, the name of
-the class template followed by the template argument list
+the class template followed by a template argument list
 equivalent to that of the partial specialization\iref{temp.class.spec}
 enclosed in \tcode{<>} (or an equivalent template alias specialization).
 \end{itemize}
@@ -4883,7 +4888,7 @@
 if
 \begin{itemize}
 \item
-its lookup context, if it is a \grammarterm{qualified name},
+its lookup context, if it is a qualified name,
 is the current instantiation, and
 \item
 lookup for it finds any member of a class that is the current instantiation
@@ -4950,7 +4955,7 @@
 \pnum
 If, for a given set of template arguments, a specialization of a template is
 instantiated that refers to a member of the current instantiation with a
-qualified name, the name in is looked up in the
+qualified name, the name is looked up in the
 template instantiation context. If the result of this lookup differs from the
 result of name lookup in the template definition context, name lookup is
 ambiguous.
@@ -5936,7 +5941,7 @@
 \pnum
 An implementation shall not implicitly instantiate a function template,
 a variable template,
-a member template, a non-virtual member function, or a member class or
+a member template, a non-virtual member function, a member class or
 static data member of a templated class, or a substatement of a constexpr if
 statement\iref{stmt.if}, unless such instantiation is required.
 \begin{note}