Introduce <memberedDeclarationBody> and use it

Author: eernstg

specification/dartLangSpec.tex

@@ -2911,14 +2911,18 @@ \section{Classes}
 <classDeclaration> ::=
   \ABSTRACT? \CLASS{} <typeIdentifier> <typeParameters>?
   \gnewline{} <superclass>? <interfaces>?
-  \gnewline{} `{' (<metadata> <classMemberDeclaration>)* `}'
+  \gnewline{} <memberedDeclarationBody>
   \alt \ABSTRACT? \CLASS{} <mixinApplicationClass>
 
 <typeNotVoidList> ::= <typeNotVoid> (`,' <typeNotVoid>)*
 
-<classMemberDeclaration> ::= <declaration> `;'
+<memberDeclarationNoMetadata> ::= <declaration> `;'
   \alt <methodHeader> <functionBody>
 
+<memberDeclaration> ::= <metadata> <memberDeclarationNoMetadata>
+
+<memberedDeclarationBody> ::= `{' <memberDeclaration>* `}'
+
 <methodHeader> ::= <constructorHeader> <initializers>?
   \alt <factoryConstructorHeader>
   \alt \STATIC? <functionHeader>
@@ -6088,7 +6092,7 @@ \subsection{Mixin Declaration}
 \begin{grammar}
 <mixinDeclaration> ::= \MIXIN{} <typeIdentifier> <typeParameters>?
   \gnewline{} (\ON{} <typeNotVoidList>)? <interfaces>?
-  \gnewline{} `\{' (<metadata> <classMemberDeclaration>)* `\}'
+  \gnewline{} <memberedDeclarationBody>
 \end{grammar}
 
 %% TODO(eernst): Change this paragraph if we allow factory constructors.
@@ -6365,7 +6369,7 @@ \section{Extensions}
 \begin{grammar}
 <extensionDeclaration> ::= \gnewline{}
   \EXTENSION{} <typeIdentifierNotType>? <typeParameters>? \ON{} <type>
-  \gnewline{} `\{' (<metadata> <classMemberDeclaration>)* `\}'
+  \gnewline{} <memberedDeclarationBody>
 \end{grammar}
 
 \LMHash{}%
@@ -22349,8 +22353,8 @@ \subsection{Static Types}
 
 <optionalPositionalParameterTypes> ::= `[' <normalParameterTypes> `,'? `]'
 
-<namedParameterTypes> ::=
-  `\{' <namedParameterType> (`,' <namedParameterType>)* `,'? `\}'
+<namedParameterTypes> ::= \gnewline{}
+  `{' <namedParameterType> (`,' <namedParameterType>)* `,'? `}'
 
 <namedParameterType> ::=
   <metadata> \REQUIRED? <typedIdentifier>