Skip to content

Commit cd41f4a

Browse files
authored
[everywhere] Consistently use 'whitespace'. (#4211)
Do not use 'white space' or 'white-space'.
1 parent 7ff057c commit cd41f4a

File tree

4 files changed

+38
-38
lines changed

4 files changed

+38
-38
lines changed

source/lex.tex

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@
101101
to the file.
102102

103103
\item The source file is decomposed into preprocessing
104-
tokens\iref{lex.pptoken} and sequences of white-space characters
104+
tokens\iref{lex.pptoken} and sequences of whitespace characters
105105
(including comments). A source file shall not end in a partial
106106
preprocessing token or in a partial comment.
107107
\begin{footnote}
@@ -115,7 +115,7 @@
115115
comment.
116116
\end{footnote}
117117
Each comment is replaced by one space character. New-line characters are
118-
retained. Whether each nonempty sequence of white-space characters other
118+
retained. Whether each nonempty sequence of whitespace characters other
119119
than new-line is retained or replaced by one space character is
120120
unspecified. The process of dividing a source file's
121121
characters into preprocessing tokens is context-dependent.
@@ -322,7 +322,7 @@
322322
string-literal\br
323323
user-defined-string-literal\br
324324
preprocessing-op-or-punc\br
325-
\textnormal{each non-white-space character that cannot be one of the above}
325+
\textnormal{each non-whitespace character that cannot be one of the above}
326326
\end{bnf}
327327

328328
\pnum
@@ -337,17 +337,17 @@
337337
(\grammarterm{import-keyword}, \grammarterm{module-keyword}, and \grammarterm{export-keyword}),
338338
identifiers, preprocessing numbers, character literals (including user-defined character
339339
literals), string literals (including user-defined string literals), preprocessing
340-
operators and punctuators, and single non-white-space characters that do not lexically
340+
operators and punctuators, and single non-whitespace characters that do not lexically
341341
match the other preprocessing token categories. If a \tcode{'} or a \tcode{"} character
342342
matches the last category, the behavior is undefined. Preprocessing tokens can be
343343
separated by
344-
\indextext{space!white}%
345-
white space;
344+
\indextext{whitespace}%
345+
whitespace;
346346
\indextext{comment}%
347-
this consists of comments\iref{lex.comment}, or white-space
347+
this consists of comments\iref{lex.comment}, or whitespace
348348
characters (space, horizontal tab, new-line, vertical tab, and
349349
form-feed), or both. As described in \ref{cpp}, in certain
350-
circumstances during translation phase 4, white space (or the absence
350+
circumstances during translation phase 4, whitespace (or the absence
351351
thereof) serves as more than preprocessing token separation. White space
352352
can appear within a preprocessing token only as part of a header name or
353353
between the quotation characters in a character literal or
@@ -499,12 +499,12 @@
499499
Literals include strings and character and numeric literals.
500500
\end{footnote}
501501
operators, and other separators.
502-
\indextext{white space}%
502+
\indextext{whitespace}%
503503
Blanks, horizontal and vertical tabs, newlines, formfeeds, and comments
504-
(collectively, ``white space''), as described below, are ignored except
504+
(collectively, ``whitespace''), as described below, are ignored except
505505
as they serve to separate tokens.
506506
\begin{note}
507-
Some white space is
507+
Some whitespace is
508508
required to separate otherwise adjacent identifiers, keywords, numeric
509509
literals, and alternative tokens containing alphabetic characters.
510510
\end{note}
@@ -521,7 +521,7 @@
521521
\indextext{comment!\tcode{//}}%
522522
The characters \tcode{//} start a comment, which terminates immediately before the
523523
next new-line character. If there is a form-feed or a vertical-tab
524-
character in such a comment, only white-space characters shall appear
524+
character in such a comment, only whitespace characters shall appear
525525
between it and the new-line that terminates the comment; no diagnostic
526526
is required.
527527
\begin{note}

source/locales.tex

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4312,8 +4312,8 @@
43124312
or
43134313
\tcode{money_base::none}
43144314
appears as the last element in the format pattern,
4315-
no white space is consumed. Otherwise, where \tcode{money_base::space} appears in any of the
4316-
initial elements of the format pattern, at least one white space character is required. Where
4315+
no whitespace is consumed. Otherwise, where \tcode{money_base::space} appears in any of the
4316+
initial elements of the format pattern, at least one whitespace character is required. Where
43174317
\tcode{money_base::none} appears in any of the initial elements of the format pattern, white
43184318
space is allowed but not required.
43194319
If
@@ -4657,10 +4657,10 @@
46574657
\tcode{none}
46584658
or
46594659
\tcode{space}
4660-
appears, white space is permitted in the format,
4660+
appears, whitespace is permitted in the format,
46614661
except where
46624662
\tcode{none}
4663-
appears at the end, in which case no white space is permitted.
4663+
appears at the end, in which case no whitespace is permitted.
46644664
The value
46654665
\tcode{space}
46664666
indicates that at least one space is required at that position.

source/preprocessor.tex

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@
105105

106106
\begin{bnf}
107107
\nontermdef{lparen}\br
108-
\descr{a \terminal{(} character not immediately preceded by white-space}
108+
\descr{a \terminal{(} character not immediately preceded by whitespace}
109109
\end{bnf}
110110

111111
\begin{bnf}
@@ -137,8 +137,8 @@
137137
the first token in the sequence,
138138
referred to as a \defnadj{directive-introducing}{token},
139139
begins with the first character in the source file
140-
(optionally after white space containing no new-line characters) or
141-
follows white space containing at least one new-line character,
140+
(optionally after whitespace containing no new-line characters) or
141+
follows whitespace containing at least one new-line character,
142142
and is
143143

144144
\begin{itemize}
@@ -175,7 +175,7 @@
175175
Thus,
176176
preprocessing directives are commonly called ``lines''.
177177
These ``lines'' have no other syntactic significance,
178-
as all white space is equivalent except in certain situations
178+
as all whitespace is equivalent except in certain situations
179179
during preprocessing (see the
180180
\tcode{\#}
181181
character string literal creation operator in~\ref{cpp.stringize}, for example).
@@ -232,14 +232,14 @@
232232
the directive name and the following new-line character.
233233

234234
\pnum
235-
The only white-space characters that shall appear
235+
The only whitespace characters that shall appear
236236
between preprocessing tokens
237237
within a preprocessing directive
238238
(from just after the directive-introducing token
239239
through just before the terminating new-line character)
240240
are space and horizontal-tab
241241
(including spaces that have replaced comments
242-
or possibly other white-space characters
242+
or possibly other whitespace characters
243243
in translation phase 3).
244244

245245
\pnum
@@ -945,8 +945,8 @@
945945
\indextext{macro!replacement list}%
946946
Two replacement lists are identical if and only if
947947
the preprocessing tokens in both have
948-
the same number, ordering, spelling, and white-space separation,
949-
where all white-space separations are considered identical.
948+
the same number, ordering, spelling, and whitespace separation,
949+
where all whitespace separations are considered identical.
950950

951951
\pnum
952952
An identifier currently defined as an
@@ -971,24 +971,24 @@
971971
The following sequence is valid:
972972
\begin{codeblock}
973973
#define OBJ_LIKE (1-1)
974-
#define OBJ_LIKE @\tcode{/* white space */ (1-1) /* other */}@
974+
#define OBJ_LIKE @\tcode{/* whitespace */ (1-1) /* other */}@
975975
#define FUNC_LIKE(a) ( a )
976-
#define FUNC_LIKE( a )( @\tcode{/* note the white space */ \textbackslash}@
976+
#define FUNC_LIKE( a )( @\tcode{/* note the whitespace */ \textbackslash}@
977977
a @\tcode{/* other stuff on this line}@
978978
@\tcode{*/}@ )
979979
\end{codeblock}
980980
But the following redefinitions are invalid:
981981
\begin{codeblock}
982982
#define OBJ_LIKE (0) // different token sequence
983-
#define OBJ_LIKE (1 - 1) // different white space
983+
#define OBJ_LIKE (1 - 1) // different whitespace
984984
#define FUNC_LIKE(b) ( a ) // different parameter usage
985985
#define FUNC_LIKE(b) ( b ) // different parameter spelling
986986
\end{codeblock}
987987
\end{example}
988988

989989
\pnum
990990
\indextext{macro!replacement list}%
991-
There shall be white-space between the identifier and the replacement list
991+
There shall be whitespace between the identifier and the replacement list
992992
in the definition of an object-like macro.
993993

994994
\pnum
@@ -1021,7 +1021,7 @@
10211021
\indextext{name!macro|see{macro, name}}%
10221022
\defnx{macro name}{macro!name}.
10231023
There is one name space for macro names.
1024-
Any white-space characters preceding or following the
1024+
Any whitespace characters preceding or following the
10251025
replacement list of preprocessing tokens are not considered
10261026
part of the replacement list for either form of macro.
10271027

@@ -1102,7 +1102,7 @@
11021102
right parenthesis preprocessing tokens.
11031103
Within the sequence of preprocessing tokens making up an invocation
11041104
of a function-like macro,
1105-
new-line is considered a normal white-space character.
1105+
new-line is considered a normal whitespace character.
11061106

11071107
\pnum
11081108
\indextext{macro!function-like!arguments}%
@@ -1305,7 +1305,7 @@
13051305
corresponding argument (excluding placemarker tokens).
13061306
Let the \defn{stringizing argument} be the preprocessing token sequence
13071307
for the corresponding argument with placemarker tokens removed.
1308-
Each occurrence of white space between the stringizing argument's preprocessing
1308+
Each occurrence of whitespace between the stringizing argument's preprocessing
13091309
tokens becomes a single space character in the character string literal.
13101310
White space before the first preprocessing token and after the last
13111311
preprocessing token comprising the stringizing argument is deleted.

source/time.tex

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11104,8 +11104,8 @@
1110411104
given as a positive decimal integer called out as \tcode{\placeholder{N}} below
1110511105
which governs how many characters are parsed from the stream in interpreting the flag.
1110611106
All characters in the format string that are not represented in~\tref{time.parse.spec},
11107-
except for white space, are parsed unchanged from the stream.
11108-
A white space character matches zero or more white space characters in the input stream.
11107+
except for whitespace, are parsed unchanged from the stream.
11108+
A whitespace character matches zero or more whitespace characters in the input stream.
1110911109

1111011110
\pnum
1111111111
If the type being parsed cannot represent
@@ -11248,13 +11248,13 @@
1124811248
the locale's alternative representation.
1124911249
\\ \rowsep
1125011250
\tcode{\%n} &
11251-
Matches one white space character.
11251+
Matches one whitespace character.
1125211252
\begin{tailnote}
1125311253
\tcode{\%n}, \tcode{\%t}, and a space
11254-
can be combined to match a wide range of white-space patterns.
11254+
can be combined to match a wide range of whitespace patterns.
1125511255
For example,
11256-
\tcode{"\%n "} matches one or more white space characters, and
11257-
\tcode{"\%n\%t\%t"} matches one to three white space characters.
11256+
\tcode{"\%n "} matches one or more whitespace characters, and
11257+
\tcode{"\%n\%t\%t"} matches one to three whitespace characters.
1125811258
\end{tailnote}
1125911259
\\ \rowsep
1126011260
\tcode{\%p} &
@@ -11281,7 +11281,7 @@
1128111281
the locale's alternative representation.
1128211282
\\ \rowsep
1128311283
\tcode{\%t} &
11284-
Matches zero or one white space characters.
11284+
Matches zero or one whitespace characters.
1128511285
\\ \rowsep
1128611286
\tcode{\%T} &
1128711287
Equivalent to \tcode{\%H:\%M:\%S}.

0 commit comments

Comments
 (0)