Skip to content

Commit 09e1d93

Browse files
authored
Merge 2022-11 CWG Motion 4
P2710R0 Core Language Working Group NB comment resolutions for the November, 2022 meeting; issues 2615, 2639, 2640, 2652, and 2653
2 parents 5b39c08 + 00b90f3 commit 09e1d93

File tree

3 files changed

+14
-9
lines changed

3 files changed

+14
-9
lines changed

source/declarations.tex

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3387,9 +3387,9 @@
33873387
\begin{bnf}
33883388
\nontermdef{parameter-declaration}\br
33893389
\opt{attribute-specifier-seq} \opt{\keyword{this}} decl-specifier-seq declarator\br
3390-
\opt{attribute-specifier-seq} \opt{\keyword{this}} decl-specifier-seq declarator \terminal{=} initializer-clause\br
3390+
\opt{attribute-specifier-seq} decl-specifier-seq declarator \terminal{=} initializer-clause\br
33913391
\opt{attribute-specifier-seq} \opt{\keyword{this}} decl-specifier-seq \opt{abstract-declarator}\br
3392-
\opt{attribute-specifier-seq} \opt{\keyword{this}} decl-specifier-seq \opt{abstract-declarator} \terminal{=} initializer-clause
3392+
\opt{attribute-specifier-seq} decl-specifier-seq \opt{abstract-declarator} \terminal{=} initializer-clause
33933393
\end{bnf}
33943394

33953395
The optional \grammarterm{attribute-specifier-seq} in a \grammarterm{parameter-declaration}

source/lex.tex

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -82,12 +82,18 @@
8282
then it shall be a well-formed UTF-8 code unit sequence and
8383
it is decoded to produce a sequence of UCS scalar values
8484
that constitutes the sequence of elements of the translation character set.
85+
In the resulting sequence,
86+
each pair of characters in the input sequence consisting of
87+
\unicode{000d}{carriage return} followed by \unicode{000a}{line feed},
88+
as well as each
89+
\unicode{000d}{carriage return} not immediately followed by a \unicode{000a}{line feed},
90+
is replaced by a single new-line character.
8591

8692
For any other kind of input file supported by the implementation,
8793
characters are mapped, in an
8894
\impldef{mapping physical source file characters to translation character set} manner,
89-
to a sequence of translation character set elements\iref{lex.charset}
90-
(introducing new-line characters for end-of-line indicators).
95+
to a sequence of translation character set elements\iref{lex.charset},
96+
representing end-of-line indicators as new-line characters.
9197

9298
\item
9399
\indextext{line splicing}%
@@ -308,10 +314,7 @@
308314

309315
\begin{bnf}
310316
\nontermdef{n-char} \textnormal{one of}\br
311-
\terminal{A B C D E F G H I J K L M N O P Q R S T U V W X Y Z}\br
312-
\terminal{0 1 2 3 4 5 6 7 8 9}\br
313-
\textnormal{\unicode{002d}{hyphen-minus}}\br
314-
\textnormal{\unicode{0020}{space}}
317+
\textnormal{any member of the translation character set except the \unicode{007d}{right curly bracket} or new-line character}
315318
\end{bnf}
316319

317320
\begin{bnf}

source/preprocessor.tex

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -390,6 +390,7 @@
390390
{ll}
391391
\topline
392392
\lhdr{Attribute} & \rhdr{Value} \\ \rowsep
393+
\tcode{assume} & \tcode{202207L} \\
393394
\tcode{carries_dependency} & \tcode{200809L} \\
394395
\tcode{deprecated} & \tcode{201309L} \\
395396
\tcode{fallthrough} & \tcode{201603L} \\
@@ -1765,7 +1766,8 @@
17651766
\mname{STDCPP_BFLOAT16_T}\\
17661767
Defined as the integer literal \tcode{1}
17671768
if and only if the implementation supports an extended floating-point type
1768-
with the properties described in \ref{basic.extended.fp}.
1769+
with the properties of the \grammarterm{typedef-name} \tcode{std::bfloat16_t}
1770+
as described in \ref{basic.extended.fp}.
17691771

17701772
\item
17711773
\indextext{__time__@\mname{TIME}}%

0 commit comments

Comments
 (0)