[parser] Add enclosingDeclarationName to beginMethod
This adds the enclosingDeclarationName to the beginMethod of the
parser listener.
This enables the removal BuilderFactory.currentTypeParameterScopeBuilder.
Change-Id: Ie2bec9432c20b8bdbd62a14e8a65c272179d4698
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/383182
Reviewed-by: Chloe Stefantsova <cstefantsova@google.com>
Reviewed-by: Paul Berry <paulberry@google.com>
diff --git a/pkg/_fe_analyzer_shared/lib/src/parser/forwarding_listener.dart b/pkg/_fe_analyzer_shared/lib/src/parser/forwarding_listener.dart
index a0fea03..357780a 100644
--- a/pkg/_fe_analyzer_shared/lib/src/parser/forwarding_listener.dart
+++ b/pkg/_fe_analyzer_shared/lib/src/parser/forwarding_listener.dart
@@ -392,9 +392,18 @@
Token? covariantToken,
Token? varFinalOrConst,
Token? getOrSet,
- Token name) {
- listener?.beginMethod(declarationKind, augmentToken, externalToken,
- staticToken, covariantToken, varFinalOrConst, getOrSet, name);
+ Token name,
+ String? enclosingDeclarationName) {
+ listener?.beginMethod(
+ declarationKind,
+ augmentToken,
+ externalToken,
+ staticToken,
+ covariantToken,
+ varFinalOrConst,
+ getOrSet,
+ name,
+ enclosingDeclarationName);
}
@override
diff --git a/pkg/_fe_analyzer_shared/lib/src/parser/listener.dart b/pkg/_fe_analyzer_shared/lib/src/parser/listener.dart
index d96dfe2..76af8f0 100644
--- a/pkg/_fe_analyzer_shared/lib/src/parser/listener.dart
+++ b/pkg/_fe_analyzer_shared/lib/src/parser/listener.dart
@@ -1183,7 +1183,8 @@
Token? covariantToken,
Token? varFinalOrConst,
Token? getOrSet,
- Token name) {}
+ Token name,
+ String? enclosingDeclarationName) {}
/// Handle the end of a class method declaration. Substructures:
/// - metadata
diff --git a/pkg/_fe_analyzer_shared/lib/src/parser/parser_impl.dart b/pkg/_fe_analyzer_shared/lib/src/parser/parser_impl.dart
index 4f37e6e..1152a30 100644
--- a/pkg/_fe_analyzer_shared/lib/src/parser/parser_impl.dart
+++ b/pkg/_fe_analyzer_shared/lib/src/parser/parser_impl.dart
@@ -4878,8 +4878,16 @@
// TODO(danrubel): Consider parsing the name before calling beginMethod
// rather than passing the name token into beginMethod.
- listener.beginMethod(kind, augmentToken, externalToken, staticToken,
- covariantToken, varFinalOrConst, getOrSet, name);
+ listener.beginMethod(
+ kind,
+ augmentToken,
+ externalToken,
+ staticToken,
+ covariantToken,
+ varFinalOrConst,
+ getOrSet,
+ name,
+ enclosingDeclarationName);
Token token = typeInfo.parseType(beforeType, this);
assert(token.next == (getOrSet ?? name) ||
diff --git a/pkg/analyzer/lib/src/fasta/ast_builder.dart b/pkg/analyzer/lib/src/fasta/ast_builder.dart
index 52d26ac..2296ca9 100644
--- a/pkg/analyzer/lib/src/fasta/ast_builder.dart
+++ b/pkg/analyzer/lib/src/fasta/ast_builder.dart
@@ -449,7 +449,8 @@
Token? covariantToken,
Token? varFinalOrConst,
Token? getOrSet,
- Token name) {
+ Token name,
+ String? enclosingDeclarationName) {
_Modifiers modifiers = _Modifiers();
if (augmentToken != null) {
assert(augmentToken.isModifier);
diff --git a/pkg/analyzer/test/generated/parser_fasta_listener.dart b/pkg/analyzer/test/generated/parser_fasta_listener.dart
index 78d0264..a2f7b13 100644
--- a/pkg/analyzer/test/generated/parser_fasta_listener.dart
+++ b/pkg/analyzer/test/generated/parser_fasta_listener.dart
@@ -393,9 +393,18 @@
Token? covariantToken,
Token? varFinalOrConst,
Token? getOrSet,
- Token name) {
- super.beginMethod(declarationKind, augmentToken, externalToken, staticToken,
- covariantToken, varFinalOrConst, getOrSet, name);
+ Token name,
+ String? enclosingDeclarationName) {
+ super.beginMethod(
+ declarationKind,
+ augmentToken,
+ externalToken,
+ staticToken,
+ covariantToken,
+ varFinalOrConst,
+ getOrSet,
+ name,
+ enclosingDeclarationName);
begin('Method');
}
diff --git a/pkg/front_end/lib/src/kernel/macro/annotation_parser.dart b/pkg/front_end/lib/src/kernel/macro/annotation_parser.dart
index c66182b..20ada4d 100644
--- a/pkg/front_end/lib/src/kernel/macro/annotation_parser.dart
+++ b/pkg/front_end/lib/src/kernel/macro/annotation_parser.dart
@@ -885,7 +885,8 @@
Token? covariantToken,
Token? varFinalOrConst,
Token? getOrSet,
- Token name) {
+ Token name,
+ String? enclosingDeclarationName) {
_unexpected();
}
diff --git a/pkg/front_end/lib/src/source/builder_factory.dart b/pkg/front_end/lib/src/source/builder_factory.dart
index 507bb30..438cc81 100644
--- a/pkg/front_end/lib/src/source/builder_factory.dart
+++ b/pkg/front_end/lib/src/source/builder_factory.dart
@@ -76,12 +76,6 @@
}
abstract class BuilderFactory {
- /// The current declaration that is being built. When we start parsing a
- /// declaration (class, method, and so on), we don't have enough information
- /// to create a builder and this object records its members and types until,
- /// for example, [addClass] is called.
- TypeParameterScopeBuilder get currentTypeParameterScopeBuilder;
-
void beginClassOrNamedMixinApplicationHeader();
/// Registers that this builder is preparing for a class declaration with the
diff --git a/pkg/front_end/lib/src/source/outline_builder.dart b/pkg/front_end/lib/src/source/outline_builder.dart
index 93a1138..ba7d410 100644
--- a/pkg/front_end/lib/src/source/outline_builder.dart
+++ b/pkg/front_end/lib/src/source/outline_builder.dart
@@ -1891,10 +1891,9 @@
Token? covariantToken,
Token? varFinalOrConst,
Token? getOrSet,
- Token name) {
- inConstructor =
- name.lexeme == _builderFactory.currentTypeParameterScopeBuilder.name &&
- getOrSet == null;
+ Token name,
+ String? enclosingDeclarationName) {
+ inConstructor = name.lexeme == enclosingDeclarationName && getOrSet == null;
DeclarationContext declarationContext;
switch (declarationKind) {
case DeclarationKind.TopLevel:
diff --git a/pkg/front_end/lib/src/source/source_builder_factory.dart b/pkg/front_end/lib/src/source/source_builder_factory.dart
index 0361522..a17d16e 100644
--- a/pkg/front_end/lib/src/source/source_builder_factory.dart
+++ b/pkg/front_end/lib/src/source/source_builder_factory.dart
@@ -92,8 +92,11 @@
final TypeParameterScopeBuilder _libraryTypeParameterScopeBuilder;
- @override
- TypeParameterScopeBuilder currentTypeParameterScopeBuilder;
+ /// The current declaration that is being built. When we start parsing a
+ /// declaration (class, method, and so on), we don't have enough information
+ /// to create a builder and this object records its members and types until,
+ /// for example, [addClass] is called.
+ TypeParameterScopeBuilder _currentTypeParameterScopeBuilder;
/// Index of the library we use references for.
final IndexedLibrary? indexedLibrary;
@@ -169,7 +172,7 @@
: _compilationUnit = compilationUnit,
_augmentationRoot = augmentationRoot,
_libraryTypeParameterScopeBuilder = libraryTypeParameterScopeBuilder,
- currentTypeParameterScopeBuilder = libraryTypeParameterScopeBuilder,
+ _currentTypeParameterScopeBuilder = libraryTypeParameterScopeBuilder,
_problemReporting = problemReporting,
_parent = parent,
_scope = scope,
@@ -188,8 +191,8 @@
@override
void beginClassOrNamedMixinApplicationHeader() {
- currentTypeParameterScopeBuilder =
- currentTypeParameterScopeBuilder.createNested(
+ _currentTypeParameterScopeBuilder =
+ _currentTypeParameterScopeBuilder.createNested(
TypeParameterScopeKind.classOrNamedMixinApplication,
"class or mixin application");
@@ -206,7 +209,7 @@
@override
void beginClassDeclaration(String name, int charOffset,
List<NominalVariableBuilder>? typeVariables) {
- currentTypeParameterScopeBuilder.markAsClassDeclaration(
+ _currentTypeParameterScopeBuilder.markAsClassDeclaration(
name, charOffset, typeVariables);
_declarationFragments.push(
new ClassFragment(name, charOffset, _typeScopes.current.lookupScope));
@@ -222,16 +225,18 @@
TypeParameterScopeBuilder endClassDeclaration(String name) {
TypeParameterScopeKind kind = TypeParameterScopeKind.classDeclaration;
assert(
- currentTypeParameterScopeBuilder.kind == kind,
+ _currentTypeParameterScopeBuilder.kind == kind,
// Coverage-ignore(suite): Not run.
"Unexpected declaration. "
- "Trying to end a ${currentTypeParameterScopeBuilder.kind} as a $kind.");
+ "Trying to end a ${_currentTypeParameterScopeBuilder.kind} as a "
+ "$kind.");
assert(
- name.startsWith(currentTypeParameterScopeBuilder.name),
+ name.startsWith(_currentTypeParameterScopeBuilder.name),
// Coverage-ignore(suite): Not run.
- "${name} != ${currentTypeParameterScopeBuilder.name}");
- TypeParameterScopeBuilder previous = currentTypeParameterScopeBuilder;
- currentTypeParameterScopeBuilder = currentTypeParameterScopeBuilder.parent!;
+ "${name} != ${_currentTypeParameterScopeBuilder.name}");
+ TypeParameterScopeBuilder previous = _currentTypeParameterScopeBuilder;
+ _currentTypeParameterScopeBuilder =
+ _currentTypeParameterScopeBuilder.parent!;
TypeScope bodyScope = _typeScopes.pop();
assert(
@@ -253,10 +258,12 @@
List<NominalVariableBuilder>? typeVariables) {
TypeParameterScopeKind kind = TypeParameterScopeKind.classDeclaration;
assert(
- currentTypeParameterScopeBuilder.kind == kind,
+ _currentTypeParameterScopeBuilder.kind == kind,
"Unexpected declaration. "
- "Trying to end a ${currentTypeParameterScopeBuilder.kind} as a $kind.");
- currentTypeParameterScopeBuilder = currentTypeParameterScopeBuilder.parent!;
+ "Trying to end a ${_currentTypeParameterScopeBuilder.kind} as a "
+ "$kind.");
+ _currentTypeParameterScopeBuilder =
+ _currentTypeParameterScopeBuilder.parent!;
TypeScope bodyScope = _typeScopes.pop();
assert(bodyScope.kind == TypeScopeKind.classDeclaration,
@@ -274,7 +281,7 @@
@override
void beginMixinDeclaration(String name, int charOffset,
List<NominalVariableBuilder>? typeVariables) {
- currentTypeParameterScopeBuilder.markAsMixinDeclaration(
+ _currentTypeParameterScopeBuilder.markAsMixinDeclaration(
name, charOffset, typeVariables);
_declarationFragments.push(
new MixinFragment(name, charOffset, _typeScopes.current.lookupScope));
@@ -290,16 +297,18 @@
TypeParameterScopeBuilder endMixinDeclaration(String name) {
TypeParameterScopeKind kind = TypeParameterScopeKind.mixinDeclaration;
assert(
- currentTypeParameterScopeBuilder.kind == kind,
+ _currentTypeParameterScopeBuilder.kind == kind,
// Coverage-ignore(suite): Not run.
"Unexpected declaration. "
- "Trying to end a ${currentTypeParameterScopeBuilder.kind} as a $kind.");
+ "Trying to end a ${_currentTypeParameterScopeBuilder.kind} as a "
+ "$kind.");
assert(
- name == currentTypeParameterScopeBuilder.name,
+ name == _currentTypeParameterScopeBuilder.name,
// Coverage-ignore(suite): Not run.
- "${name} != ${currentTypeParameterScopeBuilder.name}");
- TypeParameterScopeBuilder previous = currentTypeParameterScopeBuilder;
- currentTypeParameterScopeBuilder = currentTypeParameterScopeBuilder.parent!;
+ "${name} != ${_currentTypeParameterScopeBuilder.name}");
+ TypeParameterScopeBuilder previous = _currentTypeParameterScopeBuilder;
+ _currentTypeParameterScopeBuilder =
+ _currentTypeParameterScopeBuilder.parent!;
TypeScope bodyScope = _typeScopes.pop();
assert(
@@ -321,10 +330,12 @@
List<NominalVariableBuilder>? typeVariables) {
TypeParameterScopeKind kind = TypeParameterScopeKind.mixinDeclaration;
assert(
- currentTypeParameterScopeBuilder.kind == kind,
+ _currentTypeParameterScopeBuilder.kind == kind,
"Unexpected declaration. "
- "Trying to end a ${currentTypeParameterScopeBuilder.kind} as a $kind.");
- currentTypeParameterScopeBuilder = currentTypeParameterScopeBuilder.parent!;
+ "Trying to end a ${_currentTypeParameterScopeBuilder.kind} as a "
+ "$kind.");
+ _currentTypeParameterScopeBuilder =
+ _currentTypeParameterScopeBuilder.parent!;
TypeScope bodyScope = _typeScopes.pop();
assert(bodyScope.kind == TypeScopeKind.mixinDeclaration,
@@ -342,7 +353,7 @@
@override
void beginNamedMixinApplication(String name, int charOffset,
List<NominalVariableBuilder>? typeVariables) {
- currentTypeParameterScopeBuilder.markAsNamedMixinApplication(
+ _currentTypeParameterScopeBuilder.markAsNamedMixinApplication(
name, charOffset, typeVariables);
}
@@ -350,15 +361,17 @@
void endNamedMixinApplication(String name) {
TypeParameterScopeKind kind = TypeParameterScopeKind.namedMixinApplication;
assert(
- currentTypeParameterScopeBuilder.kind == kind,
+ _currentTypeParameterScopeBuilder.kind == kind,
// Coverage-ignore(suite): Not run.
"Unexpected declaration. "
- "Trying to end a ${currentTypeParameterScopeBuilder.kind} as a $kind.");
+ "Trying to end a ${_currentTypeParameterScopeBuilder.kind} as a "
+ "$kind.");
assert(
- name == currentTypeParameterScopeBuilder.name,
+ name == _currentTypeParameterScopeBuilder.name,
// Coverage-ignore(suite): Not run.
- "${name} != ${currentTypeParameterScopeBuilder.name}");
- currentTypeParameterScopeBuilder = currentTypeParameterScopeBuilder.parent!;
+ "${name} != ${_currentTypeParameterScopeBuilder.name}");
+ _currentTypeParameterScopeBuilder =
+ _currentTypeParameterScopeBuilder.parent!;
TypeScope typeParameterScope = _typeScopes.pop();
assert(
@@ -372,11 +385,13 @@
List<NominalVariableBuilder>? typeVariables) {
TypeParameterScopeKind kind = TypeParameterScopeKind.namedMixinApplication;
assert(
- currentTypeParameterScopeBuilder.kind == kind,
+ _currentTypeParameterScopeBuilder.kind == kind,
// Coverage-ignore(suite): Not run.
"Unexpected declaration. "
- "Trying to end a ${currentTypeParameterScopeBuilder.kind} as a $kind.");
- currentTypeParameterScopeBuilder = currentTypeParameterScopeBuilder.parent!;
+ "Trying to end a ${_currentTypeParameterScopeBuilder.kind} as a "
+ "$kind.");
+ _currentTypeParameterScopeBuilder =
+ _currentTypeParameterScopeBuilder.parent!;
TypeScope typeParameterScope = _typeScopes.pop();
assert(
@@ -391,7 +406,7 @@
@override
void beginEnumDeclarationHeader(String name) {
- currentTypeParameterScopeBuilder = currentTypeParameterScopeBuilder
+ _currentTypeParameterScopeBuilder = _currentTypeParameterScopeBuilder
.createNested(TypeParameterScopeKind.enumDeclaration, name);
NominalParameterNameSpace nominalParameterNameSpace =
new NominalParameterNameSpace();
@@ -406,7 +421,7 @@
@override
void beginEnumDeclaration(String name, int charOffset,
List<NominalVariableBuilder>? typeVariables) {
- currentTypeParameterScopeBuilder.markAsEnumDeclaration(
+ _currentTypeParameterScopeBuilder.markAsEnumDeclaration(
name, charOffset, typeVariables);
_declarationFragments.push(
new EnumFragment(name, charOffset, _typeScopes.current.lookupScope));
@@ -422,16 +437,18 @@
void endEnumDeclaration(String name) {
TypeParameterScopeKind kind = TypeParameterScopeKind.enumDeclaration;
assert(
- currentTypeParameterScopeBuilder.kind == kind,
+ _currentTypeParameterScopeBuilder.kind == kind,
// Coverage-ignore(suite): Not run.
"Unexpected declaration. "
- "Trying to end a ${currentTypeParameterScopeBuilder.kind} as a $kind.");
+ "Trying to end a ${_currentTypeParameterScopeBuilder.kind} as a "
+ "$kind.");
assert(
- name == currentTypeParameterScopeBuilder.name,
+ name == _currentTypeParameterScopeBuilder.name,
// Coverage-ignore(suite): Not run.
- "${name} != ${currentTypeParameterScopeBuilder.name}");
+ "${name} != ${_currentTypeParameterScopeBuilder.name}");
- currentTypeParameterScopeBuilder = currentTypeParameterScopeBuilder.parent!;
+ _currentTypeParameterScopeBuilder =
+ _currentTypeParameterScopeBuilder.parent!;
TypeScope bodyScope = _typeScopes.pop();
assert(
@@ -450,11 +467,13 @@
List<NominalVariableBuilder>? typeVariables) {
TypeParameterScopeKind kind = TypeParameterScopeKind.enumDeclaration;
assert(
- currentTypeParameterScopeBuilder.kind == kind,
+ _currentTypeParameterScopeBuilder.kind == kind,
// Coverage-ignore(suite): Not run.
"Unexpected declaration. "
- "Trying to end a ${currentTypeParameterScopeBuilder.kind} as a $kind.");
- currentTypeParameterScopeBuilder = currentTypeParameterScopeBuilder.parent!;
+ "Trying to end a ${_currentTypeParameterScopeBuilder.kind} as a "
+ "$kind.");
+ _currentTypeParameterScopeBuilder =
+ _currentTypeParameterScopeBuilder.parent!;
TypeScope bodyScope = _typeScopes.pop();
assert(
@@ -475,8 +494,8 @@
@override
void beginExtensionOrExtensionTypeHeader() {
- currentTypeParameterScopeBuilder =
- currentTypeParameterScopeBuilder.createNested(
+ _currentTypeParameterScopeBuilder =
+ _currentTypeParameterScopeBuilder.createNested(
TypeParameterScopeKind.extensionOrExtensionTypeDeclaration,
"extension");
NominalParameterNameSpace nominalParameterNameSpace =
@@ -492,7 +511,7 @@
@override
void beginExtensionDeclaration(String? name, int charOffset,
List<NominalVariableBuilder>? typeVariables) {
- currentTypeParameterScopeBuilder.markAsExtensionDeclaration(
+ _currentTypeParameterScopeBuilder.markAsExtensionDeclaration(
name, charOffset, typeVariables);
_declarationFragments.push(new ExtensionFragment(
name, charOffset, _typeScopes.current.lookupScope));
@@ -503,7 +522,7 @@
_typeScopes.push(new TypeScope(TypeScopeKind.extensionDeclaration,
_declarationFragments.current.bodyScope, _typeScopes.current));
if (extensionThisType != null) {
- currentTypeParameterScopeBuilder
+ _currentTypeParameterScopeBuilder
.registerExtensionThisType(extensionThisType);
}
}
@@ -512,18 +531,20 @@
TypeParameterScopeBuilder endExtensionDeclaration(String? name) {
TypeParameterScopeKind kind = TypeParameterScopeKind.extensionDeclaration;
assert(
- currentTypeParameterScopeBuilder.kind == kind,
+ _currentTypeParameterScopeBuilder.kind == kind,
// Coverage-ignore(suite): Not run.
"Unexpected declaration. "
- "Trying to end a ${currentTypeParameterScopeBuilder.kind} as a $kind.");
+ "Trying to end a ${_currentTypeParameterScopeBuilder.kind} as a "
+ "$kind.");
assert(
- name == currentTypeParameterScopeBuilder.name ||
- currentTypeParameterScopeBuilder.name ==
+ name == _currentTypeParameterScopeBuilder.name ||
+ _currentTypeParameterScopeBuilder.name ==
UnnamedExtensionName.unnamedExtensionSentinel,
// Coverage-ignore(suite): Not run.
- "${name} != ${currentTypeParameterScopeBuilder.name}");
- TypeParameterScopeBuilder previous = currentTypeParameterScopeBuilder;
- currentTypeParameterScopeBuilder = currentTypeParameterScopeBuilder.parent!;
+ "${name} != ${_currentTypeParameterScopeBuilder.name}");
+ TypeParameterScopeBuilder previous = _currentTypeParameterScopeBuilder;
+ _currentTypeParameterScopeBuilder =
+ _currentTypeParameterScopeBuilder.parent!;
TypeScope bodyScope = _typeScopes.pop();
assert(
@@ -542,7 +563,7 @@
@override
void beginExtensionTypeDeclaration(String name, int charOffset,
List<NominalVariableBuilder>? typeVariables) {
- currentTypeParameterScopeBuilder.markAsExtensionTypeDeclaration(
+ _currentTypeParameterScopeBuilder.markAsExtensionTypeDeclaration(
name, charOffset, typeVariables);
_declarationFragments.push(new ExtensionTypeFragment(
name, charOffset, _typeScopes.current.lookupScope));
@@ -559,16 +580,18 @@
TypeParameterScopeKind kind =
TypeParameterScopeKind.extensionTypeDeclaration;
assert(
- currentTypeParameterScopeBuilder.kind == kind,
+ _currentTypeParameterScopeBuilder.kind == kind,
// Coverage-ignore(suite): Not run.
"Unexpected declaration. "
- "Trying to end a ${currentTypeParameterScopeBuilder.kind} as a $kind.");
+ "Trying to end a ${_currentTypeParameterScopeBuilder.kind} as a "
+ "$kind.");
assert(
- name == currentTypeParameterScopeBuilder.name,
+ name == _currentTypeParameterScopeBuilder.name,
// Coverage-ignore(suite): Not run.
- "${name} != ${currentTypeParameterScopeBuilder.name}");
- TypeParameterScopeBuilder previous = currentTypeParameterScopeBuilder;
- currentTypeParameterScopeBuilder = currentTypeParameterScopeBuilder.parent!;
+ "${name} != ${_currentTypeParameterScopeBuilder.name}");
+ TypeParameterScopeBuilder previous = _currentTypeParameterScopeBuilder;
+ _currentTypeParameterScopeBuilder =
+ _currentTypeParameterScopeBuilder.parent!;
TypeScope bodyScope = _typeScopes.pop();
assert(
@@ -586,7 +609,7 @@
@override
void beginFactoryMethod() {
- currentTypeParameterScopeBuilder = currentTypeParameterScopeBuilder
+ _currentTypeParameterScopeBuilder = _currentTypeParameterScopeBuilder
.createNested(TypeParameterScopeKind.factoryMethod, "#factory_method");
NominalParameterNameSpace nominalParameterNameSpace =
new NominalParameterNameSpace();
@@ -602,11 +625,13 @@
void endFactoryMethod() {
TypeParameterScopeKind kind = TypeParameterScopeKind.factoryMethod;
assert(
- currentTypeParameterScopeBuilder.kind == kind,
+ _currentTypeParameterScopeBuilder.kind == kind,
// Coverage-ignore(suite): Not run.
"Unexpected declaration. "
- "Trying to end a ${currentTypeParameterScopeBuilder.kind} as a $kind.");
- currentTypeParameterScopeBuilder = currentTypeParameterScopeBuilder.parent!;
+ "Trying to end a ${_currentTypeParameterScopeBuilder.kind} as a "
+ "$kind.");
+ _currentTypeParameterScopeBuilder =
+ _currentTypeParameterScopeBuilder.parent!;
TypeScope typeVariableScope = _typeScopes.pop();
assert(
typeVariableScope.kind == TypeScopeKind.memberTypeParameters,
@@ -619,10 +644,12 @@
void endFactoryMethodForParserRecovery() {
TypeParameterScopeKind kind = TypeParameterScopeKind.factoryMethod;
assert(
- currentTypeParameterScopeBuilder.kind == kind,
+ _currentTypeParameterScopeBuilder.kind == kind,
"Unexpected declaration. "
- "Trying to end a ${currentTypeParameterScopeBuilder.kind} as a $kind.");
- currentTypeParameterScopeBuilder = currentTypeParameterScopeBuilder.parent!;
+ "Trying to end a ${_currentTypeParameterScopeBuilder.kind} as a "
+ "$kind.");
+ _currentTypeParameterScopeBuilder =
+ _currentTypeParameterScopeBuilder.parent!;
TypeScope typeVariableScope = _typeScopes.pop();
assert(typeVariableScope.kind == TypeScopeKind.memberTypeParameters,
"Unexpected type scope: $typeVariableScope.");
@@ -633,7 +660,7 @@
@override
void beginConstructor() {
- currentTypeParameterScopeBuilder = currentTypeParameterScopeBuilder
+ _currentTypeParameterScopeBuilder = _currentTypeParameterScopeBuilder
.createNested(TypeParameterScopeKind.constructor, "#method");
NominalParameterNameSpace nominalParameterNameSpace =
new NominalParameterNameSpace();
@@ -649,11 +676,13 @@
void endConstructor() {
TypeParameterScopeKind kind = TypeParameterScopeKind.constructor;
assert(
- currentTypeParameterScopeBuilder.kind == kind,
+ _currentTypeParameterScopeBuilder.kind == kind,
// Coverage-ignore(suite): Not run.
"Unexpected declaration. "
- "Trying to end a ${currentTypeParameterScopeBuilder.kind} as a $kind.");
- currentTypeParameterScopeBuilder = currentTypeParameterScopeBuilder.parent!;
+ "Trying to end a ${_currentTypeParameterScopeBuilder.kind} as a "
+ "$kind.");
+ _currentTypeParameterScopeBuilder =
+ _currentTypeParameterScopeBuilder.parent!;
TypeScope typeVariableScope = _typeScopes.pop();
assert(
typeVariableScope.kind == TypeScopeKind.memberTypeParameters,
@@ -666,11 +695,13 @@
List<NominalVariableBuilder>? typeVariables) {
TypeParameterScopeKind kind = TypeParameterScopeKind.constructor;
assert(
- currentTypeParameterScopeBuilder.kind == kind,
+ _currentTypeParameterScopeBuilder.kind == kind,
// Coverage-ignore(suite): Not run.
"Unexpected declaration. "
- "Trying to end a ${currentTypeParameterScopeBuilder.kind} as a $kind.");
- currentTypeParameterScopeBuilder = currentTypeParameterScopeBuilder.parent!;
+ "Trying to end a ${_currentTypeParameterScopeBuilder.kind} as a "
+ "$kind.");
+ _currentTypeParameterScopeBuilder =
+ _currentTypeParameterScopeBuilder.parent!;
TypeScope typeVariableScope = _typeScopes.pop();
assert(
typeVariableScope.kind == TypeScopeKind.memberTypeParameters,
@@ -684,7 +715,7 @@
@override
void beginStaticMethod() {
- currentTypeParameterScopeBuilder = currentTypeParameterScopeBuilder
+ _currentTypeParameterScopeBuilder = _currentTypeParameterScopeBuilder
.createNested(TypeParameterScopeKind.staticMethod, "#method");
NominalParameterNameSpace nominalParameterNameSpace =
new NominalParameterNameSpace();
@@ -700,11 +731,13 @@
void endStaticMethod() {
TypeParameterScopeKind kind = TypeParameterScopeKind.staticMethod;
assert(
- currentTypeParameterScopeBuilder.kind == kind,
+ _currentTypeParameterScopeBuilder.kind == kind,
// Coverage-ignore(suite): Not run.
"Unexpected declaration. "
- "Trying to end a ${currentTypeParameterScopeBuilder.kind} as a $kind.");
- currentTypeParameterScopeBuilder = currentTypeParameterScopeBuilder.parent!;
+ "Trying to end a ${_currentTypeParameterScopeBuilder.kind} as a "
+ "$kind.");
+ _currentTypeParameterScopeBuilder =
+ _currentTypeParameterScopeBuilder.parent!;
TypeScope typeVariableScope = _typeScopes.pop();
assert(
typeVariableScope.kind == TypeScopeKind.memberTypeParameters,
@@ -718,10 +751,12 @@
List<NominalVariableBuilder>? typeVariables) {
TypeParameterScopeKind kind = TypeParameterScopeKind.staticMethod;
assert(
- currentTypeParameterScopeBuilder.kind == kind,
+ _currentTypeParameterScopeBuilder.kind == kind,
"Unexpected declaration. "
- "Trying to end a ${currentTypeParameterScopeBuilder.kind} as a $kind.");
- currentTypeParameterScopeBuilder = currentTypeParameterScopeBuilder.parent!;
+ "Trying to end a ${_currentTypeParameterScopeBuilder.kind} as a "
+ "$kind.");
+ _currentTypeParameterScopeBuilder =
+ _currentTypeParameterScopeBuilder.parent!;
TypeScope typeVariableScope = _typeScopes.pop();
assert(typeVariableScope.kind == TypeScopeKind.memberTypeParameters,
"Unexpected type scope: $typeVariableScope.");
@@ -733,7 +768,7 @@
@override
void beginInstanceMethod() {
- currentTypeParameterScopeBuilder = currentTypeParameterScopeBuilder
+ _currentTypeParameterScopeBuilder = _currentTypeParameterScopeBuilder
.createNested(TypeParameterScopeKind.instanceMethod, "#method");
NominalParameterNameSpace nominalParameterNameSpace =
new NominalParameterNameSpace();
@@ -749,11 +784,13 @@
void endInstanceMethod() {
TypeParameterScopeKind kind = TypeParameterScopeKind.instanceMethod;
assert(
- currentTypeParameterScopeBuilder.kind == kind,
+ _currentTypeParameterScopeBuilder.kind == kind,
// Coverage-ignore(suite): Not run.
"Unexpected declaration. "
- "Trying to end a ${currentTypeParameterScopeBuilder.kind} as a $kind.");
- currentTypeParameterScopeBuilder = currentTypeParameterScopeBuilder.parent!;
+ "Trying to end a ${_currentTypeParameterScopeBuilder.kind} as a "
+ "$kind.");
+ _currentTypeParameterScopeBuilder =
+ _currentTypeParameterScopeBuilder.parent!;
TypeScope typeVariableScope = _typeScopes.pop();
assert(
typeVariableScope.kind == TypeScopeKind.memberTypeParameters,
@@ -766,11 +803,13 @@
List<NominalVariableBuilder>? typeVariables) {
TypeParameterScopeKind kind = TypeParameterScopeKind.instanceMethod;
assert(
- currentTypeParameterScopeBuilder.kind == kind,
+ _currentTypeParameterScopeBuilder.kind == kind,
// Coverage-ignore(suite): Not run.
"Unexpected declaration. "
- "Trying to end a ${currentTypeParameterScopeBuilder.kind} as a $kind.");
- currentTypeParameterScopeBuilder = currentTypeParameterScopeBuilder.parent!;
+ "Trying to end a ${_currentTypeParameterScopeBuilder.kind} as a "
+ "$kind.");
+ _currentTypeParameterScopeBuilder =
+ _currentTypeParameterScopeBuilder.parent!;
TypeScope typeVariableScope = _typeScopes.pop();
assert(
typeVariableScope.kind == TypeScopeKind.memberTypeParameters,
@@ -784,7 +823,7 @@
@override
void beginTopLevelMethod() {
- currentTypeParameterScopeBuilder = currentTypeParameterScopeBuilder
+ _currentTypeParameterScopeBuilder = _currentTypeParameterScopeBuilder
.createNested(TypeParameterScopeKind.topLevelMethod, "#method");
NominalParameterNameSpace nominalParameterNameSpace =
new NominalParameterNameSpace();
@@ -800,11 +839,13 @@
void endTopLevelMethod() {
TypeParameterScopeKind kind = TypeParameterScopeKind.topLevelMethod;
assert(
- currentTypeParameterScopeBuilder.kind == kind,
+ _currentTypeParameterScopeBuilder.kind == kind,
// Coverage-ignore(suite): Not run.
"Unexpected declaration. "
- "Trying to end a ${currentTypeParameterScopeBuilder.kind} as a $kind.");
- currentTypeParameterScopeBuilder = currentTypeParameterScopeBuilder.parent!;
+ "Trying to end a ${_currentTypeParameterScopeBuilder.kind} as a "
+ "$kind.");
+ _currentTypeParameterScopeBuilder =
+ _currentTypeParameterScopeBuilder.parent!;
TypeScope typeVariableScope = _typeScopes.pop();
assert(
typeVariableScope.kind == TypeScopeKind.memberTypeParameters,
@@ -817,11 +858,13 @@
List<NominalVariableBuilder>? typeVariables) {
TypeParameterScopeKind kind = TypeParameterScopeKind.topLevelMethod;
assert(
- currentTypeParameterScopeBuilder.kind == kind,
+ _currentTypeParameterScopeBuilder.kind == kind,
// Coverage-ignore(suite): Not run.
"Unexpected declaration. "
- "Trying to end a ${currentTypeParameterScopeBuilder.kind} as a $kind.");
- currentTypeParameterScopeBuilder = currentTypeParameterScopeBuilder.parent!;
+ "Trying to end a ${_currentTypeParameterScopeBuilder.kind} as a "
+ "$kind.");
+ _currentTypeParameterScopeBuilder =
+ _currentTypeParameterScopeBuilder.parent!;
TypeScope typeVariableScope = _typeScopes.pop();
assert(
typeVariableScope.kind == TypeScopeKind.memberTypeParameters,
@@ -835,7 +878,7 @@
@override
void beginTypedef() {
- currentTypeParameterScopeBuilder = currentTypeParameterScopeBuilder
+ _currentTypeParameterScopeBuilder = _currentTypeParameterScopeBuilder
.createNested(TypeParameterScopeKind.typedef, "#typedef");
NominalParameterNameSpace nominalParameterNameSpace =
new NominalParameterNameSpace();
@@ -851,11 +894,13 @@
void endTypedef() {
TypeParameterScopeKind kind = TypeParameterScopeKind.typedef;
assert(
- currentTypeParameterScopeBuilder.kind == kind,
+ _currentTypeParameterScopeBuilder.kind == kind,
// Coverage-ignore(suite): Not run.
"Unexpected declaration. "
- "Trying to end a ${currentTypeParameterScopeBuilder.kind} as a $kind.");
- currentTypeParameterScopeBuilder = currentTypeParameterScopeBuilder.parent!;
+ "Trying to end a ${_currentTypeParameterScopeBuilder.kind} as a "
+ "$kind.");
+ _currentTypeParameterScopeBuilder =
+ _currentTypeParameterScopeBuilder.parent!;
TypeScope typeVariableScope = _typeScopes.pop();
assert(
typeVariableScope.kind == TypeScopeKind.declarationTypeParameters,
@@ -869,10 +914,12 @@
List<NominalVariableBuilder>? typeVariables) {
TypeParameterScopeKind kind = TypeParameterScopeKind.typedef;
assert(
- currentTypeParameterScopeBuilder.kind == kind,
+ _currentTypeParameterScopeBuilder.kind == kind,
"Unexpected declaration. "
- "Trying to end a ${currentTypeParameterScopeBuilder.kind} as a $kind.");
- currentTypeParameterScopeBuilder = currentTypeParameterScopeBuilder.parent!;
+ "Trying to end a ${_currentTypeParameterScopeBuilder.kind} as a "
+ "$kind.");
+ _currentTypeParameterScopeBuilder =
+ _currentTypeParameterScopeBuilder.parent!;
TypeScope typeVariableScope = _typeScopes.pop();
assert(typeVariableScope.kind == TypeScopeKind.declarationTypeParameters,
"Unexpected type scope: $typeVariableScope.");
@@ -884,7 +931,7 @@
@override
void beginFunctionType() {
- currentTypeParameterScopeBuilder = currentTypeParameterScopeBuilder
+ _currentTypeParameterScopeBuilder = _currentTypeParameterScopeBuilder
.createNested(TypeParameterScopeKind.functionType, "#function_type");
Map<String, StructuralVariableBuilder> structuralParameterScope = {};
_structuralParameterScopes.push(structuralParameterScope);
@@ -899,11 +946,13 @@
void endFunctionType() {
TypeParameterScopeKind kind = TypeParameterScopeKind.functionType;
assert(
- currentTypeParameterScopeBuilder.kind == kind,
+ _currentTypeParameterScopeBuilder.kind == kind,
// Coverage-ignore(suite): Not run.
"Unexpected declaration. "
- "Trying to end a ${currentTypeParameterScopeBuilder.kind} as a $kind.");
- currentTypeParameterScopeBuilder = currentTypeParameterScopeBuilder.parent!;
+ "Trying to end a ${_currentTypeParameterScopeBuilder.kind} as a "
+ "$kind.");
+ _currentTypeParameterScopeBuilder =
+ _currentTypeParameterScopeBuilder.parent!;
TypeScope typeVariableScope = _typeScopes.pop();
assert(
typeVariableScope.kind == TypeScopeKind.functionTypeParameters,
@@ -912,8 +961,8 @@
}
void beginUnnamedMixinApplication() {
- currentTypeParameterScopeBuilder =
- currentTypeParameterScopeBuilder.createNested(
+ _currentTypeParameterScopeBuilder =
+ _currentTypeParameterScopeBuilder.createNested(
TypeParameterScopeKind.unnamedMixinApplication,
"mixin application");
NominalParameterNameSpace nominalParameterNameSpace =
@@ -930,11 +979,13 @@
TypeParameterScopeKind kind =
TypeParameterScopeKind.unnamedMixinApplication;
assert(
- currentTypeParameterScopeBuilder.kind == kind,
+ _currentTypeParameterScopeBuilder.kind == kind,
// Coverage-ignore(suite): Not run.
"Unexpected declaration. "
- "Trying to end a ${currentTypeParameterScopeBuilder.kind} as a $kind.");
- currentTypeParameterScopeBuilder = currentTypeParameterScopeBuilder.parent!;
+ "Trying to end a ${_currentTypeParameterScopeBuilder.kind} as a "
+ "$kind.");
+ _currentTypeParameterScopeBuilder =
+ _currentTypeParameterScopeBuilder.parent!;
TypeScope typeVariableScope = _typeScopes.pop();
assert(
typeVariableScope.kind == TypeScopeKind.unnamedMixinApplication,
@@ -1697,7 +1748,8 @@
: isMixinDeclaration
? [supertype!, mixin]
: null,
- null, // No `on` clause types.
+ null,
+ // No `on` clause types.
typeParameterScope,
nameSpaceBuilder,
_parent,
@@ -1933,11 +1985,11 @@
String? constructorName;
if (isConstructor) {
constructorName = computeAndValidateConstructorName(
- currentTypeParameterScopeBuilder, identifier) ??
+ _currentTypeParameterScopeBuilder, identifier) ??
name;
}
bool cloneTypeVariablesFromEnclosingDeclaration;
- switch (currentTypeParameterScopeBuilder.kind) {
+ switch (_currentTypeParameterScopeBuilder.kind) {
case TypeParameterScopeKind.extensionDeclaration:
case TypeParameterScopeKind.extensionTypeDeclaration:
cloneTypeVariablesFromEnclosingDeclaration = !isStatic;
@@ -1959,7 +2011,7 @@
cloneTypeVariablesFromEnclosingDeclaration = false;
}
if (cloneTypeVariablesFromEnclosingDeclaration) {
- TypeParameterScopeBuilder declaration = currentTypeParameterScopeBuilder;
+ TypeParameterScopeBuilder declaration = _currentTypeParameterScopeBuilder;
NominalVariableCopy? nominalVariableCopy = copyTypeVariables(
declaration.typeVariables,
kind: TypeVariableKind.extensionSynthesized,
@@ -2102,7 +2154,7 @@
beginConstructor();
endConstructor();
NominalVariableCopy? nominalVariableCopy = copyTypeVariables(
- currentTypeParameterScopeBuilder.typeVariables,
+ _currentTypeParameterScopeBuilder.typeVariables,
kind: TypeVariableKind.extensionSynthesized,
instanceTypeVariableAccess: InstanceTypeVariableAccessState.Allowed);
List<NominalVariableBuilder>? typeVariables =
@@ -2114,11 +2166,15 @@
constructorName,
typeVariables,
formals,
- /* startCharOffset = */ charOffset,
+ /* startCharOffset = */
charOffset,
- /* charOpenParenOffset = */ charOffset,
- /* charEndOffset = */ charOffset,
- /* nativeMethodName = */ null,
+ charOffset,
+ /* charOpenParenOffset = */
+ charOffset,
+ /* charEndOffset = */
+ charOffset,
+ /* nativeMethodName = */
+ null,
forAbstractClassOrMixin: false);
offsetMap.registerPrimaryConstructor(beginToken, builder);
}
@@ -2132,13 +2188,18 @@
_declarationFragments.current.addPrimaryConstructorField(_addField(
metadata,
finalMask,
- /* isTopLevel = */ false,
+ /* isTopLevel = */
+ false,
type,
name,
- /* charOffset = */ charOffset,
- /* charEndOffset = */ charOffset,
- /* initializerToken = */ null,
- /* hasInitializer = */ false));
+ /* charOffset = */
+ charOffset,
+ /* charEndOffset = */
+ charOffset,
+ /* initializerToken = */
+ null,
+ /* hasInitializer = */
+ false));
}
SourceFunctionBuilder _addConstructor(
@@ -2179,7 +2240,7 @@
}
AbstractSourceConstructorBuilder constructorBuilder;
- if (currentTypeParameterScopeBuilder.kind ==
+ if (_currentTypeParameterScopeBuilder.kind ==
TypeParameterScopeKind.extensionTypeDeclaration) {
constructorBuilder = new SourceExtensionTypeConstructorBuilder(
metadata,
@@ -2258,12 +2319,12 @@
TypeBuilder returnType;
List<TypeBuilder>? returnTypeArguments;
TypeParameterScopeBuilder? parentDeclaration =
- currentTypeParameterScopeBuilder.parent!;
+ _currentTypeParameterScopeBuilder.parent!;
if (parentDeclaration.kind == TypeParameterScopeKind.extensionDeclaration) {
// Make the synthesized return type invalid for extensions.
- String name = currentTypeParameterScopeBuilder.parent!.name;
+ String name = _currentTypeParameterScopeBuilder.parent!.name;
returnType = new NamedTypeBuilderImpl.forInvalidType(
- currentTypeParameterScopeBuilder.parent!.name,
+ _currentTypeParameterScopeBuilder.parent!.name,
const NullabilityBuilder.omitted(),
messageExtensionDeclaresConstructor.withLocation(
_compilationUnit.fileUri, charOffset, name.length));
@@ -2420,13 +2481,13 @@
List<TypeBuilder>? typeArguments, Identifier? suffix, int charOffset) {
// At the moment, the name of the type in a constructor reference can be
// omitted only within an enum element declaration.
- if (currentTypeParameterScopeBuilder.kind ==
+ if (_currentTypeParameterScopeBuilder.kind ==
TypeParameterScopeKind.enumDeclaration) {
if (libraryFeatures.enhancedEnums.isEnabled) {
int constructorNameOffset = suffix?.nameOffset ?? charOffset;
return addConstructorReference(
new SyntheticTypeName(
- currentTypeParameterScopeBuilder.name, constructorNameOffset),
+ _currentTypeParameterScopeBuilder.name, constructorNameOffset),
typeArguments,
suffix?.name,
constructorNameOffset);
@@ -2517,10 +2578,10 @@
required bool isExtensionMember,
required bool isExtensionTypeMember}) {
assert(!isExtensionMember ||
- currentTypeParameterScopeBuilder.kind ==
+ _currentTypeParameterScopeBuilder.kind ==
TypeParameterScopeKind.extensionDeclaration);
assert(!isExtensionTypeMember ||
- currentTypeParameterScopeBuilder.kind ==
+ _currentTypeParameterScopeBuilder.kind ==
TypeParameterScopeKind.extensionTypeDeclaration);
DeclarationFragment? enclosingDeclaration =
_declarationFragments.currentOrNull;
@@ -2668,12 +2729,12 @@
(loader.target.backendTarget.useStaticFieldLowering &&
(isStatic || isTopLevel)));
- final bool isInstanceMember = currentTypeParameterScopeBuilder.kind !=
+ final bool isInstanceMember = _currentTypeParameterScopeBuilder.kind !=
TypeParameterScopeKind.library &&
(modifiers & staticMask) == 0;
- final bool isExtensionMember = currentTypeParameterScopeBuilder.kind ==
+ final bool isExtensionMember = _currentTypeParameterScopeBuilder.kind ==
TypeParameterScopeKind.extensionDeclaration;
- final bool isExtensionTypeMember = currentTypeParameterScopeBuilder.kind ==
+ final bool isExtensionTypeMember = _currentTypeParameterScopeBuilder.kind ==
TypeParameterScopeKind.extensionTypeDeclaration;
DeclarationFragment? enclosingDeclaration =
_declarationFragments.currentOrNull;
@@ -3039,7 +3100,8 @@
}
void _addBuilder(String name, Builder declaration, int charOffset) {
- if (currentTypeParameterScopeBuilder == _libraryTypeParameterScopeBuilder) {
+ if (_currentTypeParameterScopeBuilder ==
+ _libraryTypeParameterScopeBuilder) {
_addBuilderToLibrary(name, declaration, charOffset);
} else {
_addBuilderToDeclaration(name, declaration, charOffset);
@@ -3049,11 +3111,11 @@
Builder _addBuilderToLibrary(
String name, Builder declaration, int charOffset) {
assert(
- currentTypeParameterScopeBuilder == _libraryTypeParameterScopeBuilder);
+ _currentTypeParameterScopeBuilder == _libraryTypeParameterScopeBuilder);
if (declaration is SourceExtensionBuilder &&
declaration.isUnnamedExtension) {
declaration.parent = _parent;
- currentTypeParameterScopeBuilder.extensions!.add(declaration);
+ _currentTypeParameterScopeBuilder.extensions!.add(declaration);
return declaration;
}
@@ -3075,8 +3137,8 @@
"Unexpected constructor in library: $declaration.");
Map<String, Builder> members = declaration.isSetter
- ? currentTypeParameterScopeBuilder.setters!
- : currentTypeParameterScopeBuilder.members!;
+ ? _currentTypeParameterScopeBuilder.setters!
+ : _currentTypeParameterScopeBuilder.members!;
Builder? existing = members[name];
@@ -3135,15 +3197,15 @@
// We add the extension declaration to the extension scope only if its
// name is unique. Only the first of duplicate extensions is accessible
// by name or by resolution and the remaining are dropped for the output.
- currentTypeParameterScopeBuilder.extensions!
+ _currentTypeParameterScopeBuilder.extensions!
.add(declaration as SourceExtensionBuilder);
} else if (declaration.isAugment) {
if (existing != null) {
if (declaration.isSetter) {
- (currentTypeParameterScopeBuilder.setterAugmentations[name] ??= [])
+ (_currentTypeParameterScopeBuilder.setterAugmentations[name] ??= [])
.add(declaration);
} else {
- (currentTypeParameterScopeBuilder.augmentations[name] ??= [])
+ (_currentTypeParameterScopeBuilder.augmentations[name] ??= [])
.add(declaration);
}
} else {
@@ -3158,7 +3220,7 @@
void _addBuilderToDeclaration(
String name, Builder declaration, int charOffset) {
- assert(currentTypeParameterScopeBuilder.parent ==
+ assert(_currentTypeParameterScopeBuilder.parent ==
_libraryTypeParameterScopeBuilder);
_declarationFragments.current
diff --git a/pkg/front_end/lib/src/util/parser_ast_helper.dart b/pkg/front_end/lib/src/util/parser_ast_helper.dart
index cb904ad..d3381b70 100644
--- a/pkg/front_end/lib/src/util/parser_ast_helper.dart
+++ b/pkg/front_end/lib/src/util/parser_ast_helper.dart
@@ -1526,7 +1526,8 @@
Token? covariantToken,
Token? varFinalOrConst,
Token? getOrSet,
- Token name) {
+ Token name,
+ String? enclosingDeclarationName) {
MethodBegin data = new MethodBegin(ParserAstType.BEGIN,
declarationKind: declarationKind,
augmentToken: augmentToken,
@@ -1535,7 +1536,8 @@
covariantToken: covariantToken,
varFinalOrConst: varFinalOrConst,
getOrSet: getOrSet,
- name: name);
+ name: name,
+ enclosingDeclarationName: enclosingDeclarationName);
seen(data);
}
@@ -6416,6 +6418,7 @@
final Token? varFinalOrConst;
final Token? getOrSet;
final Token name;
+ final String? enclosingDeclarationName;
MethodBegin(ParserAstType type,
{required this.declarationKind,
@@ -6425,7 +6428,8 @@
this.covariantToken,
this.varFinalOrConst,
this.getOrSet,
- required this.name})
+ required this.name,
+ this.enclosingDeclarationName})
: super("Method", type);
@override
@@ -6438,6 +6442,7 @@
"varFinalOrConst": varFinalOrConst,
"getOrSet": getOrSet,
"name": name,
+ "enclosingDeclarationName": enclosingDeclarationName,
};
@override
diff --git a/pkg/front_end/parser_testcases/augmentation/augment_super.dart.expect b/pkg/front_end/parser_testcases/augmentation/augment_super.dart.expect
index 2437bca..8092d16 100644
--- a/pkg/front_end/parser_testcases/augmentation/augment_super.dart.expect
+++ b/pkg/front_end/parser_testcases/augmentation/augment_super.dart.expect
@@ -195,7 +195,7 @@
beginMetadataStar(augment)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, augment, null, null, null, null, null, instanceMethod)
+ beginMethod(DeclarationKind.Class, augment, null, null, null, null, null, instanceMethod, Class)
handleVoidKeyword(void)
handleIdentifier(instanceMethod, methodDeclaration)
handleNoTypeVariables(()
@@ -216,7 +216,7 @@
beginMetadataStar(augment)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, augment, null, null, null, null, null, instanceMethodErrors)
+ beginMethod(DeclarationKind.Class, augment, null, null, null, null, null, instanceMethodErrors, Class)
handleVoidKeyword(void)
handleIdentifier(instanceMethodErrors, methodDeclaration)
handleNoTypeVariables(()
@@ -248,7 +248,7 @@
beginMetadataStar(augment)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, augment, null, null, null, null, get, instanceProperty)
+ beginMethod(DeclarationKind.Class, augment, null, null, null, null, get, instanceProperty, Class)
handleIdentifier(int, typeReference)
handleNoTypeArguments(get)
handleType(int, null)
@@ -274,7 +274,7 @@
beginMetadataStar(augment)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, augment, null, null, null, null, set, instanceProperty)
+ beginMethod(DeclarationKind.Class, augment, null, null, null, null, set, instanceProperty, Class)
handleVoidKeyword(void)
handleIdentifier(instanceProperty, methodDeclaration)
handleNoTypeVariables(()
@@ -305,7 +305,7 @@
beginMetadataStar(void)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, injectedInstanceMethod)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, injectedInstanceMethod, Class)
handleVoidKeyword(void)
handleIdentifier(injectedInstanceMethod, methodDeclaration)
handleNoTypeVariables(()
diff --git a/pkg/front_end/parser_testcases/augmentation/augment_super.dart.intertwined.expect b/pkg/front_end/parser_testcases/augmentation/augment_super.dart.intertwined.expect
index 79e1bb0..703b1bb 100644
--- a/pkg/front_end/parser_testcases/augmentation/augment_super.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/augmentation/augment_super.dart.intertwined.expect
@@ -437,7 +437,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod({, null, augment, null, null, null, null, null, augment, VoidType(), null, instanceMethod, DeclarationKind.Class, Class, false)
- listener: beginMethod(DeclarationKind.Class, augment, null, null, null, null, null, instanceMethod)
+ listener: beginMethod(DeclarationKind.Class, augment, null, null, null, null, null, instanceMethod, Class)
listener: handleVoidKeyword(void)
ensureIdentifierPotentiallyRecovered(void, methodDeclaration, false)
listener: handleIdentifier(instanceMethod, methodDeclaration)
@@ -487,7 +487,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(}, null, augment, null, null, null, null, null, augment, VoidType(), null, instanceMethodErrors, DeclarationKind.Class, Class, false)
- listener: beginMethod(DeclarationKind.Class, augment, null, null, null, null, null, instanceMethodErrors)
+ listener: beginMethod(DeclarationKind.Class, augment, null, null, null, null, null, instanceMethodErrors, Class)
listener: handleVoidKeyword(void)
ensureIdentifierPotentiallyRecovered(void, methodDeclaration, false)
listener: handleIdentifier(instanceMethodErrors, methodDeclaration)
@@ -566,7 +566,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(}, null, augment, null, null, null, null, null, augment, SimpleType(), get, instanceProperty, DeclarationKind.Class, Class, false)
- listener: beginMethod(DeclarationKind.Class, augment, null, null, null, null, get, instanceProperty)
+ listener: beginMethod(DeclarationKind.Class, augment, null, null, null, null, get, instanceProperty, Class)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(get)
listener: handleType(int, null)
@@ -645,7 +645,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(}, null, augment, null, null, null, null, null, augment, VoidType(), set, instanceProperty, DeclarationKind.Class, Class, false)
- listener: beginMethod(DeclarationKind.Class, augment, null, null, null, null, set, instanceProperty)
+ listener: beginMethod(DeclarationKind.Class, augment, null, null, null, null, set, instanceProperty, Class)
listener: handleVoidKeyword(void)
ensureIdentifierPotentiallyRecovered(set, methodDeclaration, false)
listener: handleIdentifier(instanceProperty, methodDeclaration)
@@ -714,7 +714,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(}, null, null, null, null, null, null, null, }, VoidType(), null, injectedInstanceMethod, DeclarationKind.Class, Class, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, injectedInstanceMethod)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, injectedInstanceMethod, Class)
listener: handleVoidKeyword(void)
ensureIdentifierPotentiallyRecovered(void, methodDeclaration, false)
listener: handleIdentifier(injectedInstanceMethod, methodDeclaration)
diff --git a/pkg/front_end/parser_testcases/augmentation/member_declarations.dart.expect b/pkg/front_end/parser_testcases/augmentation/member_declarations.dart.expect
index a55ea14..a7ebff9 100644
--- a/pkg/front_end/parser_testcases/augmentation/member_declarations.dart.expect
+++ b/pkg/front_end/parser_testcases/augmentation/member_declarations.dart.expect
@@ -14,7 +14,7 @@
beginMetadataStar(augment)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, augment, null, null, null, null, null, method)
+ beginMethod(DeclarationKind.Class, augment, null, null, null, null, null, method, Class)
handleNoType(augment)
handleIdentifier(method, methodDeclaration)
handleNoTypeVariables(()
@@ -29,7 +29,7 @@
beginMetadataStar(augment)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, augment, null, null, null, null, null, method)
+ beginMethod(DeclarationKind.Class, augment, null, null, null, null, null, method, Class)
handleVoidKeyword(void)
handleIdentifier(method, methodDeclaration)
handleNoTypeVariables(()
@@ -44,7 +44,7 @@
beginMetadataStar(augment)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, augment, null, null, null, null, get, getter)
+ beginMethod(DeclarationKind.Class, augment, null, null, null, null, get, getter, Class)
handleNoType(augment)
handleIdentifier(getter, methodDeclaration)
handleNoTypeVariables(=>)
@@ -58,7 +58,7 @@
beginMetadataStar(augment)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, augment, null, null, null, null, get, getter)
+ beginMethod(DeclarationKind.Class, augment, null, null, null, null, get, getter, Class)
handleIdentifier(int, typeReference)
handleNoTypeArguments(get)
handleType(int, null)
@@ -74,7 +74,7 @@
beginMetadataStar(augment)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, augment, null, null, null, null, set, setter)
+ beginMethod(DeclarationKind.Class, augment, null, null, null, null, set, setter, Class)
handleNoType(augment)
handleIdentifier(setter, methodDeclaration)
handleNoTypeVariables(()
@@ -96,7 +96,7 @@
beginMetadataStar(augment)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, augment, null, null, null, null, set, setter)
+ beginMethod(DeclarationKind.Class, augment, null, null, null, null, set, setter, Class)
handleVoidKeyword(void)
handleIdentifier(setter, methodDeclaration)
handleNoTypeVariables(()
@@ -189,7 +189,7 @@
beginMetadataStar(augment)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, augment, null, static, null, null, null, method)
+ beginMethod(DeclarationKind.Class, augment, null, static, null, null, null, method, Class)
handleNoType(static)
handleIdentifier(method, methodDeclaration)
handleNoTypeVariables(()
@@ -204,7 +204,7 @@
beginMetadataStar(augment)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, augment, null, static, null, null, null, method)
+ beginMethod(DeclarationKind.Class, augment, null, static, null, null, null, method, Class)
handleVoidKeyword(void)
handleIdentifier(method, methodDeclaration)
handleNoTypeVariables(()
@@ -219,7 +219,7 @@
beginMetadataStar(augment)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, augment, null, static, null, null, get, getter)
+ beginMethod(DeclarationKind.Class, augment, null, static, null, null, get, getter, Class)
handleNoType(static)
handleIdentifier(getter, methodDeclaration)
handleNoTypeVariables(=>)
@@ -233,7 +233,7 @@
beginMetadataStar(augment)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, augment, null, static, null, null, get, getter)
+ beginMethod(DeclarationKind.Class, augment, null, static, null, null, get, getter, Class)
handleIdentifier(int, typeReference)
handleNoTypeArguments(get)
handleType(int, null)
@@ -249,7 +249,7 @@
beginMetadataStar(augment)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, augment, null, static, null, null, set, setter)
+ beginMethod(DeclarationKind.Class, augment, null, static, null, null, set, setter, Class)
handleNoType(static)
handleIdentifier(setter, methodDeclaration)
handleNoTypeVariables(()
@@ -271,7 +271,7 @@
beginMetadataStar(augment)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, augment, null, static, null, null, set, setter)
+ beginMethod(DeclarationKind.Class, augment, null, static, null, null, set, setter, Class)
handleVoidKeyword(void)
handleIdentifier(setter, methodDeclaration)
handleNoTypeVariables(()
@@ -377,7 +377,7 @@
beginMetadataStar(augment)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Mixin, augment, null, null, null, null, null, method)
+ beginMethod(DeclarationKind.Mixin, augment, null, null, null, null, null, method, Mixin)
handleNoType(augment)
handleIdentifier(method, methodDeclaration)
handleNoTypeVariables(()
@@ -392,7 +392,7 @@
beginMetadataStar(augment)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Mixin, augment, null, null, null, null, null, method)
+ beginMethod(DeclarationKind.Mixin, augment, null, null, null, null, null, method, Mixin)
handleVoidKeyword(void)
handleIdentifier(method, methodDeclaration)
handleNoTypeVariables(()
@@ -407,7 +407,7 @@
beginMetadataStar(augment)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Mixin, augment, null, null, null, null, get, getter)
+ beginMethod(DeclarationKind.Mixin, augment, null, null, null, null, get, getter, Mixin)
handleNoType(augment)
handleIdentifier(getter, methodDeclaration)
handleNoTypeVariables(=>)
@@ -421,7 +421,7 @@
beginMetadataStar(augment)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Mixin, augment, null, null, null, null, get, getter)
+ beginMethod(DeclarationKind.Mixin, augment, null, null, null, null, get, getter, Mixin)
handleIdentifier(int, typeReference)
handleNoTypeArguments(get)
handleType(int, null)
@@ -437,7 +437,7 @@
beginMetadataStar(augment)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Mixin, augment, null, null, null, null, set, setter)
+ beginMethod(DeclarationKind.Mixin, augment, null, null, null, null, set, setter, Mixin)
handleNoType(augment)
handleIdentifier(setter, methodDeclaration)
handleNoTypeVariables(()
@@ -459,7 +459,7 @@
beginMetadataStar(augment)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Mixin, augment, null, null, null, null, set, setter)
+ beginMethod(DeclarationKind.Mixin, augment, null, null, null, null, set, setter, Mixin)
handleVoidKeyword(void)
handleIdentifier(setter, methodDeclaration)
handleNoTypeVariables(()
@@ -552,7 +552,7 @@
beginMetadataStar(augment)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Mixin, augment, null, static, null, null, null, method)
+ beginMethod(DeclarationKind.Mixin, augment, null, static, null, null, null, method, Mixin)
handleNoType(static)
handleIdentifier(method, methodDeclaration)
handleNoTypeVariables(()
@@ -567,7 +567,7 @@
beginMetadataStar(augment)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Mixin, augment, null, static, null, null, null, method)
+ beginMethod(DeclarationKind.Mixin, augment, null, static, null, null, null, method, Mixin)
handleVoidKeyword(void)
handleIdentifier(method, methodDeclaration)
handleNoTypeVariables(()
@@ -582,7 +582,7 @@
beginMetadataStar(augment)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Mixin, augment, null, static, null, null, get, getter)
+ beginMethod(DeclarationKind.Mixin, augment, null, static, null, null, get, getter, Mixin)
handleNoType(static)
handleIdentifier(getter, methodDeclaration)
handleNoTypeVariables(=>)
@@ -596,7 +596,7 @@
beginMetadataStar(augment)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Mixin, augment, null, static, null, null, get, getter)
+ beginMethod(DeclarationKind.Mixin, augment, null, static, null, null, get, getter, Mixin)
handleIdentifier(int, typeReference)
handleNoTypeArguments(get)
handleType(int, null)
@@ -612,7 +612,7 @@
beginMetadataStar(augment)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Mixin, augment, null, static, null, null, set, setter)
+ beginMethod(DeclarationKind.Mixin, augment, null, static, null, null, set, setter, Mixin)
handleNoType(static)
handleIdentifier(setter, methodDeclaration)
handleNoTypeVariables(()
@@ -634,7 +634,7 @@
beginMetadataStar(augment)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Mixin, augment, null, static, null, null, set, setter)
+ beginMethod(DeclarationKind.Mixin, augment, null, static, null, null, set, setter, Mixin)
handleVoidKeyword(void)
handleIdentifier(setter, methodDeclaration)
handleNoTypeVariables(()
diff --git a/pkg/front_end/parser_testcases/augmentation/member_declarations.dart.intertwined.expect b/pkg/front_end/parser_testcases/augmentation/member_declarations.dart.intertwined.expect
index 958c378..06c0148 100644
--- a/pkg/front_end/parser_testcases/augmentation/member_declarations.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/augmentation/member_declarations.dart.intertwined.expect
@@ -33,7 +33,7 @@
listener: beginMember()
isReservedKeyword(()
parseMethod({, null, augment, null, null, null, null, null, augment, NoType(), null, method, DeclarationKind.Class, Class, false)
- listener: beginMethod(DeclarationKind.Class, augment, null, null, null, null, null, method)
+ listener: beginMethod(DeclarationKind.Class, augment, null, null, null, null, null, method, Class)
listener: handleNoType(augment)
ensureIdentifierPotentiallyRecovered(augment, methodDeclaration, false)
listener: handleIdentifier(method, methodDeclaration)
@@ -64,7 +64,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(}, null, augment, null, null, null, null, null, augment, VoidType(), null, method, DeclarationKind.Class, Class, false)
- listener: beginMethod(DeclarationKind.Class, augment, null, null, null, null, null, method)
+ listener: beginMethod(DeclarationKind.Class, augment, null, null, null, null, null, method, Class)
listener: handleVoidKeyword(void)
ensureIdentifierPotentiallyRecovered(void, methodDeclaration, false)
listener: handleIdentifier(method, methodDeclaration)
@@ -95,7 +95,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(}, null, augment, null, null, null, null, null, augment, NoType(), get, getter, DeclarationKind.Class, Class, false)
- listener: beginMethod(DeclarationKind.Class, augment, null, null, null, null, get, getter)
+ listener: beginMethod(DeclarationKind.Class, augment, null, null, null, null, get, getter, Class)
listener: handleNoType(augment)
ensureIdentifierPotentiallyRecovered(get, methodDeclaration, false)
listener: handleIdentifier(getter, methodDeclaration)
@@ -130,7 +130,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(;, null, augment, null, null, null, null, null, augment, SimpleType(), get, getter, DeclarationKind.Class, Class, false)
- listener: beginMethod(DeclarationKind.Class, augment, null, null, null, null, get, getter)
+ listener: beginMethod(DeclarationKind.Class, augment, null, null, null, null, get, getter, Class)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(get)
listener: handleType(int, null)
@@ -167,7 +167,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(;, null, augment, null, null, null, null, null, augment, NoType(), set, setter, DeclarationKind.Class, Class, false)
- listener: beginMethod(DeclarationKind.Class, augment, null, null, null, null, set, setter)
+ listener: beginMethod(DeclarationKind.Class, augment, null, null, null, null, set, setter, Class)
listener: handleNoType(augment)
ensureIdentifierPotentiallyRecovered(set, methodDeclaration, false)
listener: handleIdentifier(setter, methodDeclaration)
@@ -208,7 +208,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(}, null, augment, null, null, null, null, null, augment, VoidType(), set, setter, DeclarationKind.Class, Class, false)
- listener: beginMethod(DeclarationKind.Class, augment, null, null, null, null, set, setter)
+ listener: beginMethod(DeclarationKind.Class, augment, null, null, null, null, set, setter, Class)
listener: handleVoidKeyword(void)
ensureIdentifierPotentiallyRecovered(set, methodDeclaration, false)
listener: handleIdentifier(setter, methodDeclaration)
@@ -383,7 +383,7 @@
listener: beginMember()
isReservedKeyword(()
parseMethod(;, null, augment, null, static, null, null, null, static, NoType(), null, method, DeclarationKind.Class, Class, false)
- listener: beginMethod(DeclarationKind.Class, augment, null, static, null, null, null, method)
+ listener: beginMethod(DeclarationKind.Class, augment, null, static, null, null, null, method, Class)
listener: handleNoType(static)
ensureIdentifierPotentiallyRecovered(static, methodDeclaration, false)
listener: handleIdentifier(method, methodDeclaration)
@@ -413,7 +413,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(}, null, augment, null, static, null, null, null, static, VoidType(), null, method, DeclarationKind.Class, Class, false)
- listener: beginMethod(DeclarationKind.Class, augment, null, static, null, null, null, method)
+ listener: beginMethod(DeclarationKind.Class, augment, null, static, null, null, null, method, Class)
listener: handleVoidKeyword(void)
ensureIdentifierPotentiallyRecovered(void, methodDeclaration, false)
listener: handleIdentifier(method, methodDeclaration)
@@ -443,7 +443,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(}, null, augment, null, static, null, null, null, static, NoType(), get, getter, DeclarationKind.Class, Class, false)
- listener: beginMethod(DeclarationKind.Class, augment, null, static, null, null, get, getter)
+ listener: beginMethod(DeclarationKind.Class, augment, null, static, null, null, get, getter, Class)
listener: handleNoType(static)
ensureIdentifierPotentiallyRecovered(get, methodDeclaration, false)
listener: handleIdentifier(getter, methodDeclaration)
@@ -477,7 +477,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(;, null, augment, null, static, null, null, null, static, SimpleType(), get, getter, DeclarationKind.Class, Class, false)
- listener: beginMethod(DeclarationKind.Class, augment, null, static, null, null, get, getter)
+ listener: beginMethod(DeclarationKind.Class, augment, null, static, null, null, get, getter, Class)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(get)
listener: handleType(int, null)
@@ -513,7 +513,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(;, null, augment, null, static, null, null, null, static, NoType(), set, setter, DeclarationKind.Class, Class, false)
- listener: beginMethod(DeclarationKind.Class, augment, null, static, null, null, set, setter)
+ listener: beginMethod(DeclarationKind.Class, augment, null, static, null, null, set, setter, Class)
listener: handleNoType(static)
ensureIdentifierPotentiallyRecovered(set, methodDeclaration, false)
listener: handleIdentifier(setter, methodDeclaration)
@@ -553,7 +553,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(}, null, augment, null, static, null, null, null, static, VoidType(), set, setter, DeclarationKind.Class, Class, false)
- listener: beginMethod(DeclarationKind.Class, augment, null, static, null, null, set, setter)
+ listener: beginMethod(DeclarationKind.Class, augment, null, static, null, null, set, setter, Class)
listener: handleVoidKeyword(void)
ensureIdentifierPotentiallyRecovered(set, methodDeclaration, false)
listener: handleIdentifier(setter, methodDeclaration)
@@ -750,7 +750,7 @@
listener: beginMember()
isReservedKeyword(()
parseMethod({, null, augment, null, null, null, null, null, augment, NoType(), null, method, DeclarationKind.Mixin, Mixin, false)
- listener: beginMethod(DeclarationKind.Mixin, augment, null, null, null, null, null, method)
+ listener: beginMethod(DeclarationKind.Mixin, augment, null, null, null, null, null, method, Mixin)
listener: handleNoType(augment)
ensureIdentifierPotentiallyRecovered(augment, methodDeclaration, false)
listener: handleIdentifier(method, methodDeclaration)
@@ -781,7 +781,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(}, null, augment, null, null, null, null, null, augment, VoidType(), null, method, DeclarationKind.Mixin, Mixin, false)
- listener: beginMethod(DeclarationKind.Mixin, augment, null, null, null, null, null, method)
+ listener: beginMethod(DeclarationKind.Mixin, augment, null, null, null, null, null, method, Mixin)
listener: handleVoidKeyword(void)
ensureIdentifierPotentiallyRecovered(void, methodDeclaration, false)
listener: handleIdentifier(method, methodDeclaration)
@@ -812,7 +812,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(}, null, augment, null, null, null, null, null, augment, NoType(), get, getter, DeclarationKind.Mixin, Mixin, false)
- listener: beginMethod(DeclarationKind.Mixin, augment, null, null, null, null, get, getter)
+ listener: beginMethod(DeclarationKind.Mixin, augment, null, null, null, null, get, getter, Mixin)
listener: handleNoType(augment)
ensureIdentifierPotentiallyRecovered(get, methodDeclaration, false)
listener: handleIdentifier(getter, methodDeclaration)
@@ -847,7 +847,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(;, null, augment, null, null, null, null, null, augment, SimpleType(), get, getter, DeclarationKind.Mixin, Mixin, false)
- listener: beginMethod(DeclarationKind.Mixin, augment, null, null, null, null, get, getter)
+ listener: beginMethod(DeclarationKind.Mixin, augment, null, null, null, null, get, getter, Mixin)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(get)
listener: handleType(int, null)
@@ -884,7 +884,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(;, null, augment, null, null, null, null, null, augment, NoType(), set, setter, DeclarationKind.Mixin, Mixin, false)
- listener: beginMethod(DeclarationKind.Mixin, augment, null, null, null, null, set, setter)
+ listener: beginMethod(DeclarationKind.Mixin, augment, null, null, null, null, set, setter, Mixin)
listener: handleNoType(augment)
ensureIdentifierPotentiallyRecovered(set, methodDeclaration, false)
listener: handleIdentifier(setter, methodDeclaration)
@@ -925,7 +925,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(}, null, augment, null, null, null, null, null, augment, VoidType(), set, setter, DeclarationKind.Mixin, Mixin, false)
- listener: beginMethod(DeclarationKind.Mixin, augment, null, null, null, null, set, setter)
+ listener: beginMethod(DeclarationKind.Mixin, augment, null, null, null, null, set, setter, Mixin)
listener: handleVoidKeyword(void)
ensureIdentifierPotentiallyRecovered(set, methodDeclaration, false)
listener: handleIdentifier(setter, methodDeclaration)
@@ -1100,7 +1100,7 @@
listener: beginMember()
isReservedKeyword(()
parseMethod(;, null, augment, null, static, null, null, null, static, NoType(), null, method, DeclarationKind.Mixin, Mixin, false)
- listener: beginMethod(DeclarationKind.Mixin, augment, null, static, null, null, null, method)
+ listener: beginMethod(DeclarationKind.Mixin, augment, null, static, null, null, null, method, Mixin)
listener: handleNoType(static)
ensureIdentifierPotentiallyRecovered(static, methodDeclaration, false)
listener: handleIdentifier(method, methodDeclaration)
@@ -1130,7 +1130,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(}, null, augment, null, static, null, null, null, static, VoidType(), null, method, DeclarationKind.Mixin, Mixin, false)
- listener: beginMethod(DeclarationKind.Mixin, augment, null, static, null, null, null, method)
+ listener: beginMethod(DeclarationKind.Mixin, augment, null, static, null, null, null, method, Mixin)
listener: handleVoidKeyword(void)
ensureIdentifierPotentiallyRecovered(void, methodDeclaration, false)
listener: handleIdentifier(method, methodDeclaration)
@@ -1160,7 +1160,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(}, null, augment, null, static, null, null, null, static, NoType(), get, getter, DeclarationKind.Mixin, Mixin, false)
- listener: beginMethod(DeclarationKind.Mixin, augment, null, static, null, null, get, getter)
+ listener: beginMethod(DeclarationKind.Mixin, augment, null, static, null, null, get, getter, Mixin)
listener: handleNoType(static)
ensureIdentifierPotentiallyRecovered(get, methodDeclaration, false)
listener: handleIdentifier(getter, methodDeclaration)
@@ -1194,7 +1194,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(;, null, augment, null, static, null, null, null, static, SimpleType(), get, getter, DeclarationKind.Mixin, Mixin, false)
- listener: beginMethod(DeclarationKind.Mixin, augment, null, static, null, null, get, getter)
+ listener: beginMethod(DeclarationKind.Mixin, augment, null, static, null, null, get, getter, Mixin)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(get)
listener: handleType(int, null)
@@ -1230,7 +1230,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(;, null, augment, null, static, null, null, null, static, NoType(), set, setter, DeclarationKind.Mixin, Mixin, false)
- listener: beginMethod(DeclarationKind.Mixin, augment, null, static, null, null, set, setter)
+ listener: beginMethod(DeclarationKind.Mixin, augment, null, static, null, null, set, setter, Mixin)
listener: handleNoType(static)
ensureIdentifierPotentiallyRecovered(set, methodDeclaration, false)
listener: handleIdentifier(setter, methodDeclaration)
@@ -1270,7 +1270,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(}, null, augment, null, static, null, null, null, static, VoidType(), set, setter, DeclarationKind.Mixin, Mixin, false)
- listener: beginMethod(DeclarationKind.Mixin, augment, null, static, null, null, set, setter)
+ listener: beginMethod(DeclarationKind.Mixin, augment, null, static, null, null, set, setter, Mixin)
listener: handleVoidKeyword(void)
ensureIdentifierPotentiallyRecovered(set, methodDeclaration, false)
listener: handleIdentifier(setter, methodDeclaration)
diff --git a/pkg/front_end/parser_testcases/augmentation/member_errors.dart.expect b/pkg/front_end/parser_testcases/augmentation/member_errors.dart.expect
index bb4c2f8..0160ac9 100644
--- a/pkg/front_end/parser_testcases/augmentation/member_errors.dart.expect
+++ b/pkg/front_end/parser_testcases/augmentation/member_errors.dart.expect
@@ -261,7 +261,7 @@
endMetadataStar(0)
handleRecoverableError(Message[DuplicatedModifier, The modifier 'augment' was already specified., Try removing all but one occurrence of the modifier., {lexeme: augment}], augment, augment)
beginMember()
- beginMethod(DeclarationKind.Class, augment, null, null, null, null, null, method)
+ beginMethod(DeclarationKind.Class, augment, null, null, null, null, null, method, Class)
handleNoType(augment)
handleIdentifier(method, methodDeclaration)
handleNoTypeVariables(()
@@ -277,7 +277,7 @@
endMetadataStar(0)
handleRecoverableError(Message[ConflictingModifiers, Members can't be declared to be both 'external' and 'augment'., Try removing one of the keywords., {string: external, string2: augment}], external, external)
beginMember()
- beginMethod(DeclarationKind.Class, augment, external, null, null, null, null, method)
+ beginMethod(DeclarationKind.Class, augment, external, null, null, null, null, method, Class)
handleNoType(external)
handleIdentifier(method, methodDeclaration)
handleNoTypeVariables(()
@@ -292,7 +292,7 @@
endMetadataStar(0)
handleRecoverableError(Message[ConflictingModifiers, Members can't be declared to be both 'augment' and 'external'., Try removing one of the keywords., {string: augment, string2: external}], augment, augment)
beginMember()
- beginMethod(DeclarationKind.Class, null, external, null, null, null, null, method)
+ beginMethod(DeclarationKind.Class, null, external, null, null, null, null, method, Class)
handleNoType(augment)
handleIdentifier(method, methodDeclaration)
handleNoTypeVariables(()
@@ -307,7 +307,7 @@
endMetadataStar(0)
handleRecoverableError(Message[DuplicatedModifier, The modifier 'augment' was already specified., Try removing all but one occurrence of the modifier., {lexeme: augment}], augment, augment)
beginMember()
- beginMethod(DeclarationKind.Class, augment, null, null, null, null, null, method)
+ beginMethod(DeclarationKind.Class, augment, null, null, null, null, null, method, Class)
handleVoidKeyword(void)
handleIdentifier(method, methodDeclaration)
handleNoTypeVariables(()
@@ -323,7 +323,7 @@
endMetadataStar(0)
handleRecoverableError(Message[ConflictingModifiers, Members can't be declared to be both 'external' and 'augment'., Try removing one of the keywords., {string: external, string2: augment}], external, external)
beginMember()
- beginMethod(DeclarationKind.Class, augment, external, null, null, null, null, method)
+ beginMethod(DeclarationKind.Class, augment, external, null, null, null, null, method, Class)
handleVoidKeyword(void)
handleIdentifier(method, methodDeclaration)
handleNoTypeVariables(()
@@ -338,7 +338,7 @@
endMetadataStar(0)
handleRecoverableError(Message[ConflictingModifiers, Members can't be declared to be both 'augment' and 'external'., Try removing one of the keywords., {string: augment, string2: external}], augment, augment)
beginMember()
- beginMethod(DeclarationKind.Class, null, external, null, null, null, null, method)
+ beginMethod(DeclarationKind.Class, null, external, null, null, null, null, method, Class)
handleVoidKeyword(void)
handleIdentifier(method, methodDeclaration)
handleNoTypeVariables(()
@@ -353,7 +353,7 @@
endMetadataStar(0)
handleRecoverableError(Message[DuplicatedModifier, The modifier 'augment' was already specified., Try removing all but one occurrence of the modifier., {lexeme: augment}], augment, augment)
beginMember()
- beginMethod(DeclarationKind.Class, augment, null, null, null, null, get, getter)
+ beginMethod(DeclarationKind.Class, augment, null, null, null, null, get, getter, Class)
handleNoType(augment)
handleIdentifier(getter, methodDeclaration)
handleNoTypeVariables(=>)
@@ -368,7 +368,7 @@
endMetadataStar(0)
handleRecoverableError(Message[ConflictingModifiers, Members can't be declared to be both 'external' and 'augment'., Try removing one of the keywords., {string: external, string2: augment}], external, external)
beginMember()
- beginMethod(DeclarationKind.Class, augment, external, null, null, null, get, getter)
+ beginMethod(DeclarationKind.Class, augment, external, null, null, null, get, getter, Class)
handleNoType(external)
handleIdentifier(getter, methodDeclaration)
handleNoTypeVariables(;)
@@ -382,7 +382,7 @@
endMetadataStar(0)
handleRecoverableError(Message[ConflictingModifiers, Members can't be declared to be both 'augment' and 'external'., Try removing one of the keywords., {string: augment, string2: external}], augment, augment)
beginMember()
- beginMethod(DeclarationKind.Class, null, external, null, null, null, get, getter)
+ beginMethod(DeclarationKind.Class, null, external, null, null, null, get, getter, Class)
handleNoType(augment)
handleIdentifier(getter, methodDeclaration)
handleNoTypeVariables(;)
@@ -396,7 +396,7 @@
endMetadataStar(0)
handleRecoverableError(Message[DuplicatedModifier, The modifier 'augment' was already specified., Try removing all but one occurrence of the modifier., {lexeme: augment}], augment, augment)
beginMember()
- beginMethod(DeclarationKind.Class, augment, null, null, null, null, get, getter)
+ beginMethod(DeclarationKind.Class, augment, null, null, null, null, get, getter, Class)
handleIdentifier(int, typeReference)
handleNoTypeArguments(get)
handleType(int, null)
@@ -413,7 +413,7 @@
endMetadataStar(0)
handleRecoverableError(Message[ConflictingModifiers, Members can't be declared to be both 'external' and 'augment'., Try removing one of the keywords., {string: external, string2: augment}], external, external)
beginMember()
- beginMethod(DeclarationKind.Class, augment, external, null, null, null, get, getter)
+ beginMethod(DeclarationKind.Class, augment, external, null, null, null, get, getter, Class)
handleIdentifier(int, typeReference)
handleNoTypeArguments(get)
handleType(int, null)
@@ -429,7 +429,7 @@
endMetadataStar(0)
handleRecoverableError(Message[ConflictingModifiers, Members can't be declared to be both 'augment' and 'external'., Try removing one of the keywords., {string: augment, string2: external}], augment, augment)
beginMember()
- beginMethod(DeclarationKind.Class, null, external, null, null, null, get, getter)
+ beginMethod(DeclarationKind.Class, null, external, null, null, null, get, getter, Class)
handleIdentifier(int, typeReference)
handleNoTypeArguments(get)
handleType(int, null)
@@ -445,7 +445,7 @@
endMetadataStar(0)
handleRecoverableError(Message[DuplicatedModifier, The modifier 'augment' was already specified., Try removing all but one occurrence of the modifier., {lexeme: augment}], augment, augment)
beginMember()
- beginMethod(DeclarationKind.Class, augment, null, null, null, null, set, setter)
+ beginMethod(DeclarationKind.Class, augment, null, null, null, null, set, setter, Class)
handleNoType(augment)
handleIdentifier(setter, methodDeclaration)
handleNoTypeVariables(()
@@ -468,7 +468,7 @@
endMetadataStar(0)
handleRecoverableError(Message[ConflictingModifiers, Members can't be declared to be both 'external' and 'augment'., Try removing one of the keywords., {string: external, string2: augment}], external, external)
beginMember()
- beginMethod(DeclarationKind.Class, augment, external, null, null, null, set, setter)
+ beginMethod(DeclarationKind.Class, augment, external, null, null, null, set, setter, Class)
handleNoType(external)
handleIdentifier(setter, methodDeclaration)
handleNoTypeVariables(()
@@ -490,7 +490,7 @@
endMetadataStar(0)
handleRecoverableError(Message[ConflictingModifiers, Members can't be declared to be both 'augment' and 'external'., Try removing one of the keywords., {string: augment, string2: external}], augment, augment)
beginMember()
- beginMethod(DeclarationKind.Class, null, external, null, null, null, set, setter)
+ beginMethod(DeclarationKind.Class, null, external, null, null, null, set, setter, Class)
handleNoType(augment)
handleIdentifier(setter, methodDeclaration)
handleNoTypeVariables(()
@@ -512,7 +512,7 @@
endMetadataStar(0)
handleRecoverableError(Message[DuplicatedModifier, The modifier 'augment' was already specified., Try removing all but one occurrence of the modifier., {lexeme: augment}], augment, augment)
beginMember()
- beginMethod(DeclarationKind.Class, augment, null, null, null, null, set, setter)
+ beginMethod(DeclarationKind.Class, augment, null, null, null, null, set, setter, Class)
handleVoidKeyword(void)
handleIdentifier(setter, methodDeclaration)
handleNoTypeVariables(()
@@ -535,7 +535,7 @@
endMetadataStar(0)
handleRecoverableError(Message[ConflictingModifiers, Members can't be declared to be both 'external' and 'augment'., Try removing one of the keywords., {string: external, string2: augment}], external, external)
beginMember()
- beginMethod(DeclarationKind.Class, augment, external, null, null, null, set, setter)
+ beginMethod(DeclarationKind.Class, augment, external, null, null, null, set, setter, Class)
handleVoidKeyword(void)
handleIdentifier(setter, methodDeclaration)
handleNoTypeVariables(()
@@ -557,7 +557,7 @@
endMetadataStar(0)
handleRecoverableError(Message[ConflictingModifiers, Members can't be declared to be both 'augment' and 'external'., Try removing one of the keywords., {string: augment, string2: external}], augment, augment)
beginMember()
- beginMethod(DeclarationKind.Class, null, external, null, null, null, set, setter)
+ beginMethod(DeclarationKind.Class, null, external, null, null, null, set, setter, Class)
handleVoidKeyword(void)
handleIdentifier(setter, methodDeclaration)
handleNoTypeVariables(()
@@ -801,7 +801,7 @@
endMetadataStar(0)
handleRecoverableError(Message[DuplicatedModifier, The modifier 'augment' was already specified., Try removing all but one occurrence of the modifier., {lexeme: augment}], augment, augment)
beginMember()
- beginMethod(DeclarationKind.Class, augment, null, static, null, null, null, method)
+ beginMethod(DeclarationKind.Class, augment, null, static, null, null, null, method, Class)
handleNoType(static)
handleIdentifier(method, methodDeclaration)
handleNoTypeVariables(()
@@ -817,7 +817,7 @@
endMetadataStar(0)
handleRecoverableError(Message[ModifierOutOfOrder, The modifier 'augment' should be before the modifier 'static'., Try re-ordering the modifiers., {string: augment, string2: static}], augment, augment)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, static, null, null, null, method)
+ beginMethod(DeclarationKind.Class, null, null, static, null, null, null, method, Class)
handleNoType(augment)
handleIdentifier(method, methodDeclaration)
handleNoTypeVariables(()
@@ -833,7 +833,7 @@
endMetadataStar(0)
handleRecoverableError(Message[DuplicatedModifier, The modifier 'augment' was already specified., Try removing all but one occurrence of the modifier., {lexeme: augment}], augment, augment)
beginMember()
- beginMethod(DeclarationKind.Class, augment, null, static, null, null, null, method)
+ beginMethod(DeclarationKind.Class, augment, null, static, null, null, null, method, Class)
handleVoidKeyword(void)
handleIdentifier(method, methodDeclaration)
handleNoTypeVariables(()
@@ -849,7 +849,7 @@
endMetadataStar(0)
handleRecoverableError(Message[ModifierOutOfOrder, The modifier 'augment' should be before the modifier 'static'., Try re-ordering the modifiers., {string: augment, string2: static}], augment, augment)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, static, null, null, null, method)
+ beginMethod(DeclarationKind.Class, null, null, static, null, null, null, method, Class)
handleVoidKeyword(void)
handleIdentifier(method, methodDeclaration)
handleNoTypeVariables(()
@@ -865,7 +865,7 @@
endMetadataStar(0)
handleRecoverableError(Message[DuplicatedModifier, The modifier 'augment' was already specified., Try removing all but one occurrence of the modifier., {lexeme: augment}], augment, augment)
beginMember()
- beginMethod(DeclarationKind.Class, augment, null, static, null, null, get, getter)
+ beginMethod(DeclarationKind.Class, augment, null, static, null, null, get, getter, Class)
handleNoType(static)
handleIdentifier(getter, methodDeclaration)
handleNoTypeVariables(=>)
@@ -880,7 +880,7 @@
endMetadataStar(0)
handleRecoverableError(Message[ModifierOutOfOrder, The modifier 'augment' should be before the modifier 'static'., Try re-ordering the modifiers., {string: augment, string2: static}], augment, augment)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, static, null, null, get, getter)
+ beginMethod(DeclarationKind.Class, null, null, static, null, null, get, getter, Class)
handleNoType(augment)
handleIdentifier(getter, methodDeclaration)
handleNoTypeVariables(=>)
@@ -895,7 +895,7 @@
endMetadataStar(0)
handleRecoverableError(Message[DuplicatedModifier, The modifier 'augment' was already specified., Try removing all but one occurrence of the modifier., {lexeme: augment}], augment, augment)
beginMember()
- beginMethod(DeclarationKind.Class, augment, null, static, null, null, get, getter)
+ beginMethod(DeclarationKind.Class, augment, null, static, null, null, get, getter, Class)
handleIdentifier(int, typeReference)
handleNoTypeArguments(get)
handleType(int, null)
@@ -912,7 +912,7 @@
endMetadataStar(0)
handleRecoverableError(Message[ModifierOutOfOrder, The modifier 'augment' should be before the modifier 'static'., Try re-ordering the modifiers., {string: augment, string2: static}], augment, augment)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, static, null, null, get, getter)
+ beginMethod(DeclarationKind.Class, null, null, static, null, null, get, getter, Class)
handleIdentifier(int, typeReference)
handleNoTypeArguments(get)
handleType(int, null)
@@ -929,7 +929,7 @@
endMetadataStar(0)
handleRecoverableError(Message[DuplicatedModifier, The modifier 'augment' was already specified., Try removing all but one occurrence of the modifier., {lexeme: augment}], augment, augment)
beginMember()
- beginMethod(DeclarationKind.Class, augment, null, static, null, null, set, setter)
+ beginMethod(DeclarationKind.Class, augment, null, static, null, null, set, setter, Class)
handleNoType(static)
handleIdentifier(setter, methodDeclaration)
handleNoTypeVariables(()
@@ -952,7 +952,7 @@
endMetadataStar(0)
handleRecoverableError(Message[ModifierOutOfOrder, The modifier 'augment' should be before the modifier 'static'., Try re-ordering the modifiers., {string: augment, string2: static}], augment, augment)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, static, null, null, set, setter)
+ beginMethod(DeclarationKind.Class, null, null, static, null, null, set, setter, Class)
handleNoType(augment)
handleIdentifier(setter, methodDeclaration)
handleNoTypeVariables(()
@@ -975,7 +975,7 @@
endMetadataStar(0)
handleRecoverableError(Message[DuplicatedModifier, The modifier 'augment' was already specified., Try removing all but one occurrence of the modifier., {lexeme: augment}], augment, augment)
beginMember()
- beginMethod(DeclarationKind.Class, augment, null, static, null, null, set, setter)
+ beginMethod(DeclarationKind.Class, augment, null, static, null, null, set, setter, Class)
handleVoidKeyword(void)
handleIdentifier(setter, methodDeclaration)
handleNoTypeVariables(()
@@ -998,7 +998,7 @@
endMetadataStar(0)
handleRecoverableError(Message[ModifierOutOfOrder, The modifier 'augment' should be before the modifier 'static'., Try re-ordering the modifiers., {string: augment, string2: static}], augment, augment)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, static, null, null, set, setter)
+ beginMethod(DeclarationKind.Class, null, null, static, null, null, set, setter, Class)
handleVoidKeyword(void)
handleIdentifier(setter, methodDeclaration)
handleNoTypeVariables(()
diff --git a/pkg/front_end/parser_testcases/augmentation/member_errors.dart.intertwined.expect b/pkg/front_end/parser_testcases/augmentation/member_errors.dart.intertwined.expect
index 6655ac5..4329287 100644
--- a/pkg/front_end/parser_testcases/augmentation/member_errors.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/augmentation/member_errors.dart.intertwined.expect
@@ -35,7 +35,7 @@
listener: beginMember()
isReservedKeyword(()
parseMethod({, null, augment, null, null, null, null, null, augment, NoType(), null, method, DeclarationKind.Class, Class, false)
- listener: beginMethod(DeclarationKind.Class, augment, null, null, null, null, null, method)
+ listener: beginMethod(DeclarationKind.Class, augment, null, null, null, null, null, method, Class)
listener: handleNoType(augment)
ensureIdentifierPotentiallyRecovered(augment, methodDeclaration, false)
listener: handleIdentifier(method, methodDeclaration)
@@ -69,7 +69,7 @@
listener: beginMember()
isReservedKeyword(()
parseMethod(}, null, augment, external, null, null, null, null, external, NoType(), null, method, DeclarationKind.Class, Class, false)
- listener: beginMethod(DeclarationKind.Class, augment, external, null, null, null, null, method)
+ listener: beginMethod(DeclarationKind.Class, augment, external, null, null, null, null, method, Class)
listener: handleNoType(external)
ensureIdentifierPotentiallyRecovered(external, methodDeclaration, false)
listener: handleIdentifier(method, methodDeclaration)
@@ -101,7 +101,7 @@
listener: beginMember()
isReservedKeyword(()
parseMethod(;, null, null, external, null, null, null, null, augment, NoType(), null, method, DeclarationKind.Class, Class, false)
- listener: beginMethod(DeclarationKind.Class, null, external, null, null, null, null, method)
+ listener: beginMethod(DeclarationKind.Class, null, external, null, null, null, null, method, Class)
listener: handleNoType(augment)
ensureIdentifierPotentiallyRecovered(augment, methodDeclaration, false)
listener: handleIdentifier(method, methodDeclaration)
@@ -132,7 +132,7 @@
listener: handleRecoverableError(Message[DuplicatedModifier, The modifier 'augment' was already specified., Try removing all but one occurrence of the modifier., {lexeme: augment}], augment, augment)
listener: beginMember()
parseMethod(;, null, augment, null, null, null, null, null, augment, VoidType(), null, method, DeclarationKind.Class, Class, false)
- listener: beginMethod(DeclarationKind.Class, augment, null, null, null, null, null, method)
+ listener: beginMethod(DeclarationKind.Class, augment, null, null, null, null, null, method, Class)
listener: handleVoidKeyword(void)
ensureIdentifierPotentiallyRecovered(void, methodDeclaration, false)
listener: handleIdentifier(method, methodDeclaration)
@@ -165,7 +165,7 @@
listener: handleRecoverableError(Message[ConflictingModifiers, Members can't be declared to be both 'external' and 'augment'., Try removing one of the keywords., {string: external, string2: augment}], external, external)
listener: beginMember()
parseMethod(}, null, augment, external, null, null, null, null, external, VoidType(), null, method, DeclarationKind.Class, Class, false)
- listener: beginMethod(DeclarationKind.Class, augment, external, null, null, null, null, method)
+ listener: beginMethod(DeclarationKind.Class, augment, external, null, null, null, null, method, Class)
listener: handleVoidKeyword(void)
ensureIdentifierPotentiallyRecovered(void, methodDeclaration, false)
listener: handleIdentifier(method, methodDeclaration)
@@ -196,7 +196,7 @@
listener: handleRecoverableError(Message[ConflictingModifiers, Members can't be declared to be both 'augment' and 'external'., Try removing one of the keywords., {string: augment, string2: external}], augment, augment)
listener: beginMember()
parseMethod(;, null, null, external, null, null, null, null, augment, VoidType(), null, method, DeclarationKind.Class, Class, false)
- listener: beginMethod(DeclarationKind.Class, null, external, null, null, null, null, method)
+ listener: beginMethod(DeclarationKind.Class, null, external, null, null, null, null, method, Class)
listener: handleVoidKeyword(void)
ensureIdentifierPotentiallyRecovered(void, methodDeclaration, false)
listener: handleIdentifier(method, methodDeclaration)
@@ -227,7 +227,7 @@
listener: handleRecoverableError(Message[DuplicatedModifier, The modifier 'augment' was already specified., Try removing all but one occurrence of the modifier., {lexeme: augment}], augment, augment)
listener: beginMember()
parseMethod(;, null, augment, null, null, null, null, null, augment, NoType(), get, getter, DeclarationKind.Class, Class, false)
- listener: beginMethod(DeclarationKind.Class, augment, null, null, null, null, get, getter)
+ listener: beginMethod(DeclarationKind.Class, augment, null, null, null, null, get, getter, Class)
listener: handleNoType(augment)
ensureIdentifierPotentiallyRecovered(get, methodDeclaration, false)
listener: handleIdentifier(getter, methodDeclaration)
@@ -264,7 +264,7 @@
listener: handleRecoverableError(Message[ConflictingModifiers, Members can't be declared to be both 'external' and 'augment'., Try removing one of the keywords., {string: external, string2: augment}], external, external)
listener: beginMember()
parseMethod(;, null, augment, external, null, null, null, null, external, NoType(), get, getter, DeclarationKind.Class, Class, false)
- listener: beginMethod(DeclarationKind.Class, augment, external, null, null, null, get, getter)
+ listener: beginMethod(DeclarationKind.Class, augment, external, null, null, null, get, getter, Class)
listener: handleNoType(external)
ensureIdentifierPotentiallyRecovered(get, methodDeclaration, false)
listener: handleIdentifier(getter, methodDeclaration)
@@ -292,7 +292,7 @@
listener: handleRecoverableError(Message[ConflictingModifiers, Members can't be declared to be both 'augment' and 'external'., Try removing one of the keywords., {string: augment, string2: external}], augment, augment)
listener: beginMember()
parseMethod(;, null, null, external, null, null, null, null, augment, NoType(), get, getter, DeclarationKind.Class, Class, false)
- listener: beginMethod(DeclarationKind.Class, null, external, null, null, null, get, getter)
+ listener: beginMethod(DeclarationKind.Class, null, external, null, null, null, get, getter, Class)
listener: handleNoType(augment)
ensureIdentifierPotentiallyRecovered(get, methodDeclaration, false)
listener: handleIdentifier(getter, methodDeclaration)
@@ -320,7 +320,7 @@
listener: handleRecoverableError(Message[DuplicatedModifier, The modifier 'augment' was already specified., Try removing all but one occurrence of the modifier., {lexeme: augment}], augment, augment)
listener: beginMember()
parseMethod(;, null, augment, null, null, null, null, null, augment, SimpleType(), get, getter, DeclarationKind.Class, Class, false)
- listener: beginMethod(DeclarationKind.Class, augment, null, null, null, null, get, getter)
+ listener: beginMethod(DeclarationKind.Class, augment, null, null, null, null, get, getter, Class)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(get)
listener: handleType(int, null)
@@ -359,7 +359,7 @@
listener: handleRecoverableError(Message[ConflictingModifiers, Members can't be declared to be both 'external' and 'augment'., Try removing one of the keywords., {string: external, string2: augment}], external, external)
listener: beginMember()
parseMethod(;, null, augment, external, null, null, null, null, external, SimpleType(), get, getter, DeclarationKind.Class, Class, false)
- listener: beginMethod(DeclarationKind.Class, augment, external, null, null, null, get, getter)
+ listener: beginMethod(DeclarationKind.Class, augment, external, null, null, null, get, getter, Class)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(get)
listener: handleType(int, null)
@@ -389,7 +389,7 @@
listener: handleRecoverableError(Message[ConflictingModifiers, Members can't be declared to be both 'augment' and 'external'., Try removing one of the keywords., {string: augment, string2: external}], augment, augment)
listener: beginMember()
parseMethod(;, null, null, external, null, null, null, null, augment, SimpleType(), get, getter, DeclarationKind.Class, Class, false)
- listener: beginMethod(DeclarationKind.Class, null, external, null, null, null, get, getter)
+ listener: beginMethod(DeclarationKind.Class, null, external, null, null, null, get, getter, Class)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(get)
listener: handleType(int, null)
@@ -419,7 +419,7 @@
listener: handleRecoverableError(Message[DuplicatedModifier, The modifier 'augment' was already specified., Try removing all but one occurrence of the modifier., {lexeme: augment}], augment, augment)
listener: beginMember()
parseMethod(;, null, augment, null, null, null, null, null, augment, NoType(), set, setter, DeclarationKind.Class, Class, false)
- listener: beginMethod(DeclarationKind.Class, augment, null, null, null, null, set, setter)
+ listener: beginMethod(DeclarationKind.Class, augment, null, null, null, null, set, setter, Class)
listener: handleNoType(augment)
ensureIdentifierPotentiallyRecovered(set, methodDeclaration, false)
listener: handleIdentifier(setter, methodDeclaration)
@@ -462,7 +462,7 @@
listener: handleRecoverableError(Message[ConflictingModifiers, Members can't be declared to be both 'external' and 'augment'., Try removing one of the keywords., {string: external, string2: augment}], external, external)
listener: beginMember()
parseMethod(}, null, augment, external, null, null, null, null, external, NoType(), set, setter, DeclarationKind.Class, Class, false)
- listener: beginMethod(DeclarationKind.Class, augment, external, null, null, null, set, setter)
+ listener: beginMethod(DeclarationKind.Class, augment, external, null, null, null, set, setter, Class)
listener: handleNoType(external)
ensureIdentifierPotentiallyRecovered(set, methodDeclaration, false)
listener: handleIdentifier(setter, methodDeclaration)
@@ -503,7 +503,7 @@
listener: handleRecoverableError(Message[ConflictingModifiers, Members can't be declared to be both 'augment' and 'external'., Try removing one of the keywords., {string: augment, string2: external}], augment, augment)
listener: beginMember()
parseMethod(;, null, null, external, null, null, null, null, augment, NoType(), set, setter, DeclarationKind.Class, Class, false)
- listener: beginMethod(DeclarationKind.Class, null, external, null, null, null, set, setter)
+ listener: beginMethod(DeclarationKind.Class, null, external, null, null, null, set, setter, Class)
listener: handleNoType(augment)
ensureIdentifierPotentiallyRecovered(set, methodDeclaration, false)
listener: handleIdentifier(setter, methodDeclaration)
@@ -544,7 +544,7 @@
listener: handleRecoverableError(Message[DuplicatedModifier, The modifier 'augment' was already specified., Try removing all but one occurrence of the modifier., {lexeme: augment}], augment, augment)
listener: beginMember()
parseMethod(;, null, augment, null, null, null, null, null, augment, VoidType(), set, setter, DeclarationKind.Class, Class, false)
- listener: beginMethod(DeclarationKind.Class, augment, null, null, null, null, set, setter)
+ listener: beginMethod(DeclarationKind.Class, augment, null, null, null, null, set, setter, Class)
listener: handleVoidKeyword(void)
ensureIdentifierPotentiallyRecovered(set, methodDeclaration, false)
listener: handleIdentifier(setter, methodDeclaration)
@@ -587,7 +587,7 @@
listener: handleRecoverableError(Message[ConflictingModifiers, Members can't be declared to be both 'external' and 'augment'., Try removing one of the keywords., {string: external, string2: augment}], external, external)
listener: beginMember()
parseMethod(}, null, augment, external, null, null, null, null, external, VoidType(), set, setter, DeclarationKind.Class, Class, false)
- listener: beginMethod(DeclarationKind.Class, augment, external, null, null, null, set, setter)
+ listener: beginMethod(DeclarationKind.Class, augment, external, null, null, null, set, setter, Class)
listener: handleVoidKeyword(void)
ensureIdentifierPotentiallyRecovered(set, methodDeclaration, false)
listener: handleIdentifier(setter, methodDeclaration)
@@ -628,7 +628,7 @@
listener: handleRecoverableError(Message[ConflictingModifiers, Members can't be declared to be both 'augment' and 'external'., Try removing one of the keywords., {string: augment, string2: external}], augment, augment)
listener: beginMember()
parseMethod(;, null, null, external, null, null, null, null, augment, VoidType(), set, setter, DeclarationKind.Class, Class, false)
- listener: beginMethod(DeclarationKind.Class, null, external, null, null, null, set, setter)
+ listener: beginMethod(DeclarationKind.Class, null, external, null, null, null, set, setter, Class)
listener: handleVoidKeyword(void)
ensureIdentifierPotentiallyRecovered(set, methodDeclaration, false)
listener: handleIdentifier(setter, methodDeclaration)
@@ -1075,7 +1075,7 @@
listener: beginMember()
isReservedKeyword(()
parseMethod(;, null, augment, null, static, null, null, null, static, NoType(), null, method, DeclarationKind.Class, Class, false)
- listener: beginMethod(DeclarationKind.Class, augment, null, static, null, null, null, method)
+ listener: beginMethod(DeclarationKind.Class, augment, null, static, null, null, null, method, Class)
listener: handleNoType(static)
ensureIdentifierPotentiallyRecovered(static, methodDeclaration, false)
listener: handleIdentifier(method, methodDeclaration)
@@ -1108,7 +1108,7 @@
listener: beginMember()
isReservedKeyword(()
parseMethod(}, null, null, null, static, null, null, null, augment, NoType(), null, method, DeclarationKind.Class, Class, false)
- listener: beginMethod(DeclarationKind.Class, null, null, static, null, null, null, method)
+ listener: beginMethod(DeclarationKind.Class, null, null, static, null, null, null, method, Class)
listener: handleNoType(augment)
ensureIdentifierPotentiallyRecovered(augment, methodDeclaration, false)
listener: handleIdentifier(method, methodDeclaration)
@@ -1140,7 +1140,7 @@
listener: handleRecoverableError(Message[DuplicatedModifier, The modifier 'augment' was already specified., Try removing all but one occurrence of the modifier., {lexeme: augment}], augment, augment)
listener: beginMember()
parseMethod(}, null, augment, null, static, null, null, null, static, VoidType(), null, method, DeclarationKind.Class, Class, false)
- listener: beginMethod(DeclarationKind.Class, augment, null, static, null, null, null, method)
+ listener: beginMethod(DeclarationKind.Class, augment, null, static, null, null, null, method, Class)
listener: handleVoidKeyword(void)
ensureIdentifierPotentiallyRecovered(void, methodDeclaration, false)
listener: handleIdentifier(method, methodDeclaration)
@@ -1172,7 +1172,7 @@
listener: handleRecoverableError(Message[ModifierOutOfOrder, The modifier 'augment' should be before the modifier 'static'., Try re-ordering the modifiers., {string: augment, string2: static}], augment, augment)
listener: beginMember()
parseMethod(}, null, null, null, static, null, null, null, augment, VoidType(), null, method, DeclarationKind.Class, Class, false)
- listener: beginMethod(DeclarationKind.Class, null, null, static, null, null, null, method)
+ listener: beginMethod(DeclarationKind.Class, null, null, static, null, null, null, method, Class)
listener: handleVoidKeyword(void)
ensureIdentifierPotentiallyRecovered(void, methodDeclaration, false)
listener: handleIdentifier(method, methodDeclaration)
@@ -1204,7 +1204,7 @@
listener: handleRecoverableError(Message[DuplicatedModifier, The modifier 'augment' was already specified., Try removing all but one occurrence of the modifier., {lexeme: augment}], augment, augment)
listener: beginMember()
parseMethod(}, null, augment, null, static, null, null, null, static, NoType(), get, getter, DeclarationKind.Class, Class, false)
- listener: beginMethod(DeclarationKind.Class, augment, null, static, null, null, get, getter)
+ listener: beginMethod(DeclarationKind.Class, augment, null, static, null, null, get, getter, Class)
listener: handleNoType(static)
ensureIdentifierPotentiallyRecovered(get, methodDeclaration, false)
listener: handleIdentifier(getter, methodDeclaration)
@@ -1240,7 +1240,7 @@
listener: handleRecoverableError(Message[ModifierOutOfOrder, The modifier 'augment' should be before the modifier 'static'., Try re-ordering the modifiers., {string: augment, string2: static}], augment, augment)
listener: beginMember()
parseMethod(;, null, null, null, static, null, null, null, augment, NoType(), get, getter, DeclarationKind.Class, Class, false)
- listener: beginMethod(DeclarationKind.Class, null, null, static, null, null, get, getter)
+ listener: beginMethod(DeclarationKind.Class, null, null, static, null, null, get, getter, Class)
listener: handleNoType(augment)
ensureIdentifierPotentiallyRecovered(get, methodDeclaration, false)
listener: handleIdentifier(getter, methodDeclaration)
@@ -1276,7 +1276,7 @@
listener: handleRecoverableError(Message[DuplicatedModifier, The modifier 'augment' was already specified., Try removing all but one occurrence of the modifier., {lexeme: augment}], augment, augment)
listener: beginMember()
parseMethod(;, null, augment, null, static, null, null, null, static, SimpleType(), get, getter, DeclarationKind.Class, Class, false)
- listener: beginMethod(DeclarationKind.Class, augment, null, static, null, null, get, getter)
+ listener: beginMethod(DeclarationKind.Class, augment, null, static, null, null, get, getter, Class)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(get)
listener: handleType(int, null)
@@ -1314,7 +1314,7 @@
listener: handleRecoverableError(Message[ModifierOutOfOrder, The modifier 'augment' should be before the modifier 'static'., Try re-ordering the modifiers., {string: augment, string2: static}], augment, augment)
listener: beginMember()
parseMethod(;, null, null, null, static, null, null, null, augment, SimpleType(), get, getter, DeclarationKind.Class, Class, false)
- listener: beginMethod(DeclarationKind.Class, null, null, static, null, null, get, getter)
+ listener: beginMethod(DeclarationKind.Class, null, null, static, null, null, get, getter, Class)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(get)
listener: handleType(int, null)
@@ -1352,7 +1352,7 @@
listener: handleRecoverableError(Message[DuplicatedModifier, The modifier 'augment' was already specified., Try removing all but one occurrence of the modifier., {lexeme: augment}], augment, augment)
listener: beginMember()
parseMethod(;, null, augment, null, static, null, null, null, static, NoType(), set, setter, DeclarationKind.Class, Class, false)
- listener: beginMethod(DeclarationKind.Class, augment, null, static, null, null, set, setter)
+ listener: beginMethod(DeclarationKind.Class, augment, null, static, null, null, set, setter, Class)
listener: handleNoType(static)
ensureIdentifierPotentiallyRecovered(set, methodDeclaration, false)
listener: handleIdentifier(setter, methodDeclaration)
@@ -1394,7 +1394,7 @@
listener: handleRecoverableError(Message[ModifierOutOfOrder, The modifier 'augment' should be before the modifier 'static'., Try re-ordering the modifiers., {string: augment, string2: static}], augment, augment)
listener: beginMember()
parseMethod(}, null, null, null, static, null, null, null, augment, NoType(), set, setter, DeclarationKind.Class, Class, false)
- listener: beginMethod(DeclarationKind.Class, null, null, static, null, null, set, setter)
+ listener: beginMethod(DeclarationKind.Class, null, null, static, null, null, set, setter, Class)
listener: handleNoType(augment)
ensureIdentifierPotentiallyRecovered(set, methodDeclaration, false)
listener: handleIdentifier(setter, methodDeclaration)
@@ -1436,7 +1436,7 @@
listener: handleRecoverableError(Message[DuplicatedModifier, The modifier 'augment' was already specified., Try removing all but one occurrence of the modifier., {lexeme: augment}], augment, augment)
listener: beginMember()
parseMethod(}, null, augment, null, static, null, null, null, static, VoidType(), set, setter, DeclarationKind.Class, Class, false)
- listener: beginMethod(DeclarationKind.Class, augment, null, static, null, null, set, setter)
+ listener: beginMethod(DeclarationKind.Class, augment, null, static, null, null, set, setter, Class)
listener: handleVoidKeyword(void)
ensureIdentifierPotentiallyRecovered(set, methodDeclaration, false)
listener: handleIdentifier(setter, methodDeclaration)
@@ -1478,7 +1478,7 @@
listener: handleRecoverableError(Message[ModifierOutOfOrder, The modifier 'augment' should be before the modifier 'static'., Try re-ordering the modifiers., {string: augment, string2: static}], augment, augment)
listener: beginMember()
parseMethod(}, null, null, null, static, null, null, null, augment, VoidType(), set, setter, DeclarationKind.Class, Class, false)
- listener: beginMethod(DeclarationKind.Class, null, null, static, null, null, set, setter)
+ listener: beginMethod(DeclarationKind.Class, null, null, static, null, null, set, setter, Class)
listener: handleVoidKeyword(void)
ensureIdentifierPotentiallyRecovered(set, methodDeclaration, false)
listener: handleIdentifier(setter, methodDeclaration)
diff --git a/pkg/front_end/parser_testcases/enhanced_enums/entries_with_type_arguments.dart.expect b/pkg/front_end/parser_testcases/enhanced_enums/entries_with_type_arguments.dart.expect
index 1729fe5..cd19cc9c 100644
--- a/pkg/front_end/parser_testcases/enhanced_enums/entries_with_type_arguments.dart.expect
+++ b/pkg/front_end/parser_testcases/enhanced_enums/entries_with_type_arguments.dart.expect
@@ -81,7 +81,7 @@
beginMetadataStar(const)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E)
+ beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E, E)
handleNoType(const)
handleIdentifier(E, methodDeclaration)
handleNoTypeVariables(()
@@ -95,7 +95,7 @@
beginMetadataStar(const)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E)
+ beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E, E)
handleNoType(const)
handleIdentifier(E, methodDeclaration)
handleIdentifier(named, methodDeclarationContinuation)
diff --git a/pkg/front_end/parser_testcases/enhanced_enums/entries_with_type_arguments.dart.intertwined.expect b/pkg/front_end/parser_testcases/enhanced_enums/entries_with_type_arguments.dart.intertwined.expect
index ee0b136..000df20 100644
--- a/pkg/front_end/parser_testcases/enhanced_enums/entries_with_type_arguments.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/enhanced_enums/entries_with_type_arguments.dart.intertwined.expect
@@ -123,7 +123,7 @@
skipOuterPattern(const)
skipObjectPatternRest(E)
parseMethod(;, null, null, null, null, null, null, const, const, NoType(), null, E, DeclarationKind.Enum, E, false)
- listener: beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E)
+ listener: beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E, E)
listener: handleNoType(const)
ensureIdentifierPotentiallyRecovered(const, methodDeclaration, false)
listener: handleIdentifier(E, methodDeclaration)
@@ -154,7 +154,7 @@
skipOuterPattern(const)
skipObjectPatternRest(named)
parseMethod(;, null, null, null, null, null, null, const, const, NoType(), null, E, DeclarationKind.Enum, E, false)
- listener: beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E)
+ listener: beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E, E)
listener: handleNoType(const)
ensureIdentifierPotentiallyRecovered(const, methodDeclaration, false)
listener: handleIdentifier(E, methodDeclaration)
diff --git a/pkg/front_end/parser_testcases/error_recovery/bracket_mismatch_01.dart.expect b/pkg/front_end/parser_testcases/error_recovery/bracket_mismatch_01.dart.expect
index 1c30bf4..56a5b6d 100644
--- a/pkg/front_end/parser_testcases/error_recovery/bracket_mismatch_01.dart.expect
+++ b/pkg/front_end/parser_testcases/error_recovery/bracket_mismatch_01.dart.expect
@@ -24,7 +24,7 @@
beginMetadataStar(C)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, C)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, C, C)
handleNoType({)
handleIdentifier(C, methodDeclaration)
handleNoTypeVariables(()
@@ -47,7 +47,7 @@
beginMetadataStar(C)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, m)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, m, C)
handleIdentifier(C, typeReference)
handleNoTypeArguments(m)
handleType(C, null)
@@ -124,7 +124,7 @@
beginMetadataStar(D)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, D)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, D, D)
handleNoType({)
handleIdentifier(D, methodDeclaration)
handleNoTypeVariables(()
@@ -147,7 +147,7 @@
beginMetadataStar(D)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, m)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, m, D)
handleIdentifier(D, typeReference)
handleNoTypeArguments(m)
handleType(D, null)
diff --git a/pkg/front_end/parser_testcases/error_recovery/bracket_mismatch_01.dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/bracket_mismatch_01.dart.intertwined.expect
index 70b8314..21333e3 100644
--- a/pkg/front_end/parser_testcases/error_recovery/bracket_mismatch_01.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/error_recovery/bracket_mismatch_01.dart.intertwined.expect
@@ -33,7 +33,7 @@
listener: beginMember()
isReservedKeyword(()
parseMethod({, null, null, null, null, null, null, null, {, NoType(), null, C, DeclarationKind.Class, C, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, C)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, C, C)
listener: handleNoType({)
ensureIdentifierPotentiallyRecovered({, methodDeclaration, false)
listener: handleIdentifier(C, methodDeclaration)
@@ -76,7 +76,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(;, null, null, null, null, null, null, null, ;, SimpleType(), null, m, DeclarationKind.Class, C, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, m)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, m, C)
listener: handleIdentifier(C, typeReference)
listener: handleNoTypeArguments(m)
listener: handleType(C, null)
@@ -284,7 +284,7 @@
listener: beginMember()
isReservedKeyword(()
parseMethod({, null, null, null, null, null, null, null, {, NoType(), null, D, DeclarationKind.Class, D, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, D)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, D, D)
listener: handleNoType({)
ensureIdentifierPotentiallyRecovered({, methodDeclaration, false)
listener: handleIdentifier(D, methodDeclaration)
@@ -327,7 +327,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(;, null, null, null, null, null, null, null, ;, SimpleType(), null, m, DeclarationKind.Class, D, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, m)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, m, D)
listener: handleIdentifier(D, typeReference)
listener: handleNoTypeArguments(m)
listener: handleType(D, null)
diff --git a/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_bad_name_general.crash_dart.expect b/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_bad_name_general.crash_dart.expect
index 31e4331..58377b5 100644
--- a/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_bad_name_general.crash_dart.expect
+++ b/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_bad_name_general.crash_dart.expect
@@ -136,7 +136,7 @@
beginMetadataStar(foo)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, foo)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, foo, Foo)
handleNoType({)
handleIdentifier(foo, methodDeclaration)
handleIdentifier(x, methodDeclarationContinuation)
@@ -154,7 +154,7 @@
beginMetadataStar(foo)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, foo)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, foo, Foo)
handleNoType(})
handleIdentifier(foo, methodDeclaration)
handleIdentifier(x, methodDeclarationContinuation)
@@ -181,7 +181,7 @@
beginMetadataStar(foo)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, foo)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, foo, Foo)
handleNoType(})
handleIdentifier(foo, methodDeclaration)
handleNoTypeVariables(()
@@ -206,7 +206,7 @@
beginMetadataStar(get)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, get, Foo)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, get, Foo, Foo)
handleNoType(})
handleIdentifier(Foo, methodDeclaration)
handleNoTypeVariables(=>)
@@ -221,7 +221,7 @@
beginMetadataStar(get)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, get, Foo)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, get, Foo, Foo)
handleNoType(;)
handleIdentifier(Foo, methodDeclaration)
handleNoTypeVariables({)
@@ -239,7 +239,7 @@
beginMetadataStar(get)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, get, Foo)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, get, Foo, Foo)
handleNoType(})
handleIdentifier(Foo, methodDeclaration)
handleIdentifier(X, methodDeclarationContinuation)
@@ -258,7 +258,7 @@
beginMetadataStar(get)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, get, Foo)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, get, Foo, Foo)
handleNoType(;)
handleIdentifier(Foo, methodDeclaration)
handleIdentifier(X, methodDeclarationContinuation)
@@ -280,7 +280,7 @@
beginMetadataStar(get)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, get, Foo)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, get, Foo, Foo)
handleNoType(})
handleIdentifier(Foo, methodDeclaration)
handleNoTypeVariables(:)
@@ -306,7 +306,7 @@
beginMetadataStar(get)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, get, Foo)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, get, Foo, Foo)
handleNoType(;)
handleIdentifier(Foo, methodDeclaration)
handleIdentifier(X, methodDeclarationContinuation)
@@ -337,7 +337,7 @@
beginMetadataStar(set)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, set, Foo)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, set, Foo, Foo)
handleNoType(})
handleIdentifier(Foo, methodDeclaration)
handleNoTypeVariables(=>)
@@ -354,7 +354,7 @@
beginMetadataStar(set)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, set, Foo)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, set, Foo, Foo)
handleNoType(;)
handleIdentifier(Foo, methodDeclaration)
handleNoTypeVariables({)
@@ -374,7 +374,7 @@
beginMetadataStar(set)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, set, Foo)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, set, Foo, Foo)
handleNoType(})
handleIdentifier(Foo, methodDeclaration)
handleIdentifier(X, methodDeclarationContinuation)
@@ -393,7 +393,7 @@
beginMetadataStar(set)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, set, Foo)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, set, Foo, Foo)
handleNoType(;)
handleIdentifier(Foo, methodDeclaration)
handleIdentifier(X, methodDeclarationContinuation)
@@ -415,7 +415,7 @@
beginMetadataStar(set)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, set, Foo)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, set, Foo, Foo)
handleNoType(})
handleIdentifier(Foo, methodDeclaration)
handleNoTypeVariables(:)
@@ -441,7 +441,7 @@
beginMetadataStar(set)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, set, Foo)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, set, Foo, Foo)
handleNoType(;)
handleIdentifier(Foo, methodDeclaration)
handleIdentifier(X, methodDeclarationContinuation)
@@ -472,7 +472,7 @@
beginMetadataStar(external)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, external, null, null, null, null, Foo)
+ beginMethod(DeclarationKind.Class, null, external, null, null, null, null, Foo, Foo)
handleNoType(external)
handleIdentifier(Foo, methodDeclaration)
handleNoTypeVariables(()
@@ -496,7 +496,7 @@
beginMetadataStar(external)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, external, null, null, null, null, Foo)
+ beginMethod(DeclarationKind.Class, null, external, null, null, null, null, Foo, Foo)
handleNoType(external)
handleIdentifier(Foo, methodDeclaration)
handleIdentifier(X, methodDeclarationContinuation)
diff --git a/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_bad_name_general.crash_dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_bad_name_general.crash_dart.intertwined.expect
index ac07f56..7f9f204 100644
--- a/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_bad_name_general.crash_dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_bad_name_general.crash_dart.intertwined.expect
@@ -33,7 +33,7 @@
listener: beginMember()
isReservedKeyword(.)
parseMethod({, null, null, null, null, null, null, null, {, NoType(), null, foo, DeclarationKind.Class, Foo, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, foo)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, foo, Foo)
listener: handleNoType({)
ensureIdentifierPotentiallyRecovered({, methodDeclaration, false)
listener: handleIdentifier(foo, methodDeclaration)
@@ -71,7 +71,7 @@
listener: beginMember()
isReservedKeyword(.)
parseMethod(}, null, null, null, null, null, null, null, }, NoType(), null, foo, DeclarationKind.Class, Foo, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, foo)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, foo, Foo)
listener: handleNoType(})
ensureIdentifierPotentiallyRecovered(}, methodDeclaration, false)
listener: handleIdentifier(foo, methodDeclaration)
@@ -134,7 +134,7 @@
listener: beginMember()
isReservedKeyword(()
parseMethod(}, null, null, null, null, null, null, null, }, NoType(), null, foo, DeclarationKind.Class, Foo, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, foo)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, foo, Foo)
listener: handleNoType(})
ensureIdentifierPotentiallyRecovered(}, methodDeclaration, false)
listener: handleIdentifier(foo, methodDeclaration)
@@ -192,7 +192,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(}, null, null, null, null, null, null, null, }, NoType(), get, Foo, DeclarationKind.Class, Foo, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, Foo)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, Foo, Foo)
listener: handleNoType(})
ensureIdentifierPotentiallyRecovered(get, methodDeclaration, false)
listener: handleIdentifier(Foo, methodDeclaration)
@@ -229,7 +229,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(;, null, null, null, null, null, null, null, ;, NoType(), get, Foo, DeclarationKind.Class, Foo, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, Foo)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, Foo, Foo)
listener: handleNoType(;)
ensureIdentifierPotentiallyRecovered(get, methodDeclaration, false)
listener: handleIdentifier(Foo, methodDeclaration)
@@ -273,7 +273,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(}, null, null, null, null, null, null, null, }, NoType(), get, Foo, DeclarationKind.Class, Foo, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, Foo)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, Foo, Foo)
listener: handleNoType(})
ensureIdentifierPotentiallyRecovered(get, methodDeclaration, false)
listener: handleIdentifier(Foo, methodDeclaration)
@@ -320,7 +320,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(;, null, null, null, null, null, null, null, ;, NoType(), get, Foo, DeclarationKind.Class, Foo, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, Foo)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, Foo, Foo)
listener: handleNoType(;)
ensureIdentifierPotentiallyRecovered(get, methodDeclaration, false)
listener: handleIdentifier(Foo, methodDeclaration)
@@ -374,7 +374,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(}, null, null, null, null, null, null, null, }, NoType(), get, Foo, DeclarationKind.Class, Foo, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, Foo)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, Foo, Foo)
listener: handleNoType(})
ensureIdentifierPotentiallyRecovered(get, methodDeclaration, false)
listener: handleIdentifier(Foo, methodDeclaration)
@@ -442,7 +442,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(;, null, null, null, null, null, null, null, ;, NoType(), get, Foo, DeclarationKind.Class, Foo, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, Foo)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, Foo, Foo)
listener: handleNoType(;)
ensureIdentifierPotentiallyRecovered(get, methodDeclaration, false)
listener: handleIdentifier(Foo, methodDeclaration)
@@ -521,7 +521,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(}, null, null, null, null, null, null, null, }, NoType(), set, Foo, DeclarationKind.Class, Foo, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, set, Foo)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, set, Foo, Foo)
listener: handleNoType(})
ensureIdentifierPotentiallyRecovered(set, methodDeclaration, false)
listener: handleIdentifier(Foo, methodDeclaration)
@@ -564,7 +564,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(;, null, null, null, null, null, null, null, ;, NoType(), set, Foo, DeclarationKind.Class, Foo, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, set, Foo)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, set, Foo, Foo)
listener: handleNoType(;)
ensureIdentifierPotentiallyRecovered(set, methodDeclaration, false)
listener: handleIdentifier(Foo, methodDeclaration)
@@ -614,7 +614,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(}, null, null, null, null, null, null, null, }, NoType(), set, Foo, DeclarationKind.Class, Foo, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, set, Foo)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, set, Foo, Foo)
listener: handleNoType(})
ensureIdentifierPotentiallyRecovered(set, methodDeclaration, false)
listener: handleIdentifier(Foo, methodDeclaration)
@@ -661,7 +661,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(;, null, null, null, null, null, null, null, ;, NoType(), set, Foo, DeclarationKind.Class, Foo, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, set, Foo)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, set, Foo, Foo)
listener: handleNoType(;)
ensureIdentifierPotentiallyRecovered(set, methodDeclaration, false)
listener: handleIdentifier(Foo, methodDeclaration)
@@ -715,7 +715,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(}, null, null, null, null, null, null, null, }, NoType(), set, Foo, DeclarationKind.Class, Foo, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, set, Foo)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, set, Foo, Foo)
listener: handleNoType(})
ensureIdentifierPotentiallyRecovered(set, methodDeclaration, false)
listener: handleIdentifier(Foo, methodDeclaration)
@@ -783,7 +783,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(;, null, null, null, null, null, null, null, ;, NoType(), set, Foo, DeclarationKind.Class, Foo, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, set, Foo)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, set, Foo, Foo)
listener: handleNoType(;)
ensureIdentifierPotentiallyRecovered(set, methodDeclaration, false)
listener: handleIdentifier(Foo, methodDeclaration)
@@ -863,7 +863,7 @@
listener: beginMember()
isReservedKeyword(()
parseMethod(}, null, null, external, null, null, null, null, external, NoType(), null, Foo, DeclarationKind.Class, Foo, false)
- listener: beginMethod(DeclarationKind.Class, null, external, null, null, null, null, Foo)
+ listener: beginMethod(DeclarationKind.Class, null, external, null, null, null, null, Foo, Foo)
listener: handleNoType(external)
ensureIdentifierPotentiallyRecovered(external, methodDeclaration, false)
listener: handleIdentifier(Foo, methodDeclaration)
@@ -920,7 +920,7 @@
listener: beginMember()
isReservedKeyword(.)
parseMethod(;, null, null, external, null, null, null, null, external, NoType(), null, Foo, DeclarationKind.Class, Foo, false)
- listener: beginMethod(DeclarationKind.Class, null, external, null, null, null, null, Foo)
+ listener: beginMethod(DeclarationKind.Class, null, external, null, null, null, null, Foo, Foo)
listener: handleNoType(external)
ensureIdentifierPotentiallyRecovered(external, methodDeclaration, false)
listener: handleIdentifier(Foo, methodDeclaration)
diff --git a/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_bad_name_get.crash_dart.expect b/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_bad_name_get.crash_dart.expect
index ceaa849..2a7bf70 100644
--- a/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_bad_name_get.crash_dart.expect
+++ b/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_bad_name_get.crash_dart.expect
@@ -44,7 +44,7 @@
beginMetadataStar(get)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, get, foo)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, get, foo, Foo)
handleNoType({)
handleIdentifier(foo, methodDeclaration)
handleIdentifier(x, methodDeclarationContinuation)
@@ -63,7 +63,7 @@
beginMetadataStar(get)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, get, foo)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, get, foo, Foo)
handleNoType(})
handleIdentifier(foo, methodDeclaration)
handleIdentifier(x, methodDeclarationContinuation)
@@ -91,7 +91,7 @@
beginMetadataStar(get)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, get, foo)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, get, foo, Foo)
handleNoType(})
handleIdentifier(foo, methodDeclaration)
handleNoTypeVariables(()
diff --git a/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_bad_name_get.crash_dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_bad_name_get.crash_dart.intertwined.expect
index 42ca4e3..16f6dd9 100644
--- a/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_bad_name_get.crash_dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_bad_name_get.crash_dart.intertwined.expect
@@ -32,7 +32,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod({, null, null, null, null, null, null, null, {, NoType(), get, foo, DeclarationKind.Class, Foo, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, foo)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, foo, Foo)
listener: handleNoType({)
ensureIdentifierPotentiallyRecovered(get, methodDeclaration, false)
listener: handleIdentifier(foo, methodDeclaration)
@@ -71,7 +71,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(}, null, null, null, null, null, null, null, }, NoType(), get, foo, DeclarationKind.Class, Foo, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, foo)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, foo, Foo)
listener: handleNoType(})
ensureIdentifierPotentiallyRecovered(get, methodDeclaration, false)
listener: handleIdentifier(foo, methodDeclaration)
@@ -135,7 +135,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(}, null, null, null, null, null, null, null, }, NoType(), get, foo, DeclarationKind.Class, Foo, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, foo)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, foo, Foo)
listener: handleNoType(})
ensureIdentifierPotentiallyRecovered(get, methodDeclaration, false)
listener: handleIdentifier(foo, methodDeclaration)
diff --git a/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_bad_name_return_type.crash_dart.expect b/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_bad_name_return_type.crash_dart.expect
index 8bc06f9..469f5b4 100644
--- a/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_bad_name_return_type.crash_dart.expect
+++ b/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_bad_name_return_type.crash_dart.expect
@@ -40,7 +40,7 @@
beginMetadataStar(void)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, foo)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, foo, Foo)
handleVoidKeyword(void)
handleIdentifier(foo, methodDeclaration)
handleIdentifier(x, methodDeclarationContinuation)
@@ -59,7 +59,7 @@
beginMetadataStar(void)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, foo)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, foo, Foo)
handleVoidKeyword(void)
handleIdentifier(foo, methodDeclaration)
handleIdentifier(x, methodDeclarationContinuation)
@@ -87,7 +87,7 @@
beginMetadataStar(void)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, foo)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, foo, Foo)
handleVoidKeyword(void)
handleIdentifier(foo, methodDeclaration)
handleNoTypeVariables(()
diff --git a/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_bad_name_return_type.crash_dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_bad_name_return_type.crash_dart.intertwined.expect
index dbff9a1..045039e 100644
--- a/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_bad_name_return_type.crash_dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_bad_name_return_type.crash_dart.intertwined.expect
@@ -32,7 +32,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod({, null, null, null, null, null, null, null, {, VoidType(), null, foo, DeclarationKind.Class, Foo, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, foo)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, foo, Foo)
listener: handleVoidKeyword(void)
ensureIdentifierPotentiallyRecovered(void, methodDeclaration, false)
listener: handleIdentifier(foo, methodDeclaration)
@@ -71,7 +71,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(}, null, null, null, null, null, null, null, }, VoidType(), null, foo, DeclarationKind.Class, Foo, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, foo)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, foo, Foo)
listener: handleVoidKeyword(void)
ensureIdentifierPotentiallyRecovered(void, methodDeclaration, false)
listener: handleIdentifier(foo, methodDeclaration)
@@ -135,7 +135,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(}, null, null, null, null, null, null, null, }, VoidType(), null, foo, DeclarationKind.Class, Foo, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, foo)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, foo, Foo)
listener: handleVoidKeyword(void)
ensureIdentifierPotentiallyRecovered(void, methodDeclaration, false)
listener: handleIdentifier(foo, methodDeclaration)
diff --git a/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_bad_name_set.crash_dart.expect b/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_bad_name_set.crash_dart.expect
index c2fb04e..8376c41 100644
--- a/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_bad_name_set.crash_dart.expect
+++ b/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_bad_name_set.crash_dart.expect
@@ -40,7 +40,7 @@
beginMetadataStar(set)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, set, foo)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, set, foo, Foo)
handleNoType({)
handleIdentifier(foo, methodDeclaration)
handleIdentifier(x, methodDeclarationContinuation)
@@ -59,7 +59,7 @@
beginMetadataStar(set)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, set, foo)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, set, foo, Foo)
handleNoType(})
handleIdentifier(foo, methodDeclaration)
handleIdentifier(x, methodDeclarationContinuation)
@@ -87,7 +87,7 @@
beginMetadataStar(set)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, set, foo)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, set, foo, Foo)
handleNoType(})
handleIdentifier(foo, methodDeclaration)
handleNoTypeVariables(()
diff --git a/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_bad_name_set.crash_dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_bad_name_set.crash_dart.intertwined.expect
index 2eb271a..8e36d82 100644
--- a/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_bad_name_set.crash_dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_bad_name_set.crash_dart.intertwined.expect
@@ -32,7 +32,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod({, null, null, null, null, null, null, null, {, NoType(), set, foo, DeclarationKind.Class, Foo, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, set, foo)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, set, foo, Foo)
listener: handleNoType({)
ensureIdentifierPotentiallyRecovered(set, methodDeclaration, false)
listener: handleIdentifier(foo, methodDeclaration)
@@ -71,7 +71,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(}, null, null, null, null, null, null, null, }, NoType(), set, foo, DeclarationKind.Class, Foo, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, set, foo)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, set, foo, Foo)
listener: handleNoType(})
ensureIdentifierPotentiallyRecovered(set, methodDeclaration, false)
listener: handleIdentifier(foo, methodDeclaration)
@@ -135,7 +135,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(}, null, null, null, null, null, null, null, }, NoType(), set, foo, DeclarationKind.Class, Foo, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, set, foo)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, set, foo, Foo)
listener: handleNoType(})
ensureIdentifierPotentiallyRecovered(set, methodDeclaration, false)
listener: handleIdentifier(foo, methodDeclaration)
diff --git a/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_get.dart.expect b/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_get.dart.expect
index bd59fd4..45ef928 100644
--- a/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_get.dart.expect
+++ b/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_get.dart.expect
@@ -40,7 +40,7 @@
beginMetadataStar(get)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, get, Foo)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, get, Foo, Foo)
handleNoType({)
handleIdentifier(Foo, methodDeclaration)
handleNoTypeVariables(()
@@ -57,7 +57,7 @@
beginMetadataStar(get)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, get, Foo)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, get, Foo, Foo)
handleNoType(})
handleIdentifier(Foo, methodDeclaration)
handleNoTypeVariables(()
@@ -83,7 +83,7 @@
beginMetadataStar(get)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, get, Foo)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, get, Foo, Foo)
handleNoType(})
handleIdentifier(Foo, methodDeclaration)
handleIdentifier(x, methodDeclarationContinuation)
@@ -101,7 +101,7 @@
beginMetadataStar(get)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, get, Foo)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, get, Foo, Foo)
handleNoType(})
handleIdentifier(Foo, methodDeclaration)
handleIdentifier(x, methodDeclarationContinuation)
diff --git a/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_get.dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_get.dart.intertwined.expect
index 028d1c1..9443c91 100644
--- a/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_get.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_get.dart.intertwined.expect
@@ -32,7 +32,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod({, null, null, null, null, null, null, null, {, NoType(), get, Foo, DeclarationKind.Class, Foo, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, Foo)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, Foo, Foo)
listener: handleNoType({)
ensureIdentifierPotentiallyRecovered(get, methodDeclaration, false)
listener: handleIdentifier(Foo, methodDeclaration)
@@ -67,7 +67,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(}, null, null, null, null, null, null, null, }, NoType(), get, Foo, DeclarationKind.Class, Foo, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, Foo)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, Foo, Foo)
listener: handleNoType(})
ensureIdentifierPotentiallyRecovered(get, methodDeclaration, false)
listener: handleIdentifier(Foo, methodDeclaration)
@@ -127,7 +127,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(}, null, null, null, null, null, null, null, }, NoType(), get, Foo, DeclarationKind.Class, Foo, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, Foo)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, Foo, Foo)
listener: handleNoType(})
ensureIdentifierPotentiallyRecovered(get, methodDeclaration, false)
listener: handleIdentifier(Foo, methodDeclaration)
@@ -164,7 +164,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(}, null, null, null, null, null, null, null, }, NoType(), get, Foo, DeclarationKind.Class, Foo, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, Foo)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, Foo, Foo)
listener: handleNoType(})
ensureIdentifierPotentiallyRecovered(get, methodDeclaration, false)
listener: handleIdentifier(Foo, methodDeclaration)
diff --git a/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_ok.dart.expect b/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_ok.dart.expect
index 0daef35..5c3a01c 100644
--- a/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_ok.dart.expect
+++ b/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_ok.dart.expect
@@ -14,7 +14,7 @@
beginMetadataStar(Foo)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo)
handleNoType({)
handleIdentifier(Foo, methodDeclaration)
handleNoTypeVariables(()
@@ -29,7 +29,7 @@
beginMetadataStar(Foo)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo)
handleNoType(})
handleIdentifier(Foo, methodDeclaration)
handleNoTypeVariables(()
@@ -53,7 +53,7 @@
beginMetadataStar(Foo)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo)
handleNoType(})
handleIdentifier(Foo, methodDeclaration)
handleIdentifier(x, methodDeclarationContinuation)
@@ -70,7 +70,7 @@
beginMetadataStar(Foo)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo)
handleNoType(})
handleIdentifier(Foo, methodDeclaration)
handleIdentifier(x, methodDeclarationContinuation)
diff --git a/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_ok.dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_ok.dart.intertwined.expect
index 4f8a97c..b8c35e5 100644
--- a/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_ok.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_ok.dart.intertwined.expect
@@ -33,7 +33,7 @@
listener: beginMember()
isReservedKeyword(()
parseMethod({, null, null, null, null, null, null, null, {, NoType(), null, Foo, DeclarationKind.Class, Foo, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo)
listener: handleNoType({)
ensureIdentifierPotentiallyRecovered({, methodDeclaration, false)
listener: handleIdentifier(Foo, methodDeclaration)
@@ -65,7 +65,7 @@
listener: beginMember()
isReservedKeyword(()
parseMethod(}, null, null, null, null, null, null, null, }, NoType(), null, Foo, DeclarationKind.Class, Foo, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo)
listener: handleNoType(})
ensureIdentifierPotentiallyRecovered(}, methodDeclaration, false)
listener: handleIdentifier(Foo, methodDeclaration)
@@ -122,7 +122,7 @@
listener: beginMember()
isReservedKeyword(.)
parseMethod(}, null, null, null, null, null, null, null, }, NoType(), null, Foo, DeclarationKind.Class, Foo, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo)
listener: handleNoType(})
ensureIdentifierPotentiallyRecovered(}, methodDeclaration, false)
listener: handleIdentifier(Foo, methodDeclaration)
@@ -158,7 +158,7 @@
listener: beginMember()
isReservedKeyword(.)
parseMethod(}, null, null, null, null, null, null, null, }, NoType(), null, Foo, DeclarationKind.Class, Foo, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo)
listener: handleNoType(})
ensureIdentifierPotentiallyRecovered(}, methodDeclaration, false)
listener: handleIdentifier(Foo, methodDeclaration)
diff --git a/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_operator.crash_dart.expect b/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_operator.crash_dart.expect
index 43396e5..55a3469 100644
--- a/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_operator.crash_dart.expect
+++ b/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_operator.crash_dart.expect
@@ -88,7 +88,7 @@
beginMetadataStar(Foo)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo)
handleNoType({)
handleIdentifier(Foo, methodDeclaration)
handleNoTypeVariables(()
@@ -104,7 +104,7 @@
endMetadataStar(0)
beginMember()
handleRecoverableError(MissingOperatorKeyword, /, /)
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, operator)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, operator, Foo)
handleNoType(})
handleOperatorName(operator, /)
handleNoTypeVariables(:)
@@ -129,7 +129,7 @@
beginMetadataStar(Foo)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo)
handleNoType(})
handleIdentifier(Foo, methodDeclaration)
handleNoTypeVariables(()
@@ -151,7 +151,7 @@
endMetadataStar(0)
beginMember()
handleRecoverableError(MissingOperatorKeyword, /, /)
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, operator)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, operator, Foo)
handleNoType(.)
handleOperatorName(operator, /)
handleNoTypeVariables(:)
@@ -176,7 +176,7 @@
beginMetadataStar(foo)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, foo)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, foo, Foo)
handleNoType(})
handleIdentifier(foo, methodDeclaration)
handleNoTypeVariables(()
@@ -192,7 +192,7 @@
endMetadataStar(0)
beginMember()
handleRecoverableError(MissingOperatorKeyword, /, /)
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, operator)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, operator, Foo)
handleNoType(})
handleOperatorName(operator, /)
handleNoTypeVariables(:)
@@ -217,7 +217,7 @@
beginMetadataStar(foo)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, foo)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, foo, Foo)
handleNoType(})
handleIdentifier(foo, methodDeclaration)
handleNoTypeVariables(()
@@ -239,7 +239,7 @@
endMetadataStar(0)
beginMember()
handleRecoverableError(MissingOperatorKeyword, /, /)
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, operator)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, operator, Foo)
handleNoType(.)
handleOperatorName(operator, /)
handleNoTypeVariables(:)
diff --git a/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_operator.crash_dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_operator.crash_dart.intertwined.expect
index a14cc7a..ce199b6 100644
--- a/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_operator.crash_dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_operator.crash_dart.intertwined.expect
@@ -33,7 +33,7 @@
listener: beginMember()
isReservedKeyword(()
parseMethod({, null, null, null, null, null, null, null, {, NoType(), null, Foo, DeclarationKind.Class, Foo, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo)
listener: handleNoType({)
ensureIdentifierPotentiallyRecovered({, methodDeclaration, false)
listener: handleIdentifier(Foo, methodDeclaration)
@@ -73,7 +73,7 @@
listener: handleRecoverableError(MissingOperatorKeyword, /, /)
rewriter()
parseMethod(}, null, null, null, null, null, null, null, }, NoType(), null, operator, DeclarationKind.Class, Foo, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, operator)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, operator, Foo)
listener: handleNoType(})
parseOperatorName(})
listener: handleOperatorName(operator, /)
@@ -128,7 +128,7 @@
listener: beginMember()
isReservedKeyword(()
parseMethod(}, null, null, null, null, null, null, null, }, NoType(), null, Foo, DeclarationKind.Class, Foo, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo)
listener: handleNoType(})
ensureIdentifierPotentiallyRecovered(}, methodDeclaration, false)
listener: handleIdentifier(Foo, methodDeclaration)
@@ -179,7 +179,7 @@
listener: handleRecoverableError(MissingOperatorKeyword, /, /)
rewriter()
parseMethod(., null, null, null, null, null, null, null, ., NoType(), null, operator, DeclarationKind.Class, Foo, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, operator)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, operator, Foo)
listener: handleNoType(.)
parseOperatorName(.)
listener: handleOperatorName(operator, /)
@@ -234,7 +234,7 @@
listener: beginMember()
isReservedKeyword(()
parseMethod(}, null, null, null, null, null, null, null, }, NoType(), null, foo, DeclarationKind.Class, Foo, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, foo)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, foo, Foo)
listener: handleNoType(})
ensureIdentifierPotentiallyRecovered(}, methodDeclaration, false)
listener: handleIdentifier(foo, methodDeclaration)
@@ -274,7 +274,7 @@
listener: handleRecoverableError(MissingOperatorKeyword, /, /)
rewriter()
parseMethod(}, null, null, null, null, null, null, null, }, NoType(), null, operator, DeclarationKind.Class, Foo, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, operator)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, operator, Foo)
listener: handleNoType(})
parseOperatorName(})
listener: handleOperatorName(operator, /)
@@ -329,7 +329,7 @@
listener: beginMember()
isReservedKeyword(()
parseMethod(}, null, null, null, null, null, null, null, }, NoType(), null, foo, DeclarationKind.Class, Foo, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, foo)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, foo, Foo)
listener: handleNoType(})
ensureIdentifierPotentiallyRecovered(}, methodDeclaration, false)
listener: handleIdentifier(foo, methodDeclaration)
@@ -380,7 +380,7 @@
listener: handleRecoverableError(MissingOperatorKeyword, /, /)
rewriter()
parseMethod(., null, null, null, null, null, null, null, ., NoType(), null, operator, DeclarationKind.Class, Foo, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, operator)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, operator, Foo)
listener: handleNoType(.)
parseOperatorName(.)
listener: handleOperatorName(operator, /)
diff --git a/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_return_type.dart.expect b/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_return_type.dart.expect
index 4543667..273aa01 100644
--- a/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_return_type.dart.expect
+++ b/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_return_type.dart.expect
@@ -32,7 +32,7 @@
beginMetadataStar(void)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo)
handleVoidKeyword(void)
handleIdentifier(Foo, methodDeclaration)
handleNoTypeVariables(()
@@ -48,7 +48,7 @@
beginMetadataStar(void)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo)
handleVoidKeyword(void)
handleIdentifier(Foo, methodDeclaration)
handleNoTypeVariables(()
@@ -73,7 +73,7 @@
beginMetadataStar(void)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo)
handleVoidKeyword(void)
handleIdentifier(Foo, methodDeclaration)
handleIdentifier(x, methodDeclarationContinuation)
@@ -91,7 +91,7 @@
beginMetadataStar(void)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo)
handleVoidKeyword(void)
handleIdentifier(Foo, methodDeclaration)
handleIdentifier(x, methodDeclarationContinuation)
diff --git a/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_return_type.dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_return_type.dart.intertwined.expect
index b15f099..0dc7101 100644
--- a/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_return_type.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_return_type.dart.intertwined.expect
@@ -32,7 +32,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod({, null, null, null, null, null, null, null, {, VoidType(), null, Foo, DeclarationKind.Class, Foo, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo)
listener: handleVoidKeyword(void)
ensureIdentifierPotentiallyRecovered(void, methodDeclaration, false)
listener: handleIdentifier(Foo, methodDeclaration)
@@ -65,7 +65,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(}, null, null, null, null, null, null, null, }, VoidType(), null, Foo, DeclarationKind.Class, Foo, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo)
listener: handleVoidKeyword(void)
ensureIdentifierPotentiallyRecovered(void, methodDeclaration, false)
listener: handleIdentifier(Foo, methodDeclaration)
@@ -123,7 +123,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(}, null, null, null, null, null, null, null, }, VoidType(), null, Foo, DeclarationKind.Class, Foo, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo)
listener: handleVoidKeyword(void)
ensureIdentifierPotentiallyRecovered(void, methodDeclaration, false)
listener: handleIdentifier(Foo, methodDeclaration)
@@ -160,7 +160,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(}, null, null, null, null, null, null, null, }, VoidType(), null, Foo, DeclarationKind.Class, Foo, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo)
listener: handleVoidKeyword(void)
ensureIdentifierPotentiallyRecovered(void, methodDeclaration, false)
listener: handleIdentifier(Foo, methodDeclaration)
diff --git a/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_set.dart.expect b/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_set.dart.expect
index fc40be5..1c9245e 100644
--- a/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_set.dart.expect
+++ b/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_set.dart.expect
@@ -32,7 +32,7 @@
beginMetadataStar(set)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, set, Foo)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, set, Foo, Foo)
handleNoType({)
handleIdentifier(Foo, methodDeclaration)
handleNoTypeVariables(()
@@ -48,7 +48,7 @@
beginMetadataStar(set)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, set, Foo)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, set, Foo, Foo)
handleNoType(})
handleIdentifier(Foo, methodDeclaration)
handleNoTypeVariables(()
@@ -73,7 +73,7 @@
beginMetadataStar(set)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, set, Foo)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, set, Foo, Foo)
handleNoType(})
handleIdentifier(Foo, methodDeclaration)
handleIdentifier(x, methodDeclarationContinuation)
@@ -91,7 +91,7 @@
beginMetadataStar(set)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, set, Foo)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, set, Foo, Foo)
handleNoType(})
handleIdentifier(Foo, methodDeclaration)
handleIdentifier(x, methodDeclarationContinuation)
diff --git a/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_set.dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_set.dart.intertwined.expect
index cb0868e..e7aff89 100644
--- a/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_set.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_set.dart.intertwined.expect
@@ -32,7 +32,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod({, null, null, null, null, null, null, null, {, NoType(), set, Foo, DeclarationKind.Class, Foo, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, set, Foo)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, set, Foo, Foo)
listener: handleNoType({)
ensureIdentifierPotentiallyRecovered(set, methodDeclaration, false)
listener: handleIdentifier(Foo, methodDeclaration)
@@ -65,7 +65,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(}, null, null, null, null, null, null, null, }, NoType(), set, Foo, DeclarationKind.Class, Foo, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, set, Foo)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, set, Foo, Foo)
listener: handleNoType(})
ensureIdentifierPotentiallyRecovered(set, methodDeclaration, false)
listener: handleIdentifier(Foo, methodDeclaration)
@@ -123,7 +123,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(}, null, null, null, null, null, null, null, }, NoType(), set, Foo, DeclarationKind.Class, Foo, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, set, Foo)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, set, Foo, Foo)
listener: handleNoType(})
ensureIdentifierPotentiallyRecovered(set, methodDeclaration, false)
listener: handleIdentifier(Foo, methodDeclaration)
@@ -160,7 +160,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(}, null, null, null, null, null, null, null, }, NoType(), set, Foo, DeclarationKind.Class, Foo, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, set, Foo)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, set, Foo, Foo)
listener: handleNoType(})
ensureIdentifierPotentiallyRecovered(set, methodDeclaration, false)
listener: handleIdentifier(Foo, methodDeclaration)
diff --git a/pkg/front_end/parser_testcases/error_recovery/extension_member_contributor_test_completion.dart.expect b/pkg/front_end/parser_testcases/error_recovery/extension_member_contributor_test_completion.dart.expect
index b962334..7169b0e 100644
--- a/pkg/front_end/parser_testcases/error_recovery/extension_member_contributor_test_completion.dart.expect
+++ b/pkg/front_end/parser_testcases/error_recovery/extension_member_contributor_test_completion.dart.expect
@@ -35,7 +35,7 @@
beginMetadataStar(bool)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Extension, null, null, null, null, null, null, a)
+ beginMethod(DeclarationKind.Extension, null, null, null, null, null, null, a, E)
handleIdentifier(bool, typeReference)
handleNoTypeArguments(a)
handleType(bool, null)
@@ -70,7 +70,7 @@
beginMetadataStar(int)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Extension, null, null, null, null, null, get, b)
+ beginMethod(DeclarationKind.Extension, null, null, null, null, null, get, b, E)
handleIdentifier(int, typeReference)
handleNoTypeArguments(get)
handleType(int, null)
@@ -86,7 +86,7 @@
beginMetadataStar(set)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Extension, null, null, null, null, null, set, c)
+ beginMethod(DeclarationKind.Extension, null, null, null, null, null, set, c, E)
handleNoType(;)
handleIdentifier(c, methodDeclaration)
handleNoTypeVariables(()
diff --git a/pkg/front_end/parser_testcases/error_recovery/extension_member_contributor_test_completion.dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/extension_member_contributor_test_completion.dart.intertwined.expect
index fd583c5..a827500 100644
--- a/pkg/front_end/parser_testcases/error_recovery/extension_member_contributor_test_completion.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/error_recovery/extension_member_contributor_test_completion.dart.intertwined.expect
@@ -40,7 +40,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod({, null, null, null, null, null, null, null, {, SimpleType(), null, a, DeclarationKind.Extension, E, false)
- listener: beginMethod(DeclarationKind.Extension, null, null, null, null, null, null, a)
+ listener: beginMethod(DeclarationKind.Extension, null, null, null, null, null, null, a, E)
listener: handleIdentifier(bool, typeReference)
listener: handleNoTypeArguments(a)
listener: handleType(bool, null)
@@ -97,7 +97,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(}, null, null, null, null, null, null, null, }, SimpleType(), get, b, DeclarationKind.Extension, E, false)
- listener: beginMethod(DeclarationKind.Extension, null, null, null, null, null, get, b)
+ listener: beginMethod(DeclarationKind.Extension, null, null, null, null, null, get, b, E)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(get)
listener: handleType(int, null)
@@ -134,7 +134,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(;, null, null, null, null, null, null, null, ;, NoType(), set, c, DeclarationKind.Extension, E, false)
- listener: beginMethod(DeclarationKind.Extension, null, null, null, null, null, set, c)
+ listener: beginMethod(DeclarationKind.Extension, null, null, null, null, null, set, c, E)
listener: handleNoType(;)
ensureIdentifierPotentiallyRecovered(set, methodDeclaration, false)
listener: handleIdentifier(c, methodDeclaration)
diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_22313.dart.expect b/pkg/front_end/parser_testcases/error_recovery/issue_22313.dart.expect
index 6cd76cd..e1c0975 100644
--- a/pkg/front_end/parser_testcases/error_recovery/issue_22313.dart.expect
+++ b/pkg/front_end/parser_testcases/error_recovery/issue_22313.dart.expect
@@ -72,7 +72,7 @@
beginMetadataStar(Foo)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo)
handleNoType({)
handleIdentifier(Foo, methodDeclaration)
handleNoTypeVariables(()
@@ -114,7 +114,7 @@
beginMetadataStar(Bar)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Bar)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Bar, Bar)
handleNoType({)
handleIdentifier(Bar, methodDeclaration)
handleNoTypeVariables(()
@@ -156,7 +156,7 @@
beginMetadataStar(Baz)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Baz)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Baz, Baz)
handleNoType({)
handleIdentifier(Baz, methodDeclaration)
handleNoTypeVariables(()
diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_22313.dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/issue_22313.dart.intertwined.expect
index 2d2adbf..2fed51e 100644
--- a/pkg/front_end/parser_testcases/error_recovery/issue_22313.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/error_recovery/issue_22313.dart.intertwined.expect
@@ -95,7 +95,7 @@
listener: beginMember()
isReservedKeyword(()
parseMethod({, null, null, null, null, null, null, null, {, NoType(), null, Foo, DeclarationKind.Class, Foo, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo)
listener: handleNoType({)
ensureIdentifierPotentiallyRecovered({, methodDeclaration, false)
listener: handleIdentifier(Foo, methodDeclaration)
@@ -179,7 +179,7 @@
listener: beginMember()
isReservedKeyword(()
parseMethod({, null, null, null, null, null, null, null, {, NoType(), null, Bar, DeclarationKind.Class, Bar, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Bar)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Bar, Bar)
listener: handleNoType({)
ensureIdentifierPotentiallyRecovered({, methodDeclaration, false)
listener: handleIdentifier(Bar, methodDeclaration)
@@ -263,7 +263,7 @@
listener: beginMember()
isReservedKeyword(()
parseMethod({, null, null, null, null, null, null, null, {, NoType(), null, Baz, DeclarationKind.Class, Baz, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Baz)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Baz, Baz)
listener: handleNoType({)
ensureIdentifierPotentiallyRecovered({, methodDeclaration, false)
listener: handleIdentifier(Baz, methodDeclaration)
diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_22314.dart.expect b/pkg/front_end/parser_testcases/error_recovery/issue_22314.dart.expect
index 1465d42..bedccfb 100644
--- a/pkg/front_end/parser_testcases/error_recovery/issue_22314.dart.expect
+++ b/pkg/front_end/parser_testcases/error_recovery/issue_22314.dart.expect
@@ -46,7 +46,7 @@
beginMetadataStar(const)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, const, null, Annotation)
+ beginMethod(DeclarationKind.Class, null, null, null, null, const, null, Annotation, Annotation)
handleNoType(const)
handleIdentifier(Annotation, methodDeclaration)
handleNoTypeVariables(()
@@ -105,7 +105,7 @@
beginMetadataStar(m)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, m)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, m, C)
handleNoType({)
handleIdentifier(m, methodDeclaration)
handleNoTypeVariables(()
diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_22314.dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/issue_22314.dart.intertwined.expect
index 1b0e32d..276321e 100644
--- a/pkg/front_end/parser_testcases/error_recovery/issue_22314.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/error_recovery/issue_22314.dart.intertwined.expect
@@ -77,7 +77,7 @@
skipOuterPattern(const)
skipObjectPatternRest(Annotation)
parseMethod(;, null, null, null, null, null, null, const, const, NoType(), null, Annotation, DeclarationKind.Class, Annotation, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, const, null, Annotation)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, const, null, Annotation, Annotation)
listener: handleNoType(const)
ensureIdentifierPotentiallyRecovered(const, methodDeclaration, false)
listener: handleIdentifier(Annotation, methodDeclaration)
@@ -179,7 +179,7 @@
listener: beginMember()
isReservedKeyword(()
parseMethod({, null, null, null, null, null, null, null, {, NoType(), null, m, DeclarationKind.Class, C, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, m)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, m, C)
listener: handleNoType({)
ensureIdentifierPotentiallyRecovered({, methodDeclaration, false)
listener: handleIdentifier(m, methodDeclaration)
diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_26810.dart.expect b/pkg/front_end/parser_testcases/error_recovery/issue_26810.dart.expect
index 05bd3c7..0885597 100644
--- a/pkg/front_end/parser_testcases/error_recovery/issue_26810.dart.expect
+++ b/pkg/front_end/parser_testcases/error_recovery/issue_26810.dart.expect
@@ -76,7 +76,7 @@
beginMetadataStar(int)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, get, a)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, get, a, Key)
handleIdentifier(int, typeReference)
handleNoTypeArguments(get)
handleType(int, null)
@@ -109,7 +109,7 @@
beginMetadataStar(int)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, get, b)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, get, b, Key)
handleIdentifier(int, typeReference)
handleNoTypeArguments(get)
handleType(int, null)
@@ -141,7 +141,7 @@
beginMetadataStar(int)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, get, c)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, get, c, Key)
handleIdentifier(int, typeReference)
handleNoTypeArguments(get)
handleType(int, null)
@@ -177,7 +177,7 @@
beginMetadataStar(int)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, get, d)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, get, d, Key)
handleIdentifier(int, typeReference)
handleNoTypeArguments(get)
handleType(int, null)
@@ -212,7 +212,7 @@
beginMetadataStar(int)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, get, e)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, get, e, Key)
handleIdentifier(int, typeReference)
handleNoTypeArguments(get)
handleType(int, null)
@@ -251,7 +251,7 @@
beginMetadataStar(int)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, get, f)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, get, f, Key)
handleIdentifier(int, typeReference)
handleNoTypeArguments(get)
handleType(int, null)
@@ -289,7 +289,7 @@
beginMetadataStar(int)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, get, g)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, get, g, Key)
handleIdentifier(int, typeReference)
handleNoTypeArguments(get)
handleType(int, null)
@@ -331,7 +331,7 @@
beginMetadataStar(int)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, get, h)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, get, h, Key)
handleIdentifier(int, typeReference)
handleNoTypeArguments(get)
handleType(int, null)
@@ -372,7 +372,7 @@
beginMetadataStar(int)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, i)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, i, Key)
handleIdentifier(int, typeReference)
handleNoTypeArguments(i)
handleType(int, null)
@@ -417,7 +417,7 @@
beginMetadataStar(int)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, j)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, j, Key)
handleIdentifier(int, typeReference)
handleNoTypeArguments(j)
handleType(int, null)
@@ -461,7 +461,7 @@
beginMetadataStar(int)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, k)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, k, Key)
handleIdentifier(int, typeReference)
handleNoTypeArguments(k)
handleType(int, null)
@@ -509,7 +509,7 @@
beginMetadataStar(int)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, l)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, l, Key)
handleIdentifier(int, typeReference)
handleNoTypeArguments(l)
handleType(int, null)
@@ -556,7 +556,7 @@
beginMetadataStar(int)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, m)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, m, Key)
handleIdentifier(int, typeReference)
handleNoTypeArguments(m)
handleType(int, null)
@@ -620,7 +620,7 @@
beginMetadataStar(int)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, n)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, n, Key)
handleIdentifier(int, typeReference)
handleNoTypeArguments(n)
handleType(int, null)
@@ -683,7 +683,7 @@
beginMetadataStar(int)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, o)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, o, Key)
handleIdentifier(int, typeReference)
handleNoTypeArguments(o)
handleType(int, null)
@@ -734,7 +734,7 @@
beginMetadataStar(int)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, p)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, p, Key)
handleIdentifier(int, typeReference)
handleNoTypeArguments(p)
handleType(int, null)
@@ -784,7 +784,7 @@
beginMetadataStar(int)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, q)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, q, Key)
handleIdentifier(int, typeReference)
handleNoTypeArguments(q)
handleType(int, null)
@@ -838,7 +838,7 @@
beginMetadataStar(int)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, r)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, r, Key)
handleIdentifier(int, typeReference)
handleNoTypeArguments(r)
handleType(int, null)
@@ -891,7 +891,7 @@
beginMetadataStar(s)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, s)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, s, Key)
handleNoType(})
handleIdentifier(s, methodDeclaration)
handleNoTypeVariables(()
@@ -978,7 +978,7 @@
beginMetadataStar(Key)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Key)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Key, Key)
handleNoType(})
handleIdentifier(Key, methodDeclaration)
handleNoTypeVariables(()
@@ -1069,7 +1069,7 @@
beginMetadataStar(Key)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Key)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Key, Key)
handleNoType(})
handleIdentifier(Key, methodDeclaration)
handleNoTypeVariables(()
@@ -1157,7 +1157,7 @@
beginMetadataStar(not_currently_working)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, not_currently_working)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, not_currently_working, Key)
handleNoType(})
handleIdentifier(not_currently_working, methodDeclaration)
handleNoTypeVariables(()
diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_26810.dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/issue_26810.dart.intertwined.expect
index 9a7ee0b..321efeb 100644
--- a/pkg/front_end/parser_testcases/error_recovery/issue_26810.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/error_recovery/issue_26810.dart.intertwined.expect
@@ -32,7 +32,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod({, null, null, null, null, null, null, null, {, SimpleType(), get, a, DeclarationKind.Class, Key, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, a)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, a, Key)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(get)
listener: handleType(int, null)
@@ -119,7 +119,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(;, null, null, null, null, null, null, null, ;, SimpleType(), get, b, DeclarationKind.Class, Key, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, b)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, b, Key)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(get)
listener: handleType(int, null)
@@ -192,7 +192,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(;, null, null, null, null, null, null, null, ;, SimpleType(), get, c, DeclarationKind.Class, Key, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, c)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, c, Key)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(get)
listener: handleType(int, null)
@@ -286,7 +286,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(}, null, null, null, null, null, null, null, }, SimpleType(), get, d, DeclarationKind.Class, Key, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, d)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, d, Key)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(get)
listener: handleType(int, null)
@@ -366,7 +366,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(}, null, null, null, null, null, null, null, }, SimpleType(), get, e, DeclarationKind.Class, Key, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, e)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, e, Key)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(get)
listener: handleType(int, null)
@@ -472,7 +472,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(;, null, null, null, null, null, null, null, ;, SimpleType(), get, f, DeclarationKind.Class, Key, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, f)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, f, Key)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(get)
listener: handleType(int, null)
@@ -559,7 +559,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(;, null, null, null, null, null, null, null, ;, SimpleType(), get, g, DeclarationKind.Class, Key, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, g)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, g, Key)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(get)
listener: handleType(int, null)
@@ -672,7 +672,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(}, null, null, null, null, null, null, null, }, SimpleType(), get, h, DeclarationKind.Class, Key, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, h)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, h, Key)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(get)
listener: handleType(int, null)
@@ -766,7 +766,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(}, null, null, null, null, null, null, null, }, SimpleType(), null, i, DeclarationKind.Class, Key, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, i)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, i, Key)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(i)
listener: handleType(int, null)
@@ -863,7 +863,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(;, null, null, null, null, null, null, null, ;, SimpleType(), null, j, DeclarationKind.Class, Key, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, j)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, j, Key)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(j)
listener: handleType(int, null)
@@ -948,7 +948,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(;, null, null, null, null, null, null, null, ;, SimpleType(), null, k, DeclarationKind.Class, Key, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, k)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, k, Key)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(k)
listener: handleType(int, null)
@@ -1052,7 +1052,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(}, null, null, null, null, null, null, null, }, SimpleType(), null, l, DeclarationKind.Class, Key, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, l)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, l, Key)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(l)
listener: handleType(int, null)
@@ -1144,7 +1144,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(}, null, null, null, null, null, null, null, }, SimpleType(), null, m, DeclarationKind.Class, Key, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, m)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, m, Key)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(m)
listener: handleType(int, null)
@@ -1283,7 +1283,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(}, null, null, null, null, null, null, null, }, SimpleType(), null, n, DeclarationKind.Class, Key, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, n)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, n, Key)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(n)
listener: handleType(int, null)
@@ -1410,7 +1410,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(}, null, null, null, null, null, null, null, }, SimpleType(), null, o, DeclarationKind.Class, Key, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, o)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, o, Key)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(o)
listener: handleType(int, null)
@@ -1526,7 +1526,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(;, null, null, null, null, null, null, null, ;, SimpleType(), null, p, DeclarationKind.Class, Key, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, p)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, p, Key)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(p)
listener: handleType(int, null)
@@ -1625,7 +1625,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(;, null, null, null, null, null, null, null, ;, SimpleType(), null, q, DeclarationKind.Class, Key, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, q)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, q, Key)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(q)
listener: handleType(int, null)
@@ -1748,7 +1748,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(}, null, null, null, null, null, null, null, }, SimpleType(), null, r, DeclarationKind.Class, Key, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, r)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, r, Key)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(r)
listener: handleType(int, null)
@@ -1855,7 +1855,7 @@
listener: beginMember()
isReservedKeyword(()
parseMethod(}, null, null, null, null, null, null, null, }, NoType(), null, s, DeclarationKind.Class, Key, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, s)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, s, Key)
listener: handleNoType(})
ensureIdentifierPotentiallyRecovered(}, methodDeclaration, false)
listener: handleIdentifier(s, methodDeclaration)
@@ -2093,7 +2093,7 @@
listener: beginMember()
isReservedKeyword(()
parseMethod(}, null, null, null, null, null, null, null, }, NoType(), null, Key, DeclarationKind.Class, Key, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Key)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Key, Key)
listener: handleNoType(})
ensureIdentifierPotentiallyRecovered(}, methodDeclaration, false)
listener: handleIdentifier(Key, methodDeclaration)
@@ -2338,7 +2338,7 @@
listener: beginMember()
isReservedKeyword(()
parseMethod(}, null, null, null, null, null, null, null, }, NoType(), null, Key, DeclarationKind.Class, Key, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Key)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Key, Key)
listener: handleNoType(})
ensureIdentifierPotentiallyRecovered(}, methodDeclaration, false)
listener: handleIdentifier(Key, methodDeclaration)
@@ -2547,7 +2547,7 @@
listener: beginMember()
isReservedKeyword(()
parseMethod(}, null, null, null, null, null, null, null, }, NoType(), null, not_currently_working, DeclarationKind.Class, Key, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, not_currently_working)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, not_currently_working, Key)
listener: handleNoType(})
ensureIdentifierPotentiallyRecovered(}, methodDeclaration, false)
listener: handleIdentifier(not_currently_working, methodDeclaration)
diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_26810_and.dart.expect b/pkg/front_end/parser_testcases/error_recovery/issue_26810_and.dart.expect
index d1ae819..98268b6 100644
--- a/pkg/front_end/parser_testcases/error_recovery/issue_26810_and.dart.expect
+++ b/pkg/front_end/parser_testcases/error_recovery/issue_26810_and.dart.expect
@@ -76,7 +76,7 @@
beginMetadataStar(int)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, get, a)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, get, a, Key)
handleIdentifier(int, typeReference)
handleNoTypeArguments(get)
handleType(int, null)
@@ -109,7 +109,7 @@
beginMetadataStar(int)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, get, b)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, get, b, Key)
handleIdentifier(int, typeReference)
handleNoTypeArguments(get)
handleType(int, null)
@@ -141,7 +141,7 @@
beginMetadataStar(int)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, get, c)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, get, c, Key)
handleIdentifier(int, typeReference)
handleNoTypeArguments(get)
handleType(int, null)
@@ -177,7 +177,7 @@
beginMetadataStar(int)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, get, d)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, get, d, Key)
handleIdentifier(int, typeReference)
handleNoTypeArguments(get)
handleType(int, null)
@@ -212,7 +212,7 @@
beginMetadataStar(int)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, get, e)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, get, e, Key)
handleIdentifier(int, typeReference)
handleNoTypeArguments(get)
handleType(int, null)
@@ -251,7 +251,7 @@
beginMetadataStar(int)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, get, f)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, get, f, Key)
handleIdentifier(int, typeReference)
handleNoTypeArguments(get)
handleType(int, null)
@@ -289,7 +289,7 @@
beginMetadataStar(int)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, get, g)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, get, g, Key)
handleIdentifier(int, typeReference)
handleNoTypeArguments(get)
handleType(int, null)
@@ -331,7 +331,7 @@
beginMetadataStar(int)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, get, h)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, get, h, Key)
handleIdentifier(int, typeReference)
handleNoTypeArguments(get)
handleType(int, null)
@@ -372,7 +372,7 @@
beginMetadataStar(int)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, i)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, i, Key)
handleIdentifier(int, typeReference)
handleNoTypeArguments(i)
handleType(int, null)
@@ -417,7 +417,7 @@
beginMetadataStar(int)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, j)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, j, Key)
handleIdentifier(int, typeReference)
handleNoTypeArguments(j)
handleType(int, null)
@@ -461,7 +461,7 @@
beginMetadataStar(int)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, k)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, k, Key)
handleIdentifier(int, typeReference)
handleNoTypeArguments(k)
handleType(int, null)
@@ -509,7 +509,7 @@
beginMetadataStar(int)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, l)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, l, Key)
handleIdentifier(int, typeReference)
handleNoTypeArguments(l)
handleType(int, null)
@@ -556,7 +556,7 @@
beginMetadataStar(int)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, m)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, m, Key)
handleIdentifier(int, typeReference)
handleNoTypeArguments(m)
handleType(int, null)
@@ -620,7 +620,7 @@
beginMetadataStar(int)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, n)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, n, Key)
handleIdentifier(int, typeReference)
handleNoTypeArguments(n)
handleType(int, null)
@@ -683,7 +683,7 @@
beginMetadataStar(int)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, o)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, o, Key)
handleIdentifier(int, typeReference)
handleNoTypeArguments(o)
handleType(int, null)
@@ -734,7 +734,7 @@
beginMetadataStar(int)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, p)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, p, Key)
handleIdentifier(int, typeReference)
handleNoTypeArguments(p)
handleType(int, null)
@@ -784,7 +784,7 @@
beginMetadataStar(int)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, q)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, q, Key)
handleIdentifier(int, typeReference)
handleNoTypeArguments(q)
handleType(int, null)
@@ -838,7 +838,7 @@
beginMetadataStar(int)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, r)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, r, Key)
handleIdentifier(int, typeReference)
handleNoTypeArguments(r)
handleType(int, null)
@@ -891,7 +891,7 @@
beginMetadataStar(s)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, s)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, s, Key)
handleNoType(})
handleIdentifier(s, methodDeclaration)
handleNoTypeVariables(()
@@ -978,7 +978,7 @@
beginMetadataStar(Key)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Key)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Key, Key)
handleNoType(})
handleIdentifier(Key, methodDeclaration)
handleNoTypeVariables(()
@@ -1069,7 +1069,7 @@
beginMetadataStar(Key)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Key)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Key, Key)
handleNoType(})
handleIdentifier(Key, methodDeclaration)
handleNoTypeVariables(()
@@ -1157,7 +1157,7 @@
beginMetadataStar(not_currently_working)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, not_currently_working)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, not_currently_working, Key)
handleNoType(})
handleIdentifier(not_currently_working, methodDeclaration)
handleNoTypeVariables(()
diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_26810_and.dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/issue_26810_and.dart.intertwined.expect
index 201e724..a897584 100644
--- a/pkg/front_end/parser_testcases/error_recovery/issue_26810_and.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/error_recovery/issue_26810_and.dart.intertwined.expect
@@ -32,7 +32,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod({, null, null, null, null, null, null, null, {, SimpleType(), get, a, DeclarationKind.Class, Key, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, a)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, a, Key)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(get)
listener: handleType(int, null)
@@ -119,7 +119,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(;, null, null, null, null, null, null, null, ;, SimpleType(), get, b, DeclarationKind.Class, Key, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, b)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, b, Key)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(get)
listener: handleType(int, null)
@@ -192,7 +192,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(;, null, null, null, null, null, null, null, ;, SimpleType(), get, c, DeclarationKind.Class, Key, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, c)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, c, Key)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(get)
listener: handleType(int, null)
@@ -286,7 +286,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(}, null, null, null, null, null, null, null, }, SimpleType(), get, d, DeclarationKind.Class, Key, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, d)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, d, Key)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(get)
listener: handleType(int, null)
@@ -366,7 +366,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(}, null, null, null, null, null, null, null, }, SimpleType(), get, e, DeclarationKind.Class, Key, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, e)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, e, Key)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(get)
listener: handleType(int, null)
@@ -473,7 +473,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(;, null, null, null, null, null, null, null, ;, SimpleType(), get, f, DeclarationKind.Class, Key, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, f)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, f, Key)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(get)
listener: handleType(int, null)
@@ -560,7 +560,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(;, null, null, null, null, null, null, null, ;, SimpleType(), get, g, DeclarationKind.Class, Key, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, g)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, g, Key)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(get)
listener: handleType(int, null)
@@ -674,7 +674,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(}, null, null, null, null, null, null, null, }, SimpleType(), get, h, DeclarationKind.Class, Key, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, h)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, h, Key)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(get)
listener: handleType(int, null)
@@ -768,7 +768,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(}, null, null, null, null, null, null, null, }, SimpleType(), null, i, DeclarationKind.Class, Key, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, i)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, i, Key)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(i)
listener: handleType(int, null)
@@ -865,7 +865,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(;, null, null, null, null, null, null, null, ;, SimpleType(), null, j, DeclarationKind.Class, Key, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, j)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, j, Key)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(j)
listener: handleType(int, null)
@@ -950,7 +950,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(;, null, null, null, null, null, null, null, ;, SimpleType(), null, k, DeclarationKind.Class, Key, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, k)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, k, Key)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(k)
listener: handleType(int, null)
@@ -1054,7 +1054,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(}, null, null, null, null, null, null, null, }, SimpleType(), null, l, DeclarationKind.Class, Key, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, l)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, l, Key)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(l)
listener: handleType(int, null)
@@ -1146,7 +1146,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(}, null, null, null, null, null, null, null, }, SimpleType(), null, m, DeclarationKind.Class, Key, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, m)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, m, Key)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(m)
listener: handleType(int, null)
@@ -1285,7 +1285,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(}, null, null, null, null, null, null, null, }, SimpleType(), null, n, DeclarationKind.Class, Key, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, n)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, n, Key)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(n)
listener: handleType(int, null)
@@ -1412,7 +1412,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(}, null, null, null, null, null, null, null, }, SimpleType(), null, o, DeclarationKind.Class, Key, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, o)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, o, Key)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(o)
listener: handleType(int, null)
@@ -1529,7 +1529,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(;, null, null, null, null, null, null, null, ;, SimpleType(), null, p, DeclarationKind.Class, Key, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, p)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, p, Key)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(p)
listener: handleType(int, null)
@@ -1628,7 +1628,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(;, null, null, null, null, null, null, null, ;, SimpleType(), null, q, DeclarationKind.Class, Key, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, q)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, q, Key)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(q)
listener: handleType(int, null)
@@ -1752,7 +1752,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(}, null, null, null, null, null, null, null, }, SimpleType(), null, r, DeclarationKind.Class, Key, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, r)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, r, Key)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(r)
listener: handleType(int, null)
@@ -1859,7 +1859,7 @@
listener: beginMember()
isReservedKeyword(()
parseMethod(}, null, null, null, null, null, null, null, }, NoType(), null, s, DeclarationKind.Class, Key, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, s)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, s, Key)
listener: handleNoType(})
ensureIdentifierPotentiallyRecovered(}, methodDeclaration, false)
listener: handleIdentifier(s, methodDeclaration)
@@ -2097,7 +2097,7 @@
listener: beginMember()
isReservedKeyword(()
parseMethod(}, null, null, null, null, null, null, null, }, NoType(), null, Key, DeclarationKind.Class, Key, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Key)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Key, Key)
listener: handleNoType(})
ensureIdentifierPotentiallyRecovered(}, methodDeclaration, false)
listener: handleIdentifier(Key, methodDeclaration)
@@ -2342,7 +2342,7 @@
listener: beginMember()
isReservedKeyword(()
parseMethod(}, null, null, null, null, null, null, null, }, NoType(), null, Key, DeclarationKind.Class, Key, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Key)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Key, Key)
listener: handleNoType(})
ensureIdentifierPotentiallyRecovered(}, methodDeclaration, false)
listener: handleIdentifier(Key, methodDeclaration)
@@ -2551,7 +2551,7 @@
listener: beginMember()
isReservedKeyword(()
parseMethod(}, null, null, null, null, null, null, null, }, NoType(), null, not_currently_working, DeclarationKind.Class, Key, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, not_currently_working)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, not_currently_working, Key)
listener: handleNoType(})
ensureIdentifierPotentiallyRecovered(}, methodDeclaration, false)
listener: handleIdentifier(not_currently_working, methodDeclaration)
diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_26810_or.dart.expect b/pkg/front_end/parser_testcases/error_recovery/issue_26810_or.dart.expect
index 1c01d94..1aa8444 100644
--- a/pkg/front_end/parser_testcases/error_recovery/issue_26810_or.dart.expect
+++ b/pkg/front_end/parser_testcases/error_recovery/issue_26810_or.dart.expect
@@ -76,7 +76,7 @@
beginMetadataStar(int)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, get, a)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, get, a, Key)
handleIdentifier(int, typeReference)
handleNoTypeArguments(get)
handleType(int, null)
@@ -109,7 +109,7 @@
beginMetadataStar(int)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, get, b)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, get, b, Key)
handleIdentifier(int, typeReference)
handleNoTypeArguments(get)
handleType(int, null)
@@ -141,7 +141,7 @@
beginMetadataStar(int)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, get, c)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, get, c, Key)
handleIdentifier(int, typeReference)
handleNoTypeArguments(get)
handleType(int, null)
@@ -177,7 +177,7 @@
beginMetadataStar(int)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, get, d)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, get, d, Key)
handleIdentifier(int, typeReference)
handleNoTypeArguments(get)
handleType(int, null)
@@ -212,7 +212,7 @@
beginMetadataStar(int)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, get, e)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, get, e, Key)
handleIdentifier(int, typeReference)
handleNoTypeArguments(get)
handleType(int, null)
@@ -251,7 +251,7 @@
beginMetadataStar(int)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, get, f)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, get, f, Key)
handleIdentifier(int, typeReference)
handleNoTypeArguments(get)
handleType(int, null)
@@ -289,7 +289,7 @@
beginMetadataStar(int)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, get, g)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, get, g, Key)
handleIdentifier(int, typeReference)
handleNoTypeArguments(get)
handleType(int, null)
@@ -331,7 +331,7 @@
beginMetadataStar(int)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, get, h)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, get, h, Key)
handleIdentifier(int, typeReference)
handleNoTypeArguments(get)
handleType(int, null)
@@ -372,7 +372,7 @@
beginMetadataStar(int)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, i)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, i, Key)
handleIdentifier(int, typeReference)
handleNoTypeArguments(i)
handleType(int, null)
@@ -417,7 +417,7 @@
beginMetadataStar(int)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, j)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, j, Key)
handleIdentifier(int, typeReference)
handleNoTypeArguments(j)
handleType(int, null)
@@ -461,7 +461,7 @@
beginMetadataStar(int)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, k)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, k, Key)
handleIdentifier(int, typeReference)
handleNoTypeArguments(k)
handleType(int, null)
@@ -509,7 +509,7 @@
beginMetadataStar(int)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, l)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, l, Key)
handleIdentifier(int, typeReference)
handleNoTypeArguments(l)
handleType(int, null)
@@ -556,7 +556,7 @@
beginMetadataStar(int)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, m)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, m, Key)
handleIdentifier(int, typeReference)
handleNoTypeArguments(m)
handleType(int, null)
@@ -620,7 +620,7 @@
beginMetadataStar(int)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, n)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, n, Key)
handleIdentifier(int, typeReference)
handleNoTypeArguments(n)
handleType(int, null)
@@ -683,7 +683,7 @@
beginMetadataStar(int)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, o)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, o, Key)
handleIdentifier(int, typeReference)
handleNoTypeArguments(o)
handleType(int, null)
@@ -734,7 +734,7 @@
beginMetadataStar(int)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, p)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, p, Key)
handleIdentifier(int, typeReference)
handleNoTypeArguments(p)
handleType(int, null)
@@ -784,7 +784,7 @@
beginMetadataStar(int)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, q)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, q, Key)
handleIdentifier(int, typeReference)
handleNoTypeArguments(q)
handleType(int, null)
@@ -838,7 +838,7 @@
beginMetadataStar(int)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, r)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, r, Key)
handleIdentifier(int, typeReference)
handleNoTypeArguments(r)
handleType(int, null)
@@ -891,7 +891,7 @@
beginMetadataStar(s)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, s)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, s, Key)
handleNoType(})
handleIdentifier(s, methodDeclaration)
handleNoTypeVariables(()
@@ -978,7 +978,7 @@
beginMetadataStar(Key)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Key)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Key, Key)
handleNoType(})
handleIdentifier(Key, methodDeclaration)
handleNoTypeVariables(()
@@ -1069,7 +1069,7 @@
beginMetadataStar(Key)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Key)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Key, Key)
handleNoType(})
handleIdentifier(Key, methodDeclaration)
handleNoTypeVariables(()
@@ -1157,7 +1157,7 @@
beginMetadataStar(not_currently_working)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, not_currently_working)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, not_currently_working, Key)
handleNoType(})
handleIdentifier(not_currently_working, methodDeclaration)
handleNoTypeVariables(()
diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_26810_or.dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/issue_26810_or.dart.intertwined.expect
index 73fa984..08d61bf 100644
--- a/pkg/front_end/parser_testcases/error_recovery/issue_26810_or.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/error_recovery/issue_26810_or.dart.intertwined.expect
@@ -32,7 +32,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod({, null, null, null, null, null, null, null, {, SimpleType(), get, a, DeclarationKind.Class, Key, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, a)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, a, Key)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(get)
listener: handleType(int, null)
@@ -119,7 +119,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(;, null, null, null, null, null, null, null, ;, SimpleType(), get, b, DeclarationKind.Class, Key, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, b)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, b, Key)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(get)
listener: handleType(int, null)
@@ -192,7 +192,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(;, null, null, null, null, null, null, null, ;, SimpleType(), get, c, DeclarationKind.Class, Key, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, c)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, c, Key)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(get)
listener: handleType(int, null)
@@ -286,7 +286,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(}, null, null, null, null, null, null, null, }, SimpleType(), get, d, DeclarationKind.Class, Key, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, d)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, d, Key)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(get)
listener: handleType(int, null)
@@ -366,7 +366,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(}, null, null, null, null, null, null, null, }, SimpleType(), get, e, DeclarationKind.Class, Key, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, e)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, e, Key)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(get)
listener: handleType(int, null)
@@ -473,7 +473,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(;, null, null, null, null, null, null, null, ;, SimpleType(), get, f, DeclarationKind.Class, Key, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, f)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, f, Key)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(get)
listener: handleType(int, null)
@@ -560,7 +560,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(;, null, null, null, null, null, null, null, ;, SimpleType(), get, g, DeclarationKind.Class, Key, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, g)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, g, Key)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(get)
listener: handleType(int, null)
@@ -674,7 +674,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(}, null, null, null, null, null, null, null, }, SimpleType(), get, h, DeclarationKind.Class, Key, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, h)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, h, Key)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(get)
listener: handleType(int, null)
@@ -768,7 +768,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(}, null, null, null, null, null, null, null, }, SimpleType(), null, i, DeclarationKind.Class, Key, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, i)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, i, Key)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(i)
listener: handleType(int, null)
@@ -865,7 +865,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(;, null, null, null, null, null, null, null, ;, SimpleType(), null, j, DeclarationKind.Class, Key, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, j)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, j, Key)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(j)
listener: handleType(int, null)
@@ -950,7 +950,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(;, null, null, null, null, null, null, null, ;, SimpleType(), null, k, DeclarationKind.Class, Key, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, k)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, k, Key)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(k)
listener: handleType(int, null)
@@ -1054,7 +1054,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(}, null, null, null, null, null, null, null, }, SimpleType(), null, l, DeclarationKind.Class, Key, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, l)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, l, Key)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(l)
listener: handleType(int, null)
@@ -1146,7 +1146,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(}, null, null, null, null, null, null, null, }, SimpleType(), null, m, DeclarationKind.Class, Key, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, m)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, m, Key)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(m)
listener: handleType(int, null)
@@ -1285,7 +1285,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(}, null, null, null, null, null, null, null, }, SimpleType(), null, n, DeclarationKind.Class, Key, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, n)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, n, Key)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(n)
listener: handleType(int, null)
@@ -1412,7 +1412,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(}, null, null, null, null, null, null, null, }, SimpleType(), null, o, DeclarationKind.Class, Key, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, o)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, o, Key)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(o)
listener: handleType(int, null)
@@ -1529,7 +1529,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(;, null, null, null, null, null, null, null, ;, SimpleType(), null, p, DeclarationKind.Class, Key, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, p)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, p, Key)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(p)
listener: handleType(int, null)
@@ -1628,7 +1628,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(;, null, null, null, null, null, null, null, ;, SimpleType(), null, q, DeclarationKind.Class, Key, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, q)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, q, Key)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(q)
listener: handleType(int, null)
@@ -1752,7 +1752,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(}, null, null, null, null, null, null, null, }, SimpleType(), null, r, DeclarationKind.Class, Key, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, r)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, r, Key)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(r)
listener: handleType(int, null)
@@ -1859,7 +1859,7 @@
listener: beginMember()
isReservedKeyword(()
parseMethod(}, null, null, null, null, null, null, null, }, NoType(), null, s, DeclarationKind.Class, Key, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, s)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, s, Key)
listener: handleNoType(})
ensureIdentifierPotentiallyRecovered(}, methodDeclaration, false)
listener: handleIdentifier(s, methodDeclaration)
@@ -2097,7 +2097,7 @@
listener: beginMember()
isReservedKeyword(()
parseMethod(}, null, null, null, null, null, null, null, }, NoType(), null, Key, DeclarationKind.Class, Key, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Key)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Key, Key)
listener: handleNoType(})
ensureIdentifierPotentiallyRecovered(}, methodDeclaration, false)
listener: handleIdentifier(Key, methodDeclaration)
@@ -2342,7 +2342,7 @@
listener: beginMember()
isReservedKeyword(()
parseMethod(}, null, null, null, null, null, null, null, }, NoType(), null, Key, DeclarationKind.Class, Key, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Key)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Key, Key)
listener: handleNoType(})
ensureIdentifierPotentiallyRecovered(}, methodDeclaration, false)
listener: handleIdentifier(Key, methodDeclaration)
@@ -2551,7 +2551,7 @@
listener: beginMember()
isReservedKeyword(()
parseMethod(}, null, null, null, null, null, null, null, }, NoType(), null, not_currently_working, DeclarationKind.Class, Key, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, not_currently_working)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, not_currently_working, Key)
listener: handleNoType(})
ensureIdentifierPotentiallyRecovered(}, methodDeclaration, false)
listener: handleIdentifier(not_currently_working, methodDeclaration)
diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_39026.crash_dart.expect b/pkg/front_end/parser_testcases/error_recovery/issue_39026.crash_dart.expect
index 6f17aee..3e2fd4d 100644
--- a/pkg/front_end/parser_testcases/error_recovery/issue_39026.crash_dart.expect
+++ b/pkg/front_end/parser_testcases/error_recovery/issue_39026.crash_dart.expect
@@ -25,7 +25,7 @@
endMetadataStar(0)
beginMember()
handleRecoverableError(MissingOperatorKeyword, <, <)
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, operator)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, operator, A)
handleIdentifier(co, typeReference)
handleNoTypeArguments(operator)
handleType(co, null)
diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_39026.crash_dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/issue_39026.crash_dart.intertwined.expect
index 85c67d5..6d92eeb 100644
--- a/pkg/front_end/parser_testcases/error_recovery/issue_39026.crash_dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/error_recovery/issue_39026.crash_dart.intertwined.expect
@@ -36,7 +36,7 @@
listener: handleRecoverableError(MissingOperatorKeyword, <, <)
rewriter()
parseMethod({, null, null, null, null, null, null, null, {, SimpleType(), null, operator, DeclarationKind.Class, A, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, operator)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, operator, A)
listener: handleIdentifier(co, typeReference)
listener: handleNoTypeArguments(operator)
listener: handleType(co, null)
diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_39026_prime.crash_dart.expect b/pkg/front_end/parser_testcases/error_recovery/issue_39026_prime.crash_dart.expect
index 799aafd..80722bd 100644
--- a/pkg/front_end/parser_testcases/error_recovery/issue_39026_prime.crash_dart.expect
+++ b/pkg/front_end/parser_testcases/error_recovery/issue_39026_prime.crash_dart.expect
@@ -20,7 +20,7 @@
beginMetadataStar(co)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, operator)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, operator, A)
handleIdentifier(co, typeReference)
handleNoTypeArguments(operator)
handleType(co, null)
diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_39026_prime.crash_dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/issue_39026_prime.crash_dart.intertwined.expect
index 559bbf2..613d2cd 100644
--- a/pkg/front_end/parser_testcases/error_recovery/issue_39026_prime.crash_dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/error_recovery/issue_39026_prime.crash_dart.intertwined.expect
@@ -32,7 +32,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod({, null, null, null, null, null, null, null, {, SimpleType(), null, operator, DeclarationKind.Class, A, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, operator)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, operator, A)
listener: handleIdentifier(co, typeReference)
listener: handleNoTypeArguments(operator)
listener: handleType(co, null)
diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_39230.crash_dart.expect b/pkg/front_end/parser_testcases/error_recovery/issue_39230.crash_dart.expect
index df9d76f..226c939 100644
--- a/pkg/front_end/parser_testcases/error_recovery/issue_39230.crash_dart.expect
+++ b/pkg/front_end/parser_testcases/error_recovery/issue_39230.crash_dart.expect
@@ -32,7 +32,7 @@
beginMetadataStar(C)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, C)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, C, C)
handleNoType({)
handleIdentifier(C, methodDeclaration)
handleNoTypeVariables(()
@@ -48,7 +48,7 @@
endMetadataStar(0)
beginMember()
handleRecoverableError(MissingOperatorKeyword, /, /)
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, operator)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, operator, C)
handleNoType(})
handleOperatorName(operator, /)
handleNoTypeVariables(:)
diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_39230.crash_dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/issue_39230.crash_dart.intertwined.expect
index 4e4fdfb..0bacb53 100644
--- a/pkg/front_end/parser_testcases/error_recovery/issue_39230.crash_dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/error_recovery/issue_39230.crash_dart.intertwined.expect
@@ -33,7 +33,7 @@
listener: beginMember()
isReservedKeyword(()
parseMethod({, null, null, null, null, null, null, null, {, NoType(), null, C, DeclarationKind.Class, C, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, C)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, C, C)
listener: handleNoType({)
ensureIdentifierPotentiallyRecovered({, methodDeclaration, false)
listener: handleIdentifier(C, methodDeclaration)
@@ -73,7 +73,7 @@
listener: handleRecoverableError(MissingOperatorKeyword, /, /)
rewriter()
parseMethod(}, null, null, null, null, null, null, null, }, NoType(), null, operator, DeclarationKind.Class, C, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, operator)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, operator, C)
listener: handleNoType(})
parseOperatorName(})
listener: handleOperatorName(operator, /)
diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_45327_prime_1.crash_dart.expect b/pkg/front_end/parser_testcases/error_recovery/issue_45327_prime_1.crash_dart.expect
index 224e051..00ccac0a 100644
--- a/pkg/front_end/parser_testcases/error_recovery/issue_45327_prime_1.crash_dart.expect
+++ b/pkg/front_end/parser_testcases/error_recovery/issue_45327_prime_1.crash_dart.expect
@@ -32,7 +32,7 @@
beginMetadataStar(foo)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, foo)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, foo, Foo)
handleNoType({)
handleIdentifier(foo, methodDeclaration)
handleNoTypeVariables(()
diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_45327_prime_1.crash_dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/issue_45327_prime_1.crash_dart.intertwined.expect
index 827cdce..21893dd 100644
--- a/pkg/front_end/parser_testcases/error_recovery/issue_45327_prime_1.crash_dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/error_recovery/issue_45327_prime_1.crash_dart.intertwined.expect
@@ -41,7 +41,7 @@
listener: beginMember()
isReservedKeyword(()
parseMethod({, null, null, null, null, null, null, null, {, NoType(), null, foo, DeclarationKind.Class, Foo, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, foo)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, foo, Foo)
listener: handleNoType({)
ensureIdentifierPotentiallyRecovered({, methodDeclaration, false)
listener: handleIdentifier(foo, methodDeclaration)
diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_46505_prime_1.crash_dart.expect b/pkg/front_end/parser_testcases/error_recovery/issue_46505_prime_1.crash_dart.expect
index 5252f26..7ec5628 100644
--- a/pkg/front_end/parser_testcases/error_recovery/issue_46505_prime_1.crash_dart.expect
+++ b/pkg/front_end/parser_testcases/error_recovery/issue_46505_prime_1.crash_dart.expect
@@ -20,7 +20,7 @@
beginMetadataStar(Stream)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, x)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, x, A)
handleIdentifier(Stream, typeReference)
beginTypeArguments(<)
handleIdentifier(List, typeReference)
diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_46505_prime_1.crash_dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/issue_46505_prime_1.crash_dart.intertwined.expect
index 2d96eb3..34c61d4b 100644
--- a/pkg/front_end/parser_testcases/error_recovery/issue_46505_prime_1.crash_dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/error_recovery/issue_46505_prime_1.crash_dart.intertwined.expect
@@ -32,7 +32,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod({, null, null, null, null, null, null, null, {, ComplexTypeInfo(start: Stream, typeArguments: ComplexTypeParamOrArgInfo(start: <, inDeclaration: true, allowsVariance: false, typeArgumentCount: 1, skipEnd: >, recovered: false), beforeQuestionMark: null, end: >, typeVariableStarters: [], gftHasReturnType: null, isRecordType: false, gftReturnTypeHasRecordType: false, recovered: false), null, x, DeclarationKind.Class, A, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, x)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, x, A)
ensureIdentifier({, typeReference)
listener: handleIdentifier(Stream, typeReference)
listener: beginTypeArguments(<)
diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_46505_prime_2.crash_dart.expect b/pkg/front_end/parser_testcases/error_recovery/issue_46505_prime_2.crash_dart.expect
index 6f52d9c..d32dc26 100644
--- a/pkg/front_end/parser_testcases/error_recovery/issue_46505_prime_2.crash_dart.expect
+++ b/pkg/front_end/parser_testcases/error_recovery/issue_46505_prime_2.crash_dart.expect
@@ -14,7 +14,7 @@
beginMetadataStar(Stream)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, x)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, x, A)
handleIdentifier(Stream, typeReference)
beginTypeArguments(<)
handleIdentifier(List, typeReference)
diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_46505_prime_2.crash_dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/issue_46505_prime_2.crash_dart.intertwined.expect
index 1e48feb..71bd39e 100644
--- a/pkg/front_end/parser_testcases/error_recovery/issue_46505_prime_2.crash_dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/error_recovery/issue_46505_prime_2.crash_dart.intertwined.expect
@@ -32,7 +32,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod({, null, null, null, null, null, null, null, {, ComplexTypeInfo(start: Stream, typeArguments: ComplexTypeParamOrArgInfo(start: <, inDeclaration: true, allowsVariance: false, typeArgumentCount: 1, skipEnd: >, recovered: false), beforeQuestionMark: null, end: >, typeVariableStarters: [], gftHasReturnType: null, isRecordType: false, gftReturnTypeHasRecordType: false, recovered: false), null, x, DeclarationKind.Class, A, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, x)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, x, A)
ensureIdentifier({, typeReference)
listener: handleIdentifier(Stream, typeReference)
listener: beginTypeArguments(<)
diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_46505_prime_5.crash_dart.expect b/pkg/front_end/parser_testcases/error_recovery/issue_46505_prime_5.crash_dart.expect
index 123cb41..18a1e79 100644
--- a/pkg/front_end/parser_testcases/error_recovery/issue_46505_prime_5.crash_dart.expect
+++ b/pkg/front_end/parser_testcases/error_recovery/issue_46505_prime_5.crash_dart.expect
@@ -236,7 +236,7 @@
beginMetadataStar(Stream)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Stream)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Stream, C)
handleIdentifier(Stream, typeReference)
beginTypeArguments(<)
handleIdentifier(List, typeReference)
diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_46505_prime_5.crash_dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/issue_46505_prime_5.crash_dart.intertwined.expect
index 52169f5..774685d 100644
--- a/pkg/front_end/parser_testcases/error_recovery/issue_46505_prime_5.crash_dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/error_recovery/issue_46505_prime_5.crash_dart.intertwined.expect
@@ -258,7 +258,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(;, null, null, null, null, null, null, null, ;, ComplexTypeInfo(start: Stream, typeArguments: ComplexTypeParamOrArgInfo(start: <, inDeclaration: true, allowsVariance: false, typeArgumentCount: 1, skipEnd: >, recovered: false), beforeQuestionMark: null, end: >, typeVariableStarters: [], gftHasReturnType: null, isRecordType: false, gftReturnTypeHasRecordType: false, recovered: false), null, Stream, DeclarationKind.Class, C, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Stream)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Stream, C)
ensureIdentifier(;, typeReference)
listener: handleIdentifier(Stream, typeReference)
listener: beginTypeArguments(<)
diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_46505_prime_6.crash_dart.expect b/pkg/front_end/parser_testcases/error_recovery/issue_46505_prime_6.crash_dart.expect
index 7abda52..98b6d8d 100644
--- a/pkg/front_end/parser_testcases/error_recovery/issue_46505_prime_6.crash_dart.expect
+++ b/pkg/front_end/parser_testcases/error_recovery/issue_46505_prime_6.crash_dart.expect
@@ -20,7 +20,7 @@
beginMetadataStar(stream)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, stream)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, stream, A)
handleNoType({)
handleIdentifier(stream, methodDeclaration)
beginTypeVariables(<)
@@ -58,7 +58,7 @@
beginMetadataStar(stream2)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, stream2)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, stream2, A)
handleNoType(})
handleIdentifier(stream2, methodDeclaration)
beginTypeVariables(<)
@@ -97,7 +97,7 @@
beginMetadataStar(stream3)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, stream3)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, stream3, A)
handleNoType(})
handleIdentifier(stream3, methodDeclaration)
beginTypeVariables(<)
diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_46505_prime_6.crash_dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/issue_46505_prime_6.crash_dart.intertwined.expect
index 672e4e4..5b560d3 100644
--- a/pkg/front_end/parser_testcases/error_recovery/issue_46505_prime_6.crash_dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/error_recovery/issue_46505_prime_6.crash_dart.intertwined.expect
@@ -33,7 +33,7 @@
listener: beginMember()
isReservedKeyword(<)
parseMethod({, null, null, null, null, null, null, null, {, NoType(), null, stream, DeclarationKind.Class, A, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, stream)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, stream, A)
listener: handleNoType({)
ensureIdentifierPotentiallyRecovered({, methodDeclaration, false)
listener: handleIdentifier(stream, methodDeclaration)
@@ -93,7 +93,7 @@
listener: beginMember()
isReservedKeyword(<)
parseMethod(}, null, null, null, null, null, null, null, }, NoType(), null, stream2, DeclarationKind.Class, A, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, stream2)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, stream2, A)
listener: handleNoType(})
ensureIdentifierPotentiallyRecovered(}, methodDeclaration, false)
listener: handleIdentifier(stream2, methodDeclaration)
@@ -157,7 +157,7 @@
listener: beginMember()
isReservedKeyword(<)
parseMethod(}, null, null, null, null, null, null, null, }, NoType(), null, stream3, DeclarationKind.Class, A, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, stream3)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, stream3, A)
listener: handleNoType(})
ensureIdentifierPotentiallyRecovered(}, methodDeclaration, false)
listener: handleIdentifier(stream3, methodDeclaration)
diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_48371_prime3.dart.expect b/pkg/front_end/parser_testcases/error_recovery/issue_48371_prime3.dart.expect
index dc60101..68a78a1 100644
--- a/pkg/front_end/parser_testcases/error_recovery/issue_48371_prime3.dart.expect
+++ b/pkg/front_end/parser_testcases/error_recovery/issue_48371_prime3.dart.expect
@@ -42,7 +42,7 @@
beginMetadataStar(void)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, foo)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, foo, A)
handleVoidKeyword(void)
handleIdentifier(foo, methodDeclaration)
handleNoTypeVariables(()
diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_48371_prime3.dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/issue_48371_prime3.dart.intertwined.expect
index fac5f56..fa87d1d 100644
--- a/pkg/front_end/parser_testcases/error_recovery/issue_48371_prime3.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/error_recovery/issue_48371_prime3.dart.intertwined.expect
@@ -68,7 +68,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod({, null, null, null, null, null, null, null, {, VoidType(), null, foo, DeclarationKind.Class, A, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, foo)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, foo, A)
listener: handleVoidKeyword(void)
ensureIdentifierPotentiallyRecovered(void, methodDeclaration, false)
listener: handleIdentifier(foo, methodDeclaration)
diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_48380_1.dart.expect b/pkg/front_end/parser_testcases/error_recovery/issue_48380_1.dart.expect
index 0c8f1ae..d4525e0 100644
--- a/pkg/front_end/parser_testcases/error_recovery/issue_48380_1.dart.expect
+++ b/pkg/front_end/parser_testcases/error_recovery/issue_48380_1.dart.expect
@@ -47,7 +47,7 @@
beginMetadataStar(const)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E)
+ beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E, E)
handleNoType(const)
handleIdentifier(E, methodDeclaration)
handleNoTypeVariables(()
@@ -61,7 +61,7 @@
beginMetadataStar(const)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E)
+ beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E, E)
handleNoType(const)
handleIdentifier(E, methodDeclaration)
handleIdentifier(foo, methodDeclarationContinuation)
diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_48380_1.dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/issue_48380_1.dart.intertwined.expect
index 0fcb51d..803466f 100644
--- a/pkg/front_end/parser_testcases/error_recovery/issue_48380_1.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/error_recovery/issue_48380_1.dart.intertwined.expect
@@ -65,7 +65,7 @@
skipOuterPattern(const)
skipObjectPatternRest(E)
parseMethod(;, null, null, null, null, null, null, const, const, NoType(), null, E, DeclarationKind.Enum, E, false)
- listener: beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E)
+ listener: beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E, E)
listener: handleNoType(const)
ensureIdentifierPotentiallyRecovered(const, methodDeclaration, false)
listener: handleIdentifier(E, methodDeclaration)
@@ -96,7 +96,7 @@
skipOuterPattern(const)
skipObjectPatternRest(foo)
parseMethod(;, null, null, null, null, null, null, const, const, NoType(), null, E, DeclarationKind.Enum, E, false)
- listener: beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E)
+ listener: beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E, E)
listener: handleNoType(const)
ensureIdentifierPotentiallyRecovered(const, methodDeclaration, false)
listener: handleIdentifier(E, methodDeclaration)
diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_48380_1_comma.dart.expect b/pkg/front_end/parser_testcases/error_recovery/issue_48380_1_comma.dart.expect
index 5af5bd2..7367b46 100644
--- a/pkg/front_end/parser_testcases/error_recovery/issue_48380_1_comma.dart.expect
+++ b/pkg/front_end/parser_testcases/error_recovery/issue_48380_1_comma.dart.expect
@@ -62,7 +62,7 @@
beginMetadataStar(const)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E)
+ beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E, E)
handleNoType(const)
handleIdentifier(E, methodDeclaration)
handleNoTypeVariables(()
@@ -76,7 +76,7 @@
beginMetadataStar(const)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E)
+ beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E, E)
handleNoType(const)
handleIdentifier(E, methodDeclaration)
handleIdentifier(foo, methodDeclarationContinuation)
diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_48380_1_comma.dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/issue_48380_1_comma.dart.intertwined.expect
index 8e49dad..ded6c04 100644
--- a/pkg/front_end/parser_testcases/error_recovery/issue_48380_1_comma.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/error_recovery/issue_48380_1_comma.dart.intertwined.expect
@@ -86,7 +86,7 @@
skipOuterPattern(const)
skipObjectPatternRest(E)
parseMethod(;, null, null, null, null, null, null, const, const, NoType(), null, E, DeclarationKind.Enum, E, false)
- listener: beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E)
+ listener: beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E, E)
listener: handleNoType(const)
ensureIdentifierPotentiallyRecovered(const, methodDeclaration, false)
listener: handleIdentifier(E, methodDeclaration)
@@ -117,7 +117,7 @@
skipOuterPattern(const)
skipObjectPatternRest(foo)
parseMethod(;, null, null, null, null, null, null, const, const, NoType(), null, E, DeclarationKind.Enum, E, false)
- listener: beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E)
+ listener: beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E, E)
listener: handleNoType(const)
ensureIdentifierPotentiallyRecovered(const, methodDeclaration, false)
listener: handleIdentifier(E, methodDeclaration)
diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_48380_1_comma_ok.dart.expect b/pkg/front_end/parser_testcases/error_recovery/issue_48380_1_comma_ok.dart.expect
index 2e0cfae..9028e30 100644
--- a/pkg/front_end/parser_testcases/error_recovery/issue_48380_1_comma_ok.dart.expect
+++ b/pkg/front_end/parser_testcases/error_recovery/issue_48380_1_comma_ok.dart.expect
@@ -50,7 +50,7 @@
beginMetadataStar(const)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E)
+ beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E, E)
handleNoType(const)
handleIdentifier(E, methodDeclaration)
handleNoTypeVariables(()
@@ -64,7 +64,7 @@
beginMetadataStar(const)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E)
+ beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E, E)
handleNoType(const)
handleIdentifier(E, methodDeclaration)
handleIdentifier(foo, methodDeclarationContinuation)
diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_48380_1_comma_ok.dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/issue_48380_1_comma_ok.dart.intertwined.expect
index e8dbe96..0a2ee63 100644
--- a/pkg/front_end/parser_testcases/error_recovery/issue_48380_1_comma_ok.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/error_recovery/issue_48380_1_comma_ok.dart.intertwined.expect
@@ -79,7 +79,7 @@
skipOuterPattern(const)
skipObjectPatternRest(E)
parseMethod(;, null, null, null, null, null, null, const, const, NoType(), null, E, DeclarationKind.Enum, E, false)
- listener: beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E)
+ listener: beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E, E)
listener: handleNoType(const)
ensureIdentifierPotentiallyRecovered(const, methodDeclaration, false)
listener: handleIdentifier(E, methodDeclaration)
@@ -110,7 +110,7 @@
skipOuterPattern(const)
skipObjectPatternRest(foo)
parseMethod(;, null, null, null, null, null, null, const, const, NoType(), null, E, DeclarationKind.Enum, E, false)
- listener: beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E)
+ listener: beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E, E)
listener: handleNoType(const)
ensureIdentifierPotentiallyRecovered(const, methodDeclaration, false)
listener: handleIdentifier(E, methodDeclaration)
diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_48380_1_ok.dart.expect b/pkg/front_end/parser_testcases/error_recovery/issue_48380_1_ok.dart.expect
index 627defd..4dde438 100644
--- a/pkg/front_end/parser_testcases/error_recovery/issue_48380_1_ok.dart.expect
+++ b/pkg/front_end/parser_testcases/error_recovery/issue_48380_1_ok.dart.expect
@@ -35,7 +35,7 @@
beginMetadataStar(const)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E)
+ beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E, E)
handleNoType(const)
handleIdentifier(E, methodDeclaration)
handleNoTypeVariables(()
@@ -49,7 +49,7 @@
beginMetadataStar(const)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E)
+ beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E, E)
handleNoType(const)
handleIdentifier(E, methodDeclaration)
handleIdentifier(foo, methodDeclarationContinuation)
diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_48380_1_ok.dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/issue_48380_1_ok.dart.intertwined.expect
index 4007a7e..f0b8002 100644
--- a/pkg/front_end/parser_testcases/error_recovery/issue_48380_1_ok.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/error_recovery/issue_48380_1_ok.dart.intertwined.expect
@@ -58,7 +58,7 @@
skipOuterPattern(const)
skipObjectPatternRest(E)
parseMethod(;, null, null, null, null, null, null, const, const, NoType(), null, E, DeclarationKind.Enum, E, false)
- listener: beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E)
+ listener: beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E, E)
listener: handleNoType(const)
ensureIdentifierPotentiallyRecovered(const, methodDeclaration, false)
listener: handleIdentifier(E, methodDeclaration)
@@ -89,7 +89,7 @@
skipOuterPattern(const)
skipObjectPatternRest(foo)
parseMethod(;, null, null, null, null, null, null, const, const, NoType(), null, E, DeclarationKind.Enum, E, false)
- listener: beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E)
+ listener: beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E, E)
listener: handleNoType(const)
ensureIdentifierPotentiallyRecovered(const, methodDeclaration, false)
listener: handleIdentifier(E, methodDeclaration)
diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_48380_2.dart.expect b/pkg/front_end/parser_testcases/error_recovery/issue_48380_2.dart.expect
index c301a2e..124b4c5 100644
--- a/pkg/front_end/parser_testcases/error_recovery/issue_48380_2.dart.expect
+++ b/pkg/front_end/parser_testcases/error_recovery/issue_48380_2.dart.expect
@@ -42,7 +42,7 @@
beginMetadataStar(const)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E)
+ beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E, E)
handleNoType(const)
handleIdentifier(E, methodDeclaration)
handleNoTypeVariables(()
@@ -56,7 +56,7 @@
beginMetadataStar(const)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E)
+ beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E, E)
handleNoType(const)
handleIdentifier(E, methodDeclaration)
handleIdentifier(foo, methodDeclarationContinuation)
diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_48380_2.dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/issue_48380_2.dart.intertwined.expect
index 5b11bb8..647c2c9 100644
--- a/pkg/front_end/parser_testcases/error_recovery/issue_48380_2.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/error_recovery/issue_48380_2.dart.intertwined.expect
@@ -60,7 +60,7 @@
skipOuterPattern(const)
skipObjectPatternRest(E)
parseMethod(;, null, null, null, null, null, null, const, const, NoType(), null, E, DeclarationKind.Enum, E, false)
- listener: beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E)
+ listener: beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E, E)
listener: handleNoType(const)
ensureIdentifierPotentiallyRecovered(const, methodDeclaration, false)
listener: handleIdentifier(E, methodDeclaration)
@@ -91,7 +91,7 @@
skipOuterPattern(const)
skipObjectPatternRest(foo)
parseMethod(;, null, null, null, null, null, null, const, const, NoType(), null, E, DeclarationKind.Enum, E, false)
- listener: beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E)
+ listener: beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E, E)
listener: handleNoType(const)
ensureIdentifierPotentiallyRecovered(const, methodDeclaration, false)
listener: handleIdentifier(E, methodDeclaration)
diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_48380_2_comma.dart.expect b/pkg/front_end/parser_testcases/error_recovery/issue_48380_2_comma.dart.expect
index 0f28890..bbc7f6b 100644
--- a/pkg/front_end/parser_testcases/error_recovery/issue_48380_2_comma.dart.expect
+++ b/pkg/front_end/parser_testcases/error_recovery/issue_48380_2_comma.dart.expect
@@ -57,7 +57,7 @@
beginMetadataStar(const)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E)
+ beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E, E)
handleNoType(const)
handleIdentifier(E, methodDeclaration)
handleNoTypeVariables(()
@@ -71,7 +71,7 @@
beginMetadataStar(const)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E)
+ beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E, E)
handleNoType(const)
handleIdentifier(E, methodDeclaration)
handleIdentifier(foo, methodDeclarationContinuation)
diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_48380_2_comma.dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/issue_48380_2_comma.dart.intertwined.expect
index 6e3c8d5..6dadee2 100644
--- a/pkg/front_end/parser_testcases/error_recovery/issue_48380_2_comma.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/error_recovery/issue_48380_2_comma.dart.intertwined.expect
@@ -81,7 +81,7 @@
skipOuterPattern(const)
skipObjectPatternRest(E)
parseMethod(;, null, null, null, null, null, null, const, const, NoType(), null, E, DeclarationKind.Enum, E, false)
- listener: beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E)
+ listener: beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E, E)
listener: handleNoType(const)
ensureIdentifierPotentiallyRecovered(const, methodDeclaration, false)
listener: handleIdentifier(E, methodDeclaration)
@@ -112,7 +112,7 @@
skipOuterPattern(const)
skipObjectPatternRest(foo)
parseMethod(;, null, null, null, null, null, null, const, const, NoType(), null, E, DeclarationKind.Enum, E, false)
- listener: beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E)
+ listener: beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E, E)
listener: handleNoType(const)
ensureIdentifierPotentiallyRecovered(const, methodDeclaration, false)
listener: handleIdentifier(E, methodDeclaration)
diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_48380_2_comma_ok.dart.expect b/pkg/front_end/parser_testcases/error_recovery/issue_48380_2_comma_ok.dart.expect
index 51b29e9..d5cc39d 100644
--- a/pkg/front_end/parser_testcases/error_recovery/issue_48380_2_comma_ok.dart.expect
+++ b/pkg/front_end/parser_testcases/error_recovery/issue_48380_2_comma_ok.dart.expect
@@ -50,7 +50,7 @@
beginMetadataStar(const)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E)
+ beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E, E)
handleNoType(const)
handleIdentifier(E, methodDeclaration)
handleNoTypeVariables(()
@@ -64,7 +64,7 @@
beginMetadataStar(const)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E)
+ beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E, E)
handleNoType(const)
handleIdentifier(E, methodDeclaration)
handleIdentifier(foo, methodDeclarationContinuation)
diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_48380_2_comma_ok.dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/issue_48380_2_comma_ok.dart.intertwined.expect
index 8609d96..90f7256 100644
--- a/pkg/front_end/parser_testcases/error_recovery/issue_48380_2_comma_ok.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/error_recovery/issue_48380_2_comma_ok.dart.intertwined.expect
@@ -78,7 +78,7 @@
skipOuterPattern(const)
skipObjectPatternRest(E)
parseMethod(;, null, null, null, null, null, null, const, const, NoType(), null, E, DeclarationKind.Enum, E, false)
- listener: beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E)
+ listener: beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E, E)
listener: handleNoType(const)
ensureIdentifierPotentiallyRecovered(const, methodDeclaration, false)
listener: handleIdentifier(E, methodDeclaration)
@@ -109,7 +109,7 @@
skipOuterPattern(const)
skipObjectPatternRest(foo)
parseMethod(;, null, null, null, null, null, null, const, const, NoType(), null, E, DeclarationKind.Enum, E, false)
- listener: beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E)
+ listener: beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E, E)
listener: handleNoType(const)
ensureIdentifierPotentiallyRecovered(const, methodDeclaration, false)
listener: handleIdentifier(E, methodDeclaration)
diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_48380_2_ok.dart.expect b/pkg/front_end/parser_testcases/error_recovery/issue_48380_2_ok.dart.expect
index 6a3e2d3..28263c5 100644
--- a/pkg/front_end/parser_testcases/error_recovery/issue_48380_2_ok.dart.expect
+++ b/pkg/front_end/parser_testcases/error_recovery/issue_48380_2_ok.dart.expect
@@ -35,7 +35,7 @@
beginMetadataStar(const)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E)
+ beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E, E)
handleNoType(const)
handleIdentifier(E, methodDeclaration)
handleNoTypeVariables(()
@@ -49,7 +49,7 @@
beginMetadataStar(const)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E)
+ beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E, E)
handleNoType(const)
handleIdentifier(E, methodDeclaration)
handleIdentifier(foo, methodDeclarationContinuation)
diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_48380_2_ok.dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/issue_48380_2_ok.dart.intertwined.expect
index d2d82be..2224738 100644
--- a/pkg/front_end/parser_testcases/error_recovery/issue_48380_2_ok.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/error_recovery/issue_48380_2_ok.dart.intertwined.expect
@@ -57,7 +57,7 @@
skipOuterPattern(const)
skipObjectPatternRest(E)
parseMethod(;, null, null, null, null, null, null, const, const, NoType(), null, E, DeclarationKind.Enum, E, false)
- listener: beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E)
+ listener: beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E, E)
listener: handleNoType(const)
ensureIdentifierPotentiallyRecovered(const, methodDeclaration, false)
listener: handleIdentifier(E, methodDeclaration)
@@ -88,7 +88,7 @@
skipOuterPattern(const)
skipObjectPatternRest(foo)
parseMethod(;, null, null, null, null, null, null, const, const, NoType(), null, E, DeclarationKind.Enum, E, false)
- listener: beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E)
+ listener: beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E, E)
listener: handleNoType(const)
ensureIdentifierPotentiallyRecovered(const, methodDeclaration, false)
listener: handleIdentifier(E, methodDeclaration)
diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_48380_3.dart.expect b/pkg/front_end/parser_testcases/error_recovery/issue_48380_3.dart.expect
index 45d42c6..f644f26 100644
--- a/pkg/front_end/parser_testcases/error_recovery/issue_48380_3.dart.expect
+++ b/pkg/front_end/parser_testcases/error_recovery/issue_48380_3.dart.expect
@@ -35,7 +35,7 @@
beginMetadataStar(const)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E)
+ beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E, E)
handleNoType(const)
handleIdentifier(E, methodDeclaration)
handleNoTypeVariables(()
@@ -49,7 +49,7 @@
beginMetadataStar(const)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E)
+ beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E, E)
handleNoType(const)
handleIdentifier(E, methodDeclaration)
handleIdentifier(foo, methodDeclarationContinuation)
diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_48380_3.dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/issue_48380_3.dart.intertwined.expect
index 220b0b9..e9724c7 100644
--- a/pkg/front_end/parser_testcases/error_recovery/issue_48380_3.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/error_recovery/issue_48380_3.dart.intertwined.expect
@@ -53,7 +53,7 @@
skipOuterPattern(const)
skipObjectPatternRest(E)
parseMethod(;, null, null, null, null, null, null, const, const, NoType(), null, E, DeclarationKind.Enum, E, false)
- listener: beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E)
+ listener: beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E, E)
listener: handleNoType(const)
ensureIdentifierPotentiallyRecovered(const, methodDeclaration, false)
listener: handleIdentifier(E, methodDeclaration)
@@ -84,7 +84,7 @@
skipOuterPattern(const)
skipObjectPatternRest(foo)
parseMethod(;, null, null, null, null, null, null, const, const, NoType(), null, E, DeclarationKind.Enum, E, false)
- listener: beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E)
+ listener: beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E, E)
listener: handleNoType(const)
ensureIdentifierPotentiallyRecovered(const, methodDeclaration, false)
listener: handleIdentifier(E, methodDeclaration)
diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_48380_3_comma.dart.expect b/pkg/front_end/parser_testcases/error_recovery/issue_48380_3_comma.dart.expect
index 25efb14..0dffe04 100644
--- a/pkg/front_end/parser_testcases/error_recovery/issue_48380_3_comma.dart.expect
+++ b/pkg/front_end/parser_testcases/error_recovery/issue_48380_3_comma.dart.expect
@@ -46,7 +46,7 @@
beginMetadataStar(const)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E)
+ beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E, E)
handleNoType(const)
handleIdentifier(E, methodDeclaration)
handleNoTypeVariables(()
@@ -60,7 +60,7 @@
beginMetadataStar(const)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E)
+ beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E, E)
handleNoType(const)
handleIdentifier(E, methodDeclaration)
handleIdentifier(foo, methodDeclarationContinuation)
diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_48380_3_comma.dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/issue_48380_3_comma.dart.intertwined.expect
index 31ffb53..11e9336 100644
--- a/pkg/front_end/parser_testcases/error_recovery/issue_48380_3_comma.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/error_recovery/issue_48380_3_comma.dart.intertwined.expect
@@ -70,7 +70,7 @@
skipOuterPattern(const)
skipObjectPatternRest(E)
parseMethod(;, null, null, null, null, null, null, const, const, NoType(), null, E, DeclarationKind.Enum, E, false)
- listener: beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E)
+ listener: beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E, E)
listener: handleNoType(const)
ensureIdentifierPotentiallyRecovered(const, methodDeclaration, false)
listener: handleIdentifier(E, methodDeclaration)
@@ -101,7 +101,7 @@
skipOuterPattern(const)
skipObjectPatternRest(foo)
parseMethod(;, null, null, null, null, null, null, const, const, NoType(), null, E, DeclarationKind.Enum, E, false)
- listener: beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E)
+ listener: beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E, E)
listener: handleNoType(const)
ensureIdentifierPotentiallyRecovered(const, methodDeclaration, false)
listener: handleIdentifier(E, methodDeclaration)
diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_48380_3_comma_ok.dart.expect b/pkg/front_end/parser_testcases/error_recovery/issue_48380_3_comma_ok.dart.expect
index fd3a9f0..6342418 100644
--- a/pkg/front_end/parser_testcases/error_recovery/issue_48380_3_comma_ok.dart.expect
+++ b/pkg/front_end/parser_testcases/error_recovery/issue_48380_3_comma_ok.dart.expect
@@ -34,7 +34,7 @@
beginMetadataStar(const)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E)
+ beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E, E)
handleNoType(const)
handleIdentifier(E, methodDeclaration)
handleNoTypeVariables(()
@@ -48,7 +48,7 @@
beginMetadataStar(const)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E)
+ beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E, E)
handleNoType(const)
handleIdentifier(E, methodDeclaration)
handleIdentifier(foo, methodDeclarationContinuation)
diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_48380_3_comma_ok.dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/issue_48380_3_comma_ok.dart.intertwined.expect
index c2959f0..12ba3ba 100644
--- a/pkg/front_end/parser_testcases/error_recovery/issue_48380_3_comma_ok.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/error_recovery/issue_48380_3_comma_ok.dart.intertwined.expect
@@ -63,7 +63,7 @@
skipOuterPattern(const)
skipObjectPatternRest(E)
parseMethod(;, null, null, null, null, null, null, const, const, NoType(), null, E, DeclarationKind.Enum, E, false)
- listener: beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E)
+ listener: beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E, E)
listener: handleNoType(const)
ensureIdentifierPotentiallyRecovered(const, methodDeclaration, false)
listener: handleIdentifier(E, methodDeclaration)
@@ -94,7 +94,7 @@
skipOuterPattern(const)
skipObjectPatternRest(foo)
parseMethod(;, null, null, null, null, null, null, const, const, NoType(), null, E, DeclarationKind.Enum, E, false)
- listener: beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E)
+ listener: beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E, E)
listener: handleNoType(const)
ensureIdentifierPotentiallyRecovered(const, methodDeclaration, false)
listener: handleIdentifier(E, methodDeclaration)
diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_48380_3_ok.dart.expect b/pkg/front_end/parser_testcases/error_recovery/issue_48380_3_ok.dart.expect
index 4772884..1f89d5e 100644
--- a/pkg/front_end/parser_testcases/error_recovery/issue_48380_3_ok.dart.expect
+++ b/pkg/front_end/parser_testcases/error_recovery/issue_48380_3_ok.dart.expect
@@ -23,7 +23,7 @@
beginMetadataStar(const)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E)
+ beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E, E)
handleNoType(const)
handleIdentifier(E, methodDeclaration)
handleNoTypeVariables(()
@@ -37,7 +37,7 @@
beginMetadataStar(const)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E)
+ beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E, E)
handleNoType(const)
handleIdentifier(E, methodDeclaration)
handleIdentifier(foo, methodDeclarationContinuation)
diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_48380_3_ok.dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/issue_48380_3_ok.dart.intertwined.expect
index f0b6256..74d1278 100644
--- a/pkg/front_end/parser_testcases/error_recovery/issue_48380_3_ok.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/error_recovery/issue_48380_3_ok.dart.intertwined.expect
@@ -46,7 +46,7 @@
skipOuterPattern(const)
skipObjectPatternRest(E)
parseMethod(;, null, null, null, null, null, null, const, const, NoType(), null, E, DeclarationKind.Enum, E, false)
- listener: beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E)
+ listener: beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E, E)
listener: handleNoType(const)
ensureIdentifierPotentiallyRecovered(const, methodDeclaration, false)
listener: handleIdentifier(E, methodDeclaration)
@@ -77,7 +77,7 @@
skipOuterPattern(const)
skipObjectPatternRest(foo)
parseMethod(;, null, null, null, null, null, null, const, const, NoType(), null, E, DeclarationKind.Enum, E, false)
- listener: beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E)
+ listener: beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E, E)
listener: handleNoType(const)
ensureIdentifierPotentiallyRecovered(const, methodDeclaration, false)
listener: handleIdentifier(E, methodDeclaration)
diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_48380_4.dart.expect b/pkg/front_end/parser_testcases/error_recovery/issue_48380_4.dart.expect
index f720744..90af963 100644
--- a/pkg/front_end/parser_testcases/error_recovery/issue_48380_4.dart.expect
+++ b/pkg/front_end/parser_testcases/error_recovery/issue_48380_4.dart.expect
@@ -22,7 +22,7 @@
beginMetadataStar(String)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Enum, null, null, null, null, null, null, hello)
+ beginMethod(DeclarationKind.Enum, null, null, null, null, null, null, hello, E)
handleIdentifier(String, typeReference)
handleNoTypeArguments(hello)
handleType(String, null)
diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_48380_4.dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/issue_48380_4.dart.intertwined.expect
index 57627ce..7073141 100644
--- a/pkg/front_end/parser_testcases/error_recovery/issue_48380_4.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/error_recovery/issue_48380_4.dart.intertwined.expect
@@ -40,7 +40,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(;, null, null, null, null, null, null, null, ;, SimpleType(), null, hello, DeclarationKind.Enum, E, false)
- listener: beginMethod(DeclarationKind.Enum, null, null, null, null, null, null, hello)
+ listener: beginMethod(DeclarationKind.Enum, null, null, null, null, null, null, hello, E)
listener: handleIdentifier(String, typeReference)
listener: handleNoTypeArguments(hello)
listener: handleType(String, null)
diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_48411.dart.expect b/pkg/front_end/parser_testcases/error_recovery/issue_48411.dart.expect
index 62fda7e..be12a1e 100644
--- a/pkg/front_end/parser_testcases/error_recovery/issue_48411.dart.expect
+++ b/pkg/front_end/parser_testcases/error_recovery/issue_48411.dart.expect
@@ -40,7 +40,7 @@
beginMetadataStar(A)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, A)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, A, A)
handleNoType({)
handleIdentifier(A, methodDeclaration)
handleNoTypeVariables(()
@@ -63,7 +63,7 @@
beginMetadataStar(A)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, A)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, A, A)
handleNoType(;)
handleIdentifier(A, methodDeclaration)
handleIdentifier(y, methodDeclarationContinuation)
@@ -105,7 +105,7 @@
beginMetadataStar(B)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, B)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, B, B)
handleNoType({)
handleIdentifier(B, methodDeclaration)
handleNoTypeVariables(()
@@ -169,7 +169,7 @@
beginMetadataStar(B2)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, B2)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, B2, B2)
handleNoType({)
handleIdentifier(B2, methodDeclaration)
handleNoTypeVariables(()
@@ -235,7 +235,7 @@
beginMetadataStar(B3)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, B3)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, B3, B3)
handleNoType({)
handleIdentifier(B3, methodDeclaration)
handleNoTypeVariables(()
@@ -284,7 +284,7 @@
beginMetadataStar(B3)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, B3)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, B3, B3)
handleNoType(;)
handleIdentifier(B3, methodDeclaration)
handleIdentifier(y, methodDeclarationContinuation)
@@ -337,7 +337,7 @@
beginMetadataStar(C)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, C)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, C, C)
handleNoType(;)
handleIdentifier(C, methodDeclaration)
handleNoTypeVariables(()
@@ -401,7 +401,7 @@
beginMetadataStar(D)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, D)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, D, D)
handleNoType({)
handleIdentifier(D, methodDeclaration)
handleNoTypeVariables(()
@@ -479,7 +479,7 @@
beginMetadataStar(E)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, E)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, E, E)
handleNoType(;)
handleIdentifier(E, methodDeclaration)
handleNoTypeVariables(()
diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_48411.dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/issue_48411.dart.intertwined.expect
index 04cb554..5f73f73 100644
--- a/pkg/front_end/parser_testcases/error_recovery/issue_48411.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/error_recovery/issue_48411.dart.intertwined.expect
@@ -33,7 +33,7 @@
listener: beginMember()
isReservedKeyword(()
parseMethod({, null, null, null, null, null, null, null, {, NoType(), null, A, DeclarationKind.Class, A, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, A)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, A, A)
listener: handleNoType({)
ensureIdentifierPotentiallyRecovered({, methodDeclaration, false)
listener: handleIdentifier(A, methodDeclaration)
@@ -75,7 +75,7 @@
listener: beginMember()
isReservedKeyword(.)
parseMethod(;, null, null, null, null, null, null, null, ;, NoType(), null, A, DeclarationKind.Class, A, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, A)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, A, A)
listener: handleNoType(;)
ensureIdentifierPotentiallyRecovered(;, methodDeclaration, false)
listener: handleIdentifier(A, methodDeclaration)
@@ -151,7 +151,7 @@
listener: beginMember()
isReservedKeyword(()
parseMethod({, null, null, null, null, null, null, null, {, NoType(), null, B, DeclarationKind.Class, B, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, B)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, B, B)
listener: handleNoType({)
ensureIdentifierPotentiallyRecovered({, methodDeclaration, false)
listener: handleIdentifier(B, methodDeclaration)
@@ -284,7 +284,7 @@
listener: beginMember()
isReservedKeyword(()
parseMethod({, null, null, null, null, null, null, null, {, NoType(), null, B2, DeclarationKind.Class, B2, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, B2)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, B2, B2)
listener: handleNoType({)
ensureIdentifierPotentiallyRecovered({, methodDeclaration, false)
listener: handleIdentifier(B2, methodDeclaration)
@@ -425,7 +425,7 @@
listener: beginMember()
isReservedKeyword(()
parseMethod({, null, null, null, null, null, null, null, {, NoType(), null, B3, DeclarationKind.Class, B3, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, B3)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, B3, B3)
listener: handleNoType({)
ensureIdentifierPotentiallyRecovered({, methodDeclaration, false)
listener: handleIdentifier(B3, methodDeclaration)
@@ -535,7 +535,7 @@
listener: beginMember()
isReservedKeyword(.)
parseMethod(;, null, null, null, null, null, null, null, ;, NoType(), null, B3, DeclarationKind.Class, B3, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, B3)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, B3, B3)
listener: handleNoType(;)
ensureIdentifierPotentiallyRecovered(;, methodDeclaration, false)
listener: handleIdentifier(B3, methodDeclaration)
@@ -628,7 +628,7 @@
listener: beginMember()
isReservedKeyword(()
parseMethod(;, null, null, null, null, null, null, null, ;, NoType(), null, C, DeclarationKind.Class, C, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, C)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, C, C)
listener: handleNoType(;)
ensureIdentifierPotentiallyRecovered(;, methodDeclaration, false)
listener: handleIdentifier(C, methodDeclaration)
@@ -761,7 +761,7 @@
listener: beginMember()
isReservedKeyword(()
parseMethod({, null, null, null, null, null, null, null, {, NoType(), null, D, DeclarationKind.Class, D, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, D)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, D, D)
listener: handleNoType({)
ensureIdentifierPotentiallyRecovered({, methodDeclaration, false)
listener: handleIdentifier(D, methodDeclaration)
@@ -916,7 +916,7 @@
listener: beginMember()
isReservedKeyword(()
parseMethod(;, null, null, null, null, null, null, null, ;, NoType(), null, E, DeclarationKind.Class, E, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, E)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, E, E)
listener: handleNoType(;)
ensureIdentifierPotentiallyRecovered(;, methodDeclaration, false)
listener: handleIdentifier(E, methodDeclaration)
diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_48411_prime.dart.expect b/pkg/front_end/parser_testcases/error_recovery/issue_48411_prime.dart.expect
index 2914ce1..74e9d1d 100644
--- a/pkg/front_end/parser_testcases/error_recovery/issue_48411_prime.dart.expect
+++ b/pkg/front_end/parser_testcases/error_recovery/issue_48411_prime.dart.expect
@@ -14,7 +14,7 @@
beginMetadataStar(A)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, A)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, A, A)
handleNoType({)
handleIdentifier(A, methodDeclaration)
handleNoTypeVariables(()
@@ -37,7 +37,7 @@
beginMetadataStar(A)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, A)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, A, A)
handleNoType(;)
handleIdentifier(A, methodDeclaration)
handleIdentifier(y, methodDeclarationContinuation)
@@ -79,7 +79,7 @@
beginMetadataStar(B)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, B)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, B, B)
handleNoType({)
handleIdentifier(B, methodDeclaration)
handleNoTypeVariables(()
@@ -142,7 +142,7 @@
beginMetadataStar(B2)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, B2)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, B2, B2)
handleNoType({)
handleIdentifier(B2, methodDeclaration)
handleNoTypeVariables(()
@@ -207,7 +207,7 @@
beginMetadataStar(B3)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, B3)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, B3, B3)
handleNoType({)
handleIdentifier(B3, methodDeclaration)
handleNoTypeVariables(()
@@ -255,7 +255,7 @@
beginMetadataStar(B3)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, B3)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, B3, B3)
handleNoType(;)
handleIdentifier(B3, methodDeclaration)
handleIdentifier(y, methodDeclarationContinuation)
@@ -308,7 +308,7 @@
beginMetadataStar(C)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, C)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, C, C)
handleNoType(;)
handleIdentifier(C, methodDeclaration)
handleNoTypeVariables(()
@@ -371,7 +371,7 @@
beginMetadataStar(D)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, D)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, D, D)
handleNoType({)
handleIdentifier(D, methodDeclaration)
handleNoTypeVariables(()
@@ -448,7 +448,7 @@
beginMetadataStar(E)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, E)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, E, E)
handleNoType(;)
handleIdentifier(E, methodDeclaration)
handleNoTypeVariables(()
diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_48411_prime.dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/issue_48411_prime.dart.intertwined.expect
index 92f9d32..4be6868 100644
--- a/pkg/front_end/parser_testcases/error_recovery/issue_48411_prime.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/error_recovery/issue_48411_prime.dart.intertwined.expect
@@ -33,7 +33,7 @@
listener: beginMember()
isReservedKeyword(()
parseMethod({, null, null, null, null, null, null, null, {, NoType(), null, A, DeclarationKind.Class, A, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, A)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, A, A)
listener: handleNoType({)
ensureIdentifierPotentiallyRecovered({, methodDeclaration, false)
listener: handleIdentifier(A, methodDeclaration)
@@ -75,7 +75,7 @@
listener: beginMember()
isReservedKeyword(.)
parseMethod(;, null, null, null, null, null, null, null, ;, NoType(), null, A, DeclarationKind.Class, A, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, A)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, A, A)
listener: handleNoType(;)
ensureIdentifierPotentiallyRecovered(;, methodDeclaration, false)
listener: handleIdentifier(A, methodDeclaration)
@@ -151,7 +151,7 @@
listener: beginMember()
isReservedKeyword(()
parseMethod({, null, null, null, null, null, null, null, {, NoType(), null, B, DeclarationKind.Class, B, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, B)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, B, B)
listener: handleNoType({)
ensureIdentifierPotentiallyRecovered({, methodDeclaration, false)
listener: handleIdentifier(B, methodDeclaration)
@@ -281,7 +281,7 @@
listener: beginMember()
isReservedKeyword(()
parseMethod({, null, null, null, null, null, null, null, {, NoType(), null, B2, DeclarationKind.Class, B2, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, B2)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, B2, B2)
listener: handleNoType({)
ensureIdentifierPotentiallyRecovered({, methodDeclaration, false)
listener: handleIdentifier(B2, methodDeclaration)
@@ -419,7 +419,7 @@
listener: beginMember()
isReservedKeyword(()
parseMethod({, null, null, null, null, null, null, null, {, NoType(), null, B3, DeclarationKind.Class, B3, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, B3)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, B3, B3)
listener: handleNoType({)
ensureIdentifierPotentiallyRecovered({, methodDeclaration, false)
listener: handleIdentifier(B3, methodDeclaration)
@@ -526,7 +526,7 @@
listener: beginMember()
isReservedKeyword(.)
parseMethod(;, null, null, null, null, null, null, null, ;, NoType(), null, B3, DeclarationKind.Class, B3, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, B3)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, B3, B3)
listener: handleNoType(;)
ensureIdentifierPotentiallyRecovered(;, methodDeclaration, false)
listener: handleIdentifier(B3, methodDeclaration)
@@ -619,7 +619,7 @@
listener: beginMember()
isReservedKeyword(()
parseMethod(;, null, null, null, null, null, null, null, ;, NoType(), null, C, DeclarationKind.Class, C, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, C)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, C, C)
listener: handleNoType(;)
ensureIdentifierPotentiallyRecovered(;, methodDeclaration, false)
listener: handleIdentifier(C, methodDeclaration)
@@ -749,7 +749,7 @@
listener: beginMember()
isReservedKeyword(()
parseMethod({, null, null, null, null, null, null, null, {, NoType(), null, D, DeclarationKind.Class, D, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, D)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, D, D)
listener: handleNoType({)
ensureIdentifierPotentiallyRecovered({, methodDeclaration, false)
listener: handleIdentifier(D, methodDeclaration)
@@ -901,7 +901,7 @@
listener: beginMember()
isReservedKeyword(()
parseMethod(;, null, null, null, null, null, null, null, ;, NoType(), null, E, DeclarationKind.Class, E, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, E)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, E, E)
listener: handleNoType(;)
ensureIdentifierPotentiallyRecovered(;, methodDeclaration, false)
listener: handleIdentifier(E, methodDeclaration)
diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_48411_prime_1.dart.expect b/pkg/front_end/parser_testcases/error_recovery/issue_48411_prime_1.dart.expect
index 6ce0572..0b877ff 100644
--- a/pkg/front_end/parser_testcases/error_recovery/issue_48411_prime_1.dart.expect
+++ b/pkg/front_end/parser_testcases/error_recovery/issue_48411_prime_1.dart.expect
@@ -84,7 +84,7 @@
beginMetadataStar(C)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, C)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, C, C)
handleNoType({)
handleIdentifier(C, methodDeclaration)
handleNoTypeVariables(()
@@ -144,7 +144,7 @@
beginMetadataStar(C)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, C)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, C, C)
handleNoType({)
handleIdentifier(C, methodDeclaration)
handleNoTypeVariables(()
@@ -179,7 +179,7 @@
endMetadataStar(0)
beginMember()
handleRecoverableError(MissingOperatorKeyword, =, =)
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, operator)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, operator, C)
handleNoType(null)
handleRecoverableError(Message[InvalidOperator, The string '=' isn't a user-definable operator., null, {lexeme: =}], =, =)
handleInvalidOperatorName(operator, =)
@@ -223,7 +223,7 @@
beginMetadataStar(C)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, C)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, C, C)
handleNoType({)
handleIdentifier(C, methodDeclaration)
handleNoTypeVariables(()
@@ -258,7 +258,7 @@
beginMetadataStar(C)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, C)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, C, C)
handleNoType({)
handleIdentifier(C, methodDeclaration)
handleNoTypeVariables(()
diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_48411_prime_1.dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/issue_48411_prime_1.dart.intertwined.expect
index b9b8052..d6b5f89 100644
--- a/pkg/front_end/parser_testcases/error_recovery/issue_48411_prime_1.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/error_recovery/issue_48411_prime_1.dart.intertwined.expect
@@ -33,7 +33,7 @@
listener: beginMember()
isReservedKeyword(()
parseMethod({, null, null, null, null, null, null, null, {, NoType(), null, C, DeclarationKind.Class, C, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, C)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, C, C)
listener: handleNoType({)
ensureIdentifierPotentiallyRecovered({, methodDeclaration, false)
listener: handleIdentifier(C, methodDeclaration)
@@ -154,7 +154,7 @@
listener: beginMember()
isReservedKeyword(()
parseMethod({, null, null, null, null, null, null, null, {, NoType(), null, C, DeclarationKind.Class, C, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, C)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, C, C)
listener: handleNoType({)
ensureIdentifierPotentiallyRecovered({, methodDeclaration, false)
listener: handleIdentifier(C, methodDeclaration)
@@ -243,7 +243,7 @@
listener: handleRecoverableError(MissingOperatorKeyword, =, =)
rewriter()
parseMethod(null, null, null, null, null, null, null, null, null, NoType(), null, operator, DeclarationKind.Class, C, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, operator)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, operator, C)
listener: handleNoType(null)
parseOperatorName(null)
isUnaryMinus(=)
@@ -333,7 +333,7 @@
listener: beginMember()
isReservedKeyword(()
parseMethod({, null, null, null, null, null, null, null, {, NoType(), null, C, DeclarationKind.Class, C, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, C)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, C, C)
listener: handleNoType({)
ensureIdentifierPotentiallyRecovered({, methodDeclaration, false)
listener: handleIdentifier(C, methodDeclaration)
@@ -409,7 +409,7 @@
listener: beginMember()
isReservedKeyword(()
parseMethod({, null, null, null, null, null, null, null, {, NoType(), null, C, DeclarationKind.Class, C, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, C)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, C, C)
listener: handleNoType({)
ensureIdentifierPotentiallyRecovered({, methodDeclaration, false)
listener: handleIdentifier(C, methodDeclaration)
diff --git a/pkg/front_end/parser_testcases/error_recovery/keyword_named_class_methods.dart.expect b/pkg/front_end/parser_testcases/error_recovery/keyword_named_class_methods.dart.expect
index c0c36fe..db591ad 100644
--- a/pkg/front_end/parser_testcases/error_recovery/keyword_named_class_methods.dart.expect
+++ b/pkg/front_end/parser_testcases/error_recovery/keyword_named_class_methods.dart.expect
@@ -504,7 +504,7 @@
beginMetadataStar(int)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, abstract)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, abstract, WrapperClass)
handleIdentifier(int, typeReference)
handleNoTypeArguments(abstract)
handleType(int, null)
@@ -562,7 +562,7 @@
beginMetadataStar(int)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, as)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, as, WrapperClass)
handleIdentifier(int, typeReference)
handleNoTypeArguments(as)
handleType(int, null)
@@ -620,7 +620,7 @@
beginMetadataStar(int)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, assert)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, assert, WrapperClass)
handleIdentifier(int, typeReference)
handleNoTypeArguments(assert)
handleType(int, null)
@@ -677,7 +677,7 @@
beginMetadataStar(int)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, async)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, async, WrapperClass)
handleIdentifier(int, typeReference)
handleNoTypeArguments(async)
handleType(int, null)
@@ -735,7 +735,7 @@
beginMetadataStar(int)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, await)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, await, WrapperClass)
handleIdentifier(int, typeReference)
handleNoTypeArguments(await)
handleType(int, null)
@@ -793,7 +793,7 @@
beginMetadataStar(int)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, break)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, break, WrapperClass)
handleIdentifier(int, typeReference)
handleNoTypeArguments(break)
handleType(int, null)
@@ -859,7 +859,7 @@
beginMetadataStar(int)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, case)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, case, WrapperClass)
handleIdentifier(int, typeReference)
handleNoTypeArguments(case)
handleType(int, null)
@@ -919,7 +919,7 @@
beginMetadataStar(int)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, catch)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, catch, WrapperClass)
handleIdentifier(int, typeReference)
handleNoTypeArguments(catch)
handleType(int, null)
@@ -979,7 +979,7 @@
beginMetadataStar(int)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, class)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, class, WrapperClass)
handleIdentifier(int, typeReference)
handleNoTypeArguments(class)
handleType(int, null)
@@ -1039,7 +1039,7 @@
beginMetadataStar(int)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, const)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, const, WrapperClass)
handleIdentifier(int, typeReference)
handleNoTypeArguments(const)
handleType(int, null)
@@ -1098,7 +1098,7 @@
beginMetadataStar(int)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, continue)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, continue, WrapperClass)
handleIdentifier(int, typeReference)
handleNoTypeArguments(continue)
handleType(int, null)
@@ -1164,7 +1164,7 @@
beginMetadataStar(int)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, covariant)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, covariant, WrapperClass)
handleIdentifier(int, typeReference)
handleNoTypeArguments(covariant)
handleType(int, null)
@@ -1222,7 +1222,7 @@
beginMetadataStar(int)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, default)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, default, WrapperClass)
handleIdentifier(int, typeReference)
handleNoTypeArguments(default)
handleType(int, null)
@@ -1282,7 +1282,7 @@
beginMetadataStar(int)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, deferred)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, deferred, WrapperClass)
handleIdentifier(int, typeReference)
handleNoTypeArguments(deferred)
handleType(int, null)
@@ -1340,7 +1340,7 @@
beginMetadataStar(int)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, do)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, do, WrapperClass)
handleIdentifier(int, typeReference)
handleNoTypeArguments(do)
handleType(int, null)
@@ -1416,7 +1416,7 @@
beginMetadataStar(int)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, dynamic)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, dynamic, WrapperClass)
handleIdentifier(int, typeReference)
handleNoTypeArguments(dynamic)
handleType(int, null)
@@ -1474,7 +1474,7 @@
beginMetadataStar(int)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, else)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, else, WrapperClass)
handleIdentifier(int, typeReference)
handleNoTypeArguments(else)
handleType(int, null)
@@ -1545,7 +1545,7 @@
beginMetadataStar(int)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, enum)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, enum, WrapperClass)
handleIdentifier(int, typeReference)
handleNoTypeArguments(enum)
handleType(int, null)
@@ -1605,7 +1605,7 @@
beginMetadataStar(int)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, export)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, export, WrapperClass)
handleIdentifier(int, typeReference)
handleNoTypeArguments(export)
handleType(int, null)
@@ -1663,7 +1663,7 @@
beginMetadataStar(int)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, extends)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, extends, WrapperClass)
handleIdentifier(int, typeReference)
handleNoTypeArguments(extends)
handleType(int, null)
@@ -1723,7 +1723,7 @@
beginMetadataStar(int)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, extension)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, extension, WrapperClass)
handleIdentifier(int, typeReference)
handleNoTypeArguments(extension)
handleType(int, null)
@@ -1781,7 +1781,7 @@
beginMetadataStar(int)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, external)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, external, WrapperClass)
handleIdentifier(int, typeReference)
handleNoTypeArguments(external)
handleType(int, null)
@@ -1839,7 +1839,7 @@
beginMetadataStar(int)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, factory)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, factory, WrapperClass)
handleIdentifier(int, typeReference)
handleNoTypeArguments(factory)
handleType(int, null)
@@ -1897,7 +1897,7 @@
beginMetadataStar(int)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, false)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, false, WrapperClass)
handleIdentifier(int, typeReference)
handleNoTypeArguments(false)
handleType(int, null)
@@ -1956,7 +1956,7 @@
beginMetadataStar(int)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, final)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, final, WrapperClass)
handleIdentifier(int, typeReference)
handleNoTypeArguments(final)
handleType(int, null)
@@ -2043,7 +2043,7 @@
beginMetadataStar(int)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, finally)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, finally, WrapperClass)
handleIdentifier(int, typeReference)
handleNoTypeArguments(finally)
handleType(int, null)
@@ -2103,7 +2103,7 @@
beginMetadataStar(int)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, for)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, for, WrapperClass)
handleIdentifier(int, typeReference)
handleNoTypeArguments(for)
handleType(int, null)
@@ -2183,7 +2183,7 @@
beginMetadataStar(int)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Function)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Function, WrapperClass)
handleIdentifier(int, typeReference)
handleNoTypeArguments(Function)
handleType(int, null)
@@ -2241,7 +2241,7 @@
beginMetadataStar(int)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, get)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, get, WrapperClass)
handleIdentifier(int, typeReference)
handleNoTypeArguments(get)
handleType(int, null)
@@ -2299,7 +2299,7 @@
beginMetadataStar(int)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, hide)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, hide, WrapperClass)
handleIdentifier(int, typeReference)
handleNoTypeArguments(hide)
handleType(int, null)
@@ -2357,7 +2357,7 @@
beginMetadataStar(int)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, if)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, if, WrapperClass)
handleIdentifier(int, typeReference)
handleNoTypeArguments(if)
handleType(int, null)
@@ -2428,7 +2428,7 @@
beginMetadataStar(int)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, implements)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, implements, WrapperClass)
handleIdentifier(int, typeReference)
handleNoTypeArguments(implements)
handleType(int, null)
@@ -2486,7 +2486,7 @@
beginMetadataStar(int)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, import)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, import, WrapperClass)
handleIdentifier(int, typeReference)
handleNoTypeArguments(import)
handleType(int, null)
@@ -2544,7 +2544,7 @@
beginMetadataStar(int)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, in)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, in, WrapperClass)
handleIdentifier(int, typeReference)
handleNoTypeArguments(in)
handleType(int, null)
@@ -2604,7 +2604,7 @@
beginMetadataStar(int)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, inout)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, inout, WrapperClass)
handleIdentifier(int, typeReference)
handleNoTypeArguments(inout)
handleType(int, null)
@@ -2662,7 +2662,7 @@
beginMetadataStar(int)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, interface)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, interface, WrapperClass)
handleIdentifier(int, typeReference)
handleNoTypeArguments(interface)
handleType(int, null)
@@ -2720,7 +2720,7 @@
beginMetadataStar(int)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, is)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, is, WrapperClass)
handleIdentifier(int, typeReference)
handleNoTypeArguments(is)
handleType(int, null)
@@ -2794,7 +2794,7 @@
beginMetadataStar(int)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, late)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, late, WrapperClass)
handleIdentifier(int, typeReference)
handleNoTypeArguments(late)
handleType(int, null)
@@ -2852,7 +2852,7 @@
beginMetadataStar(int)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, library)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, library, WrapperClass)
handleIdentifier(int, typeReference)
handleNoTypeArguments(library)
handleType(int, null)
@@ -2910,7 +2910,7 @@
beginMetadataStar(int)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, mixin)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, mixin, WrapperClass)
handleIdentifier(int, typeReference)
handleNoTypeArguments(mixin)
handleType(int, null)
@@ -2968,7 +2968,7 @@
beginMetadataStar(int)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, native)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, native, WrapperClass)
handleIdentifier(int, typeReference)
handleNoTypeArguments(native)
handleType(int, null)
@@ -3026,7 +3026,7 @@
beginMetadataStar(int)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, new)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, new, WrapperClass)
handleIdentifier(int, typeReference)
handleNoTypeArguments(new)
handleType(int, null)
@@ -3090,7 +3090,7 @@
beginMetadataStar(int)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, null)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, null, WrapperClass)
handleIdentifier(int, typeReference)
handleNoTypeArguments(null)
handleType(int, null)
@@ -3149,7 +3149,7 @@
beginMetadataStar(int)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, of)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, of, WrapperClass)
handleIdentifier(int, typeReference)
handleNoTypeArguments(of)
handleType(int, null)
@@ -3207,7 +3207,7 @@
beginMetadataStar(int)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, on)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, on, WrapperClass)
handleIdentifier(int, typeReference)
handleNoTypeArguments(on)
handleType(int, null)
@@ -3265,7 +3265,7 @@
beginMetadataStar(int)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, operator)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, operator, WrapperClass)
handleIdentifier(int, typeReference)
handleNoTypeArguments(operator)
handleType(int, null)
@@ -3323,7 +3323,7 @@
beginMetadataStar(int)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, out)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, out, WrapperClass)
handleIdentifier(int, typeReference)
handleNoTypeArguments(out)
handleType(int, null)
@@ -3381,7 +3381,7 @@
beginMetadataStar(int)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, part)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, part, WrapperClass)
handleIdentifier(int, typeReference)
handleNoTypeArguments(part)
handleType(int, null)
@@ -3439,7 +3439,7 @@
beginMetadataStar(int)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, patch)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, patch, WrapperClass)
handleIdentifier(int, typeReference)
handleNoTypeArguments(patch)
handleType(int, null)
@@ -3497,7 +3497,7 @@
beginMetadataStar(int)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, required)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, required, WrapperClass)
handleIdentifier(int, typeReference)
handleNoTypeArguments(required)
handleType(int, null)
@@ -3555,7 +3555,7 @@
beginMetadataStar(int)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, rethrow)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, rethrow, WrapperClass)
handleIdentifier(int, typeReference)
handleNoTypeArguments(rethrow)
handleType(int, null)
@@ -3615,7 +3615,7 @@
beginMetadataStar(int)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, return)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, return, WrapperClass)
handleIdentifier(int, typeReference)
handleNoTypeArguments(return)
handleType(int, null)
@@ -3672,7 +3672,7 @@
beginMetadataStar(int)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, set)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, set, WrapperClass)
handleIdentifier(int, typeReference)
handleNoTypeArguments(set)
handleType(int, null)
@@ -3730,7 +3730,7 @@
beginMetadataStar(int)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, show)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, show, WrapperClass)
handleIdentifier(int, typeReference)
handleNoTypeArguments(show)
handleType(int, null)
@@ -3788,7 +3788,7 @@
beginMetadataStar(int)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, source)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, source, WrapperClass)
handleIdentifier(int, typeReference)
handleNoTypeArguments(source)
handleType(int, null)
@@ -3846,7 +3846,7 @@
beginMetadataStar(int)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, static)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, static, WrapperClass)
handleIdentifier(int, typeReference)
handleNoTypeArguments(static)
handleType(int, null)
@@ -3917,7 +3917,7 @@
beginMetadataStar(()
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, ()
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, (, WrapperClass)
handleNoType(;)
handleRecoverableError(Message[ExpectedIdentifier, Expected an identifier, but got '('., Try inserting an identifier before '('., {lexeme: (}], (, ()
handleIdentifier(, methodDeclaration)
@@ -3974,7 +3974,7 @@
beginMetadataStar(int)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, switch)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, switch, WrapperClass)
handleIdentifier(int, typeReference)
handleNoTypeArguments(switch)
handleType(int, null)
@@ -4046,7 +4046,7 @@
beginMetadataStar(int)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, sync)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, sync, WrapperClass)
handleIdentifier(int, typeReference)
handleNoTypeArguments(sync)
handleType(int, null)
@@ -4117,7 +4117,7 @@
beginMetadataStar(()
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, ()
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, (, WrapperClass)
handleNoType(;)
handleRecoverableError(Message[ExpectedIdentifier, Expected an identifier, but got '('., Try inserting an identifier before '('., {lexeme: (}], (, ()
handleIdentifier(, methodDeclaration)
@@ -4174,7 +4174,7 @@
beginMetadataStar(int)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, throw)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, throw, WrapperClass)
handleIdentifier(int, typeReference)
handleNoTypeArguments(throw)
handleType(int, null)
@@ -4231,7 +4231,7 @@
beginMetadataStar(int)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, true)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, true, WrapperClass)
handleIdentifier(int, typeReference)
handleNoTypeArguments(true)
handleType(int, null)
@@ -4290,7 +4290,7 @@
beginMetadataStar(int)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, try)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, try, WrapperClass)
handleIdentifier(int, typeReference)
handleNoTypeArguments(try)
handleType(int, null)
@@ -4359,7 +4359,7 @@
beginMetadataStar(int)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, typedef)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, typedef, WrapperClass)
handleIdentifier(int, typeReference)
handleNoTypeArguments(typedef)
handleType(int, null)
@@ -4417,7 +4417,7 @@
beginMetadataStar(int)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, var)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, var, WrapperClass)
handleIdentifier(int, typeReference)
handleNoTypeArguments(var)
handleType(int, null)
@@ -4504,7 +4504,7 @@
beginMetadataStar(int)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, void)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, void, WrapperClass)
handleIdentifier(int, typeReference)
handleNoTypeArguments(void)
handleType(int, null)
@@ -4591,7 +4591,7 @@
beginMetadataStar(int)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, while)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, while, WrapperClass)
handleIdentifier(int, typeReference)
handleNoTypeArguments(while)
handleType(int, null)
@@ -4662,7 +4662,7 @@
beginMetadataStar(int)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, with)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, with, WrapperClass)
handleIdentifier(int, typeReference)
handleNoTypeArguments(with)
handleType(int, null)
@@ -4722,7 +4722,7 @@
beginMetadataStar(int)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, yield)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, yield, WrapperClass)
handleIdentifier(int, typeReference)
handleNoTypeArguments(yield)
handleType(int, null)
diff --git a/pkg/front_end/parser_testcases/error_recovery/keyword_named_class_methods.dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/keyword_named_class_methods.dart.intertwined.expect
index 4464fc3..07e5f4a 100644
--- a/pkg/front_end/parser_testcases/error_recovery/keyword_named_class_methods.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/error_recovery/keyword_named_class_methods.dart.intertwined.expect
@@ -32,7 +32,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod({, null, null, null, null, null, null, null, {, SimpleType(), null, abstract, DeclarationKind.Class, WrapperClass, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, abstract)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, abstract, WrapperClass)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(abstract)
listener: handleType(int, null)
@@ -176,7 +176,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(}, null, null, null, null, null, null, null, }, SimpleType(), null, as, DeclarationKind.Class, WrapperClass, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, as)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, as, WrapperClass)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(as)
listener: handleType(int, null)
@@ -322,7 +322,7 @@
isReservedKeyword(assert)
indicatesMethodOrField(()
parseMethod(}, null, null, null, null, null, null, null, }, SimpleType(), null, assert, DeclarationKind.Class, WrapperClass, true)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, assert)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, assert, WrapperClass)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(assert)
listener: handleType(int, null)
@@ -459,7 +459,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(}, null, null, null, null, null, null, null, }, SimpleType(), null, async, DeclarationKind.Class, WrapperClass, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, async)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, async, WrapperClass)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(async)
listener: handleType(int, null)
@@ -603,7 +603,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(}, null, null, null, null, null, null, null, }, SimpleType(), null, await, DeclarationKind.Class, WrapperClass, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, await)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, await, WrapperClass)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(await)
listener: handleType(int, null)
@@ -752,7 +752,7 @@
isReservedKeyword(break)
indicatesMethodOrField(()
parseMethod(}, null, null, null, null, null, null, null, }, SimpleType(), null, break, DeclarationKind.Class, WrapperClass, true)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, break)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, break, WrapperClass)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(break)
listener: handleType(int, null)
@@ -930,7 +930,7 @@
isReservedKeyword(case)
indicatesMethodOrField(()
parseMethod(}, null, null, null, null, null, null, null, }, SimpleType(), null, case, DeclarationKind.Class, WrapperClass, true)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, case)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, case, WrapperClass)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(case)
listener: handleType(int, null)
@@ -1077,7 +1077,7 @@
isReservedKeyword(catch)
indicatesMethodOrField(()
parseMethod(}, null, null, null, null, null, null, null, }, SimpleType(), null, catch, DeclarationKind.Class, WrapperClass, true)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, catch)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, catch, WrapperClass)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(catch)
listener: handleType(int, null)
@@ -1224,7 +1224,7 @@
isReservedKeyword(class)
indicatesMethodOrField(()
parseMethod(}, null, null, null, null, null, null, null, }, SimpleType(), null, class, DeclarationKind.Class, WrapperClass, true)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, class)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, class, WrapperClass)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(class)
listener: handleType(int, null)
@@ -1371,7 +1371,7 @@
isReservedKeyword(const)
indicatesMethodOrField(()
parseMethod(}, null, null, null, null, null, null, null, }, SimpleType(), null, const, DeclarationKind.Class, WrapperClass, true)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, const)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, const, WrapperClass)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(const)
listener: handleType(int, null)
@@ -1513,7 +1513,7 @@
isReservedKeyword(continue)
indicatesMethodOrField(()
parseMethod(}, null, null, null, null, null, null, null, }, SimpleType(), null, continue, DeclarationKind.Class, WrapperClass, true)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, continue)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, continue, WrapperClass)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(continue)
listener: handleType(int, null)
@@ -1689,7 +1689,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(}, null, null, null, null, null, null, null, }, SimpleType(), null, covariant, DeclarationKind.Class, WrapperClass, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, covariant)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, covariant, WrapperClass)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(covariant)
listener: handleType(int, null)
@@ -1835,7 +1835,7 @@
isReservedKeyword(default)
indicatesMethodOrField(()
parseMethod(}, null, null, null, null, null, null, null, }, SimpleType(), null, default, DeclarationKind.Class, WrapperClass, true)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, default)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, default, WrapperClass)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(default)
listener: handleType(int, null)
@@ -1980,7 +1980,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(}, null, null, null, null, null, null, null, }, SimpleType(), null, deferred, DeclarationKind.Class, WrapperClass, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, deferred)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, deferred, WrapperClass)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(deferred)
listener: handleType(int, null)
@@ -2126,7 +2126,7 @@
isReservedKeyword(do)
indicatesMethodOrField(()
parseMethod(}, null, null, null, null, null, null, null, }, SimpleType(), null, do, DeclarationKind.Class, WrapperClass, true)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, do)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, do, WrapperClass)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(do)
listener: handleType(int, null)
@@ -2326,7 +2326,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(}, null, null, null, null, null, null, null, }, SimpleType(), null, dynamic, DeclarationKind.Class, WrapperClass, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, dynamic)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, dynamic, WrapperClass)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(dynamic)
listener: handleType(int, null)
@@ -2472,7 +2472,7 @@
isReservedKeyword(else)
indicatesMethodOrField(()
parseMethod(}, null, null, null, null, null, null, null, }, SimpleType(), null, else, DeclarationKind.Class, WrapperClass, true)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, else)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, else, WrapperClass)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(else)
listener: handleType(int, null)
@@ -2668,7 +2668,7 @@
isReservedKeyword(enum)
indicatesMethodOrField(()
parseMethod(}, null, null, null, null, null, null, null, }, SimpleType(), null, enum, DeclarationKind.Class, WrapperClass, true)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, enum)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, enum, WrapperClass)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(enum)
listener: handleType(int, null)
@@ -2813,7 +2813,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(}, null, null, null, null, null, null, null, }, SimpleType(), null, export, DeclarationKind.Class, WrapperClass, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, export)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, export, WrapperClass)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(export)
listener: handleType(int, null)
@@ -2959,7 +2959,7 @@
isReservedKeyword(extends)
indicatesMethodOrField(()
parseMethod(}, null, null, null, null, null, null, null, }, SimpleType(), null, extends, DeclarationKind.Class, WrapperClass, true)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, extends)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, extends, WrapperClass)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(extends)
listener: handleType(int, null)
@@ -3104,7 +3104,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(}, null, null, null, null, null, null, null, }, SimpleType(), null, extension, DeclarationKind.Class, WrapperClass, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, extension)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, extension, WrapperClass)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(extension)
listener: handleType(int, null)
@@ -3248,7 +3248,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(}, null, null, null, null, null, null, null, }, SimpleType(), null, external, DeclarationKind.Class, WrapperClass, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, external)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, external, WrapperClass)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(external)
listener: handleType(int, null)
@@ -3392,7 +3392,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(}, null, null, null, null, null, null, null, }, SimpleType(), null, factory, DeclarationKind.Class, WrapperClass, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, factory)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, factory, WrapperClass)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(factory)
listener: handleType(int, null)
@@ -3538,7 +3538,7 @@
isReservedKeyword(false)
indicatesMethodOrField(()
parseMethod(}, null, null, null, null, null, null, null, }, SimpleType(), null, false, DeclarationKind.Class, WrapperClass, true)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, false)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, false, WrapperClass)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(false)
listener: handleType(int, null)
@@ -3680,7 +3680,7 @@
isReservedKeyword(final)
indicatesMethodOrField(()
parseMethod(}, null, null, null, null, null, null, null, }, SimpleType(), null, final, DeclarationKind.Class, WrapperClass, true)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, final)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, final, WrapperClass)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(final)
listener: handleType(int, null)
@@ -3919,7 +3919,7 @@
isReservedKeyword(finally)
indicatesMethodOrField(()
parseMethod(}, null, null, null, null, null, null, null, }, SimpleType(), null, finally, DeclarationKind.Class, WrapperClass, true)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, finally)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, finally, WrapperClass)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(finally)
listener: handleType(int, null)
@@ -4066,7 +4066,7 @@
isReservedKeyword(for)
indicatesMethodOrField(()
parseMethod(}, null, null, null, null, null, null, null, }, SimpleType(), null, for, DeclarationKind.Class, WrapperClass, true)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, for)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, for, WrapperClass)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(for)
listener: handleType(int, null)
@@ -4278,7 +4278,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(}, null, null, null, null, null, null, null, }, SimpleType(), null, Function, DeclarationKind.Class, WrapperClass, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Function)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Function, WrapperClass)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(Function)
listener: handleType(int, null)
@@ -4423,7 +4423,7 @@
listener: beginMember()
isReservedKeyword(()
parseMethod(}, null, null, null, null, null, null, null, }, SimpleType(), null, get, DeclarationKind.Class, WrapperClass, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, get)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, get, WrapperClass)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(get)
listener: handleType(int, null)
@@ -4567,7 +4567,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(}, null, null, null, null, null, null, null, }, SimpleType(), null, hide, DeclarationKind.Class, WrapperClass, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, hide)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, hide, WrapperClass)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(hide)
listener: handleType(int, null)
@@ -4713,7 +4713,7 @@
isReservedKeyword(if)
indicatesMethodOrField(()
parseMethod(}, null, null, null, null, null, null, null, }, SimpleType(), null, if, DeclarationKind.Class, WrapperClass, true)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, if)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, if, WrapperClass)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(if)
listener: handleType(int, null)
@@ -4896,7 +4896,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(}, null, null, null, null, null, null, null, }, SimpleType(), null, implements, DeclarationKind.Class, WrapperClass, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, implements)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, implements, WrapperClass)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(implements)
listener: handleType(int, null)
@@ -5040,7 +5040,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(}, null, null, null, null, null, null, null, }, SimpleType(), null, import, DeclarationKind.Class, WrapperClass, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, import)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, import, WrapperClass)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(import)
listener: handleType(int, null)
@@ -5186,7 +5186,7 @@
isReservedKeyword(in)
indicatesMethodOrField(()
parseMethod(}, null, null, null, null, null, null, null, }, SimpleType(), null, in, DeclarationKind.Class, WrapperClass, true)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, in)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, in, WrapperClass)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(in)
listener: handleType(int, null)
@@ -5331,7 +5331,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(}, null, null, null, null, null, null, null, }, SimpleType(), null, inout, DeclarationKind.Class, WrapperClass, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, inout)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, inout, WrapperClass)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(inout)
listener: handleType(int, null)
@@ -5475,7 +5475,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(}, null, null, null, null, null, null, null, }, SimpleType(), null, interface, DeclarationKind.Class, WrapperClass, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, interface)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, interface, WrapperClass)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(interface)
listener: handleType(int, null)
@@ -5621,7 +5621,7 @@
isReservedKeyword(is)
indicatesMethodOrField(()
parseMethod(}, null, null, null, null, null, null, null, }, SimpleType(), null, is, DeclarationKind.Class, WrapperClass, true)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, is)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, is, WrapperClass)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(is)
listener: handleType(int, null)
@@ -5797,7 +5797,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(}, null, null, null, null, null, null, null, }, SimpleType(), null, late, DeclarationKind.Class, WrapperClass, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, late)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, late, WrapperClass)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(late)
listener: handleType(int, null)
@@ -5941,7 +5941,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(}, null, null, null, null, null, null, null, }, SimpleType(), null, library, DeclarationKind.Class, WrapperClass, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, library)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, library, WrapperClass)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(library)
listener: handleType(int, null)
@@ -6085,7 +6085,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(}, null, null, null, null, null, null, null, }, SimpleType(), null, mixin, DeclarationKind.Class, WrapperClass, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, mixin)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, mixin, WrapperClass)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(mixin)
listener: handleType(int, null)
@@ -6229,7 +6229,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(}, null, null, null, null, null, null, null, }, SimpleType(), null, native, DeclarationKind.Class, WrapperClass, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, native)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, native, WrapperClass)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(native)
listener: handleType(int, null)
@@ -6375,7 +6375,7 @@
isReservedKeyword(new)
indicatesMethodOrField(()
parseMethod(}, null, null, null, null, null, null, null, }, SimpleType(), null, new, DeclarationKind.Class, WrapperClass, true)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, new)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, new, WrapperClass)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(new)
listener: handleType(int, null)
@@ -6528,7 +6528,7 @@
isReservedKeyword(null)
indicatesMethodOrField(()
parseMethod(}, null, null, null, null, null, null, null, }, SimpleType(), null, null, DeclarationKind.Class, WrapperClass, true)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, null)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, null, WrapperClass)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(null)
listener: handleType(int, null)
@@ -6668,7 +6668,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(}, null, null, null, null, null, null, null, }, SimpleType(), null, of, DeclarationKind.Class, WrapperClass, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, of)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, of, WrapperClass)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(of)
listener: handleType(int, null)
@@ -6812,7 +6812,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(}, null, null, null, null, null, null, null, }, SimpleType(), null, on, DeclarationKind.Class, WrapperClass, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, on)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, on, WrapperClass)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(on)
listener: handleType(int, null)
@@ -6958,7 +6958,7 @@
isUnaryMinus(()
parseMethod(}, null, null, null, null, null, null, null, }, SimpleType(), null, operator, DeclarationKind.Class, WrapperClass, false)
isUnaryMinus(()
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, operator)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, operator, WrapperClass)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(operator)
listener: handleType(int, null)
@@ -7102,7 +7102,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(}, null, null, null, null, null, null, null, }, SimpleType(), null, out, DeclarationKind.Class, WrapperClass, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, out)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, out, WrapperClass)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(out)
listener: handleType(int, null)
@@ -7246,7 +7246,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(}, null, null, null, null, null, null, null, }, SimpleType(), null, part, DeclarationKind.Class, WrapperClass, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, part)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, part, WrapperClass)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(part)
listener: handleType(int, null)
@@ -7390,7 +7390,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(}, null, null, null, null, null, null, null, }, SimpleType(), null, patch, DeclarationKind.Class, WrapperClass, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, patch)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, patch, WrapperClass)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(patch)
listener: handleType(int, null)
@@ -7534,7 +7534,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(}, null, null, null, null, null, null, null, }, SimpleType(), null, required, DeclarationKind.Class, WrapperClass, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, required)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, required, WrapperClass)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(required)
listener: handleType(int, null)
@@ -7680,7 +7680,7 @@
isReservedKeyword(rethrow)
indicatesMethodOrField(()
parseMethod(}, null, null, null, null, null, null, null, }, SimpleType(), null, rethrow, DeclarationKind.Class, WrapperClass, true)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, rethrow)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, rethrow, WrapperClass)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(rethrow)
listener: handleType(int, null)
@@ -7827,7 +7827,7 @@
isReservedKeyword(return)
indicatesMethodOrField(()
parseMethod(}, null, null, null, null, null, null, null, }, SimpleType(), null, return, DeclarationKind.Class, WrapperClass, true)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, return)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, return, WrapperClass)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(return)
listener: handleType(int, null)
@@ -7968,7 +7968,7 @@
listener: beginMember()
isReservedKeyword(()
parseMethod(}, null, null, null, null, null, null, null, }, SimpleType(), null, set, DeclarationKind.Class, WrapperClass, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, set)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, set, WrapperClass)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(set)
listener: handleType(int, null)
@@ -8112,7 +8112,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(}, null, null, null, null, null, null, null, }, SimpleType(), null, show, DeclarationKind.Class, WrapperClass, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, show)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, show, WrapperClass)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(show)
listener: handleType(int, null)
@@ -8256,7 +8256,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(}, null, null, null, null, null, null, null, }, SimpleType(), null, source, DeclarationKind.Class, WrapperClass, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, source)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, source, WrapperClass)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(source)
listener: handleType(int, null)
@@ -8400,7 +8400,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(}, null, null, null, null, null, null, null, }, SimpleType(), null, static, DeclarationKind.Class, WrapperClass, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, static)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, static, WrapperClass)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(static)
listener: handleType(int, null)
@@ -8569,7 +8569,7 @@
listener: beginMember()
recoverFromInvalidMember(;, ;, null, null, null, null, null, null, null, ;, NoType(), null, DeclarationKind.Class, WrapperClass)
parseMethod(;, null, null, null, null, null, null, null, ;, NoType(), null, (, DeclarationKind.Class, WrapperClass, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, ()
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, (, WrapperClass)
listener: handleNoType(;)
ensureIdentifierPotentiallyRecovered(;, methodDeclaration, false)
insertSyntheticIdentifier(;, methodDeclaration, message: null, messageOnToken: null)
@@ -8710,7 +8710,7 @@
isReservedKeyword(switch)
indicatesMethodOrField(()
parseMethod(}, null, null, null, null, null, null, null, }, SimpleType(), null, switch, DeclarationKind.Class, WrapperClass, true)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, switch)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, switch, WrapperClass)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(switch)
listener: handleType(int, null)
@@ -8902,7 +8902,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(}, null, null, null, null, null, null, null, }, SimpleType(), null, sync, DeclarationKind.Class, WrapperClass, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, sync)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, sync, WrapperClass)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(sync)
listener: handleType(int, null)
@@ -9071,7 +9071,7 @@
listener: beginMember()
recoverFromInvalidMember(;, ;, null, null, null, null, null, null, null, ;, NoType(), null, DeclarationKind.Class, WrapperClass)
parseMethod(;, null, null, null, null, null, null, null, ;, NoType(), null, (, DeclarationKind.Class, WrapperClass, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, ()
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, (, WrapperClass)
listener: handleNoType(;)
ensureIdentifierPotentiallyRecovered(;, methodDeclaration, false)
insertSyntheticIdentifier(;, methodDeclaration, message: null, messageOnToken: null)
@@ -9212,7 +9212,7 @@
isReservedKeyword(throw)
indicatesMethodOrField(()
parseMethod(}, null, null, null, null, null, null, null, }, SimpleType(), null, throw, DeclarationKind.Class, WrapperClass, true)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, throw)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, throw, WrapperClass)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(throw)
listener: handleType(int, null)
@@ -9353,7 +9353,7 @@
isReservedKeyword(true)
indicatesMethodOrField(()
parseMethod(}, null, null, null, null, null, null, null, }, SimpleType(), null, true, DeclarationKind.Class, WrapperClass, true)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, true)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, true, WrapperClass)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(true)
listener: handleType(int, null)
@@ -9495,7 +9495,7 @@
isReservedKeyword(try)
indicatesMethodOrField(()
parseMethod(}, null, null, null, null, null, null, null, }, SimpleType(), null, try, DeclarationKind.Class, WrapperClass, true)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, try)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, try, WrapperClass)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(try)
listener: handleType(int, null)
@@ -9677,7 +9677,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(}, null, null, null, null, null, null, null, }, SimpleType(), null, typedef, DeclarationKind.Class, WrapperClass, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, typedef)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, typedef, WrapperClass)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(typedef)
listener: handleType(int, null)
@@ -9823,7 +9823,7 @@
isReservedKeyword(var)
indicatesMethodOrField(()
parseMethod(}, null, null, null, null, null, null, null, }, SimpleType(), null, var, DeclarationKind.Class, WrapperClass, true)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, var)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, var, WrapperClass)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(var)
listener: handleType(int, null)
@@ -10062,7 +10062,7 @@
isReservedKeyword(void)
indicatesMethodOrField(()
parseMethod(}, null, null, null, null, null, null, null, }, SimpleType(), null, void, DeclarationKind.Class, WrapperClass, true)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, void)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, void, WrapperClass)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(void)
listener: handleType(int, null)
@@ -10302,7 +10302,7 @@
isReservedKeyword(while)
indicatesMethodOrField(()
parseMethod(}, null, null, null, null, null, null, null, }, SimpleType(), null, while, DeclarationKind.Class, WrapperClass, true)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, while)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, while, WrapperClass)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(while)
listener: handleType(int, null)
@@ -10487,7 +10487,7 @@
isReservedKeyword(with)
indicatesMethodOrField(()
parseMethod(}, null, null, null, null, null, null, null, }, SimpleType(), null, with, DeclarationKind.Class, WrapperClass, true)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, with)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, with, WrapperClass)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(with)
listener: handleType(int, null)
@@ -10632,7 +10632,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(}, null, null, null, null, null, null, null, }, SimpleType(), null, yield, DeclarationKind.Class, WrapperClass, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, yield)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, yield, WrapperClass)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(yield)
listener: handleType(int, null)
diff --git a/pkg/front_end/parser_testcases/error_recovery/method_called_with.dart.expect b/pkg/front_end/parser_testcases/error_recovery/method_called_with.dart.expect
index 22df41e..c1fb30c 100644
--- a/pkg/front_end/parser_testcases/error_recovery/method_called_with.dart.expect
+++ b/pkg/front_end/parser_testcases/error_recovery/method_called_with.dart.expect
@@ -40,7 +40,7 @@
beginMetadataStar(int)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, with)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, with, C)
handleIdentifier(int, typeReference)
handleNoTypeArguments(with)
handleType(int, null)
@@ -72,7 +72,7 @@
beginMetadataStar(int)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, get, with)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, get, with, C)
handleIdentifier(int, typeReference)
handleNoTypeArguments(get)
handleType(int, null)
@@ -89,7 +89,7 @@
beginMetadataStar(void)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, set, with)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, set, with, C)
handleVoidKeyword(void)
handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'with' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: with}], with, with)
handleIdentifier(with, methodDeclaration)
diff --git a/pkg/front_end/parser_testcases/error_recovery/method_called_with.dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/method_called_with.dart.intertwined.expect
index 564e4c4..5587d3f 100644
--- a/pkg/front_end/parser_testcases/error_recovery/method_called_with.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/error_recovery/method_called_with.dart.intertwined.expect
@@ -34,7 +34,7 @@
isReservedKeyword(with)
indicatesMethodOrField(()
parseMethod({, null, null, null, null, null, null, null, {, SimpleType(), null, with, DeclarationKind.Class, C, true)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, with)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, with, C)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(with)
listener: handleType(int, null)
@@ -106,7 +106,7 @@
isReservedKeyword(with)
indicatesMethodOrField(=>)
parseMethod(;, null, null, null, null, null, null, null, ;, SimpleType(), get, with, DeclarationKind.Class, C, true)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, with)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, with, C)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(get)
listener: handleType(int, null)
@@ -147,7 +147,7 @@
isReservedKeyword(with)
indicatesMethodOrField(()
parseMethod(;, null, null, null, null, null, null, null, ;, VoidType(), set, with, DeclarationKind.Class, C, true)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, set, with)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, set, with, C)
listener: handleVoidKeyword(void)
ensureIdentifierPotentiallyRecovered(set, methodDeclaration, true)
reportRecoverableErrorWithToken(with, Template(ExpectedIdentifierButGotKeyword))
diff --git a/pkg/front_end/parser_testcases/error_recovery/method_called_with_prime.dart.expect b/pkg/front_end/parser_testcases/error_recovery/method_called_with_prime.dart.expect
index c9f3ffb..53cbec8 100644
--- a/pkg/front_end/parser_testcases/error_recovery/method_called_with_prime.dart.expect
+++ b/pkg/front_end/parser_testcases/error_recovery/method_called_with_prime.dart.expect
@@ -14,7 +14,7 @@
beginMetadataStar(int)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, With)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, With, C)
handleIdentifier(int, typeReference)
handleNoTypeArguments(With)
handleType(int, null)
@@ -44,7 +44,7 @@
beginMetadataStar(int)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, get, With)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, get, With, C)
handleIdentifier(int, typeReference)
handleNoTypeArguments(get)
handleType(int, null)
@@ -60,7 +60,7 @@
beginMetadataStar(void)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, set, With)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, set, With, C)
handleVoidKeyword(void)
handleIdentifier(With, methodDeclaration)
handleNoTypeVariables(()
diff --git a/pkg/front_end/parser_testcases/error_recovery/method_called_with_prime.dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/method_called_with_prime.dart.intertwined.expect
index 4c1b9a5..77bf41b 100644
--- a/pkg/front_end/parser_testcases/error_recovery/method_called_with_prime.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/error_recovery/method_called_with_prime.dart.intertwined.expect
@@ -32,7 +32,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod({, null, null, null, null, null, null, null, {, SimpleType(), null, With, DeclarationKind.Class, C, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, With)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, With, C)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(With)
listener: handleType(int, null)
@@ -96,7 +96,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(;, null, null, null, null, null, null, null, ;, SimpleType(), get, With, DeclarationKind.Class, C, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, With)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, With, C)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(get)
listener: handleType(int, null)
@@ -133,7 +133,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(;, null, null, null, null, null, null, null, ;, VoidType(), set, With, DeclarationKind.Class, C, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, set, With)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, set, With, C)
listener: handleVoidKeyword(void)
ensureIdentifierPotentiallyRecovered(set, methodDeclaration, false)
listener: handleIdentifier(With, methodDeclaration)
diff --git a/pkg/front_end/parser_testcases/extension_named_type.dart.expect b/pkg/front_end/parser_testcases/extension_named_type.dart.expect
index 91202cb..f5acee6 100644
--- a/pkg/front_end/parser_testcases/extension_named_type.dart.expect
+++ b/pkg/front_end/parser_testcases/extension_named_type.dart.expect
@@ -42,7 +42,7 @@
beginMetadataStar(method)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.ExtensionType, null, null, null, null, null, null, method)
+ beginMethod(DeclarationKind.ExtensionType, null, null, null, null, null, null, method, on)
handleNoType({)
handleIdentifier(method, methodDeclaration)
handleNoTypeVariables(()
diff --git a/pkg/front_end/parser_testcases/extension_named_type.dart.intertwined.expect b/pkg/front_end/parser_testcases/extension_named_type.dart.intertwined.expect
index aa77e39..60e3100 100644
--- a/pkg/front_end/parser_testcases/extension_named_type.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/extension_named_type.dart.intertwined.expect
@@ -69,7 +69,7 @@
listener: beginMember()
isReservedKeyword(()
parseMethod({, null, null, null, null, null, null, null, {, NoType(), null, method, DeclarationKind.ExtensionType, on, false)
- listener: beginMethod(DeclarationKind.ExtensionType, null, null, null, null, null, null, method)
+ listener: beginMethod(DeclarationKind.ExtensionType, null, null, null, null, null, null, method, on)
listener: handleNoType({)
ensureIdentifierPotentiallyRecovered({, methodDeclaration, false)
listener: handleIdentifier(method, methodDeclaration)
diff --git a/pkg/front_end/parser_testcases/extensions/covariant.dart.expect b/pkg/front_end/parser_testcases/extensions/covariant.dart.expect
index 375812a..1750de9 100644
--- a/pkg/front_end/parser_testcases/extensions/covariant.dart.expect
+++ b/pkg/front_end/parser_testcases/extensions/covariant.dart.expect
@@ -49,7 +49,7 @@
beginMetadataStar(addChild)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Extension, null, null, null, null, null, null, addChild)
+ beginMethod(DeclarationKind.Extension, null, null, null, null, null, null, addChild, null)
handleNoType({)
handleIdentifier(addChild, methodDeclaration)
handleNoTypeVariables(()
diff --git a/pkg/front_end/parser_testcases/extensions/covariant.dart.intertwined.expect b/pkg/front_end/parser_testcases/extensions/covariant.dart.intertwined.expect
index 878aea0..95a8fc4 100644
--- a/pkg/front_end/parser_testcases/extensions/covariant.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/extensions/covariant.dart.intertwined.expect
@@ -82,7 +82,7 @@
listener: beginMember()
isReservedKeyword(()
parseMethod({, null, null, null, null, null, null, null, {, NoType(), null, addChild, DeclarationKind.Extension, null, false)
- listener: beginMethod(DeclarationKind.Extension, null, null, null, null, null, null, addChild)
+ listener: beginMethod(DeclarationKind.Extension, null, null, null, null, null, null, addChild, null)
listener: handleNoType({)
ensureIdentifierPotentiallyRecovered({, methodDeclaration, false)
listener: handleIdentifier(addChild, methodDeclaration)
diff --git a/pkg/front_end/parser_testcases/extensions/not_covariant.dart.expect b/pkg/front_end/parser_testcases/extensions/not_covariant.dart.expect
index a67d11d..43fcb49 100644
--- a/pkg/front_end/parser_testcases/extensions/not_covariant.dart.expect
+++ b/pkg/front_end/parser_testcases/extensions/not_covariant.dart.expect
@@ -43,7 +43,7 @@
beginMetadataStar(addChild)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Extension, null, null, null, null, null, null, addChild)
+ beginMethod(DeclarationKind.Extension, null, null, null, null, null, null, addChild, null)
handleNoType({)
handleIdentifier(addChild, methodDeclaration)
handleNoTypeVariables(()
diff --git a/pkg/front_end/parser_testcases/extensions/not_covariant.dart.intertwined.expect b/pkg/front_end/parser_testcases/extensions/not_covariant.dart.intertwined.expect
index b1cff28..0339d7d 100644
--- a/pkg/front_end/parser_testcases/extensions/not_covariant.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/extensions/not_covariant.dart.intertwined.expect
@@ -82,7 +82,7 @@
listener: beginMember()
isReservedKeyword(()
parseMethod({, null, null, null, null, null, null, null, {, NoType(), null, addChild, DeclarationKind.Extension, null, false)
- listener: beginMethod(DeclarationKind.Extension, null, null, null, null, null, null, addChild)
+ listener: beginMethod(DeclarationKind.Extension, null, null, null, null, null, null, addChild, null)
listener: handleNoType({)
ensureIdentifierPotentiallyRecovered({, methodDeclaration, false)
listener: handleIdentifier(addChild, methodDeclaration)
diff --git a/pkg/front_end/parser_testcases/extensions/static.dart.expect b/pkg/front_end/parser_testcases/extensions/static.dart.expect
index 53cdf27..268045b 100644
--- a/pkg/front_end/parser_testcases/extensions/static.dart.expect
+++ b/pkg/front_end/parser_testcases/extensions/static.dart.expect
@@ -43,7 +43,7 @@
beginMetadataStar(static)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Extension, null, null, static, null, null, null, addChild)
+ beginMethod(DeclarationKind.Extension, null, null, static, null, null, null, addChild, null)
handleNoType(static)
handleIdentifier(addChild, methodDeclaration)
handleNoTypeVariables(()
diff --git a/pkg/front_end/parser_testcases/extensions/static.dart.intertwined.expect b/pkg/front_end/parser_testcases/extensions/static.dart.intertwined.expect
index 8c4af34..f64620c 100644
--- a/pkg/front_end/parser_testcases/extensions/static.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/extensions/static.dart.intertwined.expect
@@ -82,7 +82,7 @@
listener: beginMember()
isReservedKeyword(()
parseMethod({, null, null, null, static, null, null, null, static, NoType(), null, addChild, DeclarationKind.Extension, null, false)
- listener: beginMethod(DeclarationKind.Extension, null, null, static, null, null, null, addChild)
+ listener: beginMethod(DeclarationKind.Extension, null, null, static, null, null, null, addChild, null)
listener: handleNoType(static)
ensureIdentifierPotentiallyRecovered(static, methodDeclaration, false)
listener: handleIdentifier(addChild, methodDeclaration)
diff --git a/pkg/front_end/parser_testcases/extensions/static_covariant.dart.expect b/pkg/front_end/parser_testcases/extensions/static_covariant.dart.expect
index b435a9b..1ff727f 100644
--- a/pkg/front_end/parser_testcases/extensions/static_covariant.dart.expect
+++ b/pkg/front_end/parser_testcases/extensions/static_covariant.dart.expect
@@ -49,7 +49,7 @@
beginMetadataStar(static)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Extension, null, null, static, null, null, null, addChild)
+ beginMethod(DeclarationKind.Extension, null, null, static, null, null, null, addChild, null)
handleNoType(static)
handleIdentifier(addChild, methodDeclaration)
handleNoTypeVariables(()
diff --git a/pkg/front_end/parser_testcases/extensions/static_covariant.dart.intertwined.expect b/pkg/front_end/parser_testcases/extensions/static_covariant.dart.intertwined.expect
index 09d6a80..7fb311f9 100644
--- a/pkg/front_end/parser_testcases/extensions/static_covariant.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/extensions/static_covariant.dart.intertwined.expect
@@ -82,7 +82,7 @@
listener: beginMember()
isReservedKeyword(()
parseMethod({, null, null, null, static, null, null, null, static, NoType(), null, addChild, DeclarationKind.Extension, null, false)
- listener: beginMethod(DeclarationKind.Extension, null, null, static, null, null, null, addChild)
+ listener: beginMethod(DeclarationKind.Extension, null, null, static, null, null, null, addChild, null)
listener: handleNoType(static)
ensureIdentifierPotentiallyRecovered(static, methodDeclaration, false)
listener: handleIdentifier(addChild, methodDeclaration)
diff --git a/pkg/front_end/parser_testcases/general/augment_super.dart.expect b/pkg/front_end/parser_testcases/general/augment_super.dart.expect
index 1b29339..21f088c 100644
--- a/pkg/front_end/parser_testcases/general/augment_super.dart.expect
+++ b/pkg/front_end/parser_testcases/general/augment_super.dart.expect
@@ -494,7 +494,7 @@
beginMetadataStar(void)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, instanceMethod)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, instanceMethod, Class)
handleVoidKeyword(void)
handleIdentifier(instanceMethod, methodDeclaration)
handleNoTypeVariables(()
@@ -536,7 +536,7 @@
beginMetadataStar(void)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, instanceMethodErrors)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, instanceMethodErrors, Class)
handleVoidKeyword(void)
handleIdentifier(instanceMethodErrors, methodDeclaration)
handleNoTypeVariables(()
@@ -585,7 +585,7 @@
beginMetadataStar(get)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, get, instanceProperty)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, get, instanceProperty, Class)
handleNoType(;)
handleIdentifier(instanceProperty, methodDeclaration)
handleNoTypeVariables({)
@@ -649,7 +649,7 @@
beginMetadataStar(void)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, set, instanceProperty)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, set, instanceProperty, Class)
handleVoidKeyword(void)
handleIdentifier(instanceProperty, methodDeclaration)
handleNoTypeVariables(()
@@ -690,7 +690,7 @@
beginMetadataStar(void)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, injectedInstanceMethod)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, injectedInstanceMethod, Class)
handleVoidKeyword(void)
handleIdentifier(injectedInstanceMethod, methodDeclaration)
handleNoTypeVariables(()
diff --git a/pkg/front_end/parser_testcases/general/augment_super.dart.intertwined.expect b/pkg/front_end/parser_testcases/general/augment_super.dart.intertwined.expect
index 03fc28d..bd9b8c3 100644
--- a/pkg/front_end/parser_testcases/general/augment_super.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/general/augment_super.dart.intertwined.expect
@@ -759,7 +759,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(;, null, null, null, null, null, null, null, ;, VoidType(), null, instanceMethod, DeclarationKind.Class, Class, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, instanceMethod)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, instanceMethod, Class)
listener: handleVoidKeyword(void)
ensureIdentifierPotentiallyRecovered(void, methodDeclaration, false)
listener: handleIdentifier(instanceMethod, methodDeclaration)
@@ -857,7 +857,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(;, null, null, null, null, null, null, null, ;, VoidType(), null, instanceMethodErrors, DeclarationKind.Class, Class, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, instanceMethodErrors)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, instanceMethodErrors, Class)
listener: handleVoidKeyword(void)
ensureIdentifierPotentiallyRecovered(void, methodDeclaration, false)
listener: handleIdentifier(instanceMethodErrors, methodDeclaration)
@@ -975,7 +975,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(;, null, null, null, null, null, null, null, ;, NoType(), get, instanceProperty, DeclarationKind.Class, Class, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, instanceProperty)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, instanceProperty, Class)
listener: handleNoType(;)
ensureIdentifierPotentiallyRecovered(get, methodDeclaration, false)
listener: handleIdentifier(instanceProperty, methodDeclaration)
@@ -1164,7 +1164,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(;, null, null, null, null, null, null, null, ;, VoidType(), set, instanceProperty, DeclarationKind.Class, Class, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, set, instanceProperty)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, set, instanceProperty, Class)
listener: handleVoidKeyword(void)
ensureIdentifierPotentiallyRecovered(set, methodDeclaration, false)
listener: handleIdentifier(instanceProperty, methodDeclaration)
@@ -1244,7 +1244,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(}, null, null, null, null, null, null, null, }, VoidType(), null, injectedInstanceMethod, DeclarationKind.Class, Class, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, injectedInstanceMethod)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, injectedInstanceMethod, Class)
listener: handleVoidKeyword(void)
ensureIdentifierPotentiallyRecovered(void, methodDeclaration, false)
listener: handleIdentifier(injectedInstanceMethod, methodDeclaration)
diff --git a/pkg/front_end/parser_testcases/general/built_in_identifier_class_methods.dart.expect b/pkg/front_end/parser_testcases/general/built_in_identifier_class_methods.dart.expect
index e8b832c..f864fb0 100644
--- a/pkg/front_end/parser_testcases/general/built_in_identifier_class_methods.dart.expect
+++ b/pkg/front_end/parser_testcases/general/built_in_identifier_class_methods.dart.expect
@@ -14,7 +14,7 @@
beginMetadataStar(int)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, abstract)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, abstract, WrapperClass)
handleIdentifier(int, typeReference)
handleNoTypeArguments(abstract)
handleType(int, null)
@@ -69,7 +69,7 @@
beginMetadataStar(int)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, as)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, as, WrapperClass)
handleIdentifier(int, typeReference)
handleNoTypeArguments(as)
handleType(int, null)
@@ -124,7 +124,7 @@
beginMetadataStar(int)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, covariant)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, covariant, WrapperClass)
handleIdentifier(int, typeReference)
handleNoTypeArguments(covariant)
handleType(int, null)
@@ -179,7 +179,7 @@
beginMetadataStar(int)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, deferred)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, deferred, WrapperClass)
handleIdentifier(int, typeReference)
handleNoTypeArguments(deferred)
handleType(int, null)
@@ -234,7 +234,7 @@
beginMetadataStar(int)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, dynamic)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, dynamic, WrapperClass)
handleIdentifier(int, typeReference)
handleNoTypeArguments(dynamic)
handleType(int, null)
@@ -289,7 +289,7 @@
beginMetadataStar(int)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, export)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, export, WrapperClass)
handleIdentifier(int, typeReference)
handleNoTypeArguments(export)
handleType(int, null)
@@ -344,7 +344,7 @@
beginMetadataStar(int)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, external)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, external, WrapperClass)
handleIdentifier(int, typeReference)
handleNoTypeArguments(external)
handleType(int, null)
@@ -399,7 +399,7 @@
beginMetadataStar(int)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, factory)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, factory, WrapperClass)
handleIdentifier(int, typeReference)
handleNoTypeArguments(factory)
handleType(int, null)
@@ -454,7 +454,7 @@
beginMetadataStar(int)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Function)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Function, WrapperClass)
handleIdentifier(int, typeReference)
handleNoTypeArguments(Function)
handleType(int, null)
@@ -509,7 +509,7 @@
beginMetadataStar(int)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, get)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, get, WrapperClass)
handleIdentifier(int, typeReference)
handleNoTypeArguments(get)
handleType(int, null)
@@ -564,7 +564,7 @@
beginMetadataStar(int)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, implements)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, implements, WrapperClass)
handleIdentifier(int, typeReference)
handleNoTypeArguments(implements)
handleType(int, null)
@@ -619,7 +619,7 @@
beginMetadataStar(int)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, import)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, import, WrapperClass)
handleIdentifier(int, typeReference)
handleNoTypeArguments(import)
handleType(int, null)
@@ -674,7 +674,7 @@
beginMetadataStar(int)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, interface)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, interface, WrapperClass)
handleIdentifier(int, typeReference)
handleNoTypeArguments(interface)
handleType(int, null)
@@ -729,7 +729,7 @@
beginMetadataStar(int)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, library)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, library, WrapperClass)
handleIdentifier(int, typeReference)
handleNoTypeArguments(library)
handleType(int, null)
@@ -784,7 +784,7 @@
beginMetadataStar(int)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, operator)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, operator, WrapperClass)
handleIdentifier(int, typeReference)
handleNoTypeArguments(operator)
handleType(int, null)
@@ -839,7 +839,7 @@
beginMetadataStar(int)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, mixin)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, mixin, WrapperClass)
handleIdentifier(int, typeReference)
handleNoTypeArguments(mixin)
handleType(int, null)
@@ -894,7 +894,7 @@
beginMetadataStar(int)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, part)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, part, WrapperClass)
handleIdentifier(int, typeReference)
handleNoTypeArguments(part)
handleType(int, null)
@@ -949,7 +949,7 @@
beginMetadataStar(int)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, set)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, set, WrapperClass)
handleIdentifier(int, typeReference)
handleNoTypeArguments(set)
handleType(int, null)
@@ -1004,7 +1004,7 @@
beginMetadataStar(int)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, static)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, static, WrapperClass)
handleIdentifier(int, typeReference)
handleNoTypeArguments(static)
handleType(int, null)
@@ -1059,7 +1059,7 @@
beginMetadataStar(int)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, typedef)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, typedef, WrapperClass)
handleIdentifier(int, typeReference)
handleNoTypeArguments(typedef)
handleType(int, null)
diff --git a/pkg/front_end/parser_testcases/general/built_in_identifier_class_methods.dart.intertwined.expect b/pkg/front_end/parser_testcases/general/built_in_identifier_class_methods.dart.intertwined.expect
index 80d286d..9f2c6f3 100644
--- a/pkg/front_end/parser_testcases/general/built_in_identifier_class_methods.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/general/built_in_identifier_class_methods.dart.intertwined.expect
@@ -32,7 +32,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod({, null, null, null, null, null, null, null, {, SimpleType(), null, abstract, DeclarationKind.Class, WrapperClass, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, abstract)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, abstract, WrapperClass)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(abstract)
listener: handleType(int, null)
@@ -169,7 +169,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(}, null, null, null, null, null, null, null, }, SimpleType(), null, as, DeclarationKind.Class, WrapperClass, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, as)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, as, WrapperClass)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(as)
listener: handleType(int, null)
@@ -306,7 +306,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(}, null, null, null, null, null, null, null, }, SimpleType(), null, covariant, DeclarationKind.Class, WrapperClass, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, covariant)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, covariant, WrapperClass)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(covariant)
listener: handleType(int, null)
@@ -443,7 +443,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(}, null, null, null, null, null, null, null, }, SimpleType(), null, deferred, DeclarationKind.Class, WrapperClass, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, deferred)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, deferred, WrapperClass)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(deferred)
listener: handleType(int, null)
@@ -580,7 +580,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(}, null, null, null, null, null, null, null, }, SimpleType(), null, dynamic, DeclarationKind.Class, WrapperClass, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, dynamic)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, dynamic, WrapperClass)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(dynamic)
listener: handleType(int, null)
@@ -717,7 +717,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(}, null, null, null, null, null, null, null, }, SimpleType(), null, export, DeclarationKind.Class, WrapperClass, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, export)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, export, WrapperClass)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(export)
listener: handleType(int, null)
@@ -854,7 +854,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(}, null, null, null, null, null, null, null, }, SimpleType(), null, external, DeclarationKind.Class, WrapperClass, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, external)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, external, WrapperClass)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(external)
listener: handleType(int, null)
@@ -991,7 +991,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(}, null, null, null, null, null, null, null, }, SimpleType(), null, factory, DeclarationKind.Class, WrapperClass, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, factory)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, factory, WrapperClass)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(factory)
listener: handleType(int, null)
@@ -1128,7 +1128,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(}, null, null, null, null, null, null, null, }, SimpleType(), null, Function, DeclarationKind.Class, WrapperClass, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Function)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Function, WrapperClass)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(Function)
listener: handleType(int, null)
@@ -1266,7 +1266,7 @@
listener: beginMember()
isReservedKeyword(()
parseMethod(}, null, null, null, null, null, null, null, }, SimpleType(), null, get, DeclarationKind.Class, WrapperClass, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, get)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, get, WrapperClass)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(get)
listener: handleType(int, null)
@@ -1403,7 +1403,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(}, null, null, null, null, null, null, null, }, SimpleType(), null, implements, DeclarationKind.Class, WrapperClass, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, implements)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, implements, WrapperClass)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(implements)
listener: handleType(int, null)
@@ -1540,7 +1540,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(}, null, null, null, null, null, null, null, }, SimpleType(), null, import, DeclarationKind.Class, WrapperClass, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, import)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, import, WrapperClass)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(import)
listener: handleType(int, null)
@@ -1677,7 +1677,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(}, null, null, null, null, null, null, null, }, SimpleType(), null, interface, DeclarationKind.Class, WrapperClass, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, interface)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, interface, WrapperClass)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(interface)
listener: handleType(int, null)
@@ -1814,7 +1814,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(}, null, null, null, null, null, null, null, }, SimpleType(), null, library, DeclarationKind.Class, WrapperClass, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, library)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, library, WrapperClass)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(library)
listener: handleType(int, null)
@@ -1953,7 +1953,7 @@
isUnaryMinus(()
parseMethod(}, null, null, null, null, null, null, null, }, SimpleType(), null, operator, DeclarationKind.Class, WrapperClass, false)
isUnaryMinus(()
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, operator)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, operator, WrapperClass)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(operator)
listener: handleType(int, null)
@@ -2090,7 +2090,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(}, null, null, null, null, null, null, null, }, SimpleType(), null, mixin, DeclarationKind.Class, WrapperClass, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, mixin)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, mixin, WrapperClass)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(mixin)
listener: handleType(int, null)
@@ -2227,7 +2227,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(}, null, null, null, null, null, null, null, }, SimpleType(), null, part, DeclarationKind.Class, WrapperClass, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, part)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, part, WrapperClass)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(part)
listener: handleType(int, null)
@@ -2365,7 +2365,7 @@
listener: beginMember()
isReservedKeyword(()
parseMethod(}, null, null, null, null, null, null, null, }, SimpleType(), null, set, DeclarationKind.Class, WrapperClass, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, set)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, set, WrapperClass)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(set)
listener: handleType(int, null)
@@ -2502,7 +2502,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(}, null, null, null, null, null, null, null, }, SimpleType(), null, static, DeclarationKind.Class, WrapperClass, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, static)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, static, WrapperClass)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(static)
listener: handleType(int, null)
@@ -2639,7 +2639,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(}, null, null, null, null, null, null, null, }, SimpleType(), null, typedef, DeclarationKind.Class, WrapperClass, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, typedef)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, typedef, WrapperClass)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(typedef)
listener: handleType(int, null)
diff --git a/pkg/front_end/parser_testcases/general/issue_41121.dart.expect b/pkg/front_end/parser_testcases/general/issue_41121.dart.expect
index afb0888..c3e5d4a 100644
--- a/pkg/front_end/parser_testcases/general/issue_41121.dart.expect
+++ b/pkg/front_end/parser_testcases/general/issue_41121.dart.expect
@@ -67,7 +67,7 @@
beginMetadataStar(ConfigurationService)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, ConfigurationService)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, ConfigurationService, ConfigurationService)
handleNoType(;)
handleIdentifier(ConfigurationService, methodDeclaration)
handleNoTypeVariables(()
@@ -114,7 +114,7 @@
beginMetadataStar(void)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, set, configuration)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, set, configuration, ConfigurationService)
handleVoidKeyword(void)
handleIdentifier(configuration, methodDeclaration)
handleNoTypeVariables(()
@@ -164,7 +164,7 @@
beginMetadataStar(Configuration)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, get, configuration)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, get, configuration, ConfigurationService)
handleIdentifier(Configuration, typeReference)
handleNoTypeArguments(get)
handleType(Configuration, null)
@@ -219,7 +219,7 @@
beginMetadataStar(void)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, method)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, method, ConfigurationService)
handleVoidKeyword(void)
handleIdentifier(method, methodDeclaration)
handleNoTypeVariables(()
@@ -245,7 +245,7 @@
beginMetadataStar(Foo)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo, ConfigurationService)
handleNoType(})
handleIdentifier(Foo, methodDeclaration)
handleNoTypeVariables(()
@@ -285,7 +285,7 @@
beginMetadataStar(Configuration)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, get, foo)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, get, foo, Configuration)
handleIdentifier(Configuration, typeReference)
handleNoTypeArguments(get)
handleType(Configuration, null)
diff --git a/pkg/front_end/parser_testcases/general/issue_41121.dart.intertwined.expect b/pkg/front_end/parser_testcases/general/issue_41121.dart.intertwined.expect
index 452e1dc..d21a73b 100644
--- a/pkg/front_end/parser_testcases/general/issue_41121.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/general/issue_41121.dart.intertwined.expect
@@ -50,7 +50,7 @@
listener: beginMember()
isReservedKeyword(()
parseMethod(;, null, null, null, null, null, null, null, ;, NoType(), null, ConfigurationService, DeclarationKind.Class, ConfigurationService, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, ConfigurationService)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, ConfigurationService, ConfigurationService)
listener: handleNoType(;)
ensureIdentifierPotentiallyRecovered(;, methodDeclaration, false)
listener: handleIdentifier(ConfigurationService, methodDeclaration)
@@ -151,7 +151,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(}, null, null, null, null, null, null, null, }, VoidType(), set, configuration, DeclarationKind.Class, ConfigurationService, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, set, configuration)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, set, configuration, ConfigurationService)
listener: handleVoidKeyword(void)
ensureIdentifierPotentiallyRecovered(set, methodDeclaration, false)
listener: handleIdentifier(configuration, methodDeclaration)
@@ -258,7 +258,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(}, null, null, null, null, null, null, null, }, SimpleType(), get, configuration, DeclarationKind.Class, ConfigurationService, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, configuration)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, configuration, ConfigurationService)
listener: handleIdentifier(Configuration, typeReference)
listener: handleNoTypeArguments(get)
listener: handleType(Configuration, null)
@@ -390,7 +390,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(}, null, null, null, null, null, null, null, }, VoidType(), null, method, DeclarationKind.Class, ConfigurationService, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, method)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, method, ConfigurationService)
listener: handleVoidKeyword(void)
ensureIdentifierPotentiallyRecovered(void, methodDeclaration, false)
listener: handleIdentifier(method, methodDeclaration)
@@ -451,7 +451,7 @@
listener: beginMember()
isReservedKeyword(()
parseMethod(}, null, null, null, null, null, null, null, }, NoType(), null, Foo, DeclarationKind.Class, ConfigurationService, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo, ConfigurationService)
listener: handleNoType(})
ensureIdentifierPotentiallyRecovered(}, methodDeclaration, false)
listener: handleIdentifier(Foo, methodDeclaration)
@@ -536,7 +536,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod({, null, null, null, null, null, null, null, {, SimpleType(), get, foo, DeclarationKind.Class, Configuration, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, foo)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, foo, Configuration)
listener: handleIdentifier(Configuration, typeReference)
listener: handleNoTypeArguments(get)
listener: handleType(Configuration, null)
diff --git a/pkg/front_end/parser_testcases/general/issue_45848_06.dart.expect b/pkg/front_end/parser_testcases/general/issue_45848_06.dart.expect
index 27986b9..fde2334 100644
--- a/pkg/front_end/parser_testcases/general/issue_45848_06.dart.expect
+++ b/pkg/front_end/parser_testcases/general/issue_45848_06.dart.expect
@@ -172,7 +172,7 @@
beginMetadataStar(bool)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Extension, null, null, null, null, null, null, operator)
+ beginMethod(DeclarationKind.Extension, null, null, null, null, null, null, operator, null)
handleIdentifier(bool, typeReference)
handleNoTypeArguments(operator)
handleType(bool, null)
diff --git a/pkg/front_end/parser_testcases/general/issue_45848_06.dart.intertwined.expect b/pkg/front_end/parser_testcases/general/issue_45848_06.dart.intertwined.expect
index 12006c5..b5dcc90 100644
--- a/pkg/front_end/parser_testcases/general/issue_45848_06.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/general/issue_45848_06.dart.intertwined.expect
@@ -365,7 +365,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod({, null, null, null, null, null, null, null, {, SimpleType(), null, operator, DeclarationKind.Extension, null, false)
- listener: beginMethod(DeclarationKind.Extension, null, null, null, null, null, null, operator)
+ listener: beginMethod(DeclarationKind.Extension, null, null, null, null, null, null, operator, null)
listener: handleIdentifier(bool, typeReference)
listener: handleNoTypeArguments(operator)
listener: handleType(bool, null)
diff --git a/pkg/front_end/parser_testcases/general/new_as_identifier.dart.expect b/pkg/front_end/parser_testcases/general/new_as_identifier.dart.expect
index 01bb5ac..6d1aa2c 100644
--- a/pkg/front_end/parser_testcases/general/new_as_identifier.dart.expect
+++ b/pkg/front_end/parser_testcases/general/new_as_identifier.dart.expect
@@ -56,7 +56,7 @@
beginMetadataStar(C)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, C)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, C, C)
handleNoType({)
handleIdentifier(C, methodDeclaration)
handleNewAsIdentifier(new)
@@ -73,7 +73,7 @@
beginMetadataStar(C)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, C)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, C, C)
handleNoType(;)
handleIdentifier(C, methodDeclaration)
handleIdentifier(constructor_field_initializer, methodDeclarationContinuation)
@@ -113,7 +113,7 @@
endMetadataStar(0)
beginMember()
handleRecoverableError(MissingOperatorKeyword, =, =)
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, operator)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, operator, C)
handleNoType(new)
handleRecoverableError(Message[InvalidOperator, The string '=' isn't a user-definable operator., null, {lexeme: =}], =, =)
handleInvalidOperatorName(operator, =)
@@ -275,7 +275,7 @@
beginMetadataStar(D)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, D)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, D, D)
handleNoType(;)
handleIdentifier(D, methodDeclaration)
handleIdentifier(super_invocation, methodDeclarationContinuation)
@@ -302,7 +302,7 @@
beginMetadataStar(D)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, D)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, D, D)
handleNoType(;)
handleIdentifier(D, methodDeclaration)
handleIdentifier(this_redirection, methodDeclarationContinuation)
diff --git a/pkg/front_end/parser_testcases/general/new_as_identifier.dart.intertwined.expect b/pkg/front_end/parser_testcases/general/new_as_identifier.dart.intertwined.expect
index 6149904..acdb1da 100644
--- a/pkg/front_end/parser_testcases/general/new_as_identifier.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/general/new_as_identifier.dart.intertwined.expect
@@ -33,7 +33,7 @@
listener: beginMember()
isReservedKeyword(.)
parseMethod({, null, null, null, null, null, null, null, {, NoType(), null, C, DeclarationKind.Class, C, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, C)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, C, C)
listener: handleNoType({)
ensureIdentifierPotentiallyRecovered({, methodDeclaration, false)
listener: handleIdentifier(C, methodDeclaration)
@@ -69,7 +69,7 @@
listener: beginMember()
isReservedKeyword(.)
parseMethod(;, null, null, null, null, null, null, null, ;, NoType(), null, C, DeclarationKind.Class, C, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, C)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, C, C)
listener: handleNoType(;)
ensureIdentifierPotentiallyRecovered(;, methodDeclaration, false)
listener: handleIdentifier(C, methodDeclaration)
@@ -169,7 +169,7 @@
listener: handleRecoverableError(MissingOperatorKeyword, =, =)
rewriter()
parseMethod(new, null, null, null, null, null, null, null, new, NoType(), null, operator, DeclarationKind.Class, C, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, operator)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, operator, C)
listener: handleNoType(new)
parseOperatorName(new)
isUnaryMinus(=)
@@ -497,7 +497,7 @@
listener: beginMember()
isReservedKeyword(.)
parseMethod(;, null, null, null, null, null, null, null, ;, NoType(), null, D, DeclarationKind.Class, D, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, D)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, D, D)
listener: handleNoType(;)
ensureIdentifierPotentiallyRecovered(;, methodDeclaration, false)
listener: handleIdentifier(D, methodDeclaration)
@@ -560,7 +560,7 @@
listener: beginMember()
isReservedKeyword(.)
parseMethod(;, null, null, null, null, null, null, null, ;, NoType(), null, D, DeclarationKind.Class, D, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, D)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, D, D)
listener: handleNoType(;)
ensureIdentifierPotentiallyRecovered(;, methodDeclaration, false)
listener: handleIdentifier(D, methodDeclaration)
diff --git a/pkg/front_end/parser_testcases/general/operator_01.dart.expect b/pkg/front_end/parser_testcases/general/operator_01.dart.expect
index 05ab1bf..db04e2b 100644
--- a/pkg/front_end/parser_testcases/general/operator_01.dart.expect
+++ b/pkg/front_end/parser_testcases/general/operator_01.dart.expect
@@ -14,7 +14,7 @@
beginMetadataStar(bool)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, operator)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, operator, Foo)
handleIdentifier(bool, typeReference)
handleNoTypeArguments(operator)
handleType(bool, null)
@@ -43,7 +43,7 @@
beginMetadataStar(int)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, operator)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, operator, Foo)
handleIdentifier(int, typeReference)
handleNoTypeArguments(operator)
handleType(int, null)
@@ -72,7 +72,7 @@
beginMetadataStar(bool)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, operator)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, operator, Foo)
handleIdentifier(bool, typeReference)
handleNoTypeArguments(operator)
handleType(bool, null)
@@ -101,7 +101,7 @@
beginMetadataStar(int)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, operator)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, operator, Foo)
handleIdentifier(int, typeReference)
handleNoTypeArguments(operator)
handleType(int, null)
@@ -130,7 +130,7 @@
beginMetadataStar(int)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, operator)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, operator, Foo)
handleIdentifier(int, typeReference)
handleNoTypeArguments(operator)
handleType(int, null)
diff --git a/pkg/front_end/parser_testcases/general/operator_01.dart.intertwined.expect b/pkg/front_end/parser_testcases/general/operator_01.dart.intertwined.expect
index ff7008d..fbdd903 100644
--- a/pkg/front_end/parser_testcases/general/operator_01.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/general/operator_01.dart.intertwined.expect
@@ -32,7 +32,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod({, null, null, null, null, null, null, null, {, SimpleType(), null, operator, DeclarationKind.Class, Foo, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, operator)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, operator, Foo)
listener: handleIdentifier(bool, typeReference)
listener: handleNoTypeArguments(operator)
listener: handleType(bool, null)
@@ -90,7 +90,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(}, null, null, null, null, null, null, null, }, SimpleType(), null, operator, DeclarationKind.Class, Foo, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, operator)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, operator, Foo)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(operator)
listener: handleType(int, null)
@@ -148,7 +148,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(}, null, null, null, null, null, null, null, }, SimpleType(), null, operator, DeclarationKind.Class, Foo, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, operator)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, operator, Foo)
listener: handleIdentifier(bool, typeReference)
listener: handleNoTypeArguments(operator)
listener: handleType(bool, null)
@@ -206,7 +206,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(}, null, null, null, null, null, null, null, }, SimpleType(), null, operator, DeclarationKind.Class, Foo, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, operator)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, operator, Foo)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(operator)
listener: handleType(int, null)
@@ -264,7 +264,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(}, null, null, null, null, null, null, null, }, SimpleType(), null, operator, DeclarationKind.Class, Foo, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, operator)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, operator, Foo)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(operator)
listener: handleType(int, null)
diff --git a/pkg/front_end/parser_testcases/general/operator_hat_class.crash_dart.expect b/pkg/front_end/parser_testcases/general/operator_hat_class.crash_dart.expect
index b68b155..8a399c7 100644
--- a/pkg/front_end/parser_testcases/general/operator_hat_class.crash_dart.expect
+++ b/pkg/front_end/parser_testcases/general/operator_hat_class.crash_dart.expect
@@ -21,7 +21,7 @@
beginMetadataStar(operator)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, operator)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, operator, operator)
handleNoType({)
handleOperatorName(operator, ^)
handleNoTypeVariables(()
diff --git a/pkg/front_end/parser_testcases/general/operator_hat_class.crash_dart.intertwined.expect b/pkg/front_end/parser_testcases/general/operator_hat_class.crash_dart.intertwined.expect
index dad85c7..b17bf6b 100644
--- a/pkg/front_end/parser_testcases/general/operator_hat_class.crash_dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/general/operator_hat_class.crash_dart.intertwined.expect
@@ -34,7 +34,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod({, null, null, null, null, null, null, null, {, NoType(), null, operator, DeclarationKind.Class, operator, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, operator)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, operator, operator)
listener: handleNoType({)
parseOperatorName({)
listener: handleOperatorName(operator, ^)
diff --git a/pkg/front_end/parser_testcases/inline_class/extension_type.dart.expect b/pkg/front_end/parser_testcases/inline_class/extension_type.dart.expect
index 62e5400..a3088bf 100644
--- a/pkg/front_end/parser_testcases/inline_class/extension_type.dart.expect
+++ b/pkg/front_end/parser_testcases/inline_class/extension_type.dart.expect
@@ -113,7 +113,7 @@
beginMetadataStar(ExtensionType4)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.ExtensionType, null, null, null, null, null, null, ExtensionType4)
+ beginMethod(DeclarationKind.ExtensionType, null, null, null, null, null, null, ExtensionType4, ExtensionType4)
handleNoType({)
handleIdentifier(ExtensionType4, methodDeclaration)
handleIdentifier(constructor, methodDeclarationContinuation)
@@ -136,7 +136,7 @@
beginMetadataStar(ExtensionType4)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.ExtensionType, null, null, null, null, null, null, ExtensionType4)
+ beginMethod(DeclarationKind.ExtensionType, null, null, null, null, null, null, ExtensionType4, ExtensionType4)
handleNoType(;)
handleIdentifier(ExtensionType4, methodDeclaration)
handleIdentifier(redirect, methodDeclarationContinuation)
@@ -248,7 +248,7 @@
beginMetadataStar(int)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.ExtensionType, null, null, null, null, null, get, getter)
+ beginMethod(DeclarationKind.ExtensionType, null, null, null, null, null, get, getter, ExtensionType4)
handleIdentifier(int, typeReference)
handleNoTypeArguments(get)
handleType(int, null)
@@ -267,7 +267,7 @@
beginMetadataStar(void)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.ExtensionType, null, null, null, null, null, set, setter)
+ beginMethod(DeclarationKind.ExtensionType, null, null, null, null, null, set, setter, ExtensionType4)
handleVoidKeyword(void)
handleIdentifier(setter, methodDeclaration)
handleNoTypeVariables(()
@@ -291,7 +291,7 @@
beginMetadataStar(int)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.ExtensionType, null, null, null, null, null, null, method)
+ beginMethod(DeclarationKind.ExtensionType, null, null, null, null, null, null, method, ExtensionType4)
handleIdentifier(int, typeReference)
handleNoTypeArguments(method)
handleType(int, null)
@@ -311,7 +311,7 @@
beginMetadataStar(int)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.ExtensionType, null, null, null, null, null, null, operator)
+ beginMethod(DeclarationKind.ExtensionType, null, null, null, null, null, null, operator, ExtensionType4)
handleIdentifier(int, typeReference)
handleNoTypeArguments(operator)
handleType(int, null)
@@ -340,7 +340,7 @@
beginMetadataStar(void)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.ExtensionType, null, null, null, null, null, null, operator)
+ beginMethod(DeclarationKind.ExtensionType, null, null, null, null, null, null, operator, ExtensionType4)
handleVoidKeyword(void)
handleOperatorName(operator, []=)
handleNoTypeVariables(()
@@ -386,7 +386,7 @@
beginMetadataStar(static)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.ExtensionType, null, null, static, null, null, get, staticGetter)
+ beginMethod(DeclarationKind.ExtensionType, null, null, static, null, null, get, staticGetter, ExtensionType4)
handleIdentifier(int, typeReference)
handleNoTypeArguments(get)
handleType(int, null)
@@ -402,7 +402,7 @@
beginMetadataStar(static)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.ExtensionType, null, null, static, null, null, set, staticSetter)
+ beginMethod(DeclarationKind.ExtensionType, null, null, static, null, null, set, staticSetter, ExtensionType4)
handleVoidKeyword(void)
handleIdentifier(staticSetter, methodDeclaration)
handleNoTypeVariables(()
@@ -426,7 +426,7 @@
beginMetadataStar(static)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.ExtensionType, null, null, static, null, null, null, staticMethod)
+ beginMethod(DeclarationKind.ExtensionType, null, null, static, null, null, null, staticMethod, ExtensionType4)
handleIdentifier(int, typeReference)
handleNoTypeArguments(staticMethod)
handleType(int, null)
diff --git a/pkg/front_end/parser_testcases/inline_class/extension_type.dart.intertwined.expect b/pkg/front_end/parser_testcases/inline_class/extension_type.dart.intertwined.expect
index ad84a15..3a36264 100644
--- a/pkg/front_end/parser_testcases/inline_class/extension_type.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/inline_class/extension_type.dart.intertwined.expect
@@ -168,7 +168,7 @@
listener: beginMember()
isReservedKeyword(.)
parseMethod({, null, null, null, null, null, null, null, {, NoType(), null, ExtensionType4, DeclarationKind.ExtensionType, ExtensionType4, false)
- listener: beginMethod(DeclarationKind.ExtensionType, null, null, null, null, null, null, ExtensionType4)
+ listener: beginMethod(DeclarationKind.ExtensionType, null, null, null, null, null, null, ExtensionType4, ExtensionType4)
listener: handleNoType({)
ensureIdentifierPotentiallyRecovered({, methodDeclaration, false)
listener: handleIdentifier(ExtensionType4, methodDeclaration)
@@ -212,7 +212,7 @@
listener: beginMember()
isReservedKeyword(.)
parseMethod(;, null, null, null, null, null, null, null, ;, NoType(), null, ExtensionType4, DeclarationKind.ExtensionType, ExtensionType4, false)
- listener: beginMethod(DeclarationKind.ExtensionType, null, null, null, null, null, null, ExtensionType4)
+ listener: beginMethod(DeclarationKind.ExtensionType, null, null, null, null, null, null, ExtensionType4, ExtensionType4)
listener: handleNoType(;)
ensureIdentifierPotentiallyRecovered(;, methodDeclaration, false)
listener: handleIdentifier(ExtensionType4, methodDeclaration)
@@ -439,7 +439,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(;, null, null, null, null, null, null, null, ;, SimpleType(), get, getter, DeclarationKind.ExtensionType, ExtensionType4, false)
- listener: beginMethod(DeclarationKind.ExtensionType, null, null, null, null, null, get, getter)
+ listener: beginMethod(DeclarationKind.ExtensionType, null, null, null, null, null, get, getter, ExtensionType4)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(get)
listener: handleType(int, null)
@@ -483,7 +483,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(;, null, null, null, null, null, null, null, ;, VoidType(), set, setter, DeclarationKind.ExtensionType, ExtensionType4, false)
- listener: beginMethod(DeclarationKind.ExtensionType, null, null, null, null, null, set, setter)
+ listener: beginMethod(DeclarationKind.ExtensionType, null, null, null, null, null, set, setter, ExtensionType4)
listener: handleVoidKeyword(void)
ensureIdentifierPotentiallyRecovered(set, methodDeclaration, false)
listener: handleIdentifier(setter, methodDeclaration)
@@ -526,7 +526,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(}, null, null, null, null, null, null, null, }, SimpleType(), null, method, DeclarationKind.ExtensionType, ExtensionType4, false)
- listener: beginMethod(DeclarationKind.ExtensionType, null, null, null, null, null, null, method)
+ listener: beginMethod(DeclarationKind.ExtensionType, null, null, null, null, null, null, method, ExtensionType4)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(method)
listener: handleType(int, null)
@@ -573,7 +573,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(;, null, null, null, null, null, null, null, ;, SimpleType(), null, operator, DeclarationKind.ExtensionType, ExtensionType4, false)
- listener: beginMethod(DeclarationKind.ExtensionType, null, null, null, null, null, null, operator)
+ listener: beginMethod(DeclarationKind.ExtensionType, null, null, null, null, null, null, operator, ExtensionType4)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(operator)
listener: handleType(int, null)
@@ -631,7 +631,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(;, null, null, null, null, null, null, null, ;, VoidType(), null, operator, DeclarationKind.ExtensionType, ExtensionType4, false)
- listener: beginMethod(DeclarationKind.ExtensionType, null, null, null, null, null, null, operator)
+ listener: beginMethod(DeclarationKind.ExtensionType, null, null, null, null, null, null, operator, ExtensionType4)
listener: handleVoidKeyword(void)
parseOperatorName(void)
listener: handleOperatorName(operator, []=)
@@ -709,7 +709,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(;, null, null, null, static, null, null, null, static, SimpleType(), get, staticGetter, DeclarationKind.ExtensionType, ExtensionType4, false)
- listener: beginMethod(DeclarationKind.ExtensionType, null, null, static, null, null, get, staticGetter)
+ listener: beginMethod(DeclarationKind.ExtensionType, null, null, static, null, null, get, staticGetter, ExtensionType4)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(get)
listener: handleType(int, null)
@@ -745,7 +745,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(;, null, null, null, static, null, null, null, static, VoidType(), set, staticSetter, DeclarationKind.ExtensionType, ExtensionType4, false)
- listener: beginMethod(DeclarationKind.ExtensionType, null, null, static, null, null, set, staticSetter)
+ listener: beginMethod(DeclarationKind.ExtensionType, null, null, static, null, null, set, staticSetter, ExtensionType4)
listener: handleVoidKeyword(void)
ensureIdentifierPotentiallyRecovered(set, methodDeclaration, false)
listener: handleIdentifier(staticSetter, methodDeclaration)
@@ -787,7 +787,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(}, null, null, null, static, null, null, null, static, SimpleType(), null, staticMethod, DeclarationKind.ExtensionType, ExtensionType4, false)
- listener: beginMethod(DeclarationKind.ExtensionType, null, null, static, null, null, null, staticMethod)
+ listener: beginMethod(DeclarationKind.ExtensionType, null, null, static, null, null, null, staticMethod, ExtensionType4)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(staticMethod)
listener: handleType(int, null)
diff --git a/pkg/front_end/parser_testcases/inline_class/extension_type_const.dart.expect b/pkg/front_end/parser_testcases/inline_class/extension_type_const.dart.expect
index 86996283e..9963eea 100644
--- a/pkg/front_end/parser_testcases/inline_class/extension_type_const.dart.expect
+++ b/pkg/front_end/parser_testcases/inline_class/extension_type_const.dart.expect
@@ -113,7 +113,7 @@
beginMetadataStar(const)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.ExtensionType, null, null, null, null, const, null, ExtensionType4)
+ beginMethod(DeclarationKind.ExtensionType, null, null, null, null, const, null, ExtensionType4, ExtensionType4)
handleNoType(const)
handleIdentifier(ExtensionType4, methodDeclaration)
handleIdentifier(constructor, methodDeclarationContinuation)
@@ -136,7 +136,7 @@
beginMetadataStar(const)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.ExtensionType, null, null, null, null, const, null, ExtensionType4)
+ beginMethod(DeclarationKind.ExtensionType, null, null, null, null, const, null, ExtensionType4, ExtensionType4)
handleNoType(const)
handleIdentifier(ExtensionType4, methodDeclaration)
handleIdentifier(redirect, methodDeclarationContinuation)
@@ -248,7 +248,7 @@
beginMetadataStar(int)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.ExtensionType, null, null, null, null, null, get, getter)
+ beginMethod(DeclarationKind.ExtensionType, null, null, null, null, null, get, getter, ExtensionType4)
handleIdentifier(int, typeReference)
handleNoTypeArguments(get)
handleType(int, null)
@@ -267,7 +267,7 @@
beginMetadataStar(void)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.ExtensionType, null, null, null, null, null, set, setter)
+ beginMethod(DeclarationKind.ExtensionType, null, null, null, null, null, set, setter, ExtensionType4)
handleVoidKeyword(void)
handleIdentifier(setter, methodDeclaration)
handleNoTypeVariables(()
@@ -291,7 +291,7 @@
beginMetadataStar(int)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.ExtensionType, null, null, null, null, null, null, method)
+ beginMethod(DeclarationKind.ExtensionType, null, null, null, null, null, null, method, ExtensionType4)
handleIdentifier(int, typeReference)
handleNoTypeArguments(method)
handleType(int, null)
@@ -311,7 +311,7 @@
beginMetadataStar(int)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.ExtensionType, null, null, null, null, null, null, operator)
+ beginMethod(DeclarationKind.ExtensionType, null, null, null, null, null, null, operator, ExtensionType4)
handleIdentifier(int, typeReference)
handleNoTypeArguments(operator)
handleType(int, null)
@@ -340,7 +340,7 @@
beginMetadataStar(void)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.ExtensionType, null, null, null, null, null, null, operator)
+ beginMethod(DeclarationKind.ExtensionType, null, null, null, null, null, null, operator, ExtensionType4)
handleVoidKeyword(void)
handleOperatorName(operator, []=)
handleNoTypeVariables(()
@@ -386,7 +386,7 @@
beginMetadataStar(static)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.ExtensionType, null, null, static, null, null, get, staticGetter)
+ beginMethod(DeclarationKind.ExtensionType, null, null, static, null, null, get, staticGetter, ExtensionType4)
handleIdentifier(int, typeReference)
handleNoTypeArguments(get)
handleType(int, null)
@@ -402,7 +402,7 @@
beginMetadataStar(static)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.ExtensionType, null, null, static, null, null, set, staticSetter)
+ beginMethod(DeclarationKind.ExtensionType, null, null, static, null, null, set, staticSetter, ExtensionType4)
handleVoidKeyword(void)
handleIdentifier(staticSetter, methodDeclaration)
handleNoTypeVariables(()
@@ -426,7 +426,7 @@
beginMetadataStar(static)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.ExtensionType, null, null, static, null, null, null, staticMethod)
+ beginMethod(DeclarationKind.ExtensionType, null, null, static, null, null, null, staticMethod, ExtensionType4)
handleIdentifier(int, typeReference)
handleNoTypeArguments(staticMethod)
handleType(int, null)
diff --git a/pkg/front_end/parser_testcases/inline_class/extension_type_const.dart.intertwined.expect b/pkg/front_end/parser_testcases/inline_class/extension_type_const.dart.intertwined.expect
index b3fa22e..2d7b10a 100644
--- a/pkg/front_end/parser_testcases/inline_class/extension_type_const.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/inline_class/extension_type_const.dart.intertwined.expect
@@ -169,7 +169,7 @@
skipOuterPattern(const)
skipObjectPatternRest(constructor)
parseMethod({, null, null, null, null, null, null, const, const, NoType(), null, ExtensionType4, DeclarationKind.ExtensionType, ExtensionType4, false)
- listener: beginMethod(DeclarationKind.ExtensionType, null, null, null, null, const, null, ExtensionType4)
+ listener: beginMethod(DeclarationKind.ExtensionType, null, null, null, null, const, null, ExtensionType4, ExtensionType4)
listener: handleNoType(const)
ensureIdentifierPotentiallyRecovered(const, methodDeclaration, false)
listener: handleIdentifier(ExtensionType4, methodDeclaration)
@@ -214,7 +214,7 @@
skipOuterPattern(const)
skipObjectPatternRest(redirect)
parseMethod(;, null, null, null, null, null, null, const, const, NoType(), null, ExtensionType4, DeclarationKind.ExtensionType, ExtensionType4, false)
- listener: beginMethod(DeclarationKind.ExtensionType, null, null, null, null, const, null, ExtensionType4)
+ listener: beginMethod(DeclarationKind.ExtensionType, null, null, null, null, const, null, ExtensionType4, ExtensionType4)
listener: handleNoType(const)
ensureIdentifierPotentiallyRecovered(const, methodDeclaration, false)
listener: handleIdentifier(ExtensionType4, methodDeclaration)
@@ -443,7 +443,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(;, null, null, null, null, null, null, null, ;, SimpleType(), get, getter, DeclarationKind.ExtensionType, ExtensionType4, false)
- listener: beginMethod(DeclarationKind.ExtensionType, null, null, null, null, null, get, getter)
+ listener: beginMethod(DeclarationKind.ExtensionType, null, null, null, null, null, get, getter, ExtensionType4)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(get)
listener: handleType(int, null)
@@ -487,7 +487,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(;, null, null, null, null, null, null, null, ;, VoidType(), set, setter, DeclarationKind.ExtensionType, ExtensionType4, false)
- listener: beginMethod(DeclarationKind.ExtensionType, null, null, null, null, null, set, setter)
+ listener: beginMethod(DeclarationKind.ExtensionType, null, null, null, null, null, set, setter, ExtensionType4)
listener: handleVoidKeyword(void)
ensureIdentifierPotentiallyRecovered(set, methodDeclaration, false)
listener: handleIdentifier(setter, methodDeclaration)
@@ -530,7 +530,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(}, null, null, null, null, null, null, null, }, SimpleType(), null, method, DeclarationKind.ExtensionType, ExtensionType4, false)
- listener: beginMethod(DeclarationKind.ExtensionType, null, null, null, null, null, null, method)
+ listener: beginMethod(DeclarationKind.ExtensionType, null, null, null, null, null, null, method, ExtensionType4)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(method)
listener: handleType(int, null)
@@ -577,7 +577,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(;, null, null, null, null, null, null, null, ;, SimpleType(), null, operator, DeclarationKind.ExtensionType, ExtensionType4, false)
- listener: beginMethod(DeclarationKind.ExtensionType, null, null, null, null, null, null, operator)
+ listener: beginMethod(DeclarationKind.ExtensionType, null, null, null, null, null, null, operator, ExtensionType4)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(operator)
listener: handleType(int, null)
@@ -635,7 +635,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(;, null, null, null, null, null, null, null, ;, VoidType(), null, operator, DeclarationKind.ExtensionType, ExtensionType4, false)
- listener: beginMethod(DeclarationKind.ExtensionType, null, null, null, null, null, null, operator)
+ listener: beginMethod(DeclarationKind.ExtensionType, null, null, null, null, null, null, operator, ExtensionType4)
listener: handleVoidKeyword(void)
parseOperatorName(void)
listener: handleOperatorName(operator, []=)
@@ -713,7 +713,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(;, null, null, null, static, null, null, null, static, SimpleType(), get, staticGetter, DeclarationKind.ExtensionType, ExtensionType4, false)
- listener: beginMethod(DeclarationKind.ExtensionType, null, null, static, null, null, get, staticGetter)
+ listener: beginMethod(DeclarationKind.ExtensionType, null, null, static, null, null, get, staticGetter, ExtensionType4)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(get)
listener: handleType(int, null)
@@ -749,7 +749,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(;, null, null, null, static, null, null, null, static, VoidType(), set, staticSetter, DeclarationKind.ExtensionType, ExtensionType4, false)
- listener: beginMethod(DeclarationKind.ExtensionType, null, null, static, null, null, set, staticSetter)
+ listener: beginMethod(DeclarationKind.ExtensionType, null, null, static, null, null, set, staticSetter, ExtensionType4)
listener: handleVoidKeyword(void)
ensureIdentifierPotentiallyRecovered(set, methodDeclaration, false)
listener: handleIdentifier(staticSetter, methodDeclaration)
@@ -791,7 +791,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(}, null, null, null, static, null, null, null, static, SimpleType(), null, staticMethod, DeclarationKind.ExtensionType, ExtensionType4, false)
- listener: beginMethod(DeclarationKind.ExtensionType, null, null, static, null, null, null, staticMethod)
+ listener: beginMethod(DeclarationKind.ExtensionType, null, null, static, null, null, null, staticMethod, ExtensionType4)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(staticMethod)
listener: handleType(int, null)
diff --git a/pkg/front_end/parser_testcases/nnbd/error_recovery/late_without_var_etc.dart.expect b/pkg/front_end/parser_testcases/nnbd/error_recovery/late_without_var_etc.dart.expect
index 0c034f9..9cefa2c 100644
--- a/pkg/front_end/parser_testcases/nnbd/error_recovery/late_without_var_etc.dart.expect
+++ b/pkg/front_end/parser_testcases/nnbd/error_recovery/late_without_var_etc.dart.expect
@@ -80,7 +80,7 @@
beginMetadataStar(void)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, foo)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, foo, Foo)
handleVoidKeyword(void)
handleIdentifier(foo, methodDeclaration)
handleNoTypeVariables(()
@@ -105,7 +105,7 @@
beginMetadataStar(static)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, static, null, null, null, bar)
+ beginMethod(DeclarationKind.Class, null, null, static, null, null, null, bar, Foo)
handleVoidKeyword(void)
handleIdentifier(bar, methodDeclaration)
handleNoTypeVariables(()
diff --git a/pkg/front_end/parser_testcases/nnbd/error_recovery/late_without_var_etc.dart.intertwined.expect b/pkg/front_end/parser_testcases/nnbd/error_recovery/late_without_var_etc.dart.intertwined.expect
index d8cde62..5693cb0 100644
--- a/pkg/front_end/parser_testcases/nnbd/error_recovery/late_without_var_etc.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/nnbd/error_recovery/late_without_var_etc.dart.intertwined.expect
@@ -117,7 +117,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(;, null, null, null, null, null, null, null, ;, VoidType(), null, foo, DeclarationKind.Class, Foo, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, foo)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, foo, Foo)
listener: handleVoidKeyword(void)
ensureIdentifierPotentiallyRecovered(void, methodDeclaration, false)
listener: handleIdentifier(foo, methodDeclaration)
@@ -170,7 +170,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(}, null, null, null, static, null, null, null, static, VoidType(), null, bar, DeclarationKind.Class, Foo, false)
- listener: beginMethod(DeclarationKind.Class, null, null, static, null, null, null, bar)
+ listener: beginMethod(DeclarationKind.Class, null, null, static, null, null, null, bar, Foo)
listener: handleVoidKeyword(void)
ensureIdentifierPotentiallyRecovered(void, methodDeclaration, false)
listener: handleIdentifier(bar, methodDeclaration)
diff --git a/pkg/front_end/parser_testcases/nnbd/issue_39723.dart.expect b/pkg/front_end/parser_testcases/nnbd/issue_39723.dart.expect
index 97543a9..8ebb963 100644
--- a/pkg/front_end/parser_testcases/nnbd/issue_39723.dart.expect
+++ b/pkg/front_end/parser_testcases/nnbd/issue_39723.dart.expect
@@ -14,7 +14,7 @@
beginMetadataStar(operator)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, operator)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, operator, A)
handleNoType({)
handleOperatorName(operator, [])
handleNoTypeVariables(()
diff --git a/pkg/front_end/parser_testcases/nnbd/issue_39723.dart.intertwined.expect b/pkg/front_end/parser_testcases/nnbd/issue_39723.dart.intertwined.expect
index 8dd5b97..24253b4 100644
--- a/pkg/front_end/parser_testcases/nnbd/issue_39723.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/nnbd/issue_39723.dart.intertwined.expect
@@ -32,7 +32,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod({, null, null, null, null, null, null, null, {, NoType(), null, operator, DeclarationKind.Class, A, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, operator)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, operator, A)
listener: handleNoType({)
parseOperatorName({)
listener: handleOperatorName(operator, [])
diff --git a/pkg/front_end/parser_testcases/nnbd/issue_39723_prime.dart.expect b/pkg/front_end/parser_testcases/nnbd/issue_39723_prime.dart.expect
index 098981f..0b03e34 100644
--- a/pkg/front_end/parser_testcases/nnbd/issue_39723_prime.dart.expect
+++ b/pkg/front_end/parser_testcases/nnbd/issue_39723_prime.dart.expect
@@ -14,7 +14,7 @@
beginMetadataStar(operator)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, operator)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, operator, A)
handleNoType({)
handleOperatorName(operator, [])
handleNoTypeVariables(()
diff --git a/pkg/front_end/parser_testcases/nnbd/issue_39723_prime.dart.intertwined.expect b/pkg/front_end/parser_testcases/nnbd/issue_39723_prime.dart.intertwined.expect
index 8dad0c2..385441a 100644
--- a/pkg/front_end/parser_testcases/nnbd/issue_39723_prime.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/nnbd/issue_39723_prime.dart.intertwined.expect
@@ -32,7 +32,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod({, null, null, null, null, null, null, null, {, NoType(), null, operator, DeclarationKind.Class, A, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, operator)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, operator, A)
listener: handleNoType({)
parseOperatorName({)
listener: handleOperatorName(operator, [])
diff --git a/pkg/front_end/parser_testcases/nnbd/issue_40834_01.dart.expect b/pkg/front_end/parser_testcases/nnbd/issue_40834_01.dart.expect
index ab8a4ba..11e91c9 100644
--- a/pkg/front_end/parser_testcases/nnbd/issue_40834_01.dart.expect
+++ b/pkg/front_end/parser_testcases/nnbd/issue_40834_01.dart.expect
@@ -36,7 +36,7 @@
beginMetadataStar(Foo)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo)
handleNoType(;)
handleIdentifier(Foo, methodDeclaration)
handleNoTypeVariables(()
@@ -85,7 +85,7 @@
beginMetadataStar(Foo)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo)
handleNoType(;)
handleIdentifier(Foo, methodDeclaration)
handleIdentifier(a, methodDeclarationContinuation)
@@ -149,7 +149,7 @@
beginMetadataStar(Foo)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo)
handleNoType(;)
handleIdentifier(Foo, methodDeclaration)
handleIdentifier(b, methodDeclarationContinuation)
@@ -213,7 +213,7 @@
beginMetadataStar(Foo)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo)
handleNoType(;)
handleIdentifier(Foo, methodDeclaration)
handleIdentifier(c, methodDeclarationContinuation)
@@ -277,7 +277,7 @@
beginMetadataStar(Foo)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo)
handleNoType(;)
handleIdentifier(Foo, methodDeclaration)
handleIdentifier(d, methodDeclarationContinuation)
diff --git a/pkg/front_end/parser_testcases/nnbd/issue_40834_01.dart.intertwined.expect b/pkg/front_end/parser_testcases/nnbd/issue_40834_01.dart.intertwined.expect
index 8b96fef..a5345769 100644
--- a/pkg/front_end/parser_testcases/nnbd/issue_40834_01.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/nnbd/issue_40834_01.dart.intertwined.expect
@@ -67,7 +67,7 @@
listener: beginMember()
isReservedKeyword(()
parseMethod(;, null, null, null, null, null, null, null, ;, NoType(), null, Foo, DeclarationKind.Class, Foo, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo)
listener: handleNoType(;)
ensureIdentifierPotentiallyRecovered(;, methodDeclaration, false)
listener: handleIdentifier(Foo, methodDeclaration)
@@ -173,7 +173,7 @@
listener: beginMember()
isReservedKeyword(.)
parseMethod(;, null, null, null, null, null, null, null, ;, NoType(), null, Foo, DeclarationKind.Class, Foo, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo)
listener: handleNoType(;)
ensureIdentifierPotentiallyRecovered(;, methodDeclaration, false)
listener: handleIdentifier(Foo, methodDeclaration)
@@ -318,7 +318,7 @@
listener: beginMember()
isReservedKeyword(.)
parseMethod(;, null, null, null, null, null, null, null, ;, NoType(), null, Foo, DeclarationKind.Class, Foo, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo)
listener: handleNoType(;)
ensureIdentifierPotentiallyRecovered(;, methodDeclaration, false)
listener: handleIdentifier(Foo, methodDeclaration)
@@ -463,7 +463,7 @@
listener: beginMember()
isReservedKeyword(.)
parseMethod(;, null, null, null, null, null, null, null, ;, NoType(), null, Foo, DeclarationKind.Class, Foo, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo)
listener: handleNoType(;)
ensureIdentifierPotentiallyRecovered(;, methodDeclaration, false)
listener: handleIdentifier(Foo, methodDeclaration)
@@ -608,7 +608,7 @@
listener: beginMember()
isReservedKeyword(.)
parseMethod(;, null, null, null, null, null, null, null, ;, NoType(), null, Foo, DeclarationKind.Class, Foo, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo)
listener: handleNoType(;)
ensureIdentifierPotentiallyRecovered(;, methodDeclaration, false)
listener: handleIdentifier(Foo, methodDeclaration)
diff --git a/pkg/front_end/parser_testcases/nnbd/issue_40834_02.dart.expect b/pkg/front_end/parser_testcases/nnbd/issue_40834_02.dart.expect
index 8bd8160..8e28977 100644
--- a/pkg/front_end/parser_testcases/nnbd/issue_40834_02.dart.expect
+++ b/pkg/front_end/parser_testcases/nnbd/issue_40834_02.dart.expect
@@ -36,7 +36,7 @@
beginMetadataStar(Foo)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo)
handleNoType(;)
handleIdentifier(Foo, methodDeclaration)
handleNoTypeVariables(()
diff --git a/pkg/front_end/parser_testcases/nnbd/issue_40834_02.dart.intertwined.expect b/pkg/front_end/parser_testcases/nnbd/issue_40834_02.dart.intertwined.expect
index bfff029..dfe5f31 100644
--- a/pkg/front_end/parser_testcases/nnbd/issue_40834_02.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/nnbd/issue_40834_02.dart.intertwined.expect
@@ -67,7 +67,7 @@
listener: beginMember()
isReservedKeyword(()
parseMethod(;, null, null, null, null, null, null, null, ;, NoType(), null, Foo, DeclarationKind.Class, Foo, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo)
listener: handleNoType(;)
ensureIdentifierPotentiallyRecovered(;, methodDeclaration, false)
listener: handleIdentifier(Foo, methodDeclaration)
diff --git a/pkg/front_end/parser_testcases/nnbd/issue_40834_03.dart.expect b/pkg/front_end/parser_testcases/nnbd/issue_40834_03.dart.expect
index eced619..cd43712 100644
--- a/pkg/front_end/parser_testcases/nnbd/issue_40834_03.dart.expect
+++ b/pkg/front_end/parser_testcases/nnbd/issue_40834_03.dart.expect
@@ -36,7 +36,7 @@
beginMetadataStar(Foo)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo)
handleNoType(;)
handleIdentifier(Foo, methodDeclaration)
handleNoTypeVariables(()
@@ -96,7 +96,7 @@
beginMetadataStar(void)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, foo)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, foo, Foo)
handleVoidKeyword(void)
handleIdentifier(foo, methodDeclaration)
handleNoTypeVariables(()
@@ -153,7 +153,7 @@
beginMetadataStar(void)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, bar)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, bar, Foo)
handleVoidKeyword(void)
handleIdentifier(bar, methodDeclaration)
handleNoTypeVariables(()
diff --git a/pkg/front_end/parser_testcases/nnbd/issue_40834_03.dart.intertwined.expect b/pkg/front_end/parser_testcases/nnbd/issue_40834_03.dart.intertwined.expect
index 0bda5b6..c13eee8 100644
--- a/pkg/front_end/parser_testcases/nnbd/issue_40834_03.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/nnbd/issue_40834_03.dart.intertwined.expect
@@ -67,7 +67,7 @@
listener: beginMember()
isReservedKeyword(()
parseMethod(;, null, null, null, null, null, null, null, ;, NoType(), null, Foo, DeclarationKind.Class, Foo, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo)
listener: handleNoType(;)
ensureIdentifierPotentiallyRecovered(;, methodDeclaration, false)
listener: handleIdentifier(Foo, methodDeclaration)
@@ -203,7 +203,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(;, null, null, null, null, null, null, null, ;, VoidType(), null, foo, DeclarationKind.Class, Foo, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, foo)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, foo, Foo)
listener: handleVoidKeyword(void)
ensureIdentifierPotentiallyRecovered(void, methodDeclaration, false)
listener: handleIdentifier(foo, methodDeclaration)
@@ -344,7 +344,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(}, null, null, null, null, null, null, null, }, VoidType(), null, bar, DeclarationKind.Class, Foo, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, bar)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, bar, Foo)
listener: handleVoidKeyword(void)
ensureIdentifierPotentiallyRecovered(void, methodDeclaration, false)
listener: handleIdentifier(bar, methodDeclaration)
diff --git a/pkg/front_end/parser_testcases/nnbd/issue_41597.dart.expect b/pkg/front_end/parser_testcases/nnbd/issue_41597.dart.expect
index cc1f236..54e950d 100644
--- a/pkg/front_end/parser_testcases/nnbd/issue_41597.dart.expect
+++ b/pkg/front_end/parser_testcases/nnbd/issue_41597.dart.expect
@@ -82,7 +82,7 @@
beginMetadataStar(C)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, C)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, C, C)
handleNoType({)
handleIdentifier(C, methodDeclaration)
handleIdentifier(c0, methodDeclarationContinuation)
@@ -106,7 +106,7 @@
beginMetadataStar(C)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, C)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, C, C)
handleNoType(;)
handleIdentifier(C, methodDeclaration)
handleIdentifier(c1, methodDeclarationContinuation)
diff --git a/pkg/front_end/parser_testcases/nnbd/issue_41597.dart.intertwined.expect b/pkg/front_end/parser_testcases/nnbd/issue_41597.dart.intertwined.expect
index c689eca..911f85e 100644
--- a/pkg/front_end/parser_testcases/nnbd/issue_41597.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/nnbd/issue_41597.dart.intertwined.expect
@@ -213,7 +213,7 @@
listener: beginMember()
isReservedKeyword(.)
parseMethod({, null, null, null, null, null, null, null, {, NoType(), null, C, DeclarationKind.Class, C, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, C)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, C, C)
listener: handleNoType({)
ensureIdentifierPotentiallyRecovered({, methodDeclaration, false)
listener: handleIdentifier(C, methodDeclaration)
@@ -266,7 +266,7 @@
listener: beginMember()
isReservedKeyword(.)
parseMethod(;, null, null, null, null, null, null, null, ;, NoType(), null, C, DeclarationKind.Class, C, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, C)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, C, C)
listener: handleNoType(;)
ensureIdentifierPotentiallyRecovered(;, methodDeclaration, false)
listener: handleIdentifier(C, methodDeclaration)
diff --git a/pkg/front_end/parser_testcases/nnbd/issue_49132.dart.expect b/pkg/front_end/parser_testcases/nnbd/issue_49132.dart.expect
index 6dc1dda..841c1c2 100644
--- a/pkg/front_end/parser_testcases/nnbd/issue_49132.dart.expect
+++ b/pkg/front_end/parser_testcases/nnbd/issue_49132.dart.expect
@@ -14,7 +14,7 @@
beginMetadataStar(Foo)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo)
handleNoType({)
handleIdentifier(Foo, methodDeclaration)
handleIdentifier(foo1, methodDeclarationContinuation)
@@ -83,7 +83,7 @@
beginMetadataStar(Foo)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo)
handleNoType(;)
handleIdentifier(Foo, methodDeclaration)
handleIdentifier(foo2, methodDeclarationContinuation)
@@ -152,7 +152,7 @@
beginMetadataStar(Foo)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo)
handleNoType(;)
handleIdentifier(Foo, methodDeclaration)
handleIdentifier(foo3, methodDeclarationContinuation)
@@ -221,7 +221,7 @@
beginMetadataStar(Foo)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo)
handleNoType(;)
handleIdentifier(Foo, methodDeclaration)
handleIdentifier(foo4, methodDeclarationContinuation)
@@ -290,7 +290,7 @@
beginMetadataStar(Foo)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo)
handleNoType(;)
handleIdentifier(Foo, methodDeclaration)
handleIdentifier(bar1, methodDeclarationContinuation)
@@ -360,7 +360,7 @@
beginMetadataStar(Foo)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo)
handleNoType(})
handleIdentifier(Foo, methodDeclaration)
handleIdentifier(bar2, methodDeclarationContinuation)
@@ -430,7 +430,7 @@
beginMetadataStar(Foo)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo)
handleNoType(})
handleIdentifier(Foo, methodDeclaration)
handleIdentifier(bar3, methodDeclarationContinuation)
@@ -500,7 +500,7 @@
beginMetadataStar(Foo)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo)
handleNoType(})
handleIdentifier(Foo, methodDeclaration)
handleIdentifier(bar4, methodDeclarationContinuation)
diff --git a/pkg/front_end/parser_testcases/nnbd/issue_49132.dart.intertwined.expect b/pkg/front_end/parser_testcases/nnbd/issue_49132.dart.intertwined.expect
index ce13f1b..bbda9f2 100644
--- a/pkg/front_end/parser_testcases/nnbd/issue_49132.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/nnbd/issue_49132.dart.intertwined.expect
@@ -33,7 +33,7 @@
listener: beginMember()
isReservedKeyword(.)
parseMethod({, null, null, null, null, null, null, null, {, NoType(), null, Foo, DeclarationKind.Class, Foo, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo)
listener: handleNoType({)
ensureIdentifierPotentiallyRecovered({, methodDeclaration, false)
listener: handleIdentifier(Foo, methodDeclaration)
@@ -171,7 +171,7 @@
listener: beginMember()
isReservedKeyword(.)
parseMethod(;, null, null, null, null, null, null, null, ;, NoType(), null, Foo, DeclarationKind.Class, Foo, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo)
listener: handleNoType(;)
ensureIdentifierPotentiallyRecovered(;, methodDeclaration, false)
listener: handleIdentifier(Foo, methodDeclaration)
@@ -309,7 +309,7 @@
listener: beginMember()
isReservedKeyword(.)
parseMethod(;, null, null, null, null, null, null, null, ;, NoType(), null, Foo, DeclarationKind.Class, Foo, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo)
listener: handleNoType(;)
ensureIdentifierPotentiallyRecovered(;, methodDeclaration, false)
listener: handleIdentifier(Foo, methodDeclaration)
@@ -447,7 +447,7 @@
listener: beginMember()
isReservedKeyword(.)
parseMethod(;, null, null, null, null, null, null, null, ;, NoType(), null, Foo, DeclarationKind.Class, Foo, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo)
listener: handleNoType(;)
ensureIdentifierPotentiallyRecovered(;, methodDeclaration, false)
listener: handleIdentifier(Foo, methodDeclaration)
@@ -585,7 +585,7 @@
listener: beginMember()
isReservedKeyword(.)
parseMethod(;, null, null, null, null, null, null, null, ;, NoType(), null, Foo, DeclarationKind.Class, Foo, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo)
listener: handleNoType(;)
ensureIdentifierPotentiallyRecovered(;, methodDeclaration, false)
listener: handleIdentifier(Foo, methodDeclaration)
@@ -731,7 +731,7 @@
listener: beginMember()
isReservedKeyword(.)
parseMethod(}, null, null, null, null, null, null, null, }, NoType(), null, Foo, DeclarationKind.Class, Foo, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo)
listener: handleNoType(})
ensureIdentifierPotentiallyRecovered(}, methodDeclaration, false)
listener: handleIdentifier(Foo, methodDeclaration)
@@ -877,7 +877,7 @@
listener: beginMember()
isReservedKeyword(.)
parseMethod(}, null, null, null, null, null, null, null, }, NoType(), null, Foo, DeclarationKind.Class, Foo, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo)
listener: handleNoType(})
ensureIdentifierPotentiallyRecovered(}, methodDeclaration, false)
listener: handleIdentifier(Foo, methodDeclaration)
@@ -1017,7 +1017,7 @@
listener: beginMember()
isReservedKeyword(.)
parseMethod(}, null, null, null, null, null, null, null, }, NoType(), null, Foo, DeclarationKind.Class, Foo, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo)
listener: handleNoType(})
ensureIdentifierPotentiallyRecovered(}, methodDeclaration, false)
listener: handleIdentifier(Foo, methodDeclaration)
diff --git a/pkg/front_end/parser_testcases/nnbd/issue_49132_not_nullable.dart.expect b/pkg/front_end/parser_testcases/nnbd/issue_49132_not_nullable.dart.expect
index 379d9a0..6cff23f 100644
--- a/pkg/front_end/parser_testcases/nnbd/issue_49132_not_nullable.dart.expect
+++ b/pkg/front_end/parser_testcases/nnbd/issue_49132_not_nullable.dart.expect
@@ -25,7 +25,7 @@
beginMetadataStar(Foo)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo)
handleNoType(;)
handleIdentifier(Foo, methodDeclaration)
handleIdentifier(foo1, methodDeclarationContinuation)
@@ -76,7 +76,7 @@
beginMetadataStar(Foo)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo)
handleNoType(})
handleIdentifier(Foo, methodDeclaration)
handleIdentifier(foo2, methodDeclarationContinuation)
@@ -136,7 +136,7 @@
beginMetadataStar(Foo)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo)
handleNoType(})
handleIdentifier(Foo, methodDeclaration)
handleIdentifier(foo3, methodDeclarationContinuation)
@@ -187,7 +187,7 @@
beginMetadataStar(Foo)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo)
handleNoType(})
handleIdentifier(Foo, methodDeclaration)
handleIdentifier(foo4, methodDeclarationContinuation)
diff --git a/pkg/front_end/parser_testcases/nnbd/issue_49132_not_nullable.dart.intertwined.expect b/pkg/front_end/parser_testcases/nnbd/issue_49132_not_nullable.dart.intertwined.expect
index 4ec4fe5..01fc2db 100644
--- a/pkg/front_end/parser_testcases/nnbd/issue_49132_not_nullable.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/nnbd/issue_49132_not_nullable.dart.intertwined.expect
@@ -50,7 +50,7 @@
listener: beginMember()
isReservedKeyword(.)
parseMethod(;, null, null, null, null, null, null, null, ;, NoType(), null, Foo, DeclarationKind.Class, Foo, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo)
listener: handleNoType(;)
ensureIdentifierPotentiallyRecovered(;, methodDeclaration, false)
listener: handleIdentifier(Foo, methodDeclaration)
@@ -175,7 +175,7 @@
listener: beginMember()
isReservedKeyword(.)
parseMethod(}, null, null, null, null, null, null, null, }, NoType(), null, Foo, DeclarationKind.Class, Foo, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo)
listener: handleNoType(})
ensureIdentifierPotentiallyRecovered(}, methodDeclaration, false)
listener: handleIdentifier(Foo, methodDeclaration)
@@ -351,7 +351,7 @@
listener: beginMember()
isReservedKeyword(.)
parseMethod(}, null, null, null, null, null, null, null, }, NoType(), null, Foo, DeclarationKind.Class, Foo, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo)
listener: handleNoType(})
ensureIdentifierPotentiallyRecovered(}, methodDeclaration, false)
listener: handleIdentifier(Foo, methodDeclaration)
@@ -476,7 +476,7 @@
listener: beginMember()
isReservedKeyword(.)
parseMethod(}, null, null, null, null, null, null, null, }, NoType(), null, Foo, DeclarationKind.Class, Foo, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo)
listener: handleNoType(})
ensureIdentifierPotentiallyRecovered(}, methodDeclaration, false)
listener: handleIdentifier(Foo, methodDeclaration)
diff --git a/pkg/front_end/parser_testcases/nnbd/issue_49132_prime.dart.expect b/pkg/front_end/parser_testcases/nnbd/issue_49132_prime.dart.expect
index d3b2b8f0..6da1b47 100644
--- a/pkg/front_end/parser_testcases/nnbd/issue_49132_prime.dart.expect
+++ b/pkg/front_end/parser_testcases/nnbd/issue_49132_prime.dart.expect
@@ -14,7 +14,7 @@
beginMetadataStar(Foo)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo)
handleNoType({)
handleIdentifier(Foo, methodDeclaration)
handleIdentifier(foo1, methodDeclarationContinuation)
@@ -87,7 +87,7 @@
beginMetadataStar(Foo)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo)
handleNoType(;)
handleIdentifier(Foo, methodDeclaration)
handleIdentifier(foo2, methodDeclarationContinuation)
@@ -160,7 +160,7 @@
beginMetadataStar(Foo)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo)
handleNoType(;)
handleIdentifier(Foo, methodDeclaration)
handleIdentifier(foo3, methodDeclarationContinuation)
@@ -233,7 +233,7 @@
beginMetadataStar(Foo)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo)
handleNoType(;)
handleIdentifier(Foo, methodDeclaration)
handleIdentifier(foo4, methodDeclarationContinuation)
@@ -306,7 +306,7 @@
beginMetadataStar(Foo)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo)
handleNoType(;)
handleIdentifier(Foo, methodDeclaration)
handleIdentifier(bar1, methodDeclarationContinuation)
@@ -380,7 +380,7 @@
beginMetadataStar(Foo)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo)
handleNoType(})
handleIdentifier(Foo, methodDeclaration)
handleIdentifier(bar2, methodDeclarationContinuation)
@@ -454,7 +454,7 @@
beginMetadataStar(Foo)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo)
handleNoType(})
handleIdentifier(Foo, methodDeclaration)
handleIdentifier(bar3, methodDeclarationContinuation)
@@ -528,7 +528,7 @@
beginMetadataStar(Foo)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo)
handleNoType(})
handleIdentifier(Foo, methodDeclaration)
handleIdentifier(bar4, methodDeclarationContinuation)
diff --git a/pkg/front_end/parser_testcases/nnbd/issue_49132_prime.dart.intertwined.expect b/pkg/front_end/parser_testcases/nnbd/issue_49132_prime.dart.intertwined.expect
index 95c3d3e..b6af538 100644
--- a/pkg/front_end/parser_testcases/nnbd/issue_49132_prime.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/nnbd/issue_49132_prime.dart.intertwined.expect
@@ -33,7 +33,7 @@
listener: beginMember()
isReservedKeyword(.)
parseMethod({, null, null, null, null, null, null, null, {, NoType(), null, Foo, DeclarationKind.Class, Foo, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo)
listener: handleNoType({)
ensureIdentifierPotentiallyRecovered({, methodDeclaration, false)
listener: handleIdentifier(Foo, methodDeclaration)
@@ -189,7 +189,7 @@
listener: beginMember()
isReservedKeyword(.)
parseMethod(;, null, null, null, null, null, null, null, ;, NoType(), null, Foo, DeclarationKind.Class, Foo, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo)
listener: handleNoType(;)
ensureIdentifierPotentiallyRecovered(;, methodDeclaration, false)
listener: handleIdentifier(Foo, methodDeclaration)
@@ -345,7 +345,7 @@
listener: beginMember()
isReservedKeyword(.)
parseMethod(;, null, null, null, null, null, null, null, ;, NoType(), null, Foo, DeclarationKind.Class, Foo, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo)
listener: handleNoType(;)
ensureIdentifierPotentiallyRecovered(;, methodDeclaration, false)
listener: handleIdentifier(Foo, methodDeclaration)
@@ -501,7 +501,7 @@
listener: beginMember()
isReservedKeyword(.)
parseMethod(;, null, null, null, null, null, null, null, ;, NoType(), null, Foo, DeclarationKind.Class, Foo, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo)
listener: handleNoType(;)
ensureIdentifierPotentiallyRecovered(;, methodDeclaration, false)
listener: handleIdentifier(Foo, methodDeclaration)
@@ -657,7 +657,7 @@
listener: beginMember()
isReservedKeyword(.)
parseMethod(;, null, null, null, null, null, null, null, ;, NoType(), null, Foo, DeclarationKind.Class, Foo, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo)
listener: handleNoType(;)
ensureIdentifierPotentiallyRecovered(;, methodDeclaration, false)
listener: handleIdentifier(Foo, methodDeclaration)
@@ -815,7 +815,7 @@
listener: beginMember()
isReservedKeyword(.)
parseMethod(}, null, null, null, null, null, null, null, }, NoType(), null, Foo, DeclarationKind.Class, Foo, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo)
listener: handleNoType(})
ensureIdentifierPotentiallyRecovered(}, methodDeclaration, false)
listener: handleIdentifier(Foo, methodDeclaration)
@@ -973,7 +973,7 @@
listener: beginMember()
isReservedKeyword(.)
parseMethod(}, null, null, null, null, null, null, null, }, NoType(), null, Foo, DeclarationKind.Class, Foo, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo)
listener: handleNoType(})
ensureIdentifierPotentiallyRecovered(}, methodDeclaration, false)
listener: handleIdentifier(Foo, methodDeclaration)
@@ -1131,7 +1131,7 @@
listener: beginMember()
isReservedKeyword(.)
parseMethod(}, null, null, null, null, null, null, null, }, NoType(), null, Foo, DeclarationKind.Class, Foo, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo)
listener: handleNoType(})
ensureIdentifierPotentiallyRecovered(}, methodDeclaration, false)
listener: handleIdentifier(Foo, methodDeclaration)
diff --git a/pkg/front_end/parser_testcases/nnbd/late_member.dart.expect b/pkg/front_end/parser_testcases/nnbd/late_member.dart.expect
index aa45617..557abe5 100644
--- a/pkg/front_end/parser_testcases/nnbd/late_member.dart.expect
+++ b/pkg/front_end/parser_testcases/nnbd/late_member.dart.expect
@@ -133,7 +133,7 @@
beginMetadataStar(late)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, late)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, late, X)
handleNoType({)
handleIdentifier(late, methodDeclaration)
handleNoTypeVariables(()
diff --git a/pkg/front_end/parser_testcases/nnbd/late_member.dart.intertwined.expect b/pkg/front_end/parser_testcases/nnbd/late_member.dart.intertwined.expect
index 6849d58..7b46000 100644
--- a/pkg/front_end/parser_testcases/nnbd/late_member.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/nnbd/late_member.dart.intertwined.expect
@@ -351,7 +351,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod({, null, null, null, null, null, null, null, {, NoType(), null, late, DeclarationKind.Class, X, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, late)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, late, X)
listener: handleNoType({)
ensureIdentifierPotentiallyRecovered({, methodDeclaration, false)
listener: handleIdentifier(late, methodDeclaration)
diff --git a/pkg/front_end/parser_testcases/nnbd/late_modifier.dart.expect b/pkg/front_end/parser_testcases/nnbd/late_modifier.dart.expect
index 0cf6cea..f17c504 100644
--- a/pkg/front_end/parser_testcases/nnbd/late_modifier.dart.expect
+++ b/pkg/front_end/parser_testcases/nnbd/late_modifier.dart.expect
@@ -151,7 +151,7 @@
beginMetadataStar(late)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, late)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, late, X)
handleNoType({)
handleIdentifier(late, methodDeclaration)
handleNoTypeVariables(()
diff --git a/pkg/front_end/parser_testcases/nnbd/late_modifier.dart.intertwined.expect b/pkg/front_end/parser_testcases/nnbd/late_modifier.dart.intertwined.expect
index 7890e2e..89fa9ea 100644
--- a/pkg/front_end/parser_testcases/nnbd/late_modifier.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/nnbd/late_modifier.dart.intertwined.expect
@@ -400,7 +400,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod({, null, null, null, null, null, null, null, {, NoType(), null, late, DeclarationKind.Class, X, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, late)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, late, X)
listener: handleNoType({)
ensureIdentifierPotentiallyRecovered({, methodDeclaration, false)
listener: handleIdentifier(late, methodDeclaration)
diff --git a/pkg/front_end/parser_testcases/nnbd/null_shorting_index.dart.expect b/pkg/front_end/parser_testcases/nnbd/null_shorting_index.dart.expect
index 2603dab..d488ac0 100644
--- a/pkg/front_end/parser_testcases/nnbd/null_shorting_index.dart.expect
+++ b/pkg/front_end/parser_testcases/nnbd/null_shorting_index.dart.expect
@@ -14,7 +14,7 @@
beginMetadataStar(int)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, operator)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, operator, Class1)
handleIdentifier(int, typeReference)
handleNoTypeArguments(operator)
handleType(int, null)
@@ -43,7 +43,7 @@
beginMetadataStar(void)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, operator)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, operator, Class1)
handleVoidKeyword(void)
handleOperatorName(operator, []=)
handleNoTypeVariables(()
diff --git a/pkg/front_end/parser_testcases/nnbd/null_shorting_index.dart.intertwined.expect b/pkg/front_end/parser_testcases/nnbd/null_shorting_index.dart.intertwined.expect
index 984a89f..b42d9d7 100644
--- a/pkg/front_end/parser_testcases/nnbd/null_shorting_index.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/nnbd/null_shorting_index.dart.intertwined.expect
@@ -32,7 +32,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod({, null, null, null, null, null, null, null, {, SimpleType(), null, operator, DeclarationKind.Class, Class1, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, operator)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, operator, Class1)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(operator)
listener: handleType(int, null)
@@ -90,7 +90,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(;, null, null, null, null, null, null, null, ;, VoidType(), null, operator, DeclarationKind.Class, Class1, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, operator)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, operator, Class1)
listener: handleVoidKeyword(void)
parseOperatorName(void)
listener: handleOperatorName(operator, []=)
diff --git a/pkg/front_end/parser_testcases/nnbd/required_member.dart.expect b/pkg/front_end/parser_testcases/nnbd/required_member.dart.expect
index 78907b2..5d3bfb8 100644
--- a/pkg/front_end/parser_testcases/nnbd/required_member.dart.expect
+++ b/pkg/front_end/parser_testcases/nnbd/required_member.dart.expect
@@ -133,7 +133,7 @@
beginMetadataStar(required)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, required)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, required, X)
handleNoType({)
handleIdentifier(required, methodDeclaration)
handleNoTypeVariables(()
diff --git a/pkg/front_end/parser_testcases/nnbd/required_member.dart.intertwined.expect b/pkg/front_end/parser_testcases/nnbd/required_member.dart.intertwined.expect
index f37cd3b..6afc6c9 100644
--- a/pkg/front_end/parser_testcases/nnbd/required_member.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/nnbd/required_member.dart.intertwined.expect
@@ -351,7 +351,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod({, null, null, null, null, null, null, null, {, NoType(), null, required, DeclarationKind.Class, X, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, required)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, required, X)
listener: handleNoType({)
ensureIdentifierPotentiallyRecovered({, methodDeclaration, false)
listener: handleIdentifier(required, methodDeclaration)
diff --git a/pkg/front_end/parser_testcases/nnbd/required_modifier.dart.expect b/pkg/front_end/parser_testcases/nnbd/required_modifier.dart.expect
index 6256ceb..b2a5cbd 100644
--- a/pkg/front_end/parser_testcases/nnbd/required_modifier.dart.expect
+++ b/pkg/front_end/parser_testcases/nnbd/required_modifier.dart.expect
@@ -144,7 +144,7 @@
beginMetadataStar(required)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, required)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, required, X)
handleNoType({)
handleIdentifier(required, methodDeclaration)
handleNoTypeVariables(()
diff --git a/pkg/front_end/parser_testcases/nnbd/required_modifier.dart.intertwined.expect b/pkg/front_end/parser_testcases/nnbd/required_modifier.dart.intertwined.expect
index 05382d3..b35d434 100644
--- a/pkg/front_end/parser_testcases/nnbd/required_modifier.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/nnbd/required_modifier.dart.intertwined.expect
@@ -367,7 +367,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod({, null, null, null, null, null, null, null, {, NoType(), null, required, DeclarationKind.Class, X, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, required)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, required, X)
listener: handleNoType({)
ensureIdentifierPotentiallyRecovered({, methodDeclaration, false)
listener: handleIdentifier(required, methodDeclaration)
diff --git a/pkg/front_end/parser_testcases/no-triple-shift/define_triple_shift_method.dart.expect b/pkg/front_end/parser_testcases/no-triple-shift/define_triple_shift_method.dart.expect
index 1b7b999..0c62c96 100644
--- a/pkg/front_end/parser_testcases/no-triple-shift/define_triple_shift_method.dart.expect
+++ b/pkg/front_end/parser_testcases/no-triple-shift/define_triple_shift_method.dart.expect
@@ -37,7 +37,7 @@
endMetadataStar(0)
beginMember()
handleExperimentNotEnabled(ExperimentalFlag.tripleShift, >>, >)
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, operator)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, operator, Foo)
handleIdentifier(Foo, typeReference)
handleNoTypeArguments(operator)
handleType(Foo, null)
diff --git a/pkg/front_end/parser_testcases/no-triple-shift/define_triple_shift_method.dart.intertwined.expect b/pkg/front_end/parser_testcases/no-triple-shift/define_triple_shift_method.dart.intertwined.expect
index 019903b..7f77256 100644
--- a/pkg/front_end/parser_testcases/no-triple-shift/define_triple_shift_method.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/no-triple-shift/define_triple_shift_method.dart.intertwined.expect
@@ -35,7 +35,7 @@
reportExperimentNotEnabled(ExperimentalFlag.tripleShift, >>, >)
listener: handleExperimentNotEnabled(ExperimentalFlag.tripleShift, >>, >)
rewriter()
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, operator)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, operator, Foo)
listener: handleIdentifier(Foo, typeReference)
listener: handleNoTypeArguments(operator)
listener: handleType(Foo, null)
diff --git a/pkg/front_end/parser_testcases/no-triple-shift/define_triple_shift_method_prime.dart.expect b/pkg/front_end/parser_testcases/no-triple-shift/define_triple_shift_method_prime.dart.expect
index 4695d94..3d303fc 100644
--- a/pkg/front_end/parser_testcases/no-triple-shift/define_triple_shift_method_prime.dart.expect
+++ b/pkg/front_end/parser_testcases/no-triple-shift/define_triple_shift_method_prime.dart.expect
@@ -14,7 +14,7 @@
beginMetadataStar(Foo)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, operator)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, operator, Foo)
handleIdentifier(Foo, typeReference)
handleNoTypeArguments(operator)
handleType(Foo, null)
diff --git a/pkg/front_end/parser_testcases/no-triple-shift/define_triple_shift_method_prime.dart.intertwined.expect b/pkg/front_end/parser_testcases/no-triple-shift/define_triple_shift_method_prime.dart.intertwined.expect
index e91de43..461f573 100644
--- a/pkg/front_end/parser_testcases/no-triple-shift/define_triple_shift_method_prime.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/no-triple-shift/define_triple_shift_method_prime.dart.intertwined.expect
@@ -32,7 +32,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod({, null, null, null, null, null, null, null, {, SimpleType(), null, operator, DeclarationKind.Class, Foo, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, operator)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, operator, Foo)
listener: handleIdentifier(Foo, typeReference)
listener: handleNoTypeArguments(operator)
listener: handleType(Foo, null)
diff --git a/pkg/front_end/parser_testcases/no-triple-shift/triple_shift_not_triple_shift.dart.expect b/pkg/front_end/parser_testcases/no-triple-shift/triple_shift_not_triple_shift.dart.expect
index 6b26b17..53edd6c 100644
--- a/pkg/front_end/parser_testcases/no-triple-shift/triple_shift_not_triple_shift.dart.expect
+++ b/pkg/front_end/parser_testcases/no-triple-shift/triple_shift_not_triple_shift.dart.expect
@@ -11,7 +11,7 @@
beginMetadataStar(String)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Extension, null, null, null, null, null, null, operator)
+ beginMethod(DeclarationKind.Extension, null, null, null, null, null, null, operator, null)
handleIdentifier(String, typeReference)
handleNoTypeArguments(operator)
handleType(String, null)
@@ -36,7 +36,7 @@
beginMetadataStar(String)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Extension, null, null, null, null, null, null, call)
+ beginMethod(DeclarationKind.Extension, null, null, null, null, null, null, call, null)
handleIdentifier(String, typeReference)
handleNoTypeArguments(call)
handleType(String, null)
diff --git a/pkg/front_end/parser_testcases/no-triple-shift/triple_shift_not_triple_shift.dart.intertwined.expect b/pkg/front_end/parser_testcases/no-triple-shift/triple_shift_not_triple_shift.dart.intertwined.expect
index 82c99ba..6b817bd 100644
--- a/pkg/front_end/parser_testcases/no-triple-shift/triple_shift_not_triple_shift.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/no-triple-shift/triple_shift_not_triple_shift.dart.intertwined.expect
@@ -24,7 +24,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod({, null, null, null, null, null, null, null, {, SimpleType(), null, operator, DeclarationKind.Extension, null, false)
- listener: beginMethod(DeclarationKind.Extension, null, null, null, null, null, null, operator)
+ listener: beginMethod(DeclarationKind.Extension, null, null, null, null, null, null, operator, null)
listener: handleIdentifier(String, typeReference)
listener: handleNoTypeArguments(operator)
listener: handleType(String, null)
@@ -75,7 +75,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(;, null, null, null, null, null, null, null, ;, SimpleType(), null, call, DeclarationKind.Extension, null, false)
- listener: beginMethod(DeclarationKind.Extension, null, null, null, null, null, null, call)
+ listener: beginMethod(DeclarationKind.Extension, null, null, null, null, null, null, call, null)
listener: handleIdentifier(String, typeReference)
listener: handleNoTypeArguments(call)
listener: handleType(String, null)
diff --git a/pkg/front_end/parser_testcases/non-nnbd/issue_40288.dart.expect b/pkg/front_end/parser_testcases/non-nnbd/issue_40288.dart.expect
index 9abe484..76a2678 100644
--- a/pkg/front_end/parser_testcases/non-nnbd/issue_40288.dart.expect
+++ b/pkg/front_end/parser_testcases/non-nnbd/issue_40288.dart.expect
@@ -14,7 +14,7 @@
beginMetadataStar(int)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, get, g)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, get, g, late)
handleIdentifier(int, typeReference)
handleNoTypeArguments(get)
handleType(int, null)
@@ -45,7 +45,7 @@
beginMetadataStar(int)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, get, g)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, get, g, required)
handleIdentifier(int, typeReference)
handleNoTypeArguments(get)
handleType(int, null)
diff --git a/pkg/front_end/parser_testcases/non-nnbd/issue_40288.dart.intertwined.expect b/pkg/front_end/parser_testcases/non-nnbd/issue_40288.dart.intertwined.expect
index b56cc97..7d54ea2 100644
--- a/pkg/front_end/parser_testcases/non-nnbd/issue_40288.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/non-nnbd/issue_40288.dart.intertwined.expect
@@ -32,7 +32,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod({, null, null, null, null, null, null, null, {, SimpleType(), get, g, DeclarationKind.Class, late, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, g)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, g, late)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(get)
listener: handleType(int, null)
@@ -96,7 +96,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod({, null, null, null, null, null, null, null, {, SimpleType(), get, g, DeclarationKind.Class, required, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, g)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, g, required)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(get)
listener: handleType(int, null)
diff --git a/pkg/front_end/parser_testcases/non-nnbd/issue_40288_prime.dart.expect b/pkg/front_end/parser_testcases/non-nnbd/issue_40288_prime.dart.expect
index 41d3b28..374c3e7 100644
--- a/pkg/front_end/parser_testcases/non-nnbd/issue_40288_prime.dart.expect
+++ b/pkg/front_end/parser_testcases/non-nnbd/issue_40288_prime.dart.expect
@@ -14,7 +14,7 @@
beginMetadataStar(int)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, get, g)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, get, g, Xlate)
handleIdentifier(int, typeReference)
handleNoTypeArguments(get)
handleType(int, null)
@@ -45,7 +45,7 @@
beginMetadataStar(int)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, get, g)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, get, g, Xrequired)
handleIdentifier(int, typeReference)
handleNoTypeArguments(get)
handleType(int, null)
diff --git a/pkg/front_end/parser_testcases/non-nnbd/issue_40288_prime.dart.intertwined.expect b/pkg/front_end/parser_testcases/non-nnbd/issue_40288_prime.dart.intertwined.expect
index ec7375f..f1b71e2 100644
--- a/pkg/front_end/parser_testcases/non-nnbd/issue_40288_prime.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/non-nnbd/issue_40288_prime.dart.intertwined.expect
@@ -32,7 +32,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod({, null, null, null, null, null, null, null, {, SimpleType(), get, g, DeclarationKind.Class, Xlate, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, g)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, g, Xlate)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(get)
listener: handleType(int, null)
@@ -96,7 +96,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod({, null, null, null, null, null, null, null, {, SimpleType(), get, g, DeclarationKind.Class, Xrequired, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, g)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, g, Xrequired)
listener: handleIdentifier(int, typeReference)
listener: handleNoTypeArguments(get)
listener: handleType(int, null)
diff --git a/pkg/front_end/parser_testcases/non-nnbd/use_required_in_non_nnbd.dart.expect b/pkg/front_end/parser_testcases/non-nnbd/use_required_in_non_nnbd.dart.expect
index b69dc09..f4b556f 100644
--- a/pkg/front_end/parser_testcases/non-nnbd/use_required_in_non_nnbd.dart.expect
+++ b/pkg/front_end/parser_testcases/non-nnbd/use_required_in_non_nnbd.dart.expect
@@ -135,7 +135,7 @@
beginMetadataStar(void)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, foo4)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, foo4, Foo)
handleVoidKeyword(void)
handleIdentifier(foo4, methodDeclaration)
handleNoTypeVariables(()
diff --git a/pkg/front_end/parser_testcases/non-nnbd/use_required_in_non_nnbd.dart.intertwined.expect b/pkg/front_end/parser_testcases/non-nnbd/use_required_in_non_nnbd.dart.intertwined.expect
index 01d6a62..8096372 100644
--- a/pkg/front_end/parser_testcases/non-nnbd/use_required_in_non_nnbd.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/non-nnbd/use_required_in_non_nnbd.dart.intertwined.expect
@@ -279,7 +279,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod({, null, null, null, null, null, null, null, {, VoidType(), null, foo4, DeclarationKind.Class, Foo, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, foo4)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, foo4, Foo)
listener: handleVoidKeyword(void)
ensureIdentifierPotentiallyRecovered(void, methodDeclaration, false)
listener: handleIdentifier(foo4, methodDeclaration)
diff --git a/pkg/front_end/parser_testcases/patterns/const_patterns.dart.expect b/pkg/front_end/parser_testcases/patterns/const_patterns.dart.expect
index dc60d72..ddb84dc 100644
--- a/pkg/front_end/parser_testcases/patterns/const_patterns.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/const_patterns.dart.expect
@@ -261,7 +261,7 @@
beginMetadataStar(const)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, const, null, Class)
+ beginMethod(DeclarationKind.Class, null, null, null, null, const, null, Class, Class)
handleNoType(const)
handleIdentifier(Class, methodDeclaration)
handleNoTypeVariables(()
@@ -284,7 +284,7 @@
beginMetadataStar(const)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, const, null, Class)
+ beginMethod(DeclarationKind.Class, null, null, null, null, const, null, Class, Class)
handleNoType(const)
handleIdentifier(Class, methodDeclaration)
handleIdentifier(named, methodDeclarationContinuation)
@@ -300,7 +300,7 @@
beginMetadataStar(call)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, call)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, call, Class)
handleNoType(;)
handleIdentifier(call, methodDeclaration)
handleNoTypeVariables(()
@@ -315,7 +315,7 @@
beginMetadataStar(test)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, test)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, test, Class)
handleNoType(})
handleIdentifier(test, methodDeclaration)
handleNoTypeVariables(()
@@ -1763,7 +1763,7 @@
beginMetadataStar(const)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, const, null, GenericClass)
+ beginMethod(DeclarationKind.Class, null, null, null, null, const, null, GenericClass, GenericClass)
handleNoType(const)
handleIdentifier(GenericClass, methodDeclaration)
handleNoTypeVariables(()
diff --git a/pkg/front_end/parser_testcases/patterns/const_patterns.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/const_patterns.dart.intertwined.expect
index b352cd0..714dd9d 100644
--- a/pkg/front_end/parser_testcases/patterns/const_patterns.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/const_patterns.dart.intertwined.expect
@@ -114,7 +114,7 @@
skipOuterPattern(const)
skipObjectPatternRest(Class)
parseMethod({, null, null, null, null, null, null, const, const, NoType(), null, Class, DeclarationKind.Class, Class, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, const, null, Class)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, const, null, Class, Class)
listener: handleNoType(const)
ensureIdentifierPotentiallyRecovered(const, methodDeclaration, false)
listener: handleIdentifier(Class, methodDeclaration)
@@ -159,7 +159,7 @@
skipOuterPattern(const)
skipObjectPatternRest(named)
parseMethod(;, null, null, null, null, null, null, const, const, NoType(), null, Class, DeclarationKind.Class, Class, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, const, null, Class)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, const, null, Class, Class)
listener: handleNoType(const)
ensureIdentifierPotentiallyRecovered(const, methodDeclaration, false)
listener: handleIdentifier(Class, methodDeclaration)
@@ -193,7 +193,7 @@
listener: beginMember()
isReservedKeyword(()
parseMethod(;, null, null, null, null, null, null, null, ;, NoType(), null, call, DeclarationKind.Class, Class, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, call)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, call, Class)
listener: handleNoType(;)
ensureIdentifierPotentiallyRecovered(;, methodDeclaration, false)
listener: handleIdentifier(call, methodDeclaration)
@@ -225,7 +225,7 @@
listener: beginMember()
isReservedKeyword(()
parseMethod(}, null, null, null, null, null, null, null, }, NoType(), null, test, DeclarationKind.Class, Class, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, test)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, test, Class)
listener: handleNoType(})
ensureIdentifierPotentiallyRecovered(}, methodDeclaration, false)
listener: handleIdentifier(test, methodDeclaration)
@@ -3273,7 +3273,7 @@
skipOuterPattern(const)
skipObjectPatternRest(GenericClass)
parseMethod({, null, null, null, null, null, null, const, const, NoType(), null, GenericClass, DeclarationKind.Class, GenericClass, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, const, null, GenericClass)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, const, null, GenericClass, GenericClass)
listener: handleNoType(const)
ensureIdentifierPotentiallyRecovered(const, methodDeclaration, false)
listener: handleIdentifier(GenericClass, methodDeclaration)
diff --git a/pkg/front_end/parser_testcases/patterns/issue_51169.dart.expect b/pkg/front_end/parser_testcases/patterns/issue_51169.dart.expect
index 8a2c9e9..99488d5 100644
--- a/pkg/front_end/parser_testcases/patterns/issue_51169.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/issue_51169.dart.expect
@@ -25,7 +25,7 @@
beginMetadataStar(Class)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Class)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Class, Class)
handleNoType(;)
handleIdentifier(Class, methodDeclaration)
handleNoTypeVariables(()
diff --git a/pkg/front_end/parser_testcases/patterns/issue_51169.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/issue_51169.dart.intertwined.expect
index e57b9c1..b971c2f 100644
--- a/pkg/front_end/parser_testcases/patterns/issue_51169.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/issue_51169.dart.intertwined.expect
@@ -50,7 +50,7 @@
listener: beginMember()
isReservedKeyword(()
parseMethod(;, null, null, null, null, null, null, null, ;, NoType(), null, Class, DeclarationKind.Class, Class, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Class)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Class, Class)
listener: handleNoType(;)
ensureIdentifierPotentiallyRecovered(;, methodDeclaration, false)
listener: handleIdentifier(Class, methodDeclaration)
diff --git a/pkg/front_end/parser_testcases/record/field_formal_parameter_with_explicit_record_type.dart.expect b/pkg/front_end/parser_testcases/record/field_formal_parameter_with_explicit_record_type.dart.expect
index 05ddee7..488beab 100644
--- a/pkg/front_end/parser_testcases/record/field_formal_parameter_with_explicit_record_type.dart.expect
+++ b/pkg/front_end/parser_testcases/record/field_formal_parameter_with_explicit_record_type.dart.expect
@@ -14,7 +14,7 @@
beginMetadataStar(C)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, C)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, C, C)
handleNoType({)
handleIdentifier(C, methodDeclaration)
handleNoTypeVariables(()
@@ -54,7 +54,7 @@
beginMetadataStar(C)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, C)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, C, C)
handleNoType(;)
handleIdentifier(C, methodDeclaration)
handleNoTypeVariables(()
@@ -96,7 +96,7 @@
beginMetadataStar(C)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, C)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, C, C)
handleNoType(;)
handleIdentifier(C, methodDeclaration)
handleNoTypeVariables(()
@@ -138,7 +138,7 @@
beginMetadataStar(C)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, C)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, C, C)
handleNoType(;)
handleIdentifier(C, methodDeclaration)
handleNoTypeVariables(()
@@ -178,7 +178,7 @@
beginMetadataStar(C)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, C)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, C, C)
handleNoType(;)
handleIdentifier(C, methodDeclaration)
handleNoTypeVariables(()
@@ -220,7 +220,7 @@
beginMetadataStar(C)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, C)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, C, C)
handleNoType(;)
handleIdentifier(C, methodDeclaration)
handleNoTypeVariables(()
diff --git a/pkg/front_end/parser_testcases/record/field_formal_parameter_with_explicit_record_type.dart.intertwined.expect b/pkg/front_end/parser_testcases/record/field_formal_parameter_with_explicit_record_type.dart.intertwined.expect
index 3e2035d..3a0bf60 100644
--- a/pkg/front_end/parser_testcases/record/field_formal_parameter_with_explicit_record_type.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/record/field_formal_parameter_with_explicit_record_type.dart.intertwined.expect
@@ -33,7 +33,7 @@
listener: beginMember()
isReservedKeyword(()
parseMethod({, null, null, null, null, null, null, null, {, NoType(), null, C, DeclarationKind.Class, C, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, C)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, C, C)
listener: handleNoType({)
ensureIdentifierPotentiallyRecovered({, methodDeclaration, false)
listener: handleIdentifier(C, methodDeclaration)
@@ -101,7 +101,7 @@
listener: beginMember()
isReservedKeyword(()
parseMethod(;, null, null, null, null, null, null, null, ;, NoType(), null, C, DeclarationKind.Class, C, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, C)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, C, C)
listener: handleNoType(;)
ensureIdentifierPotentiallyRecovered(;, methodDeclaration, false)
listener: handleIdentifier(C, methodDeclaration)
@@ -173,7 +173,7 @@
listener: beginMember()
isReservedKeyword(()
parseMethod(;, null, null, null, null, null, null, null, ;, NoType(), null, C, DeclarationKind.Class, C, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, C)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, C, C)
listener: handleNoType(;)
ensureIdentifierPotentiallyRecovered(;, methodDeclaration, false)
listener: handleIdentifier(C, methodDeclaration)
@@ -245,7 +245,7 @@
listener: beginMember()
isReservedKeyword(()
parseMethod(;, null, null, null, null, null, null, null, ;, NoType(), null, C, DeclarationKind.Class, C, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, C)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, C, C)
listener: handleNoType(;)
ensureIdentifierPotentiallyRecovered(;, methodDeclaration, false)
listener: handleIdentifier(C, methodDeclaration)
@@ -313,7 +313,7 @@
listener: beginMember()
isReservedKeyword(()
parseMethod(;, null, null, null, null, null, null, null, ;, NoType(), null, C, DeclarationKind.Class, C, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, C)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, C, C)
listener: handleNoType(;)
ensureIdentifierPotentiallyRecovered(;, methodDeclaration, false)
listener: handleIdentifier(C, methodDeclaration)
@@ -385,7 +385,7 @@
listener: beginMember()
isReservedKeyword(()
parseMethod(;, null, null, null, null, null, null, null, ;, NoType(), null, C, DeclarationKind.Class, C, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, C)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, C, C)
listener: handleNoType(;)
ensureIdentifierPotentiallyRecovered(;, methodDeclaration, false)
listener: handleIdentifier(C, methodDeclaration)
diff --git a/pkg/front_end/parser_testcases/record/issue_52365.dart.expect b/pkg/front_end/parser_testcases/record/issue_52365.dart.expect
index 9521faa..71e44cb 100644
--- a/pkg/front_end/parser_testcases/record/issue_52365.dart.expect
+++ b/pkg/front_end/parser_testcases/record/issue_52365.dart.expect
@@ -667,7 +667,7 @@
beginMetadataStar(operator)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Extension, null, null, null, null, null, null, operator)
+ beginMethod(DeclarationKind.Extension, null, null, null, null, null, null, operator, FunctionExtension)
handleNoType({)
handleOperatorName(operator, >)
handleNoTypeVariables(()
@@ -708,7 +708,7 @@
beginMetadataStar(operator)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Extension, null, null, null, null, null, null, operator)
+ beginMethod(DeclarationKind.Extension, null, null, null, null, null, null, operator, FunctionExtension)
handleNoType(})
handleOperatorName(operator, >>)
handleNoTypeVariables(()
@@ -749,7 +749,7 @@
beginMetadataStar(operator)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Extension, null, null, null, null, null, null, operator)
+ beginMethod(DeclarationKind.Extension, null, null, null, null, null, null, operator, FunctionExtension)
handleNoType(})
handleOperatorName(operator, >>>)
handleNoTypeVariables(()
@@ -802,7 +802,7 @@
beginMetadataStar(operator)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Extension, null, null, null, null, null, null, operator)
+ beginMethod(DeclarationKind.Extension, null, null, null, null, null, null, operator, RecordExtension)
handleNoType({)
handleOperatorName(operator, >)
handleNoTypeVariables(()
@@ -843,7 +843,7 @@
beginMetadataStar(operator)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Extension, null, null, null, null, null, null, operator)
+ beginMethod(DeclarationKind.Extension, null, null, null, null, null, null, operator, RecordExtension)
handleNoType(})
handleOperatorName(operator, >>)
handleNoTypeVariables(()
@@ -884,7 +884,7 @@
beginMetadataStar(operator)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Extension, null, null, null, null, null, null, operator)
+ beginMethod(DeclarationKind.Extension, null, null, null, null, null, null, operator, RecordExtension)
handleNoType(})
handleOperatorName(operator, >>>)
handleNoTypeVariables(()
diff --git a/pkg/front_end/parser_testcases/record/issue_52365.dart.intertwined.expect b/pkg/front_end/parser_testcases/record/issue_52365.dart.intertwined.expect
index a90b39b..a7c1783 100644
--- a/pkg/front_end/parser_testcases/record/issue_52365.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/record/issue_52365.dart.intertwined.expect
@@ -1968,7 +1968,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod({, null, null, null, null, null, null, null, {, NoType(), null, operator, DeclarationKind.Extension, FunctionExtension, false)
- listener: beginMethod(DeclarationKind.Extension, null, null, null, null, null, null, operator)
+ listener: beginMethod(DeclarationKind.Extension, null, null, null, null, null, null, operator, FunctionExtension)
listener: handleNoType({)
parseOperatorName({)
listener: handleOperatorName(operator, >)
@@ -2060,7 +2060,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(}, null, null, null, null, null, null, null, }, NoType(), null, operator, DeclarationKind.Extension, FunctionExtension, false)
- listener: beginMethod(DeclarationKind.Extension, null, null, null, null, null, null, operator)
+ listener: beginMethod(DeclarationKind.Extension, null, null, null, null, null, null, operator, FunctionExtension)
listener: handleNoType(})
parseOperatorName(})
listener: handleOperatorName(operator, >>)
@@ -2152,7 +2152,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(}, null, null, null, null, null, null, null, }, NoType(), null, operator, DeclarationKind.Extension, FunctionExtension, false)
- listener: beginMethod(DeclarationKind.Extension, null, null, null, null, null, null, operator)
+ listener: beginMethod(DeclarationKind.Extension, null, null, null, null, null, null, operator, FunctionExtension)
listener: handleNoType(})
parseOperatorName(})
listener: handleOperatorName(operator, >>>)
@@ -2263,7 +2263,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod({, null, null, null, null, null, null, null, {, NoType(), null, operator, DeclarationKind.Extension, RecordExtension, false)
- listener: beginMethod(DeclarationKind.Extension, null, null, null, null, null, null, operator)
+ listener: beginMethod(DeclarationKind.Extension, null, null, null, null, null, null, operator, RecordExtension)
listener: handleNoType({)
parseOperatorName({)
listener: handleOperatorName(operator, >)
@@ -2355,7 +2355,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(}, null, null, null, null, null, null, null, }, NoType(), null, operator, DeclarationKind.Extension, RecordExtension, false)
- listener: beginMethod(DeclarationKind.Extension, null, null, null, null, null, null, operator)
+ listener: beginMethod(DeclarationKind.Extension, null, null, null, null, null, null, operator, RecordExtension)
listener: handleNoType(})
parseOperatorName(})
listener: handleOperatorName(operator, >>)
@@ -2447,7 +2447,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(}, null, null, null, null, null, null, null, }, NoType(), null, operator, DeclarationKind.Extension, RecordExtension, false)
- listener: beginMethod(DeclarationKind.Extension, null, null, null, null, null, null, operator)
+ listener: beginMethod(DeclarationKind.Extension, null, null, null, null, null, null, operator, RecordExtension)
listener: handleNoType(})
parseOperatorName(})
listener: handleOperatorName(operator, >>>)
diff --git a/pkg/front_end/parser_testcases/record/operator_returning_record.dart.expect b/pkg/front_end/parser_testcases/record/operator_returning_record.dart.expect
index cad1b34..dcb5a3c 100644
--- a/pkg/front_end/parser_testcases/record/operator_returning_record.dart.expect
+++ b/pkg/front_end/parser_testcases/record/operator_returning_record.dart.expect
@@ -14,7 +14,7 @@
beginMetadataStar(()
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, operator)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, operator, Foo)
beginRecordType(()
beginRecordTypeEntry()
beginMetadataStar(int)
@@ -76,7 +76,7 @@
beginMetadataStar(()
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, operator)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, operator, Bar)
beginRecordType(()
beginRecordTypeEntry()
beginMetadataStar(int)
diff --git a/pkg/front_end/parser_testcases/record/operator_returning_record.dart.intertwined.expect b/pkg/front_end/parser_testcases/record/operator_returning_record.dart.intertwined.expect
index 4f9537b..653b9bb 100644
--- a/pkg/front_end/parser_testcases/record/operator_returning_record.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/record/operator_returning_record.dart.intertwined.expect
@@ -32,7 +32,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod({, null, null, null, null, null, null, null, {, ComplexTypeInfo(start: (, typeArguments: NoTypeParamOrArg(), beforeQuestionMark: null, end: ), typeVariableStarters: [], gftHasReturnType: null, isRecordType: true, gftReturnTypeHasRecordType: false, recovered: false), null, operator, DeclarationKind.Class, Foo, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, operator)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, operator, Foo)
parseRecordType((, {, false)
listener: beginRecordType(()
parseRecordTypeField((, identifierIsOptional: true)
@@ -152,7 +152,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod({, null, null, null, null, null, null, null, {, ComplexTypeInfo(start: (, typeArguments: NoTypeParamOrArg(), beforeQuestionMark: ), end: ?, typeVariableStarters: [], gftHasReturnType: null, isRecordType: true, gftReturnTypeHasRecordType: false, recovered: false), null, operator, DeclarationKind.Class, Bar, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, operator)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, operator, Bar)
parseRecordType((, {, true)
listener: beginRecordType(()
parseRecordTypeField((, identifierIsOptional: true)
diff --git a/pkg/front_end/parser_testcases/record/record_type_03.dart.expect b/pkg/front_end/parser_testcases/record/record_type_03.dart.expect
index bd38fc9..34d6fd09 100644
--- a/pkg/front_end/parser_testcases/record/record_type_03.dart.expect
+++ b/pkg/front_end/parser_testcases/record/record_type_03.dart.expect
@@ -189,7 +189,7 @@
beginMetadataStar(()
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, foo)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, foo, Baz)
beginRecordType(()
beginRecordTypeEntry()
beginMetadataStar(int)
diff --git a/pkg/front_end/parser_testcases/record/record_type_03.dart.intertwined.expect b/pkg/front_end/parser_testcases/record/record_type_03.dart.intertwined.expect
index 867a17a..cb96b8f 100644
--- a/pkg/front_end/parser_testcases/record/record_type_03.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/record/record_type_03.dart.intertwined.expect
@@ -402,7 +402,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod({, null, null, null, null, null, null, null, {, ComplexTypeInfo(start: (, typeArguments: NoTypeParamOrArg(), beforeQuestionMark: null, end: ), typeVariableStarters: [], gftHasReturnType: null, isRecordType: true, gftReturnTypeHasRecordType: false, recovered: false), null, foo, DeclarationKind.Class, Baz, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, foo)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, foo, Baz)
parseRecordType((, {, false)
listener: beginRecordType(()
parseRecordTypeField((, identifierIsOptional: true)
diff --git a/pkg/front_end/parser_testcases/record/record_type_getter.dart.expect b/pkg/front_end/parser_testcases/record/record_type_getter.dart.expect
index 54d5837..385b96b 100644
--- a/pkg/front_end/parser_testcases/record/record_type_getter.dart.expect
+++ b/pkg/front_end/parser_testcases/record/record_type_getter.dart.expect
@@ -907,7 +907,7 @@
beginMetadataStar(()
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, get)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, get, Foo)
beginRecordType(()
beginRecordTypeEntry()
beginMetadataStar(int)
@@ -952,7 +952,7 @@
beginMetadataStar(()
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, get)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, get, Foo)
beginRecordType(()
beginRecordTypeEntry()
beginMetadataStar(int)
@@ -1000,7 +1000,7 @@
beginMetadataStar(()
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, get)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, get, Foo)
beginRecordType(()
beginRecordTypeEntry()
beginMetadataStar(int)
@@ -1043,7 +1043,7 @@
beginMetadataStar(()
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, get)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, get, Foo)
beginRecordType(()
beginRecordTypeEntry()
beginMetadataStar(int)
@@ -1088,7 +1088,7 @@
beginMetadataStar(()
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, get)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, get, Foo)
beginRecordType(()
beginRecordTypeEntry()
beginMetadataStar(int)
@@ -1132,7 +1132,7 @@
beginMetadataStar(()
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, get)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, get, Foo)
beginRecordType(()
beginRecordTypeEntry()
beginMetadataStar(int)
@@ -1177,7 +1177,7 @@
beginMetadataStar(()
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, get)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, get, Foo)
beginRecordType(()
beginRecordTypeEntry()
beginMetadataStar(int)
@@ -1221,7 +1221,7 @@
beginMetadataStar(()
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, get)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, get, Foo)
beginRecordType(()
beginRecordTypeEntry()
beginMetadataStar(int)
@@ -1266,7 +1266,7 @@
beginMetadataStar(()
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, get, get)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, get, get, Foo)
beginRecordType(()
beginRecordTypeEntry()
beginMetadataStar(int)
@@ -1301,7 +1301,7 @@
beginMetadataStar(()
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, get, get)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, get, get, Foo)
beginRecordType(()
beginRecordTypeEntry()
beginMetadataStar(int)
@@ -1339,7 +1339,7 @@
beginMetadataStar(()
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, get, get)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, get, get, Foo)
beginRecordType(()
beginRecordTypeEntry()
beginMetadataStar(int)
@@ -1372,7 +1372,7 @@
beginMetadataStar(()
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, get, get)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, get, get, Foo)
beginRecordType(()
beginRecordTypeEntry()
beginMetadataStar(int)
@@ -1407,7 +1407,7 @@
beginMetadataStar(()
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, get, get)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, get, get, Foo)
beginRecordType(()
beginRecordTypeEntry()
beginMetadataStar(int)
@@ -1441,7 +1441,7 @@
beginMetadataStar(()
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, get, get)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, get, get, Foo)
beginRecordType(()
beginRecordTypeEntry()
beginMetadataStar(int)
@@ -1476,7 +1476,7 @@
beginMetadataStar(()
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, get, get)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, get, get, Foo)
beginRecordType(()
beginRecordTypeEntry()
beginMetadataStar(int)
@@ -1510,7 +1510,7 @@
beginMetadataStar(()
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, get, get)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, get, get, Foo)
beginRecordType(()
beginRecordTypeEntry()
beginMetadataStar(int)
@@ -1545,7 +1545,7 @@
beginMetadataStar(()
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, get, instanceGetter)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, get, instanceGetter, Foo)
beginRecordType(()
beginRecordTypeEntry()
beginMetadataStar(int)
@@ -1580,7 +1580,7 @@
beginMetadataStar(()
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, get, instanceGetter)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, get, instanceGetter, Foo)
beginRecordType(()
beginRecordTypeEntry()
beginMetadataStar(int)
@@ -1618,7 +1618,7 @@
beginMetadataStar(()
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, get, instanceGetter)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, get, instanceGetter, Foo)
beginRecordType(()
beginRecordTypeEntry()
beginMetadataStar(int)
@@ -1651,7 +1651,7 @@
beginMetadataStar(()
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, get, instanceGetter)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, get, instanceGetter, Foo)
beginRecordType(()
beginRecordTypeEntry()
beginMetadataStar(int)
@@ -1687,7 +1687,7 @@
beginMetadataStar(()
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, get, instanceGetter)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, get, instanceGetter, Foo)
beginRecordType(()
beginRecordTypeEntry()
beginMetadataStar(int)
@@ -1721,7 +1721,7 @@
beginMetadataStar(()
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, get, instanceGetter)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, get, instanceGetter, Foo)
beginRecordType(()
beginRecordTypeEntry()
beginMetadataStar(int)
@@ -1758,7 +1758,7 @@
beginMetadataStar(()
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, get, instanceGetter)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, get, instanceGetter, Foo)
beginRecordType(()
beginRecordTypeEntry()
beginMetadataStar(int)
@@ -1792,7 +1792,7 @@
beginMetadataStar(()
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, get, instanceGetter)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, get, instanceGetter, Foo)
beginRecordType(()
beginRecordTypeEntry()
beginMetadataStar(int)
@@ -1844,7 +1844,7 @@
beginMetadataStar(static)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, static, null, null, null, get)
+ beginMethod(DeclarationKind.Class, null, null, static, null, null, null, get, Bar)
beginRecordType(()
beginRecordTypeEntry()
beginMetadataStar(int)
@@ -1889,7 +1889,7 @@
beginMetadataStar(static)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, static, null, null, null, get)
+ beginMethod(DeclarationKind.Class, null, null, static, null, null, null, get, Bar)
beginRecordType(()
beginRecordTypeEntry()
beginMetadataStar(int)
@@ -1937,7 +1937,7 @@
beginMetadataStar(static)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, static, null, null, null, get)
+ beginMethod(DeclarationKind.Class, null, null, static, null, null, null, get, Bar)
beginRecordType(()
beginRecordTypeEntry()
beginMetadataStar(int)
@@ -1980,7 +1980,7 @@
beginMetadataStar(static)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, static, null, null, null, get)
+ beginMethod(DeclarationKind.Class, null, null, static, null, null, null, get, Bar)
beginRecordType(()
beginRecordTypeEntry()
beginMetadataStar(int)
@@ -2025,7 +2025,7 @@
beginMetadataStar(static)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, static, null, null, null, get)
+ beginMethod(DeclarationKind.Class, null, null, static, null, null, null, get, Bar)
beginRecordType(()
beginRecordTypeEntry()
beginMetadataStar(int)
@@ -2069,7 +2069,7 @@
beginMetadataStar(static)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, static, null, null, null, get)
+ beginMethod(DeclarationKind.Class, null, null, static, null, null, null, get, Bar)
beginRecordType(()
beginRecordTypeEntry()
beginMetadataStar(int)
@@ -2114,7 +2114,7 @@
beginMetadataStar(static)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, static, null, null, null, get)
+ beginMethod(DeclarationKind.Class, null, null, static, null, null, null, get, Bar)
beginRecordType(()
beginRecordTypeEntry()
beginMetadataStar(int)
@@ -2158,7 +2158,7 @@
beginMetadataStar(static)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, static, null, null, null, get)
+ beginMethod(DeclarationKind.Class, null, null, static, null, null, null, get, Bar)
beginRecordType(()
beginRecordTypeEntry()
beginMetadataStar(int)
@@ -2203,7 +2203,7 @@
beginMetadataStar(static)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, static, null, null, get, get)
+ beginMethod(DeclarationKind.Class, null, null, static, null, null, get, get, Bar)
beginRecordType(()
beginRecordTypeEntry()
beginMetadataStar(int)
@@ -2238,7 +2238,7 @@
beginMetadataStar(static)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, static, null, null, get, get)
+ beginMethod(DeclarationKind.Class, null, null, static, null, null, get, get, Bar)
beginRecordType(()
beginRecordTypeEntry()
beginMetadataStar(int)
@@ -2276,7 +2276,7 @@
beginMetadataStar(static)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, static, null, null, get, get)
+ beginMethod(DeclarationKind.Class, null, null, static, null, null, get, get, Bar)
beginRecordType(()
beginRecordTypeEntry()
beginMetadataStar(int)
@@ -2309,7 +2309,7 @@
beginMetadataStar(static)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, static, null, null, get, get)
+ beginMethod(DeclarationKind.Class, null, null, static, null, null, get, get, Bar)
beginRecordType(()
beginRecordTypeEntry()
beginMetadataStar(int)
@@ -2344,7 +2344,7 @@
beginMetadataStar(static)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, static, null, null, get, get)
+ beginMethod(DeclarationKind.Class, null, null, static, null, null, get, get, Bar)
beginRecordType(()
beginRecordTypeEntry()
beginMetadataStar(int)
@@ -2378,7 +2378,7 @@
beginMetadataStar(static)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, static, null, null, get, get)
+ beginMethod(DeclarationKind.Class, null, null, static, null, null, get, get, Bar)
beginRecordType(()
beginRecordTypeEntry()
beginMetadataStar(int)
@@ -2413,7 +2413,7 @@
beginMetadataStar(static)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, static, null, null, get, get)
+ beginMethod(DeclarationKind.Class, null, null, static, null, null, get, get, Bar)
beginRecordType(()
beginRecordTypeEntry()
beginMetadataStar(int)
@@ -2447,7 +2447,7 @@
beginMetadataStar(static)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, static, null, null, get, get)
+ beginMethod(DeclarationKind.Class, null, null, static, null, null, get, get, Bar)
beginRecordType(()
beginRecordTypeEntry()
beginMetadataStar(int)
@@ -2482,7 +2482,7 @@
beginMetadataStar(static)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, static, null, null, get, staticGetter)
+ beginMethod(DeclarationKind.Class, null, null, static, null, null, get, staticGetter, Bar)
beginRecordType(()
beginRecordTypeEntry()
beginMetadataStar(int)
@@ -2517,7 +2517,7 @@
beginMetadataStar(static)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, static, null, null, get, staticGetter)
+ beginMethod(DeclarationKind.Class, null, null, static, null, null, get, staticGetter, Bar)
beginRecordType(()
beginRecordTypeEntry()
beginMetadataStar(int)
@@ -2555,7 +2555,7 @@
beginMetadataStar(static)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, static, null, null, get, staticGetter)
+ beginMethod(DeclarationKind.Class, null, null, static, null, null, get, staticGetter, Bar)
beginRecordType(()
beginRecordTypeEntry()
beginMetadataStar(int)
@@ -2588,7 +2588,7 @@
beginMetadataStar(static)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, static, null, null, get, staticGetter)
+ beginMethod(DeclarationKind.Class, null, null, static, null, null, get, staticGetter, Bar)
beginRecordType(()
beginRecordTypeEntry()
beginMetadataStar(int)
@@ -2623,7 +2623,7 @@
beginMetadataStar(static)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, static, null, null, get, staticGetter)
+ beginMethod(DeclarationKind.Class, null, null, static, null, null, get, staticGetter, Bar)
beginRecordType(()
beginRecordTypeEntry()
beginMetadataStar(int)
@@ -2657,7 +2657,7 @@
beginMetadataStar(static)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, static, null, null, get, staticGetter)
+ beginMethod(DeclarationKind.Class, null, null, static, null, null, get, staticGetter, Bar)
beginRecordType(()
beginRecordTypeEntry()
beginMetadataStar(int)
@@ -2692,7 +2692,7 @@
beginMetadataStar(static)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, static, null, null, get, staticGetter)
+ beginMethod(DeclarationKind.Class, null, null, static, null, null, get, staticGetter, Bar)
beginRecordType(()
beginRecordTypeEntry()
beginMetadataStar(int)
@@ -2726,7 +2726,7 @@
beginMetadataStar(static)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, static, null, null, get, staticGetter)
+ beginMethod(DeclarationKind.Class, null, null, static, null, null, get, staticGetter, Bar)
beginRecordType(()
beginRecordTypeEntry()
beginMetadataStar(int)
diff --git a/pkg/front_end/parser_testcases/record/record_type_getter.dart.intertwined.expect b/pkg/front_end/parser_testcases/record/record_type_getter.dart.intertwined.expect
index 9b86513..7e57b30 100644
--- a/pkg/front_end/parser_testcases/record/record_type_getter.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/record/record_type_getter.dart.intertwined.expect
@@ -1764,7 +1764,7 @@
listener: beginMember()
isReservedKeyword(()
parseMethod({, null, null, null, null, null, null, null, {, ComplexTypeInfo(start: (, typeArguments: NoTypeParamOrArg(), beforeQuestionMark: null, end: ), typeVariableStarters: [], gftHasReturnType: null, isRecordType: true, gftReturnTypeHasRecordType: false, recovered: false), null, get, DeclarationKind.Class, Foo, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, get)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, get, Foo)
parseRecordType((, {, false)
listener: beginRecordType(()
parseRecordTypeField((, identifierIsOptional: true)
@@ -1856,7 +1856,7 @@
listener: beginMember()
isReservedKeyword(()
parseMethod(;, null, null, null, null, null, null, null, ;, ComplexTypeInfo(start: (, typeArguments: NoTypeParamOrArg(), beforeQuestionMark: null, end: ), typeVariableStarters: [], gftHasReturnType: null, isRecordType: true, gftReturnTypeHasRecordType: false, recovered: false), null, get, DeclarationKind.Class, Foo, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, get)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, get, Foo)
parseRecordType((, ;, false)
listener: beginRecordType(()
parseRecordTypeField((, identifierIsOptional: true)
@@ -1955,7 +1955,7 @@
listener: beginMember()
isReservedKeyword(()
parseMethod(}, null, null, null, null, null, null, null, }, ComplexTypeInfo(start: (, typeArguments: NoTypeParamOrArg(), beforeQuestionMark: null, end: ), typeVariableStarters: [], gftHasReturnType: null, isRecordType: true, gftReturnTypeHasRecordType: false, recovered: false), null, get, DeclarationKind.Class, Foo, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, get)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, get, Foo)
parseRecordType((, }, false)
listener: beginRecordType(()
parseRecordTypeField((, identifierIsOptional: true)
@@ -2035,7 +2035,7 @@
listener: beginMember()
isReservedKeyword(()
parseMethod(;, null, null, null, null, null, null, null, ;, ComplexTypeInfo(start: (, typeArguments: NoTypeParamOrArg(), beforeQuestionMark: null, end: ), typeVariableStarters: [], gftHasReturnType: null, isRecordType: true, gftReturnTypeHasRecordType: false, recovered: false), null, get, DeclarationKind.Class, Foo, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, get)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, get, Foo)
parseRecordType((, ;, false)
listener: beginRecordType(()
parseRecordTypeField((, identifierIsOptional: true)
@@ -2123,7 +2123,7 @@
listener: beginMember()
isReservedKeyword(()
parseMethod(}, null, null, null, null, null, null, null, }, ComplexTypeInfo(start: (, typeArguments: NoTypeParamOrArg(), beforeQuestionMark: null, end: ), typeVariableStarters: [], gftHasReturnType: null, isRecordType: true, gftReturnTypeHasRecordType: false, recovered: false), null, get, DeclarationKind.Class, Foo, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, get)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, get, Foo)
parseRecordType((, }, false)
listener: beginRecordType(()
parseRecordTypeField((, identifierIsOptional: true)
@@ -2204,7 +2204,7 @@
listener: beginMember()
isReservedKeyword(()
parseMethod(;, null, null, null, null, null, null, null, ;, ComplexTypeInfo(start: (, typeArguments: NoTypeParamOrArg(), beforeQuestionMark: null, end: ), typeVariableStarters: [], gftHasReturnType: null, isRecordType: true, gftReturnTypeHasRecordType: false, recovered: false), null, get, DeclarationKind.Class, Foo, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, get)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, get, Foo)
parseRecordType((, ;, false)
listener: beginRecordType(()
parseRecordTypeField((, identifierIsOptional: true)
@@ -2292,7 +2292,7 @@
listener: beginMember()
isReservedKeyword(()
parseMethod(}, null, null, null, null, null, null, null, }, ComplexTypeInfo(start: (, typeArguments: NoTypeParamOrArg(), beforeQuestionMark: null, end: ), typeVariableStarters: [], gftHasReturnType: null, isRecordType: true, gftReturnTypeHasRecordType: false, recovered: false), null, get, DeclarationKind.Class, Foo, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, get)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, get, Foo)
parseRecordType((, }, false)
listener: beginRecordType(()
parseRecordTypeField((, identifierIsOptional: true)
@@ -2373,7 +2373,7 @@
listener: beginMember()
isReservedKeyword(()
parseMethod(;, null, null, null, null, null, null, null, ;, ComplexTypeInfo(start: (, typeArguments: NoTypeParamOrArg(), beforeQuestionMark: null, end: ), typeVariableStarters: [], gftHasReturnType: null, isRecordType: true, gftReturnTypeHasRecordType: false, recovered: false), null, get, DeclarationKind.Class, Foo, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, get)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, get, Foo)
parseRecordType((, ;, false)
listener: beginRecordType(()
parseRecordTypeField((, identifierIsOptional: true)
@@ -2460,7 +2460,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(}, null, null, null, null, null, null, null, }, ComplexTypeInfo(start: (, typeArguments: NoTypeParamOrArg(), beforeQuestionMark: null, end: ), typeVariableStarters: [], gftHasReturnType: null, isRecordType: true, gftReturnTypeHasRecordType: false, recovered: false), get, get, DeclarationKind.Class, Foo, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, get)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, get, Foo)
parseRecordType((, }, false)
listener: beginRecordType(()
parseRecordTypeField((, identifierIsOptional: true)
@@ -2536,7 +2536,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(;, null, null, null, null, null, null, null, ;, ComplexTypeInfo(start: (, typeArguments: NoTypeParamOrArg(), beforeQuestionMark: null, end: ), typeVariableStarters: [], gftHasReturnType: null, isRecordType: true, gftReturnTypeHasRecordType: false, recovered: false), get, get, DeclarationKind.Class, Foo, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, get)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, get, Foo)
parseRecordType((, ;, false)
listener: beginRecordType(()
parseRecordTypeField((, identifierIsOptional: true)
@@ -2619,7 +2619,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(}, null, null, null, null, null, null, null, }, ComplexTypeInfo(start: (, typeArguments: NoTypeParamOrArg(), beforeQuestionMark: null, end: ), typeVariableStarters: [], gftHasReturnType: null, isRecordType: true, gftReturnTypeHasRecordType: false, recovered: false), get, get, DeclarationKind.Class, Foo, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, get)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, get, Foo)
parseRecordType((, }, false)
listener: beginRecordType(()
parseRecordTypeField((, identifierIsOptional: true)
@@ -2683,7 +2683,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(;, null, null, null, null, null, null, null, ;, ComplexTypeInfo(start: (, typeArguments: NoTypeParamOrArg(), beforeQuestionMark: null, end: ), typeVariableStarters: [], gftHasReturnType: null, isRecordType: true, gftReturnTypeHasRecordType: false, recovered: false), get, get, DeclarationKind.Class, Foo, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, get)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, get, Foo)
parseRecordType((, ;, false)
listener: beginRecordType(()
parseRecordTypeField((, identifierIsOptional: true)
@@ -2755,7 +2755,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(}, null, null, null, null, null, null, null, }, ComplexTypeInfo(start: (, typeArguments: NoTypeParamOrArg(), beforeQuestionMark: null, end: ), typeVariableStarters: [], gftHasReturnType: null, isRecordType: true, gftReturnTypeHasRecordType: false, recovered: false), get, get, DeclarationKind.Class, Foo, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, get)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, get, Foo)
parseRecordType((, }, false)
listener: beginRecordType(()
parseRecordTypeField((, identifierIsOptional: true)
@@ -2820,7 +2820,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(;, null, null, null, null, null, null, null, ;, ComplexTypeInfo(start: (, typeArguments: NoTypeParamOrArg(), beforeQuestionMark: null, end: ), typeVariableStarters: [], gftHasReturnType: null, isRecordType: true, gftReturnTypeHasRecordType: false, recovered: false), get, get, DeclarationKind.Class, Foo, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, get)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, get, Foo)
parseRecordType((, ;, false)
listener: beginRecordType(()
parseRecordTypeField((, identifierIsOptional: true)
@@ -2892,7 +2892,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(}, null, null, null, null, null, null, null, }, ComplexTypeInfo(start: (, typeArguments: NoTypeParamOrArg(), beforeQuestionMark: null, end: ), typeVariableStarters: [], gftHasReturnType: null, isRecordType: true, gftReturnTypeHasRecordType: false, recovered: false), get, get, DeclarationKind.Class, Foo, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, get)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, get, Foo)
parseRecordType((, }, false)
listener: beginRecordType(()
parseRecordTypeField((, identifierIsOptional: true)
@@ -2957,7 +2957,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(;, null, null, null, null, null, null, null, ;, ComplexTypeInfo(start: (, typeArguments: NoTypeParamOrArg(), beforeQuestionMark: null, end: ), typeVariableStarters: [], gftHasReturnType: null, isRecordType: true, gftReturnTypeHasRecordType: false, recovered: false), get, get, DeclarationKind.Class, Foo, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, get)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, get, Foo)
parseRecordType((, ;, false)
listener: beginRecordType(()
parseRecordTypeField((, identifierIsOptional: true)
@@ -3029,7 +3029,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(}, null, null, null, null, null, null, null, }, ComplexTypeInfo(start: (, typeArguments: NoTypeParamOrArg(), beforeQuestionMark: null, end: ), typeVariableStarters: [], gftHasReturnType: null, isRecordType: true, gftReturnTypeHasRecordType: false, recovered: false), get, instanceGetter, DeclarationKind.Class, Foo, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, instanceGetter)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, instanceGetter, Foo)
parseRecordType((, }, false)
listener: beginRecordType(()
parseRecordTypeField((, identifierIsOptional: true)
@@ -3105,7 +3105,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(;, null, null, null, null, null, null, null, ;, ComplexTypeInfo(start: (, typeArguments: NoTypeParamOrArg(), beforeQuestionMark: null, end: ), typeVariableStarters: [], gftHasReturnType: null, isRecordType: true, gftReturnTypeHasRecordType: false, recovered: false), get, instanceGetter, DeclarationKind.Class, Foo, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, instanceGetter)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, instanceGetter, Foo)
parseRecordType((, ;, false)
listener: beginRecordType(()
parseRecordTypeField((, identifierIsOptional: true)
@@ -3188,7 +3188,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(}, null, null, null, null, null, null, null, }, ComplexTypeInfo(start: (, typeArguments: NoTypeParamOrArg(), beforeQuestionMark: null, end: ), typeVariableStarters: [], gftHasReturnType: null, isRecordType: true, gftReturnTypeHasRecordType: false, recovered: false), get, instanceGetter, DeclarationKind.Class, Foo, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, instanceGetter)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, instanceGetter, Foo)
parseRecordType((, }, false)
listener: beginRecordType(()
parseRecordTypeField((, identifierIsOptional: true)
@@ -3252,7 +3252,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(;, null, null, null, null, null, null, null, ;, ComplexTypeInfo(start: (, typeArguments: NoTypeParamOrArg(), beforeQuestionMark: null, end: ), typeVariableStarters: [], gftHasReturnType: null, isRecordType: true, gftReturnTypeHasRecordType: false, recovered: false), get, instanceGetter, DeclarationKind.Class, Foo, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, instanceGetter)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, instanceGetter, Foo)
parseRecordType((, ;, false)
listener: beginRecordType(()
parseRecordTypeField((, identifierIsOptional: true)
@@ -3323,7 +3323,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(}, null, null, null, null, null, null, null, }, ComplexTypeInfo(start: (, typeArguments: NoTypeParamOrArg(), beforeQuestionMark: null, end: ), typeVariableStarters: [], gftHasReturnType: null, isRecordType: true, gftReturnTypeHasRecordType: false, recovered: false), get, instanceGetter, DeclarationKind.Class, Foo, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, instanceGetter)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, instanceGetter, Foo)
parseRecordType((, }, false)
listener: beginRecordType(()
parseRecordTypeField((, identifierIsOptional: true)
@@ -3388,7 +3388,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(;, null, null, null, null, null, null, null, ;, ComplexTypeInfo(start: (, typeArguments: NoTypeParamOrArg(), beforeQuestionMark: null, end: ), typeVariableStarters: [], gftHasReturnType: null, isRecordType: true, gftReturnTypeHasRecordType: false, recovered: false), get, instanceGetter, DeclarationKind.Class, Foo, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, instanceGetter)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, instanceGetter, Foo)
parseRecordType((, ;, false)
listener: beginRecordType(()
parseRecordTypeField((, identifierIsOptional: true)
@@ -3460,7 +3460,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(}, null, null, null, null, null, null, null, }, ComplexTypeInfo(start: (, typeArguments: NoTypeParamOrArg(), beforeQuestionMark: null, end: ), typeVariableStarters: [], gftHasReturnType: null, isRecordType: true, gftReturnTypeHasRecordType: false, recovered: false), get, instanceGetter, DeclarationKind.Class, Foo, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, instanceGetter)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, instanceGetter, Foo)
parseRecordType((, }, false)
listener: beginRecordType(()
parseRecordTypeField((, identifierIsOptional: true)
@@ -3525,7 +3525,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(;, null, null, null, null, null, null, null, ;, ComplexTypeInfo(start: (, typeArguments: NoTypeParamOrArg(), beforeQuestionMark: null, end: ), typeVariableStarters: [], gftHasReturnType: null, isRecordType: true, gftReturnTypeHasRecordType: false, recovered: false), get, instanceGetter, DeclarationKind.Class, Foo, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, instanceGetter)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, instanceGetter, Foo)
parseRecordType((, ;, false)
listener: beginRecordType(()
parseRecordTypeField((, identifierIsOptional: true)
@@ -3625,7 +3625,7 @@
listener: beginMember()
isReservedKeyword(()
parseMethod({, null, null, null, static, null, null, null, static, ComplexTypeInfo(start: (, typeArguments: NoTypeParamOrArg(), beforeQuestionMark: null, end: ), typeVariableStarters: [], gftHasReturnType: null, isRecordType: true, gftReturnTypeHasRecordType: false, recovered: false), null, get, DeclarationKind.Class, Bar, false)
- listener: beginMethod(DeclarationKind.Class, null, null, static, null, null, null, get)
+ listener: beginMethod(DeclarationKind.Class, null, null, static, null, null, null, get, Bar)
parseRecordType((, static, false)
listener: beginRecordType(()
parseRecordTypeField((, identifierIsOptional: true)
@@ -3716,7 +3716,7 @@
listener: beginMember()
isReservedKeyword(()
parseMethod(;, null, null, null, static, null, null, null, static, ComplexTypeInfo(start: (, typeArguments: NoTypeParamOrArg(), beforeQuestionMark: null, end: ), typeVariableStarters: [], gftHasReturnType: null, isRecordType: true, gftReturnTypeHasRecordType: false, recovered: false), null, get, DeclarationKind.Class, Bar, false)
- listener: beginMethod(DeclarationKind.Class, null, null, static, null, null, null, get)
+ listener: beginMethod(DeclarationKind.Class, null, null, static, null, null, null, get, Bar)
parseRecordType((, static, false)
listener: beginRecordType(()
parseRecordTypeField((, identifierIsOptional: true)
@@ -3814,7 +3814,7 @@
listener: beginMember()
isReservedKeyword(()
parseMethod(}, null, null, null, static, null, null, null, static, ComplexTypeInfo(start: (, typeArguments: NoTypeParamOrArg(), beforeQuestionMark: null, end: ), typeVariableStarters: [], gftHasReturnType: null, isRecordType: true, gftReturnTypeHasRecordType: false, recovered: false), null, get, DeclarationKind.Class, Bar, false)
- listener: beginMethod(DeclarationKind.Class, null, null, static, null, null, null, get)
+ listener: beginMethod(DeclarationKind.Class, null, null, static, null, null, null, get, Bar)
parseRecordType((, static, false)
listener: beginRecordType(()
parseRecordTypeField((, identifierIsOptional: true)
@@ -3893,7 +3893,7 @@
listener: beginMember()
isReservedKeyword(()
parseMethod(;, null, null, null, static, null, null, null, static, ComplexTypeInfo(start: (, typeArguments: NoTypeParamOrArg(), beforeQuestionMark: null, end: ), typeVariableStarters: [], gftHasReturnType: null, isRecordType: true, gftReturnTypeHasRecordType: false, recovered: false), null, get, DeclarationKind.Class, Bar, false)
- listener: beginMethod(DeclarationKind.Class, null, null, static, null, null, null, get)
+ listener: beginMethod(DeclarationKind.Class, null, null, static, null, null, null, get, Bar)
parseRecordType((, static, false)
listener: beginRecordType(()
parseRecordTypeField((, identifierIsOptional: true)
@@ -3980,7 +3980,7 @@
listener: beginMember()
isReservedKeyword(()
parseMethod(}, null, null, null, static, null, null, null, static, ComplexTypeInfo(start: (, typeArguments: NoTypeParamOrArg(), beforeQuestionMark: null, end: ), typeVariableStarters: [], gftHasReturnType: null, isRecordType: true, gftReturnTypeHasRecordType: false, recovered: false), null, get, DeclarationKind.Class, Bar, false)
- listener: beginMethod(DeclarationKind.Class, null, null, static, null, null, null, get)
+ listener: beginMethod(DeclarationKind.Class, null, null, static, null, null, null, get, Bar)
parseRecordType((, static, false)
listener: beginRecordType(()
parseRecordTypeField((, identifierIsOptional: true)
@@ -4060,7 +4060,7 @@
listener: beginMember()
isReservedKeyword(()
parseMethod(;, null, null, null, static, null, null, null, static, ComplexTypeInfo(start: (, typeArguments: NoTypeParamOrArg(), beforeQuestionMark: null, end: ), typeVariableStarters: [], gftHasReturnType: null, isRecordType: true, gftReturnTypeHasRecordType: false, recovered: false), null, get, DeclarationKind.Class, Bar, false)
- listener: beginMethod(DeclarationKind.Class, null, null, static, null, null, null, get)
+ listener: beginMethod(DeclarationKind.Class, null, null, static, null, null, null, get, Bar)
parseRecordType((, static, false)
listener: beginRecordType(()
parseRecordTypeField((, identifierIsOptional: true)
@@ -4147,7 +4147,7 @@
listener: beginMember()
isReservedKeyword(()
parseMethod(}, null, null, null, static, null, null, null, static, ComplexTypeInfo(start: (, typeArguments: NoTypeParamOrArg(), beforeQuestionMark: null, end: ), typeVariableStarters: [], gftHasReturnType: null, isRecordType: true, gftReturnTypeHasRecordType: false, recovered: false), null, get, DeclarationKind.Class, Bar, false)
- listener: beginMethod(DeclarationKind.Class, null, null, static, null, null, null, get)
+ listener: beginMethod(DeclarationKind.Class, null, null, static, null, null, null, get, Bar)
parseRecordType((, static, false)
listener: beginRecordType(()
parseRecordTypeField((, identifierIsOptional: true)
@@ -4227,7 +4227,7 @@
listener: beginMember()
isReservedKeyword(()
parseMethod(;, null, null, null, static, null, null, null, static, ComplexTypeInfo(start: (, typeArguments: NoTypeParamOrArg(), beforeQuestionMark: null, end: ), typeVariableStarters: [], gftHasReturnType: null, isRecordType: true, gftReturnTypeHasRecordType: false, recovered: false), null, get, DeclarationKind.Class, Bar, false)
- listener: beginMethod(DeclarationKind.Class, null, null, static, null, null, null, get)
+ listener: beginMethod(DeclarationKind.Class, null, null, static, null, null, null, get, Bar)
parseRecordType((, static, false)
listener: beginRecordType(()
parseRecordTypeField((, identifierIsOptional: true)
@@ -4313,7 +4313,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(}, null, null, null, static, null, null, null, static, ComplexTypeInfo(start: (, typeArguments: NoTypeParamOrArg(), beforeQuestionMark: null, end: ), typeVariableStarters: [], gftHasReturnType: null, isRecordType: true, gftReturnTypeHasRecordType: false, recovered: false), get, get, DeclarationKind.Class, Bar, false)
- listener: beginMethod(DeclarationKind.Class, null, null, static, null, null, get, get)
+ listener: beginMethod(DeclarationKind.Class, null, null, static, null, null, get, get, Bar)
parseRecordType((, static, false)
listener: beginRecordType(()
parseRecordTypeField((, identifierIsOptional: true)
@@ -4388,7 +4388,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(;, null, null, null, static, null, null, null, static, ComplexTypeInfo(start: (, typeArguments: NoTypeParamOrArg(), beforeQuestionMark: null, end: ), typeVariableStarters: [], gftHasReturnType: null, isRecordType: true, gftReturnTypeHasRecordType: false, recovered: false), get, get, DeclarationKind.Class, Bar, false)
- listener: beginMethod(DeclarationKind.Class, null, null, static, null, null, get, get)
+ listener: beginMethod(DeclarationKind.Class, null, null, static, null, null, get, get, Bar)
parseRecordType((, static, false)
listener: beginRecordType(()
parseRecordTypeField((, identifierIsOptional: true)
@@ -4470,7 +4470,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(}, null, null, null, static, null, null, null, static, ComplexTypeInfo(start: (, typeArguments: NoTypeParamOrArg(), beforeQuestionMark: null, end: ), typeVariableStarters: [], gftHasReturnType: null, isRecordType: true, gftReturnTypeHasRecordType: false, recovered: false), get, get, DeclarationKind.Class, Bar, false)
- listener: beginMethod(DeclarationKind.Class, null, null, static, null, null, get, get)
+ listener: beginMethod(DeclarationKind.Class, null, null, static, null, null, get, get, Bar)
parseRecordType((, static, false)
listener: beginRecordType(()
parseRecordTypeField((, identifierIsOptional: true)
@@ -4533,7 +4533,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(;, null, null, null, static, null, null, null, static, ComplexTypeInfo(start: (, typeArguments: NoTypeParamOrArg(), beforeQuestionMark: null, end: ), typeVariableStarters: [], gftHasReturnType: null, isRecordType: true, gftReturnTypeHasRecordType: false, recovered: false), get, get, DeclarationKind.Class, Bar, false)
- listener: beginMethod(DeclarationKind.Class, null, null, static, null, null, get, get)
+ listener: beginMethod(DeclarationKind.Class, null, null, static, null, null, get, get, Bar)
parseRecordType((, static, false)
listener: beginRecordType(()
parseRecordTypeField((, identifierIsOptional: true)
@@ -4604,7 +4604,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(}, null, null, null, static, null, null, null, static, ComplexTypeInfo(start: (, typeArguments: NoTypeParamOrArg(), beforeQuestionMark: null, end: ), typeVariableStarters: [], gftHasReturnType: null, isRecordType: true, gftReturnTypeHasRecordType: false, recovered: false), get, get, DeclarationKind.Class, Bar, false)
- listener: beginMethod(DeclarationKind.Class, null, null, static, null, null, get, get)
+ listener: beginMethod(DeclarationKind.Class, null, null, static, null, null, get, get, Bar)
parseRecordType((, static, false)
listener: beginRecordType(()
parseRecordTypeField((, identifierIsOptional: true)
@@ -4668,7 +4668,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(;, null, null, null, static, null, null, null, static, ComplexTypeInfo(start: (, typeArguments: NoTypeParamOrArg(), beforeQuestionMark: null, end: ), typeVariableStarters: [], gftHasReturnType: null, isRecordType: true, gftReturnTypeHasRecordType: false, recovered: false), get, get, DeclarationKind.Class, Bar, false)
- listener: beginMethod(DeclarationKind.Class, null, null, static, null, null, get, get)
+ listener: beginMethod(DeclarationKind.Class, null, null, static, null, null, get, get, Bar)
parseRecordType((, static, false)
listener: beginRecordType(()
parseRecordTypeField((, identifierIsOptional: true)
@@ -4739,7 +4739,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(}, null, null, null, static, null, null, null, static, ComplexTypeInfo(start: (, typeArguments: NoTypeParamOrArg(), beforeQuestionMark: null, end: ), typeVariableStarters: [], gftHasReturnType: null, isRecordType: true, gftReturnTypeHasRecordType: false, recovered: false), get, get, DeclarationKind.Class, Bar, false)
- listener: beginMethod(DeclarationKind.Class, null, null, static, null, null, get, get)
+ listener: beginMethod(DeclarationKind.Class, null, null, static, null, null, get, get, Bar)
parseRecordType((, static, false)
listener: beginRecordType(()
parseRecordTypeField((, identifierIsOptional: true)
@@ -4803,7 +4803,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(;, null, null, null, static, null, null, null, static, ComplexTypeInfo(start: (, typeArguments: NoTypeParamOrArg(), beforeQuestionMark: null, end: ), typeVariableStarters: [], gftHasReturnType: null, isRecordType: true, gftReturnTypeHasRecordType: false, recovered: false), get, get, DeclarationKind.Class, Bar, false)
- listener: beginMethod(DeclarationKind.Class, null, null, static, null, null, get, get)
+ listener: beginMethod(DeclarationKind.Class, null, null, static, null, null, get, get, Bar)
parseRecordType((, static, false)
listener: beginRecordType(()
parseRecordTypeField((, identifierIsOptional: true)
@@ -4874,7 +4874,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(}, null, null, null, static, null, null, null, static, ComplexTypeInfo(start: (, typeArguments: NoTypeParamOrArg(), beforeQuestionMark: null, end: ), typeVariableStarters: [], gftHasReturnType: null, isRecordType: true, gftReturnTypeHasRecordType: false, recovered: false), get, staticGetter, DeclarationKind.Class, Bar, false)
- listener: beginMethod(DeclarationKind.Class, null, null, static, null, null, get, staticGetter)
+ listener: beginMethod(DeclarationKind.Class, null, null, static, null, null, get, staticGetter, Bar)
parseRecordType((, static, false)
listener: beginRecordType(()
parseRecordTypeField((, identifierIsOptional: true)
@@ -4949,7 +4949,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(;, null, null, null, static, null, null, null, static, ComplexTypeInfo(start: (, typeArguments: NoTypeParamOrArg(), beforeQuestionMark: null, end: ), typeVariableStarters: [], gftHasReturnType: null, isRecordType: true, gftReturnTypeHasRecordType: false, recovered: false), get, staticGetter, DeclarationKind.Class, Bar, false)
- listener: beginMethod(DeclarationKind.Class, null, null, static, null, null, get, staticGetter)
+ listener: beginMethod(DeclarationKind.Class, null, null, static, null, null, get, staticGetter, Bar)
parseRecordType((, static, false)
listener: beginRecordType(()
parseRecordTypeField((, identifierIsOptional: true)
@@ -5031,7 +5031,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(}, null, null, null, static, null, null, null, static, ComplexTypeInfo(start: (, typeArguments: NoTypeParamOrArg(), beforeQuestionMark: null, end: ), typeVariableStarters: [], gftHasReturnType: null, isRecordType: true, gftReturnTypeHasRecordType: false, recovered: false), get, staticGetter, DeclarationKind.Class, Bar, false)
- listener: beginMethod(DeclarationKind.Class, null, null, static, null, null, get, staticGetter)
+ listener: beginMethod(DeclarationKind.Class, null, null, static, null, null, get, staticGetter, Bar)
parseRecordType((, static, false)
listener: beginRecordType(()
parseRecordTypeField((, identifierIsOptional: true)
@@ -5094,7 +5094,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(;, null, null, null, static, null, null, null, static, ComplexTypeInfo(start: (, typeArguments: NoTypeParamOrArg(), beforeQuestionMark: null, end: ), typeVariableStarters: [], gftHasReturnType: null, isRecordType: true, gftReturnTypeHasRecordType: false, recovered: false), get, staticGetter, DeclarationKind.Class, Bar, false)
- listener: beginMethod(DeclarationKind.Class, null, null, static, null, null, get, staticGetter)
+ listener: beginMethod(DeclarationKind.Class, null, null, static, null, null, get, staticGetter, Bar)
parseRecordType((, static, false)
listener: beginRecordType(()
parseRecordTypeField((, identifierIsOptional: true)
@@ -5165,7 +5165,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(}, null, null, null, static, null, null, null, static, ComplexTypeInfo(start: (, typeArguments: NoTypeParamOrArg(), beforeQuestionMark: null, end: ), typeVariableStarters: [], gftHasReturnType: null, isRecordType: true, gftReturnTypeHasRecordType: false, recovered: false), get, staticGetter, DeclarationKind.Class, Bar, false)
- listener: beginMethod(DeclarationKind.Class, null, null, static, null, null, get, staticGetter)
+ listener: beginMethod(DeclarationKind.Class, null, null, static, null, null, get, staticGetter, Bar)
parseRecordType((, static, false)
listener: beginRecordType(()
parseRecordTypeField((, identifierIsOptional: true)
@@ -5229,7 +5229,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(;, null, null, null, static, null, null, null, static, ComplexTypeInfo(start: (, typeArguments: NoTypeParamOrArg(), beforeQuestionMark: null, end: ), typeVariableStarters: [], gftHasReturnType: null, isRecordType: true, gftReturnTypeHasRecordType: false, recovered: false), get, staticGetter, DeclarationKind.Class, Bar, false)
- listener: beginMethod(DeclarationKind.Class, null, null, static, null, null, get, staticGetter)
+ listener: beginMethod(DeclarationKind.Class, null, null, static, null, null, get, staticGetter, Bar)
parseRecordType((, static, false)
listener: beginRecordType(()
parseRecordTypeField((, identifierIsOptional: true)
@@ -5300,7 +5300,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(}, null, null, null, static, null, null, null, static, ComplexTypeInfo(start: (, typeArguments: NoTypeParamOrArg(), beforeQuestionMark: null, end: ), typeVariableStarters: [], gftHasReturnType: null, isRecordType: true, gftReturnTypeHasRecordType: false, recovered: false), get, staticGetter, DeclarationKind.Class, Bar, false)
- listener: beginMethod(DeclarationKind.Class, null, null, static, null, null, get, staticGetter)
+ listener: beginMethod(DeclarationKind.Class, null, null, static, null, null, get, staticGetter, Bar)
parseRecordType((, static, false)
listener: beginRecordType(()
parseRecordTypeField((, identifierIsOptional: true)
@@ -5364,7 +5364,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(;, null, null, null, static, null, null, null, static, ComplexTypeInfo(start: (, typeArguments: NoTypeParamOrArg(), beforeQuestionMark: null, end: ), typeVariableStarters: [], gftHasReturnType: null, isRecordType: true, gftReturnTypeHasRecordType: false, recovered: false), get, staticGetter, DeclarationKind.Class, Bar, false)
- listener: beginMethod(DeclarationKind.Class, null, null, static, null, null, get, staticGetter)
+ listener: beginMethod(DeclarationKind.Class, null, null, static, null, null, get, staticGetter, Bar)
parseRecordType((, static, false)
listener: beginRecordType(()
parseRecordTypeField((, identifierIsOptional: true)
diff --git a/pkg/front_end/parser_testcases/record/record_type_setter.dart.expect b/pkg/front_end/parser_testcases/record/record_type_setter.dart.expect
index ee5f70d..d4634a6 100644
--- a/pkg/front_end/parser_testcases/record/record_type_setter.dart.expect
+++ b/pkg/front_end/parser_testcases/record/record_type_setter.dart.expect
@@ -176,7 +176,7 @@
beginMetadataStar(()
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, set)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, set, Foo)
beginRecordType(()
beginRecordTypeEntry()
beginMetadataStar(int)
@@ -221,7 +221,7 @@
beginMetadataStar(void)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, set, set)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, set, set, Foo)
handleVoidKeyword(void)
handleIdentifier(set, methodDeclaration)
handleNoTypeVariables(()
@@ -264,7 +264,7 @@
beginMetadataStar(()
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, get, set)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, get, set, Foo)
beginRecordType(()
beginRecordTypeEntry()
beginMetadataStar(int)
@@ -299,7 +299,7 @@
beginMetadataStar(void)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, set, instanceSetter)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, set, instanceSetter, Foo)
handleVoidKeyword(void)
handleIdentifier(instanceSetter, methodDeclaration)
handleNoTypeVariables(()
@@ -357,7 +357,7 @@
beginMetadataStar(static)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, static, null, null, null, set)
+ beginMethod(DeclarationKind.Class, null, null, static, null, null, null, set, Bar)
beginRecordType(()
beginRecordTypeEntry()
beginMetadataStar(int)
@@ -402,7 +402,7 @@
beginMetadataStar(static)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, static, null, null, set, set)
+ beginMethod(DeclarationKind.Class, null, null, static, null, null, set, set, Bar)
handleVoidKeyword(void)
handleIdentifier(set, methodDeclaration)
handleNoTypeVariables(()
@@ -445,7 +445,7 @@
beginMetadataStar(static)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, static, null, null, get, set)
+ beginMethod(DeclarationKind.Class, null, null, static, null, null, get, set, Bar)
beginRecordType(()
beginRecordTypeEntry()
beginMetadataStar(int)
@@ -480,7 +480,7 @@
beginMetadataStar(static)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, static, null, null, set, staticSetter)
+ beginMethod(DeclarationKind.Class, null, null, static, null, null, set, staticSetter, Bar)
handleVoidKeyword(void)
handleIdentifier(staticSetter, methodDeclaration)
handleNoTypeVariables(()
diff --git a/pkg/front_end/parser_testcases/record/record_type_setter.dart.intertwined.expect b/pkg/front_end/parser_testcases/record/record_type_setter.dart.intertwined.expect
index 526c762..8fe4680 100644
--- a/pkg/front_end/parser_testcases/record/record_type_setter.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/record/record_type_setter.dart.intertwined.expect
@@ -362,7 +362,7 @@
listener: beginMember()
isReservedKeyword(()
parseMethod({, null, null, null, null, null, null, null, {, ComplexTypeInfo(start: (, typeArguments: NoTypeParamOrArg(), beforeQuestionMark: null, end: ), typeVariableStarters: [], gftHasReturnType: null, isRecordType: true, gftReturnTypeHasRecordType: false, recovered: false), null, set, DeclarationKind.Class, Foo, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, set)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, set, Foo)
parseRecordType((, {, false)
listener: beginRecordType(()
parseRecordTypeField((, identifierIsOptional: true)
@@ -453,7 +453,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(;, null, null, null, null, null, null, null, ;, VoidType(), set, set, DeclarationKind.Class, Foo, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, set, set)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, set, set, Foo)
listener: handleVoidKeyword(void)
ensureIdentifierPotentiallyRecovered(set, methodDeclaration, false)
listener: handleIdentifier(set, methodDeclaration)
@@ -542,7 +542,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(;, null, null, null, null, null, null, null, ;, ComplexTypeInfo(start: (, typeArguments: NoTypeParamOrArg(), beforeQuestionMark: null, end: ), typeVariableStarters: [], gftHasReturnType: null, isRecordType: true, gftReturnTypeHasRecordType: false, recovered: false), get, set, DeclarationKind.Class, Foo, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, set)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, set, Foo)
parseRecordType((, ;, false)
listener: beginRecordType(()
parseRecordTypeField((, identifierIsOptional: true)
@@ -618,7 +618,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(;, null, null, null, null, null, null, null, ;, VoidType(), set, instanceSetter, DeclarationKind.Class, Foo, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, set, instanceSetter)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, set, instanceSetter, Foo)
listener: handleVoidKeyword(void)
ensureIdentifierPotentiallyRecovered(set, methodDeclaration, false)
listener: handleIdentifier(instanceSetter, methodDeclaration)
@@ -735,7 +735,7 @@
listener: beginMember()
isReservedKeyword(()
parseMethod({, null, null, null, static, null, null, null, static, ComplexTypeInfo(start: (, typeArguments: NoTypeParamOrArg(), beforeQuestionMark: null, end: ), typeVariableStarters: [], gftHasReturnType: null, isRecordType: true, gftReturnTypeHasRecordType: false, recovered: false), null, set, DeclarationKind.Class, Bar, false)
- listener: beginMethod(DeclarationKind.Class, null, null, static, null, null, null, set)
+ listener: beginMethod(DeclarationKind.Class, null, null, static, null, null, null, set, Bar)
parseRecordType((, static, false)
listener: beginRecordType(()
parseRecordTypeField((, identifierIsOptional: true)
@@ -825,7 +825,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(;, null, null, null, static, null, null, null, static, VoidType(), set, set, DeclarationKind.Class, Bar, false)
- listener: beginMethod(DeclarationKind.Class, null, null, static, null, null, set, set)
+ listener: beginMethod(DeclarationKind.Class, null, null, static, null, null, set, set, Bar)
listener: handleVoidKeyword(void)
ensureIdentifierPotentiallyRecovered(set, methodDeclaration, false)
listener: handleIdentifier(set, methodDeclaration)
@@ -913,7 +913,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(;, null, null, null, static, null, null, null, static, ComplexTypeInfo(start: (, typeArguments: NoTypeParamOrArg(), beforeQuestionMark: null, end: ), typeVariableStarters: [], gftHasReturnType: null, isRecordType: true, gftReturnTypeHasRecordType: false, recovered: false), get, set, DeclarationKind.Class, Bar, false)
- listener: beginMethod(DeclarationKind.Class, null, null, static, null, null, get, set)
+ listener: beginMethod(DeclarationKind.Class, null, null, static, null, null, get, set, Bar)
parseRecordType((, static, false)
listener: beginRecordType(()
parseRecordTypeField((, identifierIsOptional: true)
@@ -988,7 +988,7 @@
listener: endMetadataStar(0)
listener: beginMember()
parseMethod(;, null, null, null, static, null, null, null, static, VoidType(), set, staticSetter, DeclarationKind.Class, Bar, false)
- listener: beginMethod(DeclarationKind.Class, null, null, static, null, null, set, staticSetter)
+ listener: beginMethod(DeclarationKind.Class, null, null, static, null, null, set, staticSetter, Bar)
listener: handleVoidKeyword(void)
ensureIdentifierPotentiallyRecovered(set, methodDeclaration, false)
listener: handleIdentifier(staticSetter, methodDeclaration)
diff --git a/pkg/front_end/parser_testcases/record/super_parameters_record_type.dart.expect b/pkg/front_end/parser_testcases/record/super_parameters_record_type.dart.expect
index 38c8b58..9214aeb 100644
--- a/pkg/front_end/parser_testcases/record/super_parameters_record_type.dart.expect
+++ b/pkg/front_end/parser_testcases/record/super_parameters_record_type.dart.expect
@@ -16,7 +16,7 @@
beginMetadataStar(Foo)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo)
handleNoType({)
handleIdentifier(Foo, methodDeclaration)
handleNoTypeVariables(()
@@ -54,7 +54,7 @@
beginMetadataStar(Foo)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo)
handleNoType(;)
handleIdentifier(Foo, methodDeclaration)
handleNoTypeVariables(()
@@ -94,7 +94,7 @@
beginMetadataStar(Foo)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo)
handleNoType(;)
handleIdentifier(Foo, methodDeclaration)
handleNoTypeVariables(()
@@ -134,7 +134,7 @@
beginMetadataStar(Foo)
endMetadataStar(0)
beginMember()
- beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo)
+ beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo)
handleNoType(;)
handleIdentifier(Foo, methodDeclaration)
handleNoTypeVariables(()
diff --git a/pkg/front_end/parser_testcases/record/super_parameters_record_type.dart.intertwined.expect b/pkg/front_end/parser_testcases/record/super_parameters_record_type.dart.intertwined.expect
index c1a116f..b798b18 100644
--- a/pkg/front_end/parser_testcases/record/super_parameters_record_type.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/record/super_parameters_record_type.dart.intertwined.expect
@@ -36,7 +36,7 @@
listener: beginMember()
isReservedKeyword(()
parseMethod({, null, null, null, null, null, null, null, {, NoType(), null, Foo, DeclarationKind.Class, Foo, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo)
listener: handleNoType({)
ensureIdentifierPotentiallyRecovered({, methodDeclaration, false)
listener: handleIdentifier(Foo, methodDeclaration)
@@ -98,7 +98,7 @@
listener: beginMember()
isReservedKeyword(()
parseMethod(;, null, null, null, null, null, null, null, ;, NoType(), null, Foo, DeclarationKind.Class, Foo, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo)
listener: handleNoType(;)
ensureIdentifierPotentiallyRecovered(;, methodDeclaration, false)
listener: handleIdentifier(Foo, methodDeclaration)
@@ -164,7 +164,7 @@
listener: beginMember()
isReservedKeyword(()
parseMethod(;, null, null, null, null, null, null, null, ;, NoType(), null, Foo, DeclarationKind.Class, Foo, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo)
listener: handleNoType(;)
ensureIdentifierPotentiallyRecovered(;, methodDeclaration, false)
listener: handleIdentifier(Foo, methodDeclaration)
@@ -230,7 +230,7 @@
listener: beginMember()
isReservedKeyword(()
parseMethod(;, null, null, null, null, null, null, null, ;, NoType(), null, Foo, DeclarationKind.Class, Foo, false)
- listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo)
+ listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo)
listener: handleNoType(;)
ensureIdentifierPotentiallyRecovered(;, methodDeclaration, false)
listener: handleIdentifier(Foo, methodDeclaration)
diff --git a/pkg/front_end/test/parser_test_listener.dart b/pkg/front_end/test/parser_test_listener.dart
index ae2f7a3..0c151e5 100644
--- a/pkg/front_end/test/parser_test_listener.dart
+++ b/pkg/front_end/test/parser_test_listener.dart
@@ -1661,7 +1661,8 @@
Token? covariantToken,
Token? varFinalOrConst,
Token? getOrSet,
- Token name) {
+ Token name,
+ String? enclosingDeclarationName) {
seen(augmentToken);
seen(externalToken);
seen(staticToken);
@@ -1677,7 +1678,8 @@
'$covariantToken, '
'$varFinalOrConst, '
'$getOrSet, '
- '$name)');
+ '$name, '
+ '$enclosingDeclarationName)');
indent++;
}
diff --git a/pkg/front_end/test/parser_test_listener_creator.dart b/pkg/front_end/test/parser_test_listener_creator.dart
index b346ad1..9bf837d 100644
--- a/pkg/front_end/test/parser_test_listener_creator.dart
+++ b/pkg/front_end/test/parser_test_listener_creator.dart
@@ -157,7 +157,8 @@
Token? covariantToken,
Token? varFinalOrConst,
Token? getOrSet,
- Token name) {
+ Token name,
+ String? enclosingDeclarationName) {
currentMethodName = name.lexeme;
}
diff --git a/pkg/front_end/test/parser_test_parser_creator.dart b/pkg/front_end/test/parser_test_parser_creator.dart
index e772834..fb52e96 100644
--- a/pkg/front_end/test/parser_test_parser_creator.dart
+++ b/pkg/front_end/test/parser_test_parser_creator.dart
@@ -156,7 +156,8 @@
Token? covariantToken,
Token? varFinalOrConst,
Token? getOrSet,
- Token name) {
+ Token name,
+ String? enclosingDeclarationName) {
currentMethodName = name.lexeme;
}
diff --git a/pkg/front_end/tool/_fasta/parser_ast_helper_creator.dart b/pkg/front_end/tool/_fasta/parser_ast_helper_creator.dart
index c0dd813..454485f 100644
--- a/pkg/front_end/tool/_fasta/parser_ast_helper_creator.dart
+++ b/pkg/front_end/tool/_fasta/parser_ast_helper_creator.dart
@@ -164,7 +164,8 @@
Token? covariantToken,
Token? varFinalOrConst,
Token? getOrSet,
- Token name) {
+ Token name,
+ String? enclosingDeclarationName) {
currentMethodName = name.lexeme;
}
