Skip to content

Commit 7fcf9dd

Browse files
committed
Merge 2020-11 CWG Motion 2
P0330R8 Literal Suffix for (signed) size_t
2 parents 871ef20 + c7d8b0c commit 7fcf9dd

File tree

2 files changed

+24
-1
lines changed

2 files changed

+24
-1
lines changed

source/lex.tex

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1045,8 +1045,10 @@
10451045
\nontermdef{integer-suffix}\br
10461046
unsigned-suffix \opt{long-suffix} \br
10471047
unsigned-suffix \opt{long-long-suffix} \br
1048+
unsigned-suffix \opt{size-suffix} \br
10481049
long-suffix \opt{unsigned-suffix} \br
1049-
long-long-suffix \opt{unsigned-suffix}
1050+
long-long-suffix \opt{unsigned-suffix} \br
1051+
size-suffix \opt{unsigned-suffix}
10501052
\end{bnf}
10511053

10521054
\begin{bnf}
@@ -1064,6 +1066,11 @@
10641066
\terminal{ll LL}
10651067
\end{bnf}
10661068

1069+
\begin{bnf}
1070+
\nontermdef{size-suffix} \textnormal{one of}\br
1071+
\terminal{z Z}
1072+
\end{bnf}
1073+
10671074
\pnum
10681075
\indextext{literal!\idxcode{unsigned}}%
10691076
\indextext{literal!\idxcode{long}}%
@@ -1177,6 +1184,21 @@
11771184
\tcode{unsigned long long int} &
11781185
\tcode{unsigned long long int}\\
11791186
and \tcode{ll} or \tcode{LL} &
1187+
&
1188+
\\\hline
1189+
\tcode{z} or \tcode{Z} &
1190+
the signed integer type corresponding &
1191+
the signed integer type \\
1192+
&
1193+
\qquad to \tcode{std::size_t}\iref{support.types.layout} &
1194+
\qquad corresponding to \tcode{std::size_t} \\
1195+
&
1196+
&
1197+
\tcode{std::size_t}\\\hline
1198+
Both \tcode{u} or \tcode{U} &
1199+
\tcode{std::size_t} &
1200+
\tcode{std::size_t} \\
1201+
and \tcode{z} or \tcode{Z} &
11801202
&
11811203
\\
11821204
\end{floattable}

source/preprocessor.tex

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1793,6 +1793,7 @@
17931793
\defnxname{cpp_ref_qualifiers} & \tcode{200710L} \\ \rowsep
17941794
\defnxname{cpp_return_type_deduction} & \tcode{201304L} \\ \rowsep
17951795
\defnxname{cpp_rvalue_references} & \tcode{200610L} \\ \rowsep
1796+
\defnxname{cpp_size_t_suffix} & \tcode{202011L} \\ \rowsep
17961797
\defnxname{cpp_sized_deallocation} & \tcode{201309L} \\ \rowsep
17971798
\defnxname{cpp_static_assert} & \tcode{201411L} \\ \rowsep
17981799
\defnxname{cpp_structured_bindings} & \tcode{201606L} \\ \rowsep

0 commit comments

Comments
 (0)