Skip to content

Commit 774c2b9

Browse files
committed
P3924R1 Fix inappropriate font choices for "declaration"
Fixes NB US 11-400 (C++26 CD).
1 parent fda5e37 commit 774c2b9

3 files changed

Lines changed: 16 additions & 14 deletions

File tree

source/basic.tex

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,7 @@
274274
\item it is
275275
an explicit instantiation declaration\iref{temp.explicit}, or
276276
\item it is
277-
an explicit specialization\iref{temp.expl.spec} whose
277+
an \grammarterm{explicit specialization}\iref{temp.expl.spec} whose
278278
\grammarterm{declaration} is not a definition.
279279
\end{itemize}
280280
A declaration is said to be a \defn{definition} of each entity that it defines.
@@ -999,7 +999,7 @@
999999
Corresponding declarations with appropriate linkage
10001000
declare the same entity\iref{basic.link}.
10011001
\item
1002-
The declaration in a \grammarterm{template-declaration}
1002+
The \grammarterm{declaration} of a \grammarterm{template-declaration}
10031003
inhabits the same scope as the \grammarterm{template-declaration}.
10041004
\item
10051005
Friend declarations and

source/declarations.tex

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -532,10 +532,10 @@
532532
\grammarterm{storage-class-specifier}
533533
appears in a \grammarterm{decl-specifier-seq}, there can be no
534534
\tcode{typedef} specifier in the same \grammarterm{decl-specifier-seq} and
535-
the \grammarterm{init-declarator-list} or \grammarterm{member-declarator-list}
536-
of the declaration shall not be
537-
empty (except for an anonymous union declared in a namespace scope\iref{class.union.anon}). The
538-
\grammarterm{storage-class-specifier} applies to the name declared by each
535+
the \grammarterm{init-declarator-list} of the \grammarterm{simple-declaration} or
536+
the \grammarterm{member-declarator-list} of the \grammarterm{member-declaration}
537+
shall not be empty (except for an anonymous union declared in a namespace scope\iref{class.union.anon}).
538+
The \grammarterm{storage-class-specifier} applies to the name declared by each
539539
\grammarterm{init-declarator} in the list and not to any names declared by
540540
other specifiers.
541541
\begin{note}
@@ -1258,9 +1258,10 @@
12581258
There are two \grammarterm{cv-qualifier}{s}, \keyword{const} and
12591259
\tcode{volatile}. Each \grammarterm{cv-qualifier} shall appear at most once in
12601260
a \grammarterm{cv-qualifier-seq}. If a \grammarterm{cv-qualifier} appears in a
1261-
\grammarterm{decl-specifier-seq}, the \grammarterm{init-declarator-list}
1262-
or \grammarterm{member-declarator-list} of
1263-
the declaration shall not be empty.
1261+
\grammarterm{decl-specifier-seq},
1262+
the \grammarterm{init-declarator-list} of the \grammarterm{simple-declaration} or
1263+
the \grammarterm{member-declarator-list} of the \grammarterm{member-declaration}
1264+
shall not be empty.
12641265
\begin{note}
12651266
\ref{basic.type.qualifier} and \ref{dcl.fct} describe how cv-qualifiers affect object and
12661267
function types.
@@ -2409,8 +2410,10 @@
24092410
\end{note}
24102411

24112412
\pnum
2412-
Each \grammarterm{init-declarator} or \grammarterm{member-declarator}
2413-
in a declaration is analyzed separately as if it were in a declaration by itself.
2413+
Each \grammarterm{init-declarator} of a \grammarterm{simple-declaration}
2414+
or \grammarterm{member-declarator} of a \grammarterm{member-declaration}
2415+
is analyzed separately as if it were in a
2416+
\grammarterm{simple-declaration} or \grammarterm{member-declaration} by itself.
24142417
\begin{note}
24152418
A declaration with several declarators is usually equivalent to the corresponding
24162419
sequence of declarations each with a single declarator. That is,
@@ -2945,7 +2948,7 @@
29452948
specifier
29462949
or an \grammarterm{explicit-specifier}
29472950
applies directly to each \grammarterm{declarator-id}
2948-
in a declaration;
2951+
in a \grammarterm{simple-declaration} or \grammarterm{member-declaration};
29492952
the type specified for each \grammarterm{declarator-id} depends on
29502953
both the \grammarterm{decl-specifier-seq} and its \grammarterm{declarator}.
29512954

source/statements.tex

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,6 @@
262262
\pnum
263263
\begin{note}
264264
A compound statement defines a block scope\iref{basic.scope}.
265-
A declaration is a \grammarterm{statement}\iref{stmt.dcl}.
266265
\end{note}
267266

268267
\rSec1[stmt.select]{Selection statements}%
@@ -932,7 +931,7 @@
932931
@\grammarterm{compound-statement}@
933932
}
934933
\end{codeblock}
935-
The keyword \keyword{constexpr} is present in the declaration
934+
The keyword \keyword{constexpr} is present in the \grammarterm{structured-binding-declaration}
936935
of $u_{0}, u_{1}, \dotsc, u_{N-1}$ if and only if
937936
\keyword{constexpr} is one of the \grammarterm{decl-specifier}s
938937
of the \grammarterm{decl-specifier-seq}

0 commit comments

Comments
 (0)