Skip to content

Commit 6583c4a

Browse files
authored
[std] Use template-parameter and template parameter more consistently (#7460)
Try to use template-parameter only when we refer to a grammar construct, and to 'template parameter' everywhere else. Adopt the same logic to template-argument/template argument. This change might not be exhaustive. The aim is to editorially adopt some of the wording changes made in P2841R5 to ease its review in core.
1 parent b888f45 commit 6583c4a

File tree

4 files changed

+90
-103
lines changed

4 files changed

+90
-103
lines changed

source/basic.tex

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2135,8 +2135,8 @@
21352135
parameter types and return type.
21362136
Additionally, if the aforementioned overload set is named with
21372137
a \grammarterm{template-id}, its associated entities also include
2138-
its template \grammarterm{template-argument}{s} and
2139-
those associated with its type \grammarterm{template-argument}s.
2138+
its template template arguments and
2139+
those associated with its type template arguments.
21402140

21412141
\pnum
21422142
The \term{associated namespaces} for a call are

source/declarations.tex

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -778,7 +778,7 @@
778778
\indextext{class name!\idxcode{typedef}}%
779779
A \grammarterm{simple-template-id} is only a \grammarterm{typedef-name}
780780
if its \grammarterm{template-name} names
781-
an alias template or a template \grammarterm{template-parameter}.
781+
an alias template or a template template parameter.
782782
\begin{note}
783783
A \grammarterm{simple-template-id} that names a class template specialization
784784
is a \grammarterm{class-name}\iref{class.name}.
@@ -1671,8 +1671,8 @@
16711671
the specification of the structured binding declaration;
16721672

16731673
\item otherwise, if $E$ is an unparenthesized \grammarterm{id-expression}
1674-
naming a non-type \grammarterm{template-parameter}\iref{temp.param},
1675-
\tcode{decltype($E$)} is the type of the \grammarterm{template-parameter}
1674+
naming a non-type template parameter\iref{temp.param},
1675+
\tcode{decltype($E$)} is the type of the template parameter
16761676
after performing any necessary
16771677
type deduction\iref{dcl.spec.auto,dcl.type.class.deduct};
16781678

@@ -4068,7 +4068,7 @@
40684068

40694069
\pnum
40704070
An abbreviated function template can have a \grammarterm{template-head}.
4071-
The invented \grammarterm{template-parameter}{s} are
4071+
The invented \grammarterm{type-parameter}{s} are
40724072
appended to the \grammarterm{template-parameter-list} after
40734073
the explicitly declared \grammarterm{template-parameter}{s}.
40744074
\begin{example}

source/overloading.tex

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3103,8 +3103,7 @@
31033103
\item
31043104
an explicit type conversion\iref{expr.type.conv,expr.static.cast,expr.cast}, or
31053105
\item
3106-
a non-type
3107-
\grammarterm{template-parameter}\iref{temp.arg.nontype}.
3106+
a non-type template parameter\iref{temp.arg.nontype}.
31083107
\end{itemize}
31093108
If the target type contains a placeholder type,
31103109
placeholder type deduction is performed\iref{dcl.type.auto.deduct}, and
@@ -4100,7 +4099,8 @@
41004099
A \defnx{string literal operator template}{literal!operator!template string}
41014100
is a literal operator template whose \grammarterm{template-parameter-list}
41024101
comprises
4103-
a single non-type \grammarterm{template-parameter} of class type.
4102+
a single \grammarterm{parameter-declaration} that declares a
4103+
non-type template parameter of class type.
41044104
The declaration of a literal operator template
41054105
shall have an empty \grammarterm{parameter-declaration-clause}
41064106
and shall declare either a numeric literal operator template

0 commit comments

Comments
 (0)