CWG2509 decl-specifier-seq in lambda-specifiers

Author: jensmaurer

source/expressions.tex

@@ -1690,7 +1690,20 @@
 
 \begin{bnf}
 \nontermdef{lambda-specifiers}\br
-    \opt{decl-specifier-seq} \opt{noexcept-specifier} \opt{attribute-specifier-seq} \opt{trailing-return-type}
+    \opt{lambda-specifier-seq} \opt{noexcept-specifier} \opt{attribute-specifier-seq} \opt{trailing-return-type}
+\end{bnf}
+
+\begin{bnf}
+\nontermdef{lambda-specifier}\br
+    \keyword{consteval}\br
+    \keyword{constexpr}\br
+    \keyword{mutable}
+\end{bnf}
+
+\begin{bnf}
+\nontermdef{lambda-specifier-seq}\br
+    lambda-specifier\br
+    lambda-specifier lambda-specifier-seq
 \end{bnf}
 
 \pnum
@@ -1715,12 +1728,12 @@
 \end{note}
 
 \pnum
-In the \grammarterm{decl-specifier-seq} of the \grammarterm{lambda-declarator},
-each \grammarterm{decl-specifier}
-shall be one of \keyword{mutable}, \keyword{constexpr}, or \keyword{consteval}.
+A \grammarterm{lambda-specifier-seq}
+shall contain at most one of each \grammarterm{lambda-specifier} and
+shall not contain both \keyword{constexpr} and \keyword{consteval}.
 If the \grammarterm{lambda-declarator} contains
 an explicit object parameter\iref{dcl.fct},
-then no \grammarterm{decl-specifier} in the \grammarterm{decl-specifier-seq}
+then no \grammarterm{lambda-specifier} in the \grammarterm{lambda-specifier-seq}
 shall be \keyword{mutable}.
 \begin{note}
 The trailing \grammarterm{requires-clause} is described in \ref{dcl.decl}.