From 808b2512b4fe06f274aea4e91c6d3760caf41bf2 Mon Sep 17 00:00:00 2001 From: Johnni Winther Date: Tue, 18 Nov 2025 05:26:52 -0800 Subject: [PATCH] [parser] Add beginConstructor This adds a beginConstructor listener method and calls this before constructor instead of beginMethod. This makes it possible for listeners to fully separate handling of constructors from methods. Change-Id: Ibcbcf76ccb6d97314d395c4c0efcb4f9d073519a Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/462140 Reviewed-by: Konstantin Shcheglov Commit-Queue: Johnni Winther --- .../lib/src/parser/forwarding_listener.dart | 25 +++++ .../lib/src/parser/listener.dart | 15 ++- .../lib/src/parser/parser_impl.dart | 40 ++++--- pkg/analyzer/lib/src/fasta/ast_builder.dart | 103 +++++++++++++----- .../test/generated/parser_fasta_listener.dart | 26 +++++ .../lib/src/source/outline_builder.dart | 49 +++++++++ pkg/front_end/lib/src/util/parser_ast.dart | 2 - .../lib/src/util/parser_ast_helper.dart | 76 +++++++++++++ ...primary_constructor_body_error.dart.expect | 4 +- ...tructor_body_error.dart.intertwined.expect | 4 +- .../declaring_parameter_error.dart.expect | 4 +- ...ng_parameter_error.dart.intertwined.expect | 4 +- ...primary_constructor_body_error.dart.expect | 4 +- ...tructor_body_error.dart.intertwined.expect | 4 +- .../const_no_identifier_recovery.dart.expect | 2 +- ...dentifier_recovery.dart.intertwined.expect | 2 +- .../const_property_recovery.dart.expect | 2 +- ..._property_recovery.dart.intertwined.expect | 2 +- .../entries_with_type_arguments.dart.expect | 4 +- ...ith_type_arguments.dart.intertwined.expect | 4 +- .../bracket_mismatch_01.dart.expect | 4 +- ...racket_mismatch_01.dart.intertwined.expect | 4 +- ...ecovery_bad_name_general.crash_dart.expect | 26 ++--- ...name_general.crash_dart.intertwined.expect | 26 ++--- ...or_recovery_bad_name_get.crash_dart.expect | 6 +- ...bad_name_get.crash_dart.intertwined.expect | 6 +- ...ery_bad_name_return_type.crash_dart.expect | 6 +- ..._return_type.crash_dart.intertwined.expect | 6 +- ...or_recovery_bad_name_set.crash_dart.expect | 6 +- ...bad_name_set.crash_dart.intertwined.expect | 6 +- .../constructor_recovery_get.dart.expect | 6 +- ...uctor_recovery_get.dart.intertwined.expect | 6 +- .../constructor_recovery_ok.dart.expect | 8 +- ...ructor_recovery_ok.dart.intertwined.expect | 8 +- ...ructor_recovery_operator.crash_dart.expect | 12 +- ...ery_operator.crash_dart.intertwined.expect | 12 +- ...nstructor_recovery_return_type.dart.expect | 8 +- ...covery_return_type.dart.intertwined.expect | 8 +- .../constructor_recovery_set.dart.expect | 6 +- ...uctor_recovery_set.dart.intertwined.expect | 6 +- .../error_recovery/issue_22313.dart.expect | 6 +- .../issue_22313.dart.intertwined.expect | 6 +- .../error_recovery/issue_22314.dart.expect | 2 +- .../issue_22314.dart.intertwined.expect | 2 +- .../error_recovery/issue_26810.dart.expect | 4 +- .../issue_26810.dart.intertwined.expect | 4 +- .../issue_26810_and.dart.expect | 4 +- .../issue_26810_and.dart.intertwined.expect | 4 +- .../error_recovery/issue_26810_or.dart.expect | 4 +- .../issue_26810_or.dart.intertwined.expect | 4 +- .../issue_39230.crash_dart.expect | 4 +- .../issue_39230.crash_dart.intertwined.expect | 4 +- .../error_recovery/issue_48380_1.dart.expect | 4 +- .../issue_48380_1.dart.intertwined.expect | 4 +- .../issue_48380_1_comma.dart.expect | 4 +- ...ssue_48380_1_comma.dart.intertwined.expect | 4 +- .../issue_48380_1_comma_ok.dart.expect | 4 +- ...e_48380_1_comma_ok.dart.intertwined.expect | 4 +- .../issue_48380_1_ok.dart.expect | 4 +- .../issue_48380_1_ok.dart.intertwined.expect | 4 +- .../error_recovery/issue_48380_2.dart.expect | 4 +- .../issue_48380_2.dart.intertwined.expect | 4 +- .../issue_48380_2_comma.dart.expect | 4 +- ...ssue_48380_2_comma.dart.intertwined.expect | 4 +- .../issue_48380_2_comma_ok.dart.expect | 4 +- ...e_48380_2_comma_ok.dart.intertwined.expect | 4 +- .../issue_48380_2_ok.dart.expect | 4 +- .../issue_48380_2_ok.dart.intertwined.expect | 4 +- .../error_recovery/issue_48380_3.dart.expect | 4 +- .../issue_48380_3.dart.intertwined.expect | 4 +- .../issue_48380_3_comma.dart.expect | 4 +- ...ssue_48380_3_comma.dart.intertwined.expect | 4 +- .../issue_48380_3_comma_ok.dart.expect | 4 +- ...e_48380_3_comma_ok.dart.intertwined.expect | 4 +- .../issue_48380_3_ok.dart.expect | 4 +- .../issue_48380_3_ok.dart.intertwined.expect | 4 +- .../error_recovery/issue_48411.dart.expect | 18 +-- .../issue_48411.dart.intertwined.expect | 18 +-- .../issue_48411_prime.dart.expect | 18 +-- .../issue_48411_prime.dart.intertwined.expect | 18 +-- .../issue_48411_prime_1.dart.expect | 8 +- ...ssue_48411_prime_1.dart.intertwined.expect | 8 +- .../error_recovery/issue_54284.dart.expect | 12 +- .../issue_54284.dart.intertwined.expect | 12 +- .../general/issue_41121.dart.expect | 10 +- .../issue_41121.dart.intertwined.expect | 10 +- .../general/new_as_identifier.dart.expect | 8 +- .../new_as_identifier.dart.intertwined.expect | 8 +- .../operator_hat_class.crash_dart.expect | 2 +- ...or_hat_class.crash_dart.intertwined.expect | 2 +- .../inline_class/extension_type.dart.expect | 4 +- .../extension_type.dart.intertwined.expect | 4 +- .../extension_type_const.dart.expect | 4 +- ...tension_type_const.dart.intertwined.expect | 4 +- .../nnbd/issue_40834_01.dart.expect | 10 +- .../issue_40834_01.dart.intertwined.expect | 10 +- .../nnbd/issue_40834_02.dart.expect | 2 +- .../issue_40834_02.dart.intertwined.expect | 2 +- .../nnbd/issue_40834_03.dart.expect | 2 +- .../issue_40834_03.dart.intertwined.expect | 2 +- .../nnbd/issue_41597.dart.expect | 4 +- .../nnbd/issue_41597.dart.intertwined.expect | 4 +- .../nnbd/issue_49132.dart.expect | 16 +-- .../nnbd/issue_49132.dart.intertwined.expect | 16 +-- .../nnbd/issue_49132_not_nullable.dart.expect | 8 +- ...49132_not_nullable.dart.intertwined.expect | 8 +- .../nnbd/issue_49132_prime.dart.expect | 16 +-- .../issue_49132_prime.dart.intertwined.expect | 16 +-- .../patterns/const_patterns.dart.expect | 6 +- .../const_patterns.dart.intertwined.expect | 6 +- .../patterns/issue_51169.dart.expect | 2 +- .../issue_51169.dart.intertwined.expect | 2 +- ...eter_with_explicit_record_type.dart.expect | 12 +- ...plicit_record_type.dart.intertwined.expect | 12 +- .../super_parameters_record_type.dart.expect | 8 +- ...meters_record_type.dart.intertwined.expect | 8 +- pkg/front_end/test/parser_test_listener.dart | 34 ++++++ .../test/parser_test_listener_creator.dart | 15 +++ .../test/parser_test_parser_creator.dart | 15 +++ .../tool/parser_ast_helper_creator.dart | 15 +++ 120 files changed, 722 insertions(+), 393 deletions(-) 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 f2a434cae9c..fe27755ac68 100644 --- a/pkg/_fe_analyzer_shared/lib/src/parser/forwarding_listener.dart +++ b/pkg/_fe_analyzer_shared/lib/src/parser/forwarding_listener.dart @@ -135,6 +135,31 @@ class ForwardingListener implements Listener { listener?.beginConstLiteral(token); } + @override + void beginConstructor( + DeclarationKind declarationKind, + Token? augmentToken, + Token? externalToken, + Token? staticToken, + Token? covariantToken, + Token? varFinalOrConst, + Token? getOrSet, + Token name, + String? enclosingDeclarationName, + ) { + listener?.beginConstructor( + declarationKind, + augmentToken, + externalToken, + staticToken, + covariantToken, + varFinalOrConst, + getOrSet, + name, + enclosingDeclarationName, + ); + } + @override void beginConstructorReference(Token start) { listener?.beginConstructorReference(start); diff --git a/pkg/_fe_analyzer_shared/lib/src/parser/listener.dart b/pkg/_fe_analyzer_shared/lib/src/parser/listener.dart index 300a23a2133..9bbd8600fe4 100644 --- a/pkg/_fe_analyzer_shared/lib/src/parser/listener.dart +++ b/pkg/_fe_analyzer_shared/lib/src/parser/listener.dart @@ -1160,7 +1160,6 @@ abstract class Listener implements UnescapeErrorListener { /// Handle the beginning of a class-like method declaration. Substructures: /// - metadata - /// Note that this is ended with [endConstructor] or [endMethod]. void beginMethod( DeclarationKind declarationKind, Token? augmentToken, @@ -1194,6 +1193,20 @@ abstract class Listener implements UnescapeErrorListener { logEvent("Method"); } + /// Handle the beginning of a constructor declaration. Substructures: + /// - metadata + void beginConstructor( + DeclarationKind declarationKind, + Token? augmentToken, + Token? externalToken, + Token? staticToken, + Token? covariantToken, + Token? varFinalOrConst, + Token? getOrSet, + Token name, + String? enclosingDeclarationName, + ) {} + /// Handle the end of a constructor declaration. Substructures: /// - metadata /// - return type 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 b0f577db332..c3ba3b24499 100644 --- a/pkg/_fe_analyzer_shared/lib/src/parser/parser_impl.dart +++ b/pkg/_fe_analyzer_shared/lib/src/parser/parser_impl.dart @@ -5622,19 +5622,33 @@ class Parser { } } - // 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, - enclosingDeclarationName, - ); + if (isConstructor) { + listener.beginConstructor( + kind, + augmentToken, + externalToken, + staticToken, + covariantToken, + varFinalOrConst, + getOrSet, + name, + enclosingDeclarationName, + ); + } else { + // 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, + enclosingDeclarationName, + ); + } Token token = typeInfo.parseType(beforeType, this); assert( diff --git a/pkg/analyzer/lib/src/fasta/ast_builder.dart b/pkg/analyzer/lib/src/fasta/ast_builder.dart index 111b3c4887a..5e225b006d8 100644 --- a/pkg/analyzer/lib/src/fasta/ast_builder.dart +++ b/pkg/analyzer/lib/src/fasta/ast_builder.dart @@ -340,6 +340,31 @@ class AstBuilder extends StackListener { @override void beginConstantPattern(Token? constKeyword) {} + @override + void beginConstructor( + DeclarationKind declarationKind, + Token? augmentToken, + Token? externalToken, + Token? staticToken, + Token? covariantToken, + Token? varFinalOrConst, + Token? getOrSet, + Token name, + String? enclosingDeclarationName, + ) { + _beginMethod( + declarationKind, + augmentToken, + externalToken, + staticToken, + covariantToken, + varFinalOrConst, + getOrSet, + name, + enclosingDeclarationName, + ); + } + @override void beginEnumDeclaration( Token beginToken, @@ -471,33 +496,17 @@ class AstBuilder extends StackListener { Token name, String? enclosingDeclarationName, ) { - _Modifiers modifiers = _Modifiers(); - if (augmentToken != null) { - assert(augmentToken.isModifier); - modifiers.augmentKeyword = augmentToken; - } - if (externalToken != null) { - assert(externalToken.isModifier); - modifiers.externalKeyword = externalToken; - } - if (staticToken != null) { - assert(staticToken.isModifier); - var builder = _classLikeBuilder; - if (builder is! _ClassDeclarationBuilder || - builder.name.lexeme != name.lexeme || - getOrSet != null) { - modifiers.staticKeyword = staticToken; - } - } - if (covariantToken != null) { - assert(covariantToken.isModifier); - modifiers.covariantKeyword = covariantToken; - } - if (varFinalOrConst != null) { - assert(varFinalOrConst.isModifier); - modifiers.finalConstOrVarKeyword = varFinalOrConst; - } - push(modifiers); + _beginMethod( + declarationKind, + augmentToken, + externalToken, + staticToken, + covariantToken, + varFinalOrConst, + getOrSet, + name, + enclosingDeclarationName, + ); } @override @@ -5888,6 +5897,46 @@ class AstBuilder extends StackListener { } } + void _beginMethod( + DeclarationKind declarationKind, + Token? augmentToken, + Token? externalToken, + Token? staticToken, + Token? covariantToken, + Token? varFinalOrConst, + Token? getOrSet, + Token name, + String? enclosingDeclarationName, + ) { + _Modifiers modifiers = _Modifiers(); + if (augmentToken != null) { + assert(augmentToken.isModifier); + modifiers.augmentKeyword = augmentToken; + } + if (externalToken != null) { + assert(externalToken.isModifier); + modifiers.externalKeyword = externalToken; + } + if (staticToken != null) { + assert(staticToken.isModifier); + var builder = _classLikeBuilder; + if (builder is! _ClassDeclarationBuilder || + builder.name.lexeme != name.lexeme || + getOrSet != null) { + modifiers.staticKeyword = staticToken; + } + } + if (covariantToken != null) { + assert(covariantToken.isModifier); + modifiers.covariantKeyword = covariantToken; + } + if (varFinalOrConst != null) { + assert(varFinalOrConst.isModifier); + modifiers.finalConstOrVarKeyword = varFinalOrConst; + } + push(modifiers); + } + ConstructorDeclarationImpl _buildConstructorDeclaration({ required Token beginToken, required Token endToken, diff --git a/pkg/analyzer/test/generated/parser_fasta_listener.dart b/pkg/analyzer/test/generated/parser_fasta_listener.dart index 409ca7b4183..71bd344fbbe 100644 --- a/pkg/analyzer/test/generated/parser_fasta_listener.dart +++ b/pkg/analyzer/test/generated/parser_fasta_listener.dart @@ -163,6 +163,32 @@ class ForwardingTestListener extends ForwardingListener { begin('ConstLiteral'); } + @override + void beginConstructor( + DeclarationKind declarationKind, + Token? augmentToken, + Token? externalToken, + Token? staticToken, + Token? covariantToken, + Token? varFinalOrConst, + Token? getOrSet, + Token name, + String? enclosingDeclarationName, + ) { + super.beginConstructor( + declarationKind, + augmentToken, + externalToken, + staticToken, + covariantToken, + varFinalOrConst, + getOrSet, + name, + enclosingDeclarationName, + ); + begin('Method'); + } + @override void beginConstructorReference(Token start) { super.beginConstructorReference(start); diff --git a/pkg/front_end/lib/src/source/outline_builder.dart b/pkg/front_end/lib/src/source/outline_builder.dart index 607e2892f7b..7486bf72567 100644 --- a/pkg/front_end/lib/src/source/outline_builder.dart +++ b/pkg/front_end/lib/src/source/outline_builder.dart @@ -2180,6 +2180,31 @@ class OutlineBuilder extends StackListenerImpl { push(MethodBody.Regular); } + @override + void beginConstructor( + DeclarationKind declarationKind, + Token? augmentToken, + Token? externalToken, + Token? staticToken, + Token? covariantToken, + Token? varFinalOrConst, + Token? getOrSet, + Token name, + String? enclosingDeclarationName, + ) { + _beginMethod( + declarationKind, + augmentToken, + externalToken, + staticToken, + covariantToken, + varFinalOrConst, + getOrSet, + name, + enclosingDeclarationName, + ); + } + @override void beginMethod( DeclarationKind declarationKind, @@ -2191,6 +2216,30 @@ class OutlineBuilder extends StackListenerImpl { Token? getOrSet, Token name, String? enclosingDeclarationName, + ) { + _beginMethod( + declarationKind, + augmentToken, + externalToken, + staticToken, + covariantToken, + varFinalOrConst, + getOrSet, + name, + enclosingDeclarationName, + ); + } + + void _beginMethod( + DeclarationKind declarationKind, + Token? augmentToken, + Token? externalToken, + Token? staticToken, + Token? covariantToken, + Token? varFinalOrConst, + Token? getOrSet, + Token name, + String? enclosingDeclarationName, ) { inConstructor = name.lexeme == enclosingDeclarationName && getOrSet == null; DeclarationContext declarationContext; diff --git a/pkg/front_end/lib/src/util/parser_ast.dart b/pkg/front_end/lib/src/util/parser_ast.dart index 356cc5deb51..10ed15a4d9d 100644 --- a/pkg/front_end/lib/src/util/parser_ast.dart +++ b/pkg/front_end/lib/src/util/parser_ast.dart @@ -1776,8 +1776,6 @@ class ParserASTListener extends AbstractParserAstListener { // beginExtensionDeclarationPrelude, // beginClassOrNamedMixinApplicationPrelude // beginTopLevelMember or beginUncategorizedTopLevelDeclaration. - } else if (begin == "Method" && end == "Constructor") { - // beginMethod is ended by one of endMethod or endConstructor. } else if (begin == "Fields" && end == "TopLevelFields") { // beginFields is ended by one of endTopLevelFields or endFields. } else if (begin == "ForStatement" && end == "ForIn") { 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 748f3fb2be4..21530f9e26b 100644 --- a/pkg/front_end/lib/src/util/parser_ast_helper.dart +++ b/pkg/front_end/lib/src/util/parser_ast_helper.dart @@ -1924,6 +1924,33 @@ abstract class AbstractParserAstListener implements Listener { seen(data); } + @override + void beginConstructor( + DeclarationKind declarationKind, + Token? augmentToken, + Token? externalToken, + Token? staticToken, + Token? covariantToken, + Token? varFinalOrConst, + Token? getOrSet, + Token name, + String? enclosingDeclarationName, + ) { + ConstructorBegin data = new ConstructorBegin( + ParserAstType.BEGIN, + declarationKind: declarationKind, + augmentToken: augmentToken, + externalToken: externalToken, + staticToken: staticToken, + covariantToken: covariantToken, + varFinalOrConst: varFinalOrConst, + getOrSet: getOrSet, + name: name, + enclosingDeclarationName: enclosingDeclarationName, + ); + seen(data); + } + @override void endConstructor( DeclarationKind kind, @@ -7077,6 +7104,47 @@ class MethodEnd extends ParserAstNode implements BeginAndEndTokenParserAstNode { R accept(ParserAstVisitor v) => v.visitMethodEnd(this); } +class ConstructorBegin extends ParserAstNode { + final DeclarationKind declarationKind; + final Token? augmentToken; + final Token? externalToken; + final Token? staticToken; + final Token? covariantToken; + final Token? varFinalOrConst; + final Token? getOrSet; + final Token name; + final String? enclosingDeclarationName; + + ConstructorBegin( + ParserAstType type, { + required this.declarationKind, + this.augmentToken, + this.externalToken, + this.staticToken, + this.covariantToken, + this.varFinalOrConst, + this.getOrSet, + required this.name, + this.enclosingDeclarationName, + }) : super("Constructor", type); + + @override + Map get deprecatedArguments => { + "declarationKind": declarationKind, + "augmentToken": augmentToken, + "externalToken": externalToken, + "staticToken": staticToken, + "covariantToken": covariantToken, + "varFinalOrConst": varFinalOrConst, + "getOrSet": getOrSet, + "name": name, + "enclosingDeclarationName": enclosingDeclarationName, + }; + + @override + R accept(ParserAstVisitor v) => v.visitConstructorBegin(this); +} + class ConstructorEnd extends ParserAstNode implements BeginAndEndTokenParserAstNode { final DeclarationKind kind; @@ -10716,6 +10784,7 @@ abstract class ParserAstVisitor { R visitMemberEnd(MemberEnd node); R visitMethodBegin(MethodBegin node); R visitMethodEnd(MethodEnd node); + R visitConstructorBegin(ConstructorBegin node); R visitConstructorEnd(ConstructorEnd node); R visitMetadataStarBegin(MetadataStarBegin node); R visitMetadataStarEnd(MetadataStarEnd node); @@ -11580,6 +11649,9 @@ class RecursiveParserAstVisitor implements ParserAstVisitor { @override void visitMethodEnd(MethodEnd node) => node.visitChildren(this); + @override + void visitConstructorBegin(ConstructorBegin node) => node.visitChildren(this); + @override void visitConstructorEnd(ConstructorEnd node) => node.visitChildren(this); @@ -13015,6 +13087,10 @@ class RecursiveParserAstVisitorWithDefaultNodeAsync @override Future visitMethodEnd(MethodEnd node) => defaultNode(node); + @override + Future visitConstructorBegin(ConstructorBegin node) => + defaultNode(node); + @override Future visitConstructorEnd(ConstructorEnd node) => defaultNode(node); diff --git a/pkg/front_end/parser_testcases/declaring_constructors/class_primary_constructor_body_error.dart.expect b/pkg/front_end/parser_testcases/declaring_constructors/class_primary_constructor_body_error.dart.expect index fbd146be686..b4512250c02 100644 --- a/pkg/front_end/parser_testcases/declaring_constructors/class_primary_constructor_body_error.dart.expect +++ b/pkg/front_end/parser_testcases/declaring_constructors/class_primary_constructor_body_error.dart.expect @@ -79,7 +79,7 @@ beginCompilationUnit(class) beginMetadataStar(this) endMetadataStar(0) beginMember() - beginMethod(DeclarationKind.Class, null, null, null, null, null, null, this, C2) + beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, this, C2) handleNoType({) handleRecoverableError(Message[Template(ExpectedIdentifierButGotKeyword), 'this' 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: this}], this, this) handleIdentifier(this, methodDeclaration) @@ -167,7 +167,7 @@ beginCompilationUnit(class) beginMetadataStar(this) endMetadataStar(0) beginMember() - beginMethod(DeclarationKind.Class, null, null, null, null, null, null, this, C4) + beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, this, C4) handleNoType({) handleRecoverableError(Message[Template(ExpectedIdentifierButGotKeyword), 'this' 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: this}], this, this) handleIdentifier(this, methodDeclaration) diff --git a/pkg/front_end/parser_testcases/declaring_constructors/class_primary_constructor_body_error.dart.intertwined.expect b/pkg/front_end/parser_testcases/declaring_constructors/class_primary_constructor_body_error.dart.intertwined.expect index 7a495988fa1..57d94a16418 100644 --- a/pkg/front_end/parser_testcases/declaring_constructors/class_primary_constructor_body_error.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/declaring_constructors/class_primary_constructor_body_error.dart.intertwined.expect @@ -106,7 +106,7 @@ parseUnit(class) listener: endMetadataStar(0) listener: beginMember() parseMethod({, null, null, null, null, null, null, null, {, NoType(), null, this, DeclarationKind.Class, C2, false) - listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, this, C2) + listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, this, C2) listener: handleNoType({) ensureIdentifierPotentiallyRecovered({, methodDeclaration, false) reportRecoverableErrorWithToken(this, Template(ExpectedIdentifierButGotKeyword)) @@ -275,7 +275,7 @@ parseUnit(class) listener: endMetadataStar(0) listener: beginMember() parseMethod({, null, null, null, null, null, null, null, {, NoType(), null, this, DeclarationKind.Class, C4, false) - listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, this, C4) + listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, this, C4) listener: handleNoType({) ensureIdentifierPotentiallyRecovered({, methodDeclaration, false) reportRecoverableErrorWithToken(this, Template(ExpectedIdentifierButGotKeyword)) diff --git a/pkg/front_end/parser_testcases/declaring_constructors/declaring_parameter_error.dart.expect b/pkg/front_end/parser_testcases/declaring_constructors/declaring_parameter_error.dart.expect index 5c51915a33b..f40ee99818c 100644 --- a/pkg/front_end/parser_testcases/declaring_constructors/declaring_parameter_error.dart.expect +++ b/pkg/front_end/parser_testcases/declaring_constructors/declaring_parameter_error.dart.expect @@ -173,7 +173,7 @@ beginCompilationUnit(m) beginMetadataStar(C) endMetadataStar(0) beginMember() - beginMethod(DeclarationKind.Class, null, null, null, null, null, null, C, C) + beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, C, C) handleNoType({) handleIdentifier(C, methodDeclaration) handleNoTypeVariables(() @@ -835,7 +835,7 @@ beginCompilationUnit(m) beginMetadataStar(ET) endMetadataStar(0) beginMember() - beginMethod(DeclarationKind.ExtensionType, null, null, null, null, null, null, ET, ET) + beginConstructor(DeclarationKind.ExtensionType, null, null, null, null, null, null, ET, ET) handleNoType({) handleIdentifier(ET, methodDeclaration) handleNoTypeVariables(() diff --git a/pkg/front_end/parser_testcases/declaring_constructors/declaring_parameter_error.dart.intertwined.expect b/pkg/front_end/parser_testcases/declaring_constructors/declaring_parameter_error.dart.intertwined.expect index 6535f51b9b8..9ed79fa8578 100644 --- a/pkg/front_end/parser_testcases/declaring_constructors/declaring_parameter_error.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/declaring_constructors/declaring_parameter_error.dart.intertwined.expect @@ -77,7 +77,7 @@ parseUnit(m) 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, C) + listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, C, C) listener: handleNoType({) ensureIdentifierPotentiallyRecovered({, methodDeclaration, false) listener: handleIdentifier(C, methodDeclaration) @@ -1130,7 +1130,7 @@ parseUnit(m) listener: beginMember() isReservedKeyword(() parseMethod({, null, null, null, null, null, null, null, {, NoType(), null, ET, DeclarationKind.ExtensionType, ET, false) - listener: beginMethod(DeclarationKind.ExtensionType, null, null, null, null, null, null, ET, ET) + listener: beginConstructor(DeclarationKind.ExtensionType, null, null, null, null, null, null, ET, ET) listener: handleNoType({) ensureIdentifierPotentiallyRecovered({, methodDeclaration, false) listener: handleIdentifier(ET, methodDeclaration) diff --git a/pkg/front_end/parser_testcases/declaring_constructors/extension_type_primary_constructor_body_error.dart.expect b/pkg/front_end/parser_testcases/declaring_constructors/extension_type_primary_constructor_body_error.dart.expect index f4dc99b0007..2f130e57d2e 100644 --- a/pkg/front_end/parser_testcases/declaring_constructors/extension_type_primary_constructor_body_error.dart.expect +++ b/pkg/front_end/parser_testcases/declaring_constructors/extension_type_primary_constructor_body_error.dart.expect @@ -98,7 +98,7 @@ beginCompilationUnit(extension) beginMetadataStar(this) endMetadataStar(0) beginMember() - beginMethod(DeclarationKind.ExtensionType, null, null, null, null, null, null, this, E2) + beginConstructor(DeclarationKind.ExtensionType, null, null, null, null, null, null, this, E2) handleNoType({) handleRecoverableError(Message[Template(ExpectedIdentifierButGotKeyword), 'this' 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: this}], this, this) handleIdentifier(this, methodDeclaration) @@ -200,7 +200,7 @@ beginCompilationUnit(extension) beginMetadataStar(this) endMetadataStar(0) beginMember() - beginMethod(DeclarationKind.ExtensionType, null, null, null, null, null, null, this, E4) + beginConstructor(DeclarationKind.ExtensionType, null, null, null, null, null, null, this, E4) handleNoType({) handleRecoverableError(Message[Template(ExpectedIdentifierButGotKeyword), 'this' 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: this}], this, this) handleIdentifier(this, methodDeclaration) diff --git a/pkg/front_end/parser_testcases/declaring_constructors/extension_type_primary_constructor_body_error.dart.intertwined.expect b/pkg/front_end/parser_testcases/declaring_constructors/extension_type_primary_constructor_body_error.dart.intertwined.expect index cde698f2407..f5c72882544 100644 --- a/pkg/front_end/parser_testcases/declaring_constructors/extension_type_primary_constructor_body_error.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/declaring_constructors/extension_type_primary_constructor_body_error.dart.intertwined.expect @@ -122,7 +122,7 @@ parseUnit(extension) listener: endMetadataStar(0) listener: beginMember() parseMethod({, null, null, null, null, null, null, null, {, NoType(), null, this, DeclarationKind.ExtensionType, E2, false) - listener: beginMethod(DeclarationKind.ExtensionType, null, null, null, null, null, null, this, E2) + listener: beginConstructor(DeclarationKind.ExtensionType, null, null, null, null, null, null, this, E2) listener: handleNoType({) ensureIdentifierPotentiallyRecovered({, methodDeclaration, false) reportRecoverableErrorWithToken(this, Template(ExpectedIdentifierButGotKeyword)) @@ -307,7 +307,7 @@ parseUnit(extension) listener: endMetadataStar(0) listener: beginMember() parseMethod({, null, null, null, null, null, null, null, {, NoType(), null, this, DeclarationKind.ExtensionType, E4, false) - listener: beginMethod(DeclarationKind.ExtensionType, null, null, null, null, null, null, this, E4) + listener: beginConstructor(DeclarationKind.ExtensionType, null, null, null, null, null, null, this, E4) listener: handleNoType({) ensureIdentifierPotentiallyRecovered({, methodDeclaration, false) reportRecoverableErrorWithToken(this, Template(ExpectedIdentifierButGotKeyword)) diff --git a/pkg/front_end/parser_testcases/dot_shorthands/const_no_identifier_recovery.dart.expect b/pkg/front_end/parser_testcases/dot_shorthands/const_no_identifier_recovery.dart.expect index dfaa4c1afa5..f5f4be442fd 100644 --- a/pkg/front_end/parser_testcases/dot_shorthands/const_no_identifier_recovery.dart.expect +++ b/pkg/front_end/parser_testcases/dot_shorthands/const_no_identifier_recovery.dart.expect @@ -32,7 +32,7 @@ beginCompilationUnit(class) beginMetadataStar(const) endMetadataStar(0) beginMember() - beginMethod(DeclarationKind.Class, null, null, null, null, const, null, Color, Color) + beginConstructor(DeclarationKind.Class, null, null, null, null, const, null, Color, Color) handleNoType(const) handleIdentifier(Color, methodDeclaration) handleIdentifier(red, methodDeclarationContinuation) diff --git a/pkg/front_end/parser_testcases/dot_shorthands/const_no_identifier_recovery.dart.intertwined.expect b/pkg/front_end/parser_testcases/dot_shorthands/const_no_identifier_recovery.dart.intertwined.expect index cdc31839b56..f702dc4dcef 100644 --- a/pkg/front_end/parser_testcases/dot_shorthands/const_no_identifier_recovery.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/dot_shorthands/const_no_identifier_recovery.dart.intertwined.expect @@ -53,7 +53,7 @@ parseUnit(class) listener: endMetadataStar(0) listener: beginMember() parseMethod(;, null, null, null, null, null, null, const, const, NoType(), null, Color, DeclarationKind.Class, Color, false) - listener: beginMethod(DeclarationKind.Class, null, null, null, null, const, null, Color, Color) + listener: beginConstructor(DeclarationKind.Class, null, null, null, null, const, null, Color, Color) listener: handleNoType(const) ensureIdentifierPotentiallyRecovered(const, methodDeclaration, false) listener: handleIdentifier(Color, methodDeclaration) diff --git a/pkg/front_end/parser_testcases/dot_shorthands/const_property_recovery.dart.expect b/pkg/front_end/parser_testcases/dot_shorthands/const_property_recovery.dart.expect index 603b8d174c0..3637e2a45ee 100644 --- a/pkg/front_end/parser_testcases/dot_shorthands/const_property_recovery.dart.expect +++ b/pkg/front_end/parser_testcases/dot_shorthands/const_property_recovery.dart.expect @@ -32,7 +32,7 @@ beginCompilationUnit(class) beginMetadataStar(const) endMetadataStar(0) beginMember() - beginMethod(DeclarationKind.Class, null, null, null, null, const, null, Color, Color) + beginConstructor(DeclarationKind.Class, null, null, null, null, const, null, Color, Color) handleNoType(const) handleIdentifier(Color, methodDeclaration) handleIdentifier(red, methodDeclarationContinuation) diff --git a/pkg/front_end/parser_testcases/dot_shorthands/const_property_recovery.dart.intertwined.expect b/pkg/front_end/parser_testcases/dot_shorthands/const_property_recovery.dart.intertwined.expect index 48e8898742e..ec96619ef1f 100644 --- a/pkg/front_end/parser_testcases/dot_shorthands/const_property_recovery.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/dot_shorthands/const_property_recovery.dart.intertwined.expect @@ -53,7 +53,7 @@ parseUnit(class) listener: endMetadataStar(0) listener: beginMember() parseMethod(;, null, null, null, null, null, null, const, const, NoType(), null, Color, DeclarationKind.Class, Color, false) - listener: beginMethod(DeclarationKind.Class, null, null, null, null, const, null, Color, Color) + listener: beginConstructor(DeclarationKind.Class, null, null, null, null, const, null, Color, Color) listener: handleNoType(const) ensureIdentifierPotentiallyRecovered(const, methodDeclaration, false) listener: handleIdentifier(Color, 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 29148bf72f4..8792a676b18 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 @@ -83,7 +83,7 @@ beginCompilationUnit(enum) beginMetadataStar(const) endMetadataStar(0) beginMember() - beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E, E) + beginConstructor(DeclarationKind.Enum, null, null, null, null, const, null, E, E) handleNoType(const) handleIdentifier(E, methodDeclaration) handleNoTypeVariables(() @@ -97,7 +97,7 @@ beginCompilationUnit(enum) beginMetadataStar(const) endMetadataStar(0) beginMember() - beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E, E) + beginConstructor(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 f2d93698e47..2493d758d4d 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 @@ -127,7 +127,7 @@ parseUnit(enum) listener: endMetadataStar(0) listener: beginMember() 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, E) + listener: beginConstructor(DeclarationKind.Enum, null, null, null, null, const, null, E, E) listener: handleNoType(const) ensureIdentifierPotentiallyRecovered(const, methodDeclaration, false) listener: handleIdentifier(E, methodDeclaration) @@ -156,7 +156,7 @@ parseUnit(enum) listener: endMetadataStar(0) listener: beginMember() 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, E) + listener: beginConstructor(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 70c396a0234..aa9ffe77690 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 @@ -25,7 +25,7 @@ beginCompilationUnit(class) beginMetadataStar(C) endMetadataStar(0) beginMember() - beginMethod(DeclarationKind.Class, null, null, null, null, null, null, C, C) + beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, C, C) handleNoType({) handleIdentifier(C, methodDeclaration) handleNoTypeVariables(() @@ -126,7 +126,7 @@ beginCompilationUnit(class) beginMetadataStar(D) endMetadataStar(0) beginMember() - beginMethod(DeclarationKind.Class, null, null, null, null, null, null, D, D) + beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, D, D) handleNoType({) handleIdentifier(D, methodDeclaration) handleNoTypeVariables(() 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 944f27dc771..5c50ddc15f9 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 @@ -35,7 +35,7 @@ parseUnit(class) 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, C) + listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, C, C) listener: handleNoType({) ensureIdentifierPotentiallyRecovered({, methodDeclaration, false) listener: handleIdentifier(C, methodDeclaration) @@ -308,7 +308,7 @@ parseUnit(class) 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, D) + listener: beginConstructor(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/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 df419005be3..a90a6112e0e 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 @@ -137,7 +137,7 @@ beginCompilationUnit(class) beginMetadataStar(foo) endMetadataStar(0) beginMember() - beginMethod(DeclarationKind.Class, null, null, null, null, null, null, foo, Foo) + beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, foo, Foo) handleNoType({) handleIdentifier(foo, methodDeclaration) handleIdentifier(x, methodDeclarationContinuation) @@ -155,7 +155,7 @@ beginCompilationUnit(class) beginMetadataStar(foo) endMetadataStar(0) beginMember() - beginMethod(DeclarationKind.Class, null, null, null, null, null, null, foo, Foo) + beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, foo, Foo) handleNoType(}) handleIdentifier(foo, methodDeclaration) handleIdentifier(x, methodDeclarationContinuation) @@ -182,7 +182,7 @@ beginCompilationUnit(class) beginMetadataStar(foo) endMetadataStar(0) beginMember() - beginMethod(DeclarationKind.Class, null, null, null, null, null, null, foo, Foo) + beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, foo, Foo) handleNoType(}) handleIdentifier(foo, methodDeclaration) handleNoTypeVariables(() @@ -240,7 +240,7 @@ beginCompilationUnit(class) beginMetadataStar(get) endMetadataStar(0) beginMember() - beginMethod(DeclarationKind.Class, null, null, null, null, null, get, Foo, Foo) + beginConstructor(DeclarationKind.Class, null, null, null, null, null, get, Foo, Foo) handleNoType(}) handleIdentifier(Foo, methodDeclaration) handleIdentifier(X, methodDeclarationContinuation) @@ -259,7 +259,7 @@ beginCompilationUnit(class) beginMetadataStar(get) endMetadataStar(0) beginMember() - beginMethod(DeclarationKind.Class, null, null, null, null, null, get, Foo, Foo) + beginConstructor(DeclarationKind.Class, null, null, null, null, null, get, Foo, Foo) handleNoType(;) handleIdentifier(Foo, methodDeclaration) handleIdentifier(X, methodDeclarationContinuation) @@ -281,7 +281,7 @@ beginCompilationUnit(class) beginMetadataStar(get) endMetadataStar(0) beginMember() - beginMethod(DeclarationKind.Class, null, null, null, null, null, get, Foo, Foo) + beginConstructor(DeclarationKind.Class, null, null, null, null, null, get, Foo, Foo) handleNoType(}) handleIdentifier(Foo, methodDeclaration) handleNoTypeVariables(:) @@ -307,7 +307,7 @@ beginCompilationUnit(class) beginMetadataStar(get) endMetadataStar(0) beginMember() - beginMethod(DeclarationKind.Class, null, null, null, null, null, get, Foo, Foo) + beginConstructor(DeclarationKind.Class, null, null, null, null, null, get, Foo, Foo) handleNoType(;) handleIdentifier(Foo, methodDeclaration) handleIdentifier(X, methodDeclarationContinuation) @@ -375,7 +375,7 @@ beginCompilationUnit(class) beginMetadataStar(set) endMetadataStar(0) beginMember() - beginMethod(DeclarationKind.Class, null, null, null, null, null, set, Foo, Foo) + beginConstructor(DeclarationKind.Class, null, null, null, null, null, set, Foo, Foo) handleNoType(}) handleIdentifier(Foo, methodDeclaration) handleIdentifier(X, methodDeclarationContinuation) @@ -394,7 +394,7 @@ beginCompilationUnit(class) beginMetadataStar(set) endMetadataStar(0) beginMember() - beginMethod(DeclarationKind.Class, null, null, null, null, null, set, Foo, Foo) + beginConstructor(DeclarationKind.Class, null, null, null, null, null, set, Foo, Foo) handleNoType(;) handleIdentifier(Foo, methodDeclaration) handleIdentifier(X, methodDeclarationContinuation) @@ -416,7 +416,7 @@ beginCompilationUnit(class) beginMetadataStar(set) endMetadataStar(0) beginMember() - beginMethod(DeclarationKind.Class, null, null, null, null, null, set, Foo, Foo) + beginConstructor(DeclarationKind.Class, null, null, null, null, null, set, Foo, Foo) handleNoType(}) handleIdentifier(Foo, methodDeclaration) handleNoTypeVariables(:) @@ -442,7 +442,7 @@ beginCompilationUnit(class) beginMetadataStar(set) endMetadataStar(0) beginMember() - beginMethod(DeclarationKind.Class, null, null, null, null, null, set, Foo, Foo) + beginConstructor(DeclarationKind.Class, null, null, null, null, null, set, Foo, Foo) handleNoType(;) handleIdentifier(Foo, methodDeclaration) handleIdentifier(X, methodDeclarationContinuation) @@ -473,7 +473,7 @@ beginCompilationUnit(class) beginMetadataStar(external) endMetadataStar(0) beginMember() - beginMethod(DeclarationKind.Class, null, external, null, null, null, null, Foo, Foo) + beginConstructor(DeclarationKind.Class, null, external, null, null, null, null, Foo, Foo) handleNoType(external) handleIdentifier(Foo, methodDeclaration) handleNoTypeVariables(() @@ -497,7 +497,7 @@ beginCompilationUnit(class) beginMetadataStar(external) endMetadataStar(0) beginMember() - beginMethod(DeclarationKind.Class, null, external, null, null, null, null, Foo, Foo) + beginConstructor(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 83184dd2f5b..388cc48bfd1 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 @@ -35,7 +35,7 @@ parseUnit(class) 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, Foo) + listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, foo, Foo) listener: handleNoType({) ensureIdentifierPotentiallyRecovered({, methodDeclaration, false) listener: handleIdentifier(foo, methodDeclaration) @@ -73,7 +73,7 @@ parseUnit(class) 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, Foo) + listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, foo, Foo) listener: handleNoType(}) ensureIdentifierPotentiallyRecovered(}, methodDeclaration, false) listener: handleIdentifier(foo, methodDeclaration) @@ -138,7 +138,7 @@ parseUnit(class) 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, Foo) + listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, foo, Foo) listener: handleNoType(}) ensureIdentifierPotentiallyRecovered(}, methodDeclaration, false) listener: handleIdentifier(foo, methodDeclaration) @@ -283,7 +283,7 @@ parseUnit(class) 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, Foo) + listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, get, Foo, Foo) listener: handleNoType(}) ensureIdentifierPotentiallyRecovered(get, methodDeclaration, false) listener: handleIdentifier(Foo, methodDeclaration) @@ -332,7 +332,7 @@ parseUnit(class) 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, Foo) + listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, get, Foo, Foo) listener: handleNoType(;) ensureIdentifierPotentiallyRecovered(get, methodDeclaration, false) listener: handleIdentifier(Foo, methodDeclaration) @@ -388,7 +388,7 @@ parseUnit(class) 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, Foo) + listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, get, Foo, Foo) listener: handleNoType(}) ensureIdentifierPotentiallyRecovered(get, methodDeclaration, false) listener: handleIdentifier(Foo, methodDeclaration) @@ -460,7 +460,7 @@ parseUnit(class) 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, Foo) + listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, get, Foo, Foo) listener: handleNoType(;) ensureIdentifierPotentiallyRecovered(get, methodDeclaration, false) listener: handleIdentifier(Foo, methodDeclaration) @@ -640,7 +640,7 @@ parseUnit(class) 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, Foo) + listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, set, Foo, Foo) listener: handleNoType(}) ensureIdentifierPotentiallyRecovered(set, methodDeclaration, false) listener: handleIdentifier(Foo, methodDeclaration) @@ -689,7 +689,7 @@ parseUnit(class) 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, Foo) + listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, set, Foo, Foo) listener: handleNoType(;) ensureIdentifierPotentiallyRecovered(set, methodDeclaration, false) listener: handleIdentifier(Foo, methodDeclaration) @@ -745,7 +745,7 @@ parseUnit(class) 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, Foo) + listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, set, Foo, Foo) listener: handleNoType(}) ensureIdentifierPotentiallyRecovered(set, methodDeclaration, false) listener: handleIdentifier(Foo, methodDeclaration) @@ -817,7 +817,7 @@ parseUnit(class) 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, Foo) + listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, set, Foo, Foo) listener: handleNoType(;) ensureIdentifierPotentiallyRecovered(set, methodDeclaration, false) listener: handleIdentifier(Foo, methodDeclaration) @@ -901,7 +901,7 @@ parseUnit(class) 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, Foo) + listener: beginConstructor(DeclarationKind.Class, null, external, null, null, null, null, Foo, Foo) listener: handleNoType(external) ensureIdentifierPotentiallyRecovered(external, methodDeclaration, false) listener: handleIdentifier(Foo, methodDeclaration) @@ -960,7 +960,7 @@ parseUnit(class) 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, Foo) + listener: beginConstructor(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 c31b7c40824..951b09d6030 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 @@ -45,7 +45,7 @@ beginCompilationUnit(class) beginMetadataStar(get) endMetadataStar(0) beginMember() - beginMethod(DeclarationKind.Class, null, null, null, null, null, get, foo, Foo) + beginConstructor(DeclarationKind.Class, null, null, null, null, null, get, foo, Foo) handleNoType({) handleIdentifier(foo, methodDeclaration) handleIdentifier(x, methodDeclarationContinuation) @@ -64,7 +64,7 @@ beginCompilationUnit(class) beginMetadataStar(get) endMetadataStar(0) beginMember() - beginMethod(DeclarationKind.Class, null, null, null, null, null, get, foo, Foo) + beginConstructor(DeclarationKind.Class, null, null, null, null, null, get, foo, Foo) handleNoType(}) handleIdentifier(foo, methodDeclaration) handleIdentifier(x, methodDeclarationContinuation) @@ -92,7 +92,7 @@ beginCompilationUnit(class) beginMetadataStar(get) endMetadataStar(0) beginMember() - beginMethod(DeclarationKind.Class, null, null, null, null, null, get, foo, Foo) + beginConstructor(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 f4a7e67e532..1b06a3a0efe 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 @@ -34,7 +34,7 @@ parseUnit(class) 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, Foo) + listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, get, foo, Foo) listener: handleNoType({) ensureIdentifierPotentiallyRecovered(get, methodDeclaration, false) listener: handleIdentifier(foo, methodDeclaration) @@ -73,7 +73,7 @@ parseUnit(class) 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, Foo) + listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, get, foo, Foo) listener: handleNoType(}) ensureIdentifierPotentiallyRecovered(get, methodDeclaration, false) listener: handleIdentifier(foo, methodDeclaration) @@ -139,7 +139,7 @@ parseUnit(class) 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, Foo) + listener: beginConstructor(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 7e79e158d8b..91c48f00e10 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 @@ -41,7 +41,7 @@ beginCompilationUnit(class) beginMetadataStar(void) endMetadataStar(0) beginMember() - beginMethod(DeclarationKind.Class, null, null, null, null, null, null, foo, Foo) + beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, foo, Foo) handleVoidKeyword(void) handleIdentifier(foo, methodDeclaration) handleIdentifier(x, methodDeclarationContinuation) @@ -60,7 +60,7 @@ beginCompilationUnit(class) beginMetadataStar(void) endMetadataStar(0) beginMember() - beginMethod(DeclarationKind.Class, null, null, null, null, null, null, foo, Foo) + beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, foo, Foo) handleVoidKeyword(void) handleIdentifier(foo, methodDeclaration) handleIdentifier(x, methodDeclarationContinuation) @@ -88,7 +88,7 @@ beginCompilationUnit(class) beginMetadataStar(void) endMetadataStar(0) beginMember() - beginMethod(DeclarationKind.Class, null, null, null, null, null, null, foo, Foo) + beginConstructor(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 d07101d2860..06a5010e3b7 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 @@ -34,7 +34,7 @@ parseUnit(class) 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, Foo) + listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, foo, Foo) listener: handleVoidKeyword(void) ensureIdentifierPotentiallyRecovered(void, methodDeclaration, false) listener: handleIdentifier(foo, methodDeclaration) @@ -73,7 +73,7 @@ parseUnit(class) 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, Foo) + listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, foo, Foo) listener: handleVoidKeyword(void) ensureIdentifierPotentiallyRecovered(void, methodDeclaration, false) listener: handleIdentifier(foo, methodDeclaration) @@ -139,7 +139,7 @@ parseUnit(class) 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, Foo) + listener: beginConstructor(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 d5a5f0d24e8..b7ebdaa054b 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 @@ -41,7 +41,7 @@ beginCompilationUnit(class) beginMetadataStar(set) endMetadataStar(0) beginMember() - beginMethod(DeclarationKind.Class, null, null, null, null, null, set, foo, Foo) + beginConstructor(DeclarationKind.Class, null, null, null, null, null, set, foo, Foo) handleNoType({) handleIdentifier(foo, methodDeclaration) handleIdentifier(x, methodDeclarationContinuation) @@ -60,7 +60,7 @@ beginCompilationUnit(class) beginMetadataStar(set) endMetadataStar(0) beginMember() - beginMethod(DeclarationKind.Class, null, null, null, null, null, set, foo, Foo) + beginConstructor(DeclarationKind.Class, null, null, null, null, null, set, foo, Foo) handleNoType(}) handleIdentifier(foo, methodDeclaration) handleIdentifier(x, methodDeclarationContinuation) @@ -88,7 +88,7 @@ beginCompilationUnit(class) beginMetadataStar(set) endMetadataStar(0) beginMember() - beginMethod(DeclarationKind.Class, null, null, null, null, null, set, foo, Foo) + beginConstructor(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 23c0627fd56..6024d7ccc2d 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 @@ -34,7 +34,7 @@ parseUnit(class) 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, Foo) + listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, set, foo, Foo) listener: handleNoType({) ensureIdentifierPotentiallyRecovered(set, methodDeclaration, false) listener: handleIdentifier(foo, methodDeclaration) @@ -73,7 +73,7 @@ parseUnit(class) 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, Foo) + listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, set, foo, Foo) listener: handleNoType(}) ensureIdentifierPotentiallyRecovered(set, methodDeclaration, false) listener: handleIdentifier(foo, methodDeclaration) @@ -139,7 +139,7 @@ parseUnit(class) 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, Foo) + listener: beginConstructor(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 ad4bd5dec42..737c624d4f2 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 @@ -58,7 +58,7 @@ beginCompilationUnit(class) beginMetadataStar(get) endMetadataStar(0) beginMember() - beginMethod(DeclarationKind.Class, null, null, null, null, null, get, Foo, Foo) + beginConstructor(DeclarationKind.Class, null, null, null, null, null, get, Foo, Foo) handleNoType(}) handleIdentifier(Foo, methodDeclaration) handleNoTypeVariables(() @@ -84,7 +84,7 @@ beginCompilationUnit(class) beginMetadataStar(get) endMetadataStar(0) beginMember() - beginMethod(DeclarationKind.Class, null, null, null, null, null, get, Foo, Foo) + beginConstructor(DeclarationKind.Class, null, null, null, null, null, get, Foo, Foo) handleNoType(}) handleIdentifier(Foo, methodDeclaration) handleIdentifier(x, methodDeclarationContinuation) @@ -102,7 +102,7 @@ beginCompilationUnit(class) beginMetadataStar(get) endMetadataStar(0) beginMember() - beginMethod(DeclarationKind.Class, null, null, null, null, null, get, Foo, Foo) + beginConstructor(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 f6a9261fd91..75a81a5d428 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 @@ -69,7 +69,7 @@ parseUnit(class) 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, Foo) + listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, get, Foo, Foo) listener: handleNoType(}) ensureIdentifierPotentiallyRecovered(get, methodDeclaration, false) listener: handleIdentifier(Foo, methodDeclaration) @@ -131,7 +131,7 @@ parseUnit(class) 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, Foo) + listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, get, Foo, Foo) listener: handleNoType(}) ensureIdentifierPotentiallyRecovered(get, methodDeclaration, false) listener: handleIdentifier(Foo, methodDeclaration) @@ -168,7 +168,7 @@ parseUnit(class) 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, Foo) + listener: beginConstructor(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 2e5d6465886..6cfad81cdda 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 @@ -15,7 +15,7 @@ beginCompilationUnit(class) beginMetadataStar(Foo) endMetadataStar(0) beginMember() - beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo) + beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo) handleNoType({) handleIdentifier(Foo, methodDeclaration) handleNoTypeVariables(() @@ -30,7 +30,7 @@ beginCompilationUnit(class) beginMetadataStar(Foo) endMetadataStar(0) beginMember() - beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo) + beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo) handleNoType(}) handleIdentifier(Foo, methodDeclaration) handleNoTypeVariables(() @@ -54,7 +54,7 @@ beginCompilationUnit(class) beginMetadataStar(Foo) endMetadataStar(0) beginMember() - beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo) + beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo) handleNoType(}) handleIdentifier(Foo, methodDeclaration) handleIdentifier(x, methodDeclarationContinuation) @@ -71,7 +71,7 @@ beginCompilationUnit(class) beginMetadataStar(Foo) endMetadataStar(0) beginMember() - beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo) + beginConstructor(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 8636c8ea73d..3e5ccdd0e38 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 @@ -35,7 +35,7 @@ parseUnit(class) 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, Foo) + listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo) listener: handleNoType({) ensureIdentifierPotentiallyRecovered({, methodDeclaration, false) listener: handleIdentifier(Foo, methodDeclaration) @@ -67,7 +67,7 @@ parseUnit(class) 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, Foo) + listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo) listener: handleNoType(}) ensureIdentifierPotentiallyRecovered(}, methodDeclaration, false) listener: handleIdentifier(Foo, methodDeclaration) @@ -126,7 +126,7 @@ parseUnit(class) 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, Foo) + listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo) listener: handleNoType(}) ensureIdentifierPotentiallyRecovered(}, methodDeclaration, false) listener: handleIdentifier(Foo, methodDeclaration) @@ -162,7 +162,7 @@ parseUnit(class) 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, Foo) + listener: beginConstructor(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 93a829f79c5..9178d29fa88 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 @@ -89,7 +89,7 @@ beginCompilationUnit(class) beginMetadataStar(Foo) endMetadataStar(0) beginMember() - beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo) + beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo) handleNoType({) handleIdentifier(Foo, methodDeclaration) handleNoTypeVariables(() @@ -105,7 +105,7 @@ beginCompilationUnit(class) endMetadataStar(0) beginMember() handleRecoverableError(MissingOperatorKeyword, /, /) - beginMethod(DeclarationKind.Class, null, null, null, null, null, null, operator, Foo) + beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, operator, Foo) handleNoType(}) handleOperatorName(operator, /) handleNoTypeVariables(:) @@ -130,7 +130,7 @@ beginCompilationUnit(class) beginMetadataStar(Foo) endMetadataStar(0) beginMember() - beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo) + beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo) handleNoType(}) handleIdentifier(Foo, methodDeclaration) handleNoTypeVariables(() @@ -152,7 +152,7 @@ beginCompilationUnit(class) endMetadataStar(0) beginMember() handleRecoverableError(MissingOperatorKeyword, /, /) - beginMethod(DeclarationKind.Class, null, null, null, null, null, null, operator, Foo) + beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, operator, Foo) handleNoType(.) handleOperatorName(operator, /) handleNoTypeVariables(:) @@ -193,7 +193,7 @@ beginCompilationUnit(class) endMetadataStar(0) beginMember() handleRecoverableError(MissingOperatorKeyword, /, /) - beginMethod(DeclarationKind.Class, null, null, null, null, null, null, operator, Foo) + beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, operator, Foo) handleNoType(}) handleOperatorName(operator, /) handleNoTypeVariables(:) @@ -240,7 +240,7 @@ beginCompilationUnit(class) endMetadataStar(0) beginMember() handleRecoverableError(MissingOperatorKeyword, /, /) - beginMethod(DeclarationKind.Class, null, null, null, null, null, null, operator, Foo) + beginConstructor(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 3ca02faf460..d5eb17be85c 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 @@ -35,7 +35,7 @@ parseUnit(class) 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, Foo) + listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo) listener: handleNoType({) ensureIdentifierPotentiallyRecovered({, methodDeclaration, false) listener: handleIdentifier(Foo, methodDeclaration) @@ -75,7 +75,7 @@ parseUnit(class) 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, Foo) + listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, operator, Foo) listener: handleNoType(}) parseOperatorName(}) listener: handleOperatorName(operator, /) @@ -132,7 +132,7 @@ parseUnit(class) 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, Foo) + listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo) listener: handleNoType(}) ensureIdentifierPotentiallyRecovered(}, methodDeclaration, false) listener: handleIdentifier(Foo, methodDeclaration) @@ -183,7 +183,7 @@ parseUnit(class) 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, Foo) + listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, operator, Foo) listener: handleNoType(.) parseOperatorName(.) listener: handleOperatorName(operator, /) @@ -280,7 +280,7 @@ parseUnit(class) 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, Foo) + listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, operator, Foo) listener: handleNoType(}) parseOperatorName(}) listener: handleOperatorName(operator, /) @@ -388,7 +388,7 @@ parseUnit(class) 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, Foo) + listener: beginConstructor(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 66811e2aaed..6348123aca1 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 @@ -33,7 +33,7 @@ beginCompilationUnit(class) beginMetadataStar(void) endMetadataStar(0) beginMember() - beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo) + beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo) handleVoidKeyword(void) handleIdentifier(Foo, methodDeclaration) handleNoTypeVariables(() @@ -49,7 +49,7 @@ beginCompilationUnit(class) beginMetadataStar(void) endMetadataStar(0) beginMember() - beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo) + beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo) handleVoidKeyword(void) handleIdentifier(Foo, methodDeclaration) handleNoTypeVariables(() @@ -74,7 +74,7 @@ beginCompilationUnit(class) beginMetadataStar(void) endMetadataStar(0) beginMember() - beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo) + beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo) handleVoidKeyword(void) handleIdentifier(Foo, methodDeclaration) handleIdentifier(x, methodDeclarationContinuation) @@ -92,7 +92,7 @@ beginCompilationUnit(class) beginMetadataStar(void) endMetadataStar(0) beginMember() - beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo) + beginConstructor(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 185e537ffdb..1e5a86cc754 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 @@ -34,7 +34,7 @@ parseUnit(class) 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, Foo) + listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo) listener: handleVoidKeyword(void) ensureIdentifierPotentiallyRecovered(void, methodDeclaration, false) listener: handleIdentifier(Foo, methodDeclaration) @@ -67,7 +67,7 @@ parseUnit(class) 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, Foo) + listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo) listener: handleVoidKeyword(void) ensureIdentifierPotentiallyRecovered(void, methodDeclaration, false) listener: handleIdentifier(Foo, methodDeclaration) @@ -127,7 +127,7 @@ parseUnit(class) 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, Foo) + listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo) listener: handleVoidKeyword(void) ensureIdentifierPotentiallyRecovered(void, methodDeclaration, false) listener: handleIdentifier(Foo, methodDeclaration) @@ -164,7 +164,7 @@ parseUnit(class) 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, Foo) + listener: beginConstructor(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 aa5bc995506..7d651d42700 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 @@ -49,7 +49,7 @@ beginCompilationUnit(class) beginMetadataStar(set) endMetadataStar(0) beginMember() - beginMethod(DeclarationKind.Class, null, null, null, null, null, set, Foo, Foo) + beginConstructor(DeclarationKind.Class, null, null, null, null, null, set, Foo, Foo) handleNoType(}) handleIdentifier(Foo, methodDeclaration) handleNoTypeVariables(() @@ -74,7 +74,7 @@ beginCompilationUnit(class) beginMetadataStar(set) endMetadataStar(0) beginMember() - beginMethod(DeclarationKind.Class, null, null, null, null, null, set, Foo, Foo) + beginConstructor(DeclarationKind.Class, null, null, null, null, null, set, Foo, Foo) handleNoType(}) handleIdentifier(Foo, methodDeclaration) handleIdentifier(x, methodDeclarationContinuation) @@ -92,7 +92,7 @@ beginCompilationUnit(class) beginMetadataStar(set) endMetadataStar(0) beginMember() - beginMethod(DeclarationKind.Class, null, null, null, null, null, set, Foo, Foo) + beginConstructor(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 d1cbfdf4b22..3bc26bb0d77 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 @@ -67,7 +67,7 @@ parseUnit(class) 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, Foo) + listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, set, Foo, Foo) listener: handleNoType(}) ensureIdentifierPotentiallyRecovered(set, methodDeclaration, false) listener: handleIdentifier(Foo, methodDeclaration) @@ -127,7 +127,7 @@ parseUnit(class) 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, Foo) + listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, set, Foo, Foo) listener: handleNoType(}) ensureIdentifierPotentiallyRecovered(set, methodDeclaration, false) listener: handleIdentifier(Foo, methodDeclaration) @@ -164,7 +164,7 @@ parseUnit(class) 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, Foo) + listener: beginConstructor(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/issue_22313.dart.expect b/pkg/front_end/parser_testcases/error_recovery/issue_22313.dart.expect index 09b30647ffa..b09b1bcf1cb 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 @@ -75,7 +75,7 @@ beginCompilationUnit(class) beginMetadataStar(Foo) endMetadataStar(0) beginMember() - beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo) + beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo) handleNoType({) handleIdentifier(Foo, methodDeclaration) handleNoTypeVariables(() @@ -118,7 +118,7 @@ beginCompilationUnit(class) beginMetadataStar(Bar) endMetadataStar(0) beginMember() - beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Bar, Bar) + beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, Bar, Bar) handleNoType({) handleIdentifier(Bar, methodDeclaration) handleNoTypeVariables(() @@ -161,7 +161,7 @@ beginCompilationUnit(class) beginMetadataStar(Baz) endMetadataStar(0) beginMember() - beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Baz, Baz) + beginConstructor(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 e60d1d0700e..46ce15a6ec0 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 @@ -101,7 +101,7 @@ parseUnit(class) 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, Foo) + listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo) listener: handleNoType({) ensureIdentifierPotentiallyRecovered({, methodDeclaration, false) listener: handleIdentifier(Foo, methodDeclaration) @@ -187,7 +187,7 @@ parseUnit(class) 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, Bar) + listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, Bar, Bar) listener: handleNoType({) ensureIdentifierPotentiallyRecovered({, methodDeclaration, false) listener: handleIdentifier(Bar, methodDeclaration) @@ -273,7 +273,7 @@ parseUnit(class) 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, Baz) + listener: beginConstructor(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 6ad3eeff463..29a40761fb7 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 @@ -47,7 +47,7 @@ beginCompilationUnit(const) beginMetadataStar(const) endMetadataStar(0) beginMember() - beginMethod(DeclarationKind.Class, null, null, null, null, const, null, Annotation, Annotation) + beginConstructor(DeclarationKind.Class, null, null, null, null, const, null, Annotation, Annotation) handleNoType(const) handleIdentifier(Annotation, 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 9f009325ea9..dc1adb6ded5 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 @@ parseUnit(const) listener: endMetadataStar(0) listener: beginMember() 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, Annotation) + listener: beginConstructor(DeclarationKind.Class, null, null, null, null, const, null, Annotation, Annotation) listener: handleNoType(const) ensureIdentifierPotentiallyRecovered(const, methodDeclaration, false) listener: handleIdentifier(Annotation, 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 0afdad28d3d..91ddd9a0e00 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 @@ -979,7 +979,7 @@ beginCompilationUnit(abstract) beginMetadataStar(Key) endMetadataStar(0) beginMember() - beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Key, Key) + beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, Key, Key) handleNoType(}) handleIdentifier(Key, methodDeclaration) handleNoTypeVariables(() @@ -1070,7 +1070,7 @@ beginCompilationUnit(abstract) beginMetadataStar(Key) endMetadataStar(0) beginMember() - beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Key, Key) + beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, Key, Key) handleNoType(}) handleIdentifier(Key, 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 c00ad4e9ae5..a4b4d9f15dc 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 @@ -2102,7 +2102,7 @@ parseUnit(abstract) 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, Key) + listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, Key, Key) listener: handleNoType(}) ensureIdentifierPotentiallyRecovered(}, methodDeclaration, false) listener: handleIdentifier(Key, methodDeclaration) @@ -2350,7 +2350,7 @@ parseUnit(abstract) 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, Key) + listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, Key, Key) listener: handleNoType(}) ensureIdentifierPotentiallyRecovered(}, methodDeclaration, false) listener: handleIdentifier(Key, 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 ee8ce0adedb..363c4390d6f 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 @@ -979,7 +979,7 @@ beginCompilationUnit(abstract) beginMetadataStar(Key) endMetadataStar(0) beginMember() - beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Key, Key) + beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, Key, Key) handleNoType(}) handleIdentifier(Key, methodDeclaration) handleNoTypeVariables(() @@ -1070,7 +1070,7 @@ beginCompilationUnit(abstract) beginMetadataStar(Key) endMetadataStar(0) beginMember() - beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Key, Key) + beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, Key, Key) handleNoType(}) handleIdentifier(Key, 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 7d454811532..451b42043c1 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 @@ -2106,7 +2106,7 @@ parseUnit(abstract) 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, Key) + listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, Key, Key) listener: handleNoType(}) ensureIdentifierPotentiallyRecovered(}, methodDeclaration, false) listener: handleIdentifier(Key, methodDeclaration) @@ -2354,7 +2354,7 @@ parseUnit(abstract) 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, Key) + listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, Key, Key) listener: handleNoType(}) ensureIdentifierPotentiallyRecovered(}, methodDeclaration, false) listener: handleIdentifier(Key, 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 37bc72aa9cb..b2d91166ff6 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 @@ -979,7 +979,7 @@ beginCompilationUnit(abstract) beginMetadataStar(Key) endMetadataStar(0) beginMember() - beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Key, Key) + beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, Key, Key) handleNoType(}) handleIdentifier(Key, methodDeclaration) handleNoTypeVariables(() @@ -1070,7 +1070,7 @@ beginCompilationUnit(abstract) beginMetadataStar(Key) endMetadataStar(0) beginMember() - beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Key, Key) + beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, Key, Key) handleNoType(}) handleIdentifier(Key, 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 799d9f4d8f6..f515181ff42 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 @@ -2106,7 +2106,7 @@ parseUnit(abstract) 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, Key) + listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, Key, Key) listener: handleNoType(}) ensureIdentifierPotentiallyRecovered(}, methodDeclaration, false) listener: handleIdentifier(Key, methodDeclaration) @@ -2354,7 +2354,7 @@ parseUnit(abstract) 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, Key) + listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, Key, Key) listener: handleNoType(}) ensureIdentifierPotentiallyRecovered(}, methodDeclaration, false) listener: handleIdentifier(Key, methodDeclaration) 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 b8b0db54b09..378568f3a21 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 @@ -33,7 +33,7 @@ beginCompilationUnit(class) beginMetadataStar(C) endMetadataStar(0) beginMember() - beginMethod(DeclarationKind.Class, null, null, null, null, null, null, C, C) + beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, C, C) handleNoType({) handleIdentifier(C, methodDeclaration) handleNoTypeVariables(() @@ -49,7 +49,7 @@ beginCompilationUnit(class) endMetadataStar(0) beginMember() handleRecoverableError(MissingOperatorKeyword, /, /) - beginMethod(DeclarationKind.Class, null, null, null, null, null, null, operator, C) + beginConstructor(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 08dc724e957..aa1c8b0e278 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 @@ -35,7 +35,7 @@ parseUnit(class) 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, C) + listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, C, C) listener: handleNoType({) ensureIdentifierPotentiallyRecovered({, methodDeclaration, false) listener: handleIdentifier(C, methodDeclaration) @@ -75,7 +75,7 @@ parseUnit(class) 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, C) + listener: beginConstructor(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_48380_1.dart.expect b/pkg/front_end/parser_testcases/error_recovery/issue_48380_1.dart.expect index 78cf9c4f227..206dc76ddac 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 @@ -49,7 +49,7 @@ beginCompilationUnit(enum) beginMetadataStar(const) endMetadataStar(0) beginMember() - beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E, E) + beginConstructor(DeclarationKind.Enum, null, null, null, null, const, null, E, E) handleNoType(const) handleIdentifier(E, methodDeclaration) handleNoTypeVariables(() @@ -63,7 +63,7 @@ beginCompilationUnit(enum) beginMetadataStar(const) endMetadataStar(0) beginMember() - beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E, E) + beginConstructor(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 2592250641a..1e62086e4e0 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 @@ -66,7 +66,7 @@ parseUnit(enum) listener: endMetadataStar(0) listener: beginMember() 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, E) + listener: beginConstructor(DeclarationKind.Enum, null, null, null, null, const, null, E, E) listener: handleNoType(const) ensureIdentifierPotentiallyRecovered(const, methodDeclaration, false) listener: handleIdentifier(E, methodDeclaration) @@ -95,7 +95,7 @@ parseUnit(enum) listener: endMetadataStar(0) listener: beginMember() 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, E) + listener: beginConstructor(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 80c68976a6f..9e8d2118965 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 @@ -64,7 +64,7 @@ beginCompilationUnit(enum) beginMetadataStar(const) endMetadataStar(0) beginMember() - beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E, E) + beginConstructor(DeclarationKind.Enum, null, null, null, null, const, null, E, E) handleNoType(const) handleIdentifier(E, methodDeclaration) handleNoTypeVariables(() @@ -78,7 +78,7 @@ beginCompilationUnit(enum) beginMetadataStar(const) endMetadataStar(0) beginMember() - beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E, E) + beginConstructor(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 b77dc96d245..2e7f38e990f 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 @@ -87,7 +87,7 @@ parseUnit(enum) listener: endMetadataStar(0) listener: beginMember() 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, E) + listener: beginConstructor(DeclarationKind.Enum, null, null, null, null, const, null, E, E) listener: handleNoType(const) ensureIdentifierPotentiallyRecovered(const, methodDeclaration, false) listener: handleIdentifier(E, methodDeclaration) @@ -116,7 +116,7 @@ parseUnit(enum) listener: endMetadataStar(0) listener: beginMember() 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, E) + listener: beginConstructor(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 e2f2230699a..44652a45cc0 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 @@ -52,7 +52,7 @@ beginCompilationUnit(enum) beginMetadataStar(const) endMetadataStar(0) beginMember() - beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E, E) + beginConstructor(DeclarationKind.Enum, null, null, null, null, const, null, E, E) handleNoType(const) handleIdentifier(E, methodDeclaration) handleNoTypeVariables(() @@ -66,7 +66,7 @@ beginCompilationUnit(enum) beginMetadataStar(const) endMetadataStar(0) beginMember() - beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E, E) + beginConstructor(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 05234a65f8b..69bbe43d6dc 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 @@ -80,7 +80,7 @@ parseUnit(enum) listener: endMetadataStar(0) listener: beginMember() 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, E) + listener: beginConstructor(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 @@ parseUnit(enum) listener: endMetadataStar(0) listener: beginMember() 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, E) + listener: beginConstructor(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 0747a1754d1..921af985c32 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 @@ -37,7 +37,7 @@ beginCompilationUnit(enum) beginMetadataStar(const) endMetadataStar(0) beginMember() - beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E, E) + beginConstructor(DeclarationKind.Enum, null, null, null, null, const, null, E, E) handleNoType(const) handleIdentifier(E, methodDeclaration) handleNoTypeVariables(() @@ -51,7 +51,7 @@ beginCompilationUnit(enum) beginMetadataStar(const) endMetadataStar(0) beginMember() - beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E, E) + beginConstructor(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 a2f9951881f..21287c9d92d 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 @@ -59,7 +59,7 @@ parseUnit(enum) listener: endMetadataStar(0) listener: beginMember() 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, E) + listener: beginConstructor(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 @@ parseUnit(enum) listener: endMetadataStar(0) listener: beginMember() 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, E) + listener: beginConstructor(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 4ff37f4210c..3c789ed8355 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 @@ -44,7 +44,7 @@ beginCompilationUnit(enum) beginMetadataStar(const) endMetadataStar(0) beginMember() - beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E, E) + beginConstructor(DeclarationKind.Enum, null, null, null, null, const, null, E, E) handleNoType(const) handleIdentifier(E, methodDeclaration) handleNoTypeVariables(() @@ -58,7 +58,7 @@ beginCompilationUnit(enum) beginMetadataStar(const) endMetadataStar(0) beginMember() - beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E, E) + beginConstructor(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 883f17eacf2..38dfd05cdbd 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 @@ -61,7 +61,7 @@ parseUnit(enum) listener: endMetadataStar(0) listener: beginMember() 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, E) + listener: beginConstructor(DeclarationKind.Enum, null, null, null, null, const, null, E, E) listener: handleNoType(const) ensureIdentifierPotentiallyRecovered(const, methodDeclaration, false) listener: handleIdentifier(E, methodDeclaration) @@ -90,7 +90,7 @@ parseUnit(enum) listener: endMetadataStar(0) listener: beginMember() 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, E) + listener: beginConstructor(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 9704986e5c6..44424c80a2d 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 @@ -59,7 +59,7 @@ beginCompilationUnit(enum) beginMetadataStar(const) endMetadataStar(0) beginMember() - beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E, E) + beginConstructor(DeclarationKind.Enum, null, null, null, null, const, null, E, E) handleNoType(const) handleIdentifier(E, methodDeclaration) handleNoTypeVariables(() @@ -73,7 +73,7 @@ beginCompilationUnit(enum) beginMetadataStar(const) endMetadataStar(0) beginMember() - beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E, E) + beginConstructor(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 6aa12ed1a2e..4aafa633fda 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 @@ -82,7 +82,7 @@ parseUnit(enum) listener: endMetadataStar(0) listener: beginMember() 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, E) + listener: beginConstructor(DeclarationKind.Enum, null, null, null, null, const, null, E, E) listener: handleNoType(const) ensureIdentifierPotentiallyRecovered(const, methodDeclaration, false) listener: handleIdentifier(E, methodDeclaration) @@ -111,7 +111,7 @@ parseUnit(enum) listener: endMetadataStar(0) listener: beginMember() 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, E) + listener: beginConstructor(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 e3bc3ada16e..21b8a4b58ac 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 @@ -52,7 +52,7 @@ beginCompilationUnit(enum) beginMetadataStar(const) endMetadataStar(0) beginMember() - beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E, E) + beginConstructor(DeclarationKind.Enum, null, null, null, null, const, null, E, E) handleNoType(const) handleIdentifier(E, methodDeclaration) handleNoTypeVariables(() @@ -66,7 +66,7 @@ beginCompilationUnit(enum) beginMetadataStar(const) endMetadataStar(0) beginMember() - beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E, E) + beginConstructor(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 a0e7140811a..6d7693272ea 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 @@ -79,7 +79,7 @@ parseUnit(enum) listener: endMetadataStar(0) listener: beginMember() 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, E) + listener: beginConstructor(DeclarationKind.Enum, null, null, null, null, const, null, E, E) listener: handleNoType(const) ensureIdentifierPotentiallyRecovered(const, methodDeclaration, false) listener: handleIdentifier(E, methodDeclaration) @@ -108,7 +108,7 @@ parseUnit(enum) listener: endMetadataStar(0) listener: beginMember() 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, E) + listener: beginConstructor(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 e90967201fd..46fb3a2604e 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 @@ -37,7 +37,7 @@ beginCompilationUnit(enum) beginMetadataStar(const) endMetadataStar(0) beginMember() - beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E, E) + beginConstructor(DeclarationKind.Enum, null, null, null, null, const, null, E, E) handleNoType(const) handleIdentifier(E, methodDeclaration) handleNoTypeVariables(() @@ -51,7 +51,7 @@ beginCompilationUnit(enum) beginMetadataStar(const) endMetadataStar(0) beginMember() - beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E, E) + beginConstructor(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 dd4f11b4558..4c8bcb71b47 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 @@ -58,7 +58,7 @@ parseUnit(enum) listener: endMetadataStar(0) listener: beginMember() 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, E) + listener: beginConstructor(DeclarationKind.Enum, null, null, null, null, const, null, E, E) listener: handleNoType(const) ensureIdentifierPotentiallyRecovered(const, methodDeclaration, false) listener: handleIdentifier(E, methodDeclaration) @@ -87,7 +87,7 @@ parseUnit(enum) listener: endMetadataStar(0) listener: beginMember() 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, E) + listener: beginConstructor(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 b63245f42e2..e7a95c21beb 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 @@ -37,7 +37,7 @@ beginCompilationUnit(enum) beginMetadataStar(const) endMetadataStar(0) beginMember() - beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E, E) + beginConstructor(DeclarationKind.Enum, null, null, null, null, const, null, E, E) handleNoType(const) handleIdentifier(E, methodDeclaration) handleNoTypeVariables(() @@ -51,7 +51,7 @@ beginCompilationUnit(enum) beginMetadataStar(const) endMetadataStar(0) beginMember() - beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E, E) + beginConstructor(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 a2d5cb8718a..9b1c76a4235 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 @@ -54,7 +54,7 @@ parseUnit(enum) listener: endMetadataStar(0) listener: beginMember() 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, E) + listener: beginConstructor(DeclarationKind.Enum, null, null, null, null, const, null, E, E) listener: handleNoType(const) ensureIdentifierPotentiallyRecovered(const, methodDeclaration, false) listener: handleIdentifier(E, methodDeclaration) @@ -83,7 +83,7 @@ parseUnit(enum) listener: endMetadataStar(0) listener: beginMember() 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, E) + listener: beginConstructor(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 a4ecf8e95ae..d17cc49569b 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 @@ -48,7 +48,7 @@ beginCompilationUnit(enum) beginMetadataStar(const) endMetadataStar(0) beginMember() - beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E, E) + beginConstructor(DeclarationKind.Enum, null, null, null, null, const, null, E, E) handleNoType(const) handleIdentifier(E, methodDeclaration) handleNoTypeVariables(() @@ -62,7 +62,7 @@ beginCompilationUnit(enum) beginMetadataStar(const) endMetadataStar(0) beginMember() - beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E, E) + beginConstructor(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 665bbc535c2..f588858f98a 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 @@ -71,7 +71,7 @@ parseUnit(enum) listener: endMetadataStar(0) listener: beginMember() 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, E) + listener: beginConstructor(DeclarationKind.Enum, null, null, null, null, const, null, E, E) listener: handleNoType(const) ensureIdentifierPotentiallyRecovered(const, methodDeclaration, false) listener: handleIdentifier(E, methodDeclaration) @@ -100,7 +100,7 @@ parseUnit(enum) listener: endMetadataStar(0) listener: beginMember() 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, E) + listener: beginConstructor(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 6279f79cb59..43b5c99220e 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 @@ -36,7 +36,7 @@ beginCompilationUnit(enum) beginMetadataStar(const) endMetadataStar(0) beginMember() - beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E, E) + beginConstructor(DeclarationKind.Enum, null, null, null, null, const, null, E, E) handleNoType(const) handleIdentifier(E, methodDeclaration) handleNoTypeVariables(() @@ -50,7 +50,7 @@ beginCompilationUnit(enum) beginMetadataStar(const) endMetadataStar(0) beginMember() - beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E, E) + beginConstructor(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 6fe0eaa399f..574f6b4bb5b 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 @@ -64,7 +64,7 @@ parseUnit(enum) listener: endMetadataStar(0) listener: beginMember() 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, E) + listener: beginConstructor(DeclarationKind.Enum, null, null, null, null, const, null, E, E) listener: handleNoType(const) ensureIdentifierPotentiallyRecovered(const, methodDeclaration, false) listener: handleIdentifier(E, methodDeclaration) @@ -93,7 +93,7 @@ parseUnit(enum) listener: endMetadataStar(0) listener: beginMember() 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, E) + listener: beginConstructor(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 83f6273f096..4871f2303a2 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 @@ -25,7 +25,7 @@ beginCompilationUnit(enum) beginMetadataStar(const) endMetadataStar(0) beginMember() - beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E, E) + beginConstructor(DeclarationKind.Enum, null, null, null, null, const, null, E, E) handleNoType(const) handleIdentifier(E, methodDeclaration) handleNoTypeVariables(() @@ -39,7 +39,7 @@ beginCompilationUnit(enum) beginMetadataStar(const) endMetadataStar(0) beginMember() - beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E, E) + beginConstructor(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 26e38944c68..37d96f9eb84 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 @@ -47,7 +47,7 @@ parseUnit(enum) listener: endMetadataStar(0) listener: beginMember() 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, E) + listener: beginConstructor(DeclarationKind.Enum, null, null, null, null, const, null, E, E) listener: handleNoType(const) ensureIdentifierPotentiallyRecovered(const, methodDeclaration, false) listener: handleIdentifier(E, methodDeclaration) @@ -76,7 +76,7 @@ parseUnit(enum) listener: endMetadataStar(0) listener: beginMember() 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, E) + listener: beginConstructor(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_48411.dart.expect b/pkg/front_end/parser_testcases/error_recovery/issue_48411.dart.expect index 318d750efef..0357bbd33da 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 @@ -41,7 +41,7 @@ beginCompilationUnit(class) beginMetadataStar(A) endMetadataStar(0) beginMember() - beginMethod(DeclarationKind.Class, null, null, null, null, null, null, A, A) + beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, A, A) handleNoType({) handleIdentifier(A, methodDeclaration) handleNoTypeVariables(() @@ -64,7 +64,7 @@ beginCompilationUnit(class) beginMetadataStar(A) endMetadataStar(0) beginMember() - beginMethod(DeclarationKind.Class, null, null, null, null, null, null, A, A) + beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, A, A) handleNoType(;) handleIdentifier(A, methodDeclaration) handleIdentifier(y, methodDeclarationContinuation) @@ -107,7 +107,7 @@ beginCompilationUnit(class) beginMetadataStar(B) endMetadataStar(0) beginMember() - beginMethod(DeclarationKind.Class, null, null, null, null, null, null, B, B) + beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, B, B) handleNoType({) handleIdentifier(B, methodDeclaration) handleNoTypeVariables(() @@ -172,7 +172,7 @@ beginCompilationUnit(class) beginMetadataStar(B2) endMetadataStar(0) beginMember() - beginMethod(DeclarationKind.Class, null, null, null, null, null, null, B2, B2) + beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, B2, B2) handleNoType({) handleIdentifier(B2, methodDeclaration) handleNoTypeVariables(() @@ -239,7 +239,7 @@ beginCompilationUnit(class) beginMetadataStar(B3) endMetadataStar(0) beginMember() - beginMethod(DeclarationKind.Class, null, null, null, null, null, null, B3, B3) + beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, B3, B3) handleNoType({) handleIdentifier(B3, methodDeclaration) handleNoTypeVariables(() @@ -288,7 +288,7 @@ beginCompilationUnit(class) beginMetadataStar(B3) endMetadataStar(0) beginMember() - beginMethod(DeclarationKind.Class, null, null, null, null, null, null, B3, B3) + beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, B3, B3) handleNoType(;) handleIdentifier(B3, methodDeclaration) handleIdentifier(y, methodDeclarationContinuation) @@ -342,7 +342,7 @@ beginCompilationUnit(class) beginMetadataStar(C) endMetadataStar(0) beginMember() - beginMethod(DeclarationKind.Class, null, null, null, null, null, null, C, C) + beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, C, C) handleNoType(;) handleIdentifier(C, methodDeclaration) handleNoTypeVariables(() @@ -407,7 +407,7 @@ beginCompilationUnit(class) beginMetadataStar(D) endMetadataStar(0) beginMember() - beginMethod(DeclarationKind.Class, null, null, null, null, null, null, D, D) + beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, D, D) handleNoType({) handleIdentifier(D, methodDeclaration) handleNoTypeVariables(() @@ -486,7 +486,7 @@ beginCompilationUnit(class) beginMetadataStar(E) endMetadataStar(0) beginMember() - beginMethod(DeclarationKind.Class, null, null, null, null, null, null, E, E) + beginConstructor(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 50c941096a8..4908be67950 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 @@ -35,7 +35,7 @@ parseUnit(class) 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, A) + listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, A, A) listener: handleNoType({) ensureIdentifierPotentiallyRecovered({, methodDeclaration, false) listener: handleIdentifier(A, methodDeclaration) @@ -77,7 +77,7 @@ parseUnit(class) 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, A) + listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, A, A) listener: handleNoType(;) ensureIdentifierPotentiallyRecovered(;, methodDeclaration, false) listener: handleIdentifier(A, methodDeclaration) @@ -155,7 +155,7 @@ parseUnit(class) 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, B) + listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, B, B) listener: handleNoType({) ensureIdentifierPotentiallyRecovered({, methodDeclaration, false) listener: handleIdentifier(B, methodDeclaration) @@ -286,7 +286,7 @@ parseUnit(class) 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, B2) + listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, B2, B2) listener: handleNoType({) ensureIdentifierPotentiallyRecovered({, methodDeclaration, false) listener: handleIdentifier(B2, methodDeclaration) @@ -424,7 +424,7 @@ parseUnit(class) 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, B3) + listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, B3, B3) listener: handleNoType({) ensureIdentifierPotentiallyRecovered({, methodDeclaration, false) listener: handleIdentifier(B3, methodDeclaration) @@ -529,7 +529,7 @@ parseUnit(class) 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, B3) + listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, B3, B3) listener: handleNoType(;) ensureIdentifierPotentiallyRecovered(;, methodDeclaration, false) listener: handleIdentifier(B3, methodDeclaration) @@ -624,7 +624,7 @@ parseUnit(class) 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, C) + listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, C, C) listener: handleNoType(;) ensureIdentifierPotentiallyRecovered(;, methodDeclaration, false) listener: handleIdentifier(C, methodDeclaration) @@ -763,7 +763,7 @@ parseUnit(class) 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, D) + listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, D, D) listener: handleNoType({) ensureIdentifierPotentiallyRecovered({, methodDeclaration, false) listener: handleIdentifier(D, methodDeclaration) @@ -924,7 +924,7 @@ parseUnit(class) 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, E) + listener: beginConstructor(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 691213d88b3..9c19ba8c32e 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 @@ -15,7 +15,7 @@ beginCompilationUnit(class) beginMetadataStar(A) endMetadataStar(0) beginMember() - beginMethod(DeclarationKind.Class, null, null, null, null, null, null, A, A) + beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, A, A) handleNoType({) handleIdentifier(A, methodDeclaration) handleNoTypeVariables(() @@ -38,7 +38,7 @@ beginCompilationUnit(class) beginMetadataStar(A) endMetadataStar(0) beginMember() - beginMethod(DeclarationKind.Class, null, null, null, null, null, null, A, A) + beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, A, A) handleNoType(;) handleIdentifier(A, methodDeclaration) handleIdentifier(y, methodDeclarationContinuation) @@ -81,7 +81,7 @@ beginCompilationUnit(class) beginMetadataStar(B) endMetadataStar(0) beginMember() - beginMethod(DeclarationKind.Class, null, null, null, null, null, null, B, B) + beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, B, B) handleNoType({) handleIdentifier(B, methodDeclaration) handleNoTypeVariables(() @@ -145,7 +145,7 @@ beginCompilationUnit(class) beginMetadataStar(B2) endMetadataStar(0) beginMember() - beginMethod(DeclarationKind.Class, null, null, null, null, null, null, B2, B2) + beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, B2, B2) handleNoType({) handleIdentifier(B2, methodDeclaration) handleNoTypeVariables(() @@ -211,7 +211,7 @@ beginCompilationUnit(class) beginMetadataStar(B3) endMetadataStar(0) beginMember() - beginMethod(DeclarationKind.Class, null, null, null, null, null, null, B3, B3) + beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, B3, B3) handleNoType({) handleIdentifier(B3, methodDeclaration) handleNoTypeVariables(() @@ -259,7 +259,7 @@ beginCompilationUnit(class) beginMetadataStar(B3) endMetadataStar(0) beginMember() - beginMethod(DeclarationKind.Class, null, null, null, null, null, null, B3, B3) + beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, B3, B3) handleNoType(;) handleIdentifier(B3, methodDeclaration) handleIdentifier(y, methodDeclarationContinuation) @@ -313,7 +313,7 @@ beginCompilationUnit(class) beginMetadataStar(C) endMetadataStar(0) beginMember() - beginMethod(DeclarationKind.Class, null, null, null, null, null, null, C, C) + beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, C, C) handleNoType(;) handleIdentifier(C, methodDeclaration) handleNoTypeVariables(() @@ -377,7 +377,7 @@ beginCompilationUnit(class) beginMetadataStar(D) endMetadataStar(0) beginMember() - beginMethod(DeclarationKind.Class, null, null, null, null, null, null, D, D) + beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, D, D) handleNoType({) handleIdentifier(D, methodDeclaration) handleNoTypeVariables(() @@ -455,7 +455,7 @@ beginCompilationUnit(class) beginMetadataStar(E) endMetadataStar(0) beginMember() - beginMethod(DeclarationKind.Class, null, null, null, null, null, null, E, E) + beginConstructor(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 1e24cd9cef4..836e09d4593 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 @@ -35,7 +35,7 @@ parseUnit(class) 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, A) + listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, A, A) listener: handleNoType({) ensureIdentifierPotentiallyRecovered({, methodDeclaration, false) listener: handleIdentifier(A, methodDeclaration) @@ -77,7 +77,7 @@ parseUnit(class) 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, A) + listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, A, A) listener: handleNoType(;) ensureIdentifierPotentiallyRecovered(;, methodDeclaration, false) listener: handleIdentifier(A, methodDeclaration) @@ -155,7 +155,7 @@ parseUnit(class) 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, B) + listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, B, B) listener: handleNoType({) ensureIdentifierPotentiallyRecovered({, methodDeclaration, false) listener: handleIdentifier(B, methodDeclaration) @@ -283,7 +283,7 @@ parseUnit(class) 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, B2) + listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, B2, B2) listener: handleNoType({) ensureIdentifierPotentiallyRecovered({, methodDeclaration, false) listener: handleIdentifier(B2, methodDeclaration) @@ -418,7 +418,7 @@ parseUnit(class) 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, B3) + listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, B3, B3) listener: handleNoType({) ensureIdentifierPotentiallyRecovered({, methodDeclaration, false) listener: handleIdentifier(B3, methodDeclaration) @@ -520,7 +520,7 @@ parseUnit(class) 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, B3) + listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, B3, B3) listener: handleNoType(;) ensureIdentifierPotentiallyRecovered(;, methodDeclaration, false) listener: handleIdentifier(B3, methodDeclaration) @@ -615,7 +615,7 @@ parseUnit(class) 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, C) + listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, C, C) listener: handleNoType(;) ensureIdentifierPotentiallyRecovered(;, methodDeclaration, false) listener: handleIdentifier(C, methodDeclaration) @@ -751,7 +751,7 @@ parseUnit(class) 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, D) + listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, D, D) listener: handleNoType({) ensureIdentifierPotentiallyRecovered({, methodDeclaration, false) listener: handleIdentifier(D, methodDeclaration) @@ -909,7 +909,7 @@ parseUnit(class) 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, E) + listener: beginConstructor(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 dd19b20320f..2bb3d4f8421 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 @@ -85,7 +85,7 @@ beginCompilationUnit(class) beginMetadataStar(C) endMetadataStar(0) beginMember() - beginMethod(DeclarationKind.Class, null, null, null, null, null, null, C, C) + beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, C, C) handleNoType({) handleIdentifier(C, methodDeclaration) handleNoTypeVariables(() @@ -146,7 +146,7 @@ beginCompilationUnit(class) beginMetadataStar(C) endMetadataStar(0) beginMember() - beginMethod(DeclarationKind.Class, null, null, null, null, null, null, C, C) + beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, C, C) handleNoType({) handleIdentifier(C, methodDeclaration) handleNoTypeVariables(() @@ -226,7 +226,7 @@ beginCompilationUnit(class) beginMetadataStar(C) endMetadataStar(0) beginMember() - beginMethod(DeclarationKind.Class, null, null, null, null, null, null, C, C) + beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, C, C) handleNoType({) handleIdentifier(C, methodDeclaration) handleNoTypeVariables(() @@ -262,7 +262,7 @@ beginCompilationUnit(class) beginMetadataStar(C) endMetadataStar(0) beginMember() - beginMethod(DeclarationKind.Class, null, null, null, null, null, null, C, C) + beginConstructor(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 5f44148c878..8a335f457e3 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 @@ -35,7 +35,7 @@ parseUnit(class) 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, C) + listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, C, C) listener: handleNoType({) ensureIdentifierPotentiallyRecovered({, methodDeclaration, false) listener: handleIdentifier(C, methodDeclaration) @@ -160,7 +160,7 @@ parseUnit(class) 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, C) + listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, C, C) listener: handleNoType({) ensureIdentifierPotentiallyRecovered({, methodDeclaration, false) listener: handleIdentifier(C, methodDeclaration) @@ -342,7 +342,7 @@ parseUnit(class) 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, C) + listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, C, C) listener: handleNoType({) ensureIdentifierPotentiallyRecovered({, methodDeclaration, false) listener: handleIdentifier(C, methodDeclaration) @@ -422,7 +422,7 @@ parseUnit(class) 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, C) + listener: beginConstructor(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/issue_54284.dart.expect b/pkg/front_end/parser_testcases/error_recovery/issue_54284.dart.expect index ff38df76c44..4a8049b4b56 100644 --- a/pkg/front_end/parser_testcases/error_recovery/issue_54284.dart.expect +++ b/pkg/front_end/parser_testcases/error_recovery/issue_54284.dart.expect @@ -86,7 +86,7 @@ beginCompilationUnit(var) beginMetadataStar(A) endMetadataStar(0) beginMember() - beginMethod(DeclarationKind.Class, null, null, null, null, null, null, A, A) + beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, A, A) handleNoType(;) handleIdentifier(A, methodDeclaration) handleNoTypeVariables(() @@ -115,7 +115,7 @@ beginCompilationUnit(var) beginMetadataStar(A) endMetadataStar(0) beginMember() - beginMethod(DeclarationKind.Class, null, null, null, null, null, null, A, A) + beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, A, A) handleNoType(;) handleIdentifier(A, methodDeclaration) handleNoTypeVariables(() @@ -171,7 +171,7 @@ beginCompilationUnit(var) beginMetadataStar(A) endMetadataStar(0) beginMember() - beginMethod(DeclarationKind.Class, null, null, null, null, null, null, A, A) + beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, A, A) handleNoType(;) handleIdentifier(A, methodDeclaration) handleNoTypeVariables(() @@ -204,7 +204,7 @@ beginCompilationUnit(var) beginMetadataStar(A) endMetadataStar(0) beginMember() - beginMethod(DeclarationKind.Class, null, null, null, null, null, null, A, A) + beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, A, A) handleNoType(;) handleIdentifier(A, methodDeclaration) handleNoTypeVariables(() @@ -264,7 +264,7 @@ beginCompilationUnit(var) beginMetadataStar(A) endMetadataStar(0) beginMember() - beginMethod(DeclarationKind.Class, null, null, null, null, null, null, A, A) + beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, A, A) handleNoType(;) handleIdentifier(A, methodDeclaration) handleNoTypeVariables(() @@ -295,7 +295,7 @@ beginCompilationUnit(var) beginMetadataStar(A) endMetadataStar(0) beginMember() - beginMethod(DeclarationKind.Class, null, null, null, null, null, null, A, A) + beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, A, A) handleNoType(;) handleIdentifier(A, methodDeclaration) handleNoTypeVariables(() diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_54284.dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/issue_54284.dart.intertwined.expect index e7297bde72a..e0fd74f504c 100644 --- a/pkg/front_end/parser_testcases/error_recovery/issue_54284.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/error_recovery/issue_54284.dart.intertwined.expect @@ -209,7 +209,7 @@ parseUnit(var) 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, A) + listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, A, A) listener: handleNoType(;) ensureIdentifierPotentiallyRecovered(;, methodDeclaration, false) listener: handleIdentifier(A, methodDeclaration) @@ -281,7 +281,7 @@ parseUnit(var) 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, A) + listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, A, A) listener: handleNoType(;) ensureIdentifierPotentiallyRecovered(;, methodDeclaration, false) listener: handleIdentifier(A, methodDeclaration) @@ -402,7 +402,7 @@ parseUnit(var) 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, A) + listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, A, A) listener: handleNoType(;) ensureIdentifierPotentiallyRecovered(;, methodDeclaration, false) listener: handleIdentifier(A, methodDeclaration) @@ -487,7 +487,7 @@ parseUnit(var) 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, A) + listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, A, A) listener: handleNoType(;) ensureIdentifierPotentiallyRecovered(;, methodDeclaration, false) listener: handleIdentifier(A, methodDeclaration) @@ -621,7 +621,7 @@ parseUnit(var) 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, A) + listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, A, A) listener: handleNoType(;) ensureIdentifierPotentiallyRecovered(;, methodDeclaration, false) listener: handleIdentifier(A, methodDeclaration) @@ -695,7 +695,7 @@ parseUnit(var) 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, A) + listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, A, A) listener: handleNoType(;) ensureIdentifierPotentiallyRecovered(;, methodDeclaration, false) listener: handleIdentifier(A, methodDeclaration) 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 fadc5db10ae..9e1811ca689 100644 --- a/pkg/front_end/parser_testcases/general/issue_41121.dart.expect +++ b/pkg/front_end/parser_testcases/general/issue_41121.dart.expect @@ -68,7 +68,7 @@ beginCompilationUnit(class) beginMetadataStar(ConfigurationService) endMetadataStar(0) beginMember() - beginMethod(DeclarationKind.Class, null, null, null, null, null, null, ConfigurationService, ConfigurationService) + beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, ConfigurationService, ConfigurationService) handleNoType(;) handleIdentifier(ConfigurationService, methodDeclaration) handleNoTypeVariables(() @@ -115,7 +115,7 @@ beginCompilationUnit(class) beginMetadataStar(void) endMetadataStar(0) beginMember() - beginMethod(DeclarationKind.Class, null, null, null, null, null, set, configuration, ConfigurationService) + beginConstructor(DeclarationKind.Class, null, null, null, null, null, set, configuration, ConfigurationService) handleVoidKeyword(void) handleIdentifier(configuration, methodDeclaration) handleNoTypeVariables(() @@ -165,7 +165,7 @@ beginCompilationUnit(class) beginMetadataStar(Configuration) endMetadataStar(0) beginMember() - beginMethod(DeclarationKind.Class, null, null, null, null, null, get, configuration, ConfigurationService) + beginConstructor(DeclarationKind.Class, null, null, null, null, null, get, configuration, ConfigurationService) handleIdentifier(Configuration, typeReference) handleNoTypeArguments(get) handleType(Configuration, null) @@ -220,7 +220,7 @@ beginCompilationUnit(class) beginMetadataStar(void) endMetadataStar(0) beginMember() - beginMethod(DeclarationKind.Class, null, null, null, null, null, null, method, ConfigurationService) + beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, method, ConfigurationService) handleVoidKeyword(void) handleIdentifier(method, methodDeclaration) handleNoTypeVariables(() @@ -246,7 +246,7 @@ beginCompilationUnit(class) beginMetadataStar(Foo) endMetadataStar(0) beginMember() - beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo, ConfigurationService) + beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, Foo, ConfigurationService) handleNoType(}) handleIdentifier(Foo, methodDeclaration) handleNoTypeVariables(() 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 6ecbd7c539c..1feafccb8cb 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 @@ -52,7 +52,7 @@ parseUnit(class) 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, ConfigurationService) + listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, ConfigurationService, ConfigurationService) listener: handleNoType(;) ensureIdentifierPotentiallyRecovered(;, methodDeclaration, false) listener: handleIdentifier(ConfigurationService, methodDeclaration) @@ -156,7 +156,7 @@ parseUnit(class) 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, ConfigurationService) + listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, set, configuration, ConfigurationService) listener: handleVoidKeyword(void) ensureIdentifierPotentiallyRecovered(set, methodDeclaration, false) listener: handleIdentifier(configuration, methodDeclaration) @@ -266,7 +266,7 @@ parseUnit(class) 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, ConfigurationService) + listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, get, configuration, ConfigurationService) listener: handleIdentifier(Configuration, typeReference) listener: handleNoTypeArguments(get) listener: handleType(Configuration, null) @@ -402,7 +402,7 @@ parseUnit(class) 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, ConfigurationService) + listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, method, ConfigurationService) listener: handleVoidKeyword(void) ensureIdentifierPotentiallyRecovered(void, methodDeclaration, false) listener: handleIdentifier(method, methodDeclaration) @@ -465,7 +465,7 @@ parseUnit(class) 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, ConfigurationService) + listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, Foo, ConfigurationService) listener: handleNoType(}) ensureIdentifierPotentiallyRecovered(}, methodDeclaration, false) listener: handleIdentifier(Foo, methodDeclaration) 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 95aa80dcc7a..8691833680a 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 @@ -57,7 +57,7 @@ beginCompilationUnit(class) beginMetadataStar(C) endMetadataStar(0) beginMember() - beginMethod(DeclarationKind.Class, null, null, null, null, null, null, C, C) + beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, C, C) handleNoType({) handleIdentifier(C, methodDeclaration) handleNewAsIdentifier(new) @@ -74,7 +74,7 @@ beginCompilationUnit(class) beginMetadataStar(C) endMetadataStar(0) beginMember() - beginMethod(DeclarationKind.Class, null, null, null, null, null, null, C, C) + beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, C, C) handleNoType(;) handleIdentifier(C, methodDeclaration) handleIdentifier(constructor_field_initializer, methodDeclarationContinuation) @@ -277,7 +277,7 @@ beginCompilationUnit(class) beginMetadataStar(D) endMetadataStar(0) beginMember() - beginMethod(DeclarationKind.Class, null, null, null, null, null, null, D, D) + beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, D, D) handleNoType(;) handleIdentifier(D, methodDeclaration) handleIdentifier(super_invocation, methodDeclarationContinuation) @@ -304,7 +304,7 @@ beginCompilationUnit(class) beginMetadataStar(D) endMetadataStar(0) beginMember() - beginMethod(DeclarationKind.Class, null, null, null, null, null, null, D, D) + beginConstructor(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 3cdee4579dd..7dc12bab4dc 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 @@ -35,7 +35,7 @@ parseUnit(class) 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, C) + listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, C, C) listener: handleNoType({) ensureIdentifierPotentiallyRecovered({, methodDeclaration, false) listener: handleIdentifier(C, methodDeclaration) @@ -71,7 +71,7 @@ parseUnit(class) 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, C) + listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, C, C) listener: handleNoType(;) ensureIdentifierPotentiallyRecovered(;, methodDeclaration, false) listener: handleIdentifier(C, methodDeclaration) @@ -504,7 +504,7 @@ parseUnit(class) 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, D) + listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, D, D) listener: handleNoType(;) ensureIdentifierPotentiallyRecovered(;, methodDeclaration, false) listener: handleIdentifier(D, methodDeclaration) @@ -568,7 +568,7 @@ parseUnit(class) 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, D) + listener: beginConstructor(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_hat_class.crash_dart.expect b/pkg/front_end/parser_testcases/general/operator_hat_class.crash_dart.expect index 0597456df7c..2c1283ce6ac 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 @@ -22,7 +22,7 @@ beginCompilationUnit(class) beginMetadataStar(operator) endMetadataStar(0) beginMember() - beginMethod(DeclarationKind.Class, null, null, null, null, null, null, operator, operator) + beginConstructor(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 dc7f9dfa3d3..64ad2edcab2 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 @@ -36,7 +36,7 @@ parseUnit(class) 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, operator) + listener: beginConstructor(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 358d23238f1..652a24f933b 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 @@ beginCompilationUnit(extension) beginMetadataStar(ExtensionType4) endMetadataStar(0) beginMember() - beginMethod(DeclarationKind.ExtensionType, null, null, null, null, null, null, ExtensionType4, ExtensionType4) + beginConstructor(DeclarationKind.ExtensionType, null, null, null, null, null, null, ExtensionType4, ExtensionType4) handleNoType({) handleIdentifier(ExtensionType4, methodDeclaration) handleIdentifier(constructor, methodDeclarationContinuation) @@ -136,7 +136,7 @@ beginCompilationUnit(extension) beginMetadataStar(ExtensionType4) endMetadataStar(0) beginMember() - beginMethod(DeclarationKind.ExtensionType, null, null, null, null, null, null, ExtensionType4, ExtensionType4) + beginConstructor(DeclarationKind.ExtensionType, null, null, null, null, null, null, ExtensionType4, ExtensionType4) handleNoType(;) handleIdentifier(ExtensionType4, methodDeclaration) handleIdentifier(redirect, methodDeclarationContinuation) 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 fa827a5d636..49ff613ec63 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 @@ -172,7 +172,7 @@ parseUnit(extension) 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, ExtensionType4) + listener: beginConstructor(DeclarationKind.ExtensionType, null, null, null, null, null, null, ExtensionType4, ExtensionType4) listener: handleNoType({) ensureIdentifierPotentiallyRecovered({, methodDeclaration, false) listener: handleIdentifier(ExtensionType4, methodDeclaration) @@ -216,7 +216,7 @@ parseUnit(extension) 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, ExtensionType4) + listener: beginConstructor(DeclarationKind.ExtensionType, null, null, null, null, null, null, ExtensionType4, ExtensionType4) listener: handleNoType(;) ensureIdentifierPotentiallyRecovered(;, methodDeclaration, false) listener: handleIdentifier(ExtensionType4, methodDeclaration) 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 90566abc451..a469018b7c4 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 @@ beginCompilationUnit(extension) beginMetadataStar(const) endMetadataStar(0) beginMember() - beginMethod(DeclarationKind.ExtensionType, null, null, null, null, const, null, ExtensionType4, ExtensionType4) + beginConstructor(DeclarationKind.ExtensionType, null, null, null, null, const, null, ExtensionType4, ExtensionType4) handleNoType(const) handleIdentifier(ExtensionType4, methodDeclaration) handleIdentifier(constructor, methodDeclarationContinuation) @@ -136,7 +136,7 @@ beginCompilationUnit(extension) beginMetadataStar(const) endMetadataStar(0) beginMember() - beginMethod(DeclarationKind.ExtensionType, null, null, null, null, const, null, ExtensionType4, ExtensionType4) + beginConstructor(DeclarationKind.ExtensionType, null, null, null, null, const, null, ExtensionType4, ExtensionType4) handleNoType(const) handleIdentifier(ExtensionType4, methodDeclaration) handleIdentifier(redirect, methodDeclarationContinuation) 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 e98a18f00d9..7388f34adbf 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 @@ -171,7 +171,7 @@ parseUnit(extension) listener: endMetadataStar(0) listener: beginMember() 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, ExtensionType4) + listener: beginConstructor(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 @@ parseUnit(extension) listener: endMetadataStar(0) listener: beginMember() 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, ExtensionType4) + listener: beginConstructor(DeclarationKind.ExtensionType, null, null, null, null, const, null, ExtensionType4, ExtensionType4) listener: handleNoType(const) ensureIdentifierPotentiallyRecovered(const, methodDeclaration, false) listener: handleIdentifier(ExtensionType4, methodDeclaration) 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 da6bf2ffefd..ca52ce6d304 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 @@ -37,7 +37,7 @@ beginCompilationUnit(class) beginMetadataStar(Foo) endMetadataStar(0) beginMember() - beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo) + beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo) handleNoType(;) handleIdentifier(Foo, methodDeclaration) handleNoTypeVariables(() @@ -86,7 +86,7 @@ beginCompilationUnit(class) beginMetadataStar(Foo) endMetadataStar(0) beginMember() - beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo) + beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo) handleNoType(;) handleIdentifier(Foo, methodDeclaration) handleIdentifier(a, methodDeclarationContinuation) @@ -150,7 +150,7 @@ beginCompilationUnit(class) beginMetadataStar(Foo) endMetadataStar(0) beginMember() - beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo) + beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo) handleNoType(;) handleIdentifier(Foo, methodDeclaration) handleIdentifier(b, methodDeclarationContinuation) @@ -214,7 +214,7 @@ beginCompilationUnit(class) beginMetadataStar(Foo) endMetadataStar(0) beginMember() - beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo) + beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo) handleNoType(;) handleIdentifier(Foo, methodDeclaration) handleIdentifier(c, methodDeclarationContinuation) @@ -278,7 +278,7 @@ beginCompilationUnit(class) beginMetadataStar(Foo) endMetadataStar(0) beginMember() - beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo) + beginConstructor(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 cc44854bc34..49dfbd4dec9 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 @@ -69,7 +69,7 @@ parseUnit(class) 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, Foo) + listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo) listener: handleNoType(;) ensureIdentifierPotentiallyRecovered(;, methodDeclaration, false) listener: handleIdentifier(Foo, methodDeclaration) @@ -178,7 +178,7 @@ parseUnit(class) 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, Foo) + listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo) listener: handleNoType(;) ensureIdentifierPotentiallyRecovered(;, methodDeclaration, false) listener: handleIdentifier(Foo, methodDeclaration) @@ -324,7 +324,7 @@ parseUnit(class) 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, Foo) + listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo) listener: handleNoType(;) ensureIdentifierPotentiallyRecovered(;, methodDeclaration, false) listener: handleIdentifier(Foo, methodDeclaration) @@ -470,7 +470,7 @@ parseUnit(class) 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, Foo) + listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo) listener: handleNoType(;) ensureIdentifierPotentiallyRecovered(;, methodDeclaration, false) listener: handleIdentifier(Foo, methodDeclaration) @@ -616,7 +616,7 @@ parseUnit(class) 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, Foo) + listener: beginConstructor(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 36f0e1bf109..331cfab2c1d 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 @@ -37,7 +37,7 @@ beginCompilationUnit(class) beginMetadataStar(Foo) endMetadataStar(0) beginMember() - beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo) + beginConstructor(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 78ca4b160cb..9e5f9246599 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 @@ -69,7 +69,7 @@ parseUnit(class) 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, Foo) + listener: beginConstructor(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 d593b37ae99..c18d0f171f4 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 @@ -37,7 +37,7 @@ beginCompilationUnit(class) beginMetadataStar(Foo) endMetadataStar(0) beginMember() - beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo) + beginConstructor(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_03.dart.intertwined.expect b/pkg/front_end/parser_testcases/nnbd/issue_40834_03.dart.intertwined.expect index 9a97a0ab904..f6b31d40f65 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 @@ -69,7 +69,7 @@ parseUnit(class) 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, Foo) + listener: beginConstructor(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_41597.dart.expect b/pkg/front_end/parser_testcases/nnbd/issue_41597.dart.expect index 5fa3db59b62..6912c6f822d 100644 --- a/pkg/front_end/parser_testcases/nnbd/issue_41597.dart.expect +++ b/pkg/front_end/parser_testcases/nnbd/issue_41597.dart.expect @@ -83,7 +83,7 @@ beginCompilationUnit(bool) beginMetadataStar(C) endMetadataStar(0) beginMember() - beginMethod(DeclarationKind.Class, null, null, null, null, null, null, C, C) + beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, C, C) handleNoType({) handleIdentifier(C, methodDeclaration) handleIdentifier(c0, methodDeclarationContinuation) @@ -107,7 +107,7 @@ beginCompilationUnit(bool) beginMetadataStar(C) endMetadataStar(0) beginMember() - beginMethod(DeclarationKind.Class, null, null, null, null, null, null, C, C) + beginConstructor(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 e1aa6991a48..ccdd80bfd0a 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 @@ -218,7 +218,7 @@ parseUnit(bool) 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, C) + listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, C, C) listener: handleNoType({) ensureIdentifierPotentiallyRecovered({, methodDeclaration, false) listener: handleIdentifier(C, methodDeclaration) @@ -273,7 +273,7 @@ parseUnit(bool) 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, C) + listener: beginConstructor(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 85619e7dcf7..948820feb74 100644 --- a/pkg/front_end/parser_testcases/nnbd/issue_49132.dart.expect +++ b/pkg/front_end/parser_testcases/nnbd/issue_49132.dart.expect @@ -15,7 +15,7 @@ beginCompilationUnit(class) beginMetadataStar(Foo) endMetadataStar(0) beginMember() - beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo) + beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo) handleNoType({) handleIdentifier(Foo, methodDeclaration) handleIdentifier(foo1, methodDeclarationContinuation) @@ -84,7 +84,7 @@ beginCompilationUnit(class) beginMetadataStar(Foo) endMetadataStar(0) beginMember() - beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo) + beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo) handleNoType(;) handleIdentifier(Foo, methodDeclaration) handleIdentifier(foo2, methodDeclarationContinuation) @@ -153,7 +153,7 @@ beginCompilationUnit(class) beginMetadataStar(Foo) endMetadataStar(0) beginMember() - beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo) + beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo) handleNoType(;) handleIdentifier(Foo, methodDeclaration) handleIdentifier(foo3, methodDeclarationContinuation) @@ -222,7 +222,7 @@ beginCompilationUnit(class) beginMetadataStar(Foo) endMetadataStar(0) beginMember() - beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo) + beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo) handleNoType(;) handleIdentifier(Foo, methodDeclaration) handleIdentifier(foo4, methodDeclarationContinuation) @@ -291,7 +291,7 @@ beginCompilationUnit(class) beginMetadataStar(Foo) endMetadataStar(0) beginMember() - beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo) + beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo) handleNoType(;) handleIdentifier(Foo, methodDeclaration) handleIdentifier(bar1, methodDeclarationContinuation) @@ -361,7 +361,7 @@ beginCompilationUnit(class) beginMetadataStar(Foo) endMetadataStar(0) beginMember() - beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo) + beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo) handleNoType(}) handleIdentifier(Foo, methodDeclaration) handleIdentifier(bar2, methodDeclarationContinuation) @@ -431,7 +431,7 @@ beginCompilationUnit(class) beginMetadataStar(Foo) endMetadataStar(0) beginMember() - beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo) + beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo) handleNoType(}) handleIdentifier(Foo, methodDeclaration) handleIdentifier(bar3, methodDeclarationContinuation) @@ -501,7 +501,7 @@ beginCompilationUnit(class) beginMetadataStar(Foo) endMetadataStar(0) beginMember() - beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo) + beginConstructor(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 c1414cefb09..c530e6c9617 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 @@ -35,7 +35,7 @@ parseUnit(class) 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, Foo) + listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo) listener: handleNoType({) ensureIdentifierPotentiallyRecovered({, methodDeclaration, false) listener: handleIdentifier(Foo, methodDeclaration) @@ -175,7 +175,7 @@ parseUnit(class) 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, Foo) + listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo) listener: handleNoType(;) ensureIdentifierPotentiallyRecovered(;, methodDeclaration, false) listener: handleIdentifier(Foo, methodDeclaration) @@ -315,7 +315,7 @@ parseUnit(class) 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, Foo) + listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo) listener: handleNoType(;) ensureIdentifierPotentiallyRecovered(;, methodDeclaration, false) listener: handleIdentifier(Foo, methodDeclaration) @@ -455,7 +455,7 @@ parseUnit(class) 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, Foo) + listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo) listener: handleNoType(;) ensureIdentifierPotentiallyRecovered(;, methodDeclaration, false) listener: handleIdentifier(Foo, methodDeclaration) @@ -595,7 +595,7 @@ parseUnit(class) 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, Foo) + listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo) listener: handleNoType(;) ensureIdentifierPotentiallyRecovered(;, methodDeclaration, false) listener: handleIdentifier(Foo, methodDeclaration) @@ -743,7 +743,7 @@ parseUnit(class) 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, Foo) + listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo) listener: handleNoType(}) ensureIdentifierPotentiallyRecovered(}, methodDeclaration, false) listener: handleIdentifier(Foo, methodDeclaration) @@ -891,7 +891,7 @@ parseUnit(class) 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, Foo) + listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo) listener: handleNoType(}) ensureIdentifierPotentiallyRecovered(}, methodDeclaration, false) listener: handleIdentifier(Foo, methodDeclaration) @@ -1033,7 +1033,7 @@ parseUnit(class) 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, Foo) + listener: beginConstructor(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 38613936e93..289a3cde73a 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 @@ -26,7 +26,7 @@ beginCompilationUnit(class) beginMetadataStar(Foo) endMetadataStar(0) beginMember() - beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo) + beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo) handleNoType(;) handleIdentifier(Foo, methodDeclaration) handleIdentifier(foo1, methodDeclarationContinuation) @@ -77,7 +77,7 @@ beginCompilationUnit(class) beginMetadataStar(Foo) endMetadataStar(0) beginMember() - beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo) + beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo) handleNoType(}) handleIdentifier(Foo, methodDeclaration) handleIdentifier(foo2, methodDeclarationContinuation) @@ -137,7 +137,7 @@ beginCompilationUnit(class) beginMetadataStar(Foo) endMetadataStar(0) beginMember() - beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo) + beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo) handleNoType(}) handleIdentifier(Foo, methodDeclaration) handleIdentifier(foo3, methodDeclarationContinuation) @@ -188,7 +188,7 @@ beginCompilationUnit(class) beginMetadataStar(Foo) endMetadataStar(0) beginMember() - beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo) + beginConstructor(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 df8dcdecb1e..58ebd26afc9 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 @@ -52,7 +52,7 @@ parseUnit(class) 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, Foo) + listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo) listener: handleNoType(;) ensureIdentifierPotentiallyRecovered(;, methodDeclaration, false) listener: handleIdentifier(Foo, methodDeclaration) @@ -178,7 +178,7 @@ parseUnit(class) 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, Foo) + listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo) listener: handleNoType(}) ensureIdentifierPotentiallyRecovered(}, methodDeclaration, false) listener: handleIdentifier(Foo, methodDeclaration) @@ -371,7 +371,7 @@ parseUnit(class) 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, Foo) + listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo) listener: handleNoType(}) ensureIdentifierPotentiallyRecovered(}, methodDeclaration, false) listener: handleIdentifier(Foo, methodDeclaration) @@ -497,7 +497,7 @@ parseUnit(class) 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, Foo) + listener: beginConstructor(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 5d0e8637605..90d9449abf1 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 @@ -15,7 +15,7 @@ beginCompilationUnit(class) beginMetadataStar(Foo) endMetadataStar(0) beginMember() - beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo) + beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo) handleNoType({) handleIdentifier(Foo, methodDeclaration) handleIdentifier(foo1, methodDeclarationContinuation) @@ -88,7 +88,7 @@ beginCompilationUnit(class) beginMetadataStar(Foo) endMetadataStar(0) beginMember() - beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo) + beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo) handleNoType(;) handleIdentifier(Foo, methodDeclaration) handleIdentifier(foo2, methodDeclarationContinuation) @@ -161,7 +161,7 @@ beginCompilationUnit(class) beginMetadataStar(Foo) endMetadataStar(0) beginMember() - beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo) + beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo) handleNoType(;) handleIdentifier(Foo, methodDeclaration) handleIdentifier(foo3, methodDeclarationContinuation) @@ -234,7 +234,7 @@ beginCompilationUnit(class) beginMetadataStar(Foo) endMetadataStar(0) beginMember() - beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo) + beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo) handleNoType(;) handleIdentifier(Foo, methodDeclaration) handleIdentifier(foo4, methodDeclarationContinuation) @@ -307,7 +307,7 @@ beginCompilationUnit(class) beginMetadataStar(Foo) endMetadataStar(0) beginMember() - beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo) + beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo) handleNoType(;) handleIdentifier(Foo, methodDeclaration) handleIdentifier(bar1, methodDeclarationContinuation) @@ -381,7 +381,7 @@ beginCompilationUnit(class) beginMetadataStar(Foo) endMetadataStar(0) beginMember() - beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo) + beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo) handleNoType(}) handleIdentifier(Foo, methodDeclaration) handleIdentifier(bar2, methodDeclarationContinuation) @@ -455,7 +455,7 @@ beginCompilationUnit(class) beginMetadataStar(Foo) endMetadataStar(0) beginMember() - beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo) + beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo) handleNoType(}) handleIdentifier(Foo, methodDeclaration) handleIdentifier(bar3, methodDeclarationContinuation) @@ -529,7 +529,7 @@ beginCompilationUnit(class) beginMetadataStar(Foo) endMetadataStar(0) beginMember() - beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo) + beginConstructor(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 5311e2082bb..0fcf13ba0f6 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 @@ -35,7 +35,7 @@ parseUnit(class) 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, Foo) + listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo) listener: handleNoType({) ensureIdentifierPotentiallyRecovered({, methodDeclaration, false) listener: handleIdentifier(Foo, methodDeclaration) @@ -199,7 +199,7 @@ parseUnit(class) 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, Foo) + listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo) listener: handleNoType(;) ensureIdentifierPotentiallyRecovered(;, methodDeclaration, false) listener: handleIdentifier(Foo, methodDeclaration) @@ -363,7 +363,7 @@ parseUnit(class) 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, Foo) + listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo) listener: handleNoType(;) ensureIdentifierPotentiallyRecovered(;, methodDeclaration, false) listener: handleIdentifier(Foo, methodDeclaration) @@ -527,7 +527,7 @@ parseUnit(class) 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, Foo) + listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo) listener: handleNoType(;) ensureIdentifierPotentiallyRecovered(;, methodDeclaration, false) listener: handleIdentifier(Foo, methodDeclaration) @@ -691,7 +691,7 @@ parseUnit(class) 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, Foo) + listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo) listener: handleNoType(;) ensureIdentifierPotentiallyRecovered(;, methodDeclaration, false) listener: handleIdentifier(Foo, methodDeclaration) @@ -857,7 +857,7 @@ parseUnit(class) 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, Foo) + listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo) listener: handleNoType(}) ensureIdentifierPotentiallyRecovered(}, methodDeclaration, false) listener: handleIdentifier(Foo, methodDeclaration) @@ -1023,7 +1023,7 @@ parseUnit(class) 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, Foo) + listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo) listener: handleNoType(}) ensureIdentifierPotentiallyRecovered(}, methodDeclaration, false) listener: handleIdentifier(Foo, methodDeclaration) @@ -1189,7 +1189,7 @@ parseUnit(class) 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, Foo) + listener: beginConstructor(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/patterns/const_patterns.dart.expect b/pkg/front_end/parser_testcases/patterns/const_patterns.dart.expect index 892f6210ffd..95da32757a6 100644 --- a/pkg/front_end/parser_testcases/patterns/const_patterns.dart.expect +++ b/pkg/front_end/parser_testcases/patterns/const_patterns.dart.expect @@ -262,7 +262,7 @@ beginCompilationUnit(import) beginMetadataStar(const) endMetadataStar(0) beginMember() - beginMethod(DeclarationKind.Class, null, null, null, null, const, null, Class, Class) + beginConstructor(DeclarationKind.Class, null, null, null, null, const, null, Class, Class) handleNoType(const) handleIdentifier(Class, methodDeclaration) handleNoTypeVariables(() @@ -285,7 +285,7 @@ beginCompilationUnit(import) beginMetadataStar(const) endMetadataStar(0) beginMember() - beginMethod(DeclarationKind.Class, null, null, null, null, const, null, Class, Class) + beginConstructor(DeclarationKind.Class, null, null, null, null, const, null, Class, Class) handleNoType(const) handleIdentifier(Class, methodDeclaration) handleIdentifier(named, methodDeclarationContinuation) @@ -1765,7 +1765,7 @@ beginCompilationUnit(import) beginMetadataStar(const) endMetadataStar(0) beginMember() - beginMethod(DeclarationKind.Class, null, null, null, null, const, null, GenericClass, GenericClass) + beginConstructor(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 9c21431ad40..f3bc1c09bf1 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 @@ -112,7 +112,7 @@ parseUnit(import) listener: endMetadataStar(0) listener: beginMember() 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, Class) + listener: beginConstructor(DeclarationKind.Class, null, null, null, null, const, null, Class, Class) listener: handleNoType(const) ensureIdentifierPotentiallyRecovered(const, methodDeclaration, false) listener: handleIdentifier(Class, methodDeclaration) @@ -155,7 +155,7 @@ parseUnit(import) listener: endMetadataStar(0) listener: beginMember() 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, Class) + listener: beginConstructor(DeclarationKind.Class, null, null, null, null, const, null, Class, Class) listener: handleNoType(const) ensureIdentifierPotentiallyRecovered(const, methodDeclaration, false) listener: handleIdentifier(Class, methodDeclaration) @@ -3217,7 +3217,7 @@ parseUnit(import) listener: endMetadataStar(0) listener: beginMember() 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, GenericClass) + listener: beginConstructor(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 32e08966c24..f0e715ba474 100644 --- a/pkg/front_end/parser_testcases/patterns/issue_51169.dart.expect +++ b/pkg/front_end/parser_testcases/patterns/issue_51169.dart.expect @@ -26,7 +26,7 @@ beginCompilationUnit(class) beginMetadataStar(Class) endMetadataStar(0) beginMember() - beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Class, Class) + beginConstructor(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 8861853d5c8..bb47a6b1080 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 @@ -52,7 +52,7 @@ parseUnit(class) 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, Class) + listener: beginConstructor(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 2062ea3b6ab..2cbfb347912 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 @@ -15,7 +15,7 @@ beginCompilationUnit(class) beginMetadataStar(C) endMetadataStar(0) beginMember() - beginMethod(DeclarationKind.Class, null, null, null, null, null, null, C, C) + beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, C, C) handleNoType({) handleIdentifier(C, methodDeclaration) handleNoTypeVariables(() @@ -55,7 +55,7 @@ beginCompilationUnit(class) beginMetadataStar(C) endMetadataStar(0) beginMember() - beginMethod(DeclarationKind.Class, null, null, null, null, null, null, C, C) + beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, C, C) handleNoType(;) handleIdentifier(C, methodDeclaration) handleNoTypeVariables(() @@ -97,7 +97,7 @@ beginCompilationUnit(class) beginMetadataStar(C) endMetadataStar(0) beginMember() - beginMethod(DeclarationKind.Class, null, null, null, null, null, null, C, C) + beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, C, C) handleNoType(;) handleIdentifier(C, methodDeclaration) handleNoTypeVariables(() @@ -139,7 +139,7 @@ beginCompilationUnit(class) beginMetadataStar(C) endMetadataStar(0) beginMember() - beginMethod(DeclarationKind.Class, null, null, null, null, null, null, C, C) + beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, C, C) handleNoType(;) handleIdentifier(C, methodDeclaration) handleNoTypeVariables(() @@ -179,7 +179,7 @@ beginCompilationUnit(class) beginMetadataStar(C) endMetadataStar(0) beginMember() - beginMethod(DeclarationKind.Class, null, null, null, null, null, null, C, C) + beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, C, C) handleNoType(;) handleIdentifier(C, methodDeclaration) handleNoTypeVariables(() @@ -221,7 +221,7 @@ beginCompilationUnit(class) beginMetadataStar(C) endMetadataStar(0) beginMember() - beginMethod(DeclarationKind.Class, null, null, null, null, null, null, C, C) + beginConstructor(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 a8bd22cc7d2..530b3eeb316 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 @@ -35,7 +35,7 @@ parseUnit(class) 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, C) + listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, C, C) listener: handleNoType({) ensureIdentifierPotentiallyRecovered({, methodDeclaration, false) listener: handleIdentifier(C, methodDeclaration) @@ -103,7 +103,7 @@ parseUnit(class) 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, C) + listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, C, C) listener: handleNoType(;) ensureIdentifierPotentiallyRecovered(;, methodDeclaration, false) listener: handleIdentifier(C, methodDeclaration) @@ -175,7 +175,7 @@ parseUnit(class) 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, C) + listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, C, C) listener: handleNoType(;) ensureIdentifierPotentiallyRecovered(;, methodDeclaration, false) listener: handleIdentifier(C, methodDeclaration) @@ -247,7 +247,7 @@ parseUnit(class) 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, C) + listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, C, C) listener: handleNoType(;) ensureIdentifierPotentiallyRecovered(;, methodDeclaration, false) listener: handleIdentifier(C, methodDeclaration) @@ -315,7 +315,7 @@ parseUnit(class) 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, C) + listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, C, C) listener: handleNoType(;) ensureIdentifierPotentiallyRecovered(;, methodDeclaration, false) listener: handleIdentifier(C, methodDeclaration) @@ -387,7 +387,7 @@ parseUnit(class) 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, C) + listener: beginConstructor(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/super_parameters_record_type.dart.expect b/pkg/front_end/parser_testcases/record/super_parameters_record_type.dart.expect index 01ecc623476..e4d649cdb47 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 @@ -17,7 +17,7 @@ beginCompilationUnit(class) beginMetadataStar(Foo) endMetadataStar(0) beginMember() - beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo) + beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo) handleNoType({) handleIdentifier(Foo, methodDeclaration) handleNoTypeVariables(() @@ -55,7 +55,7 @@ beginCompilationUnit(class) beginMetadataStar(Foo) endMetadataStar(0) beginMember() - beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo) + beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo) handleNoType(;) handleIdentifier(Foo, methodDeclaration) handleNoTypeVariables(() @@ -95,7 +95,7 @@ beginCompilationUnit(class) beginMetadataStar(Foo) endMetadataStar(0) beginMember() - beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo) + beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo) handleNoType(;) handleIdentifier(Foo, methodDeclaration) handleNoTypeVariables(() @@ -135,7 +135,7 @@ beginCompilationUnit(class) beginMetadataStar(Foo) endMetadataStar(0) beginMember() - beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo) + beginConstructor(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 3654b43ab49..574d3e5ca99 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 @@ -38,7 +38,7 @@ parseUnit(class) 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, Foo) + listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo) listener: handleNoType({) ensureIdentifierPotentiallyRecovered({, methodDeclaration, false) listener: handleIdentifier(Foo, methodDeclaration) @@ -100,7 +100,7 @@ parseUnit(class) 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, Foo) + listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo) listener: handleNoType(;) ensureIdentifierPotentiallyRecovered(;, methodDeclaration, false) listener: handleIdentifier(Foo, methodDeclaration) @@ -166,7 +166,7 @@ parseUnit(class) 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, Foo) + listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo) listener: handleNoType(;) ensureIdentifierPotentiallyRecovered(;, methodDeclaration, false) listener: handleIdentifier(Foo, methodDeclaration) @@ -232,7 +232,7 @@ parseUnit(class) 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, Foo) + listener: beginConstructor(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 b8fb91da19f..4b5547c5afa 100644 --- a/pkg/front_end/test/parser_test_listener.dart +++ b/pkg/front_end/test/parser_test_listener.dart @@ -2173,6 +2173,40 @@ class ParserTestListener implements Listener { ); } + @override + void beginConstructor( + DeclarationKind declarationKind, + Token? augmentToken, + Token? externalToken, + Token? staticToken, + Token? covariantToken, + Token? varFinalOrConst, + Token? getOrSet, + Token name, + String? enclosingDeclarationName, + ) { + seen(augmentToken); + seen(externalToken); + seen(staticToken); + seen(covariantToken); + seen(varFinalOrConst); + seen(getOrSet); + seen(name); + doPrint( + 'beginConstructor(' + '$declarationKind, ' + '$augmentToken, ' + '$externalToken, ' + '$staticToken, ' + '$covariantToken, ' + '$varFinalOrConst, ' + '$getOrSet, ' + '$name, ' + '$enclosingDeclarationName)', + ); + indent++; + } + @override void endConstructor( DeclarationKind kind, diff --git a/pkg/front_end/test/parser_test_listener_creator.dart b/pkg/front_end/test/parser_test_listener_creator.dart index 9a6694f8c08..4ad8bfb55d6 100644 --- a/pkg/front_end/test/parser_test_listener_creator.dart +++ b/pkg/front_end/test/parser_test_listener_creator.dart @@ -156,6 +156,21 @@ class ParserCreatorListener extends Listener { insideListenerClass = false; } + @override + void beginConstructor( + DeclarationKind declarationKind, + Token? augmentToken, + Token? externalToken, + Token? staticToken, + Token? covariantToken, + Token? varFinalOrConst, + Token? getOrSet, + Token name, + String? enclosingDeclarationName, + ) { + currentMethodName = name.lexeme; + } + @override void beginMethod( DeclarationKind declarationKind, diff --git a/pkg/front_end/test/parser_test_parser_creator.dart b/pkg/front_end/test/parser_test_parser_creator.dart index f7f7fffe65b..998028c0794 100644 --- a/pkg/front_end/test/parser_test_parser_creator.dart +++ b/pkg/front_end/test/parser_test_parser_creator.dart @@ -158,6 +158,21 @@ class ParserCreatorListener extends Listener { insideParserClass = false; } + @override + void beginConstructor( + DeclarationKind declarationKind, + Token? augmentToken, + Token? externalToken, + Token? staticToken, + Token? covariantToken, + Token? varFinalOrConst, + Token? getOrSet, + Token name, + String? enclosingDeclarationName, + ) { + currentMethodName = name.lexeme; + } + @override void beginMethod( DeclarationKind declarationKind, diff --git a/pkg/front_end/tool/parser_ast_helper_creator.dart b/pkg/front_end/tool/parser_ast_helper_creator.dart index a7205562ce6..0702818f8da 100644 --- a/pkg/front_end/tool/parser_ast_helper_creator.dart +++ b/pkg/front_end/tool/parser_ast_helper_creator.dart @@ -218,6 +218,21 @@ class ParserCreatorListener extends Listener { insideListenerClass = false; } + @override + void beginConstructor( + DeclarationKind declarationKind, + Token? augmentToken, + Token? externalToken, + Token? staticToken, + Token? covariantToken, + Token? varFinalOrConst, + Token? getOrSet, + Token name, + String? enclosingDeclarationName, + ) { + currentMethodName = name.lexeme; + } + @override void beginMethod( DeclarationKind declarationKind,