Skip to content

Commit ba25e78

Browse files
committed
[pre] No names in the preprocessor
The term "name" applies specifically to entities in phase 7 of translation. Macros have macro names, headers are parsed as *header-name*s, etc.
1 parent daf06c9 commit ba25e78

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

source/preprocessor.tex

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -618,7 +618,7 @@
618618
Each directive's condition is checked in order.
619619
If it evaluates to false (zero),
620620
the group that it controls is skipped:
621-
directives are processed only through the name that determines
621+
directives are processed only through the directive name that determines
622622
the directive in order to keep track of the level
623623
of nested conditionals;
624624
the rest of the directives' preprocessing tokens are ignored,
@@ -1045,7 +1045,7 @@
10451045
\end{note}
10461046
\begin{example}
10471047
If the directive matches the second form, the whole directive is replaced.
1048-
If the directive matches the first form, everything after the name is replaced.
1048+
If the directive matches the first form, everything after the \grammarterm{header-name} is replaced.
10491049
\begin{codeblock}
10501050
#define EMPTY
10511051
#define X myfile
@@ -1532,11 +1532,11 @@
15321532
\pnum
15331533
\indextext{unit!translation}%
15341534
A translation unit shall not \tcode{\#define} or \tcode{\#undef}
1535-
names lexically identical
1535+
macro names lexically identical
15361536
to keywords,
15371537
to the identifiers listed in \tref{lex.name.special}, or
15381538
to the \grammarterm{attribute-token}{s} described in~\ref{dcl.attr},
1539-
except that the names \tcode{likely} and \tcode{unlikely} may be
1539+
except that the macro names \tcode{likely} and \tcode{unlikely} may be
15401540
defined as function-like macros.
15411541

15421542
\pnum
@@ -2191,7 +2191,7 @@
21912191
replace the value of this macro with a greater value.
21922192
\end{note}
21932193

2194-
\item The names listed in \tref{cpp.predefined.ft}.\\
2194+
\item The macro names listed in \tref{cpp.predefined.ft}.\\
21952195
The macros defined in \tref{cpp.predefined.ft} shall be defined to
21962196
the corresponding integer literal.
21972197
\begin{note}

0 commit comments

Comments
 (0)