diff --git a/tools/spec_parser/Dart.g b/tools/spec_parser/Dart.g index 1092408dc63..4622dd9cc7d 100644 --- a/tools/spec_parser/Dart.g +++ b/tools/spec_parser/Dart.g @@ -4,6 +4,9 @@ // CHANGES: // +// v0.60 Adjust the `static final` and `static const` variable declarations +// to require an initializing expression. +// // v0.59 Adjust augmentation and primary constructor related rules to match // recent updates. // @@ -535,7 +538,8 @@ declaration | EXTERNAL (STATIC? finalVarOrType | COVARIANT varOrType) identifierList | EXTERNAL? operatorSignature | ABSTRACT (finalVarOrType | COVARIANT varOrType) identifierList - | STATIC (FINAL | CONST) type? initializedIdentifierList + | STATIC ABSTRACT finalVarOrType identifierList + | STATIC (FINAL | CONST) type? staticFinalDeclarationList | STATIC LATE FINAL type? initializedIdentifierList | STATIC LATE? varOrType initializedIdentifierList | COVARIANT LATE FINAL type? identifierList diff --git a/tools/spec_parser/dart_spec_parser/Dart.g4 b/tools/spec_parser/dart_spec_parser/Dart.g4 index a60b55b3a3b..294f93447ef 100644 --- a/tools/spec_parser/dart_spec_parser/Dart.g4 +++ b/tools/spec_parser/dart_spec_parser/Dart.g4 @@ -4,6 +4,9 @@ // CHANGES: // +// v0.61 Adjust the `static final` and `static const` variable declarations +// to require an initializing expression. +// // v0.60 Adjust augmentation and primary constructor related rules to match // recent updates. // @@ -557,7 +560,8 @@ declaration | EXTERNAL (STATIC? finalVarOrType | COVARIANT varOrType) identifierList | EXTERNAL? operatorSignature | ABSTRACT (finalVarOrType | COVARIANT varOrType) identifierList - | STATIC (FINAL | CONST) type? initializedIdentifierList + | STATIC ABSTRACT finalVarOrType identifierList + | STATIC (FINAL | CONST) type? staticFinalDeclarationList | STATIC LATE FINAL type? initializedIdentifierList | STATIC LATE? varOrType initializedIdentifierList | COVARIANT LATE FINAL type? identifierList