[temp.param] Move grammar non-terminal 'type-constraint' here

from [temp.pre].
Also move the definition of 'immediately-declared
constraint' and fix all cross-references.

Author: jensmaurer

source/declarations.tex

@@ -2009,7 +2009,7 @@
 \pnum
 For a \grammarterm{placeholder-type-specifier}
 with a \grammarterm{type-constraint},
-the immediately-declared constraint\iref{temp.pre}
+the immediately-declared constraint\iref{temp.param}
 of the \grammarterm{type-constraint} for the type deduced for the placeholder
 shall be satisfied.
 

source/expressions.tex

@@ -2685,7 +2685,7 @@
 into the \grammarterm{return-type-requirement} is performed.
 
 \item
-The immediately-declared constraint\iref{temp.pre}
+The immediately-declared constraint\iref{temp.param}
 of the \grammarterm{type-constraint} for \tcode{decltype((E))}
 shall be satisfied.
 \begin{example}

source/templates.tex

@@ -49,12 +49,6 @@
   constraint-logical-and-expression \terminal{\&\&} primary-expression
 \end{bnf}
 
-\begin{bnf}
-\nontermdef{type-constraint}\br
-  \opt{nested-name-specifier} concept-name\br
-  \opt{nested-name-specifier} concept-name \terminal{<} \opt{template-argument-list} \terminal{>}
-\end{bnf}
-
 \begin{note}
 The \tcode{>} token following the
 \grammarterm{template-parameter-list} of a
@@ -141,23 +135,6 @@
 When such a declaration is used to declare a class template,
 no declarator is permitted.
 
-\pnum
-A \grammarterm{type-constraint} \tcode{Q} that designates a concept \tcode{C}
-can be used to constrain a
-contextually-determined type or template type parameter pack \tcode{T}
-with a \grammarterm{constraint-expression} \tcode{E} defined as follows.
-If \tcode{Q} is of the form \tcode{C<A$_1$, $\cdots$, A$_n$>},
-then let \tcode{E$'$} be \tcode{C<T, A$_1$, $\cdots$, A$_n$>}.
-Otherwise, let \tcode{E$'$} be \tcode{C<T>}.
-If \tcode{T} is not a pack,
-then \tcode{E} is \tcode{E$'$},
-otherwise \tcode{E} is \tcode{(E$'$ \&\& ...)}.
-This \grammarterm{constraint-expression} \tcode{E} is called the
-\defnx{immediately-declared constraint}{constraint!immediately-declared}
-of \tcode{Q} for \tcode{T}.
-The concept designated by a \grammarterm{type-constraint}
-shall be a type concept\iref{temp.concept}.
-
 \pnum
 \indextext{template name!linkage of}%
 A template name has linkage\iref{basic.link}.
@@ -267,6 +244,12 @@
   \keyword{typename}
 \end{bnf}
 
+\begin{bnf}
+\nontermdef{type-constraint}\br
+  \opt{nested-name-specifier} concept-name\br
+  \opt{nested-name-specifier} concept-name \terminal{<} \opt{template-argument-list} \terminal{>}
+\end{bnf}
+
 \begin{note}
 The \tcode{>} token following the
 \grammarterm{template-parameter-list} of a
@@ -353,6 +336,41 @@
 \end{codeblock}
 \end{note}
 
+\pnum
+A \grammarterm{type-constraint} \tcode{Q} that designates a concept \tcode{C}
+can be used to constrain a
+contextually-determined type or template type parameter pack \tcode{T}
+with a \grammarterm{constraint-expression} \tcode{E} defined as follows.
+If \tcode{Q} is of the form \tcode{C<A$_1$, $\cdots$, A$_n$>},
+then let \tcode{E$'$} be \tcode{C<T, A$_1$, $\cdots$, A$_n$>}.
+Otherwise, let \tcode{E$'$} be \tcode{C<T>}.
+If \tcode{T} is not a pack,
+then \tcode{E} is \tcode{E$'$},
+otherwise \tcode{E} is \tcode{(E$'$ \&\& ...)}.
+This \grammarterm{constraint-expression} \tcode{E} is called the
+\defnx{immediately-declared constraint}{constraint!immediately-declared}
+of \tcode{Q} for \tcode{T}.
+The concept designated by a \grammarterm{type-constraint}
+shall be a type concept\iref{temp.concept}.
+
+\pnum
+A \grammarterm{type-parameter} that starts with a \grammarterm{type-constraint}
+introduces the immediately-declared constraint
+of the \grammarterm{type-constraint} for the parameter.
+\begin{example}
+\begin{codeblock}
+template<typename T> concept C1 = true;
+template<typename... Ts> concept C2 = true;
+template<typename T, typename U> concept C3 = true;
+
+template<C1 T> struct s1;               // associates \tcode{C1<T>}
+template<C1... T> struct s2;            // associates \tcode{(C1<T> \&\& ...)}
+template<C2... T> struct s3;            // associates \tcode{(C2<T> \&\& ...)}
+template<C3<int> T> struct s4;          // associates \tcode{C3<T, int>}
+template<C3<int>... T> struct s5;       // associates \tcode{(C3<T, int> \&\& ...)}
+\end{codeblock}
+\end{example}
+
 \pnum
 A non-type \grammarterm{template-parameter}
 shall have one of the following (optionally cv-qualified) types:
@@ -451,24 +469,6 @@
 \end{codeblock}
 \end{example}
 
-\pnum
-A \grammarterm{type-parameter} that starts with a \grammarterm{type-constraint}
-introduces the immediately-declared constraint\iref{temp.pre}
-of the \grammarterm{type-constraint} for the parameter.
-\begin{example}
-\begin{codeblock}
-template<typename T> concept C1 = true;
-template<typename... Ts> concept C2 = true;
-template<typename T, typename U> concept C3 = true;
-
-template<C1 T> struct s1;               // associates \tcode{C1<T>}
-template<C1... T> struct s2;            // associates \tcode{(C1<T> \&\& ...)}
-template<C2... T> struct s3;            // associates \tcode{(C2<T> \&\& ...)}
-template<C3<int> T> struct s4;          // associates \tcode{C3<T, int>}
-template<C3<int>... T> struct s5;       // associates \tcode{(C3<T, int> \&\& ...)}
-\end{codeblock}
-\end{example}
-
 \pnum
 A non-type template parameter declared with a type that
 contains a placeholder type with a \grammarterm{type-constraint}