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 c7382050087..864a661aea2 100644 --- a/pkg/_fe_analyzer_shared/lib/src/parser/forwarding_listener.dart +++ b/pkg/_fe_analyzer_shared/lib/src/parser/forwarding_listener.dart @@ -535,6 +535,7 @@ class ForwardingListener implements Listener { @override void endClassFields( + Token abstractToken, Token externalToken, Token staticToken, Token covariantToken, @@ -543,8 +544,16 @@ class ForwardingListener implements Listener { int count, Token beginToken, Token endToken) { - listener?.endClassFields(externalToken, staticToken, covariantToken, - lateToken, varFinalOrConst, count, beginToken, endToken); + listener?.endClassFields( + abstractToken, + externalToken, + staticToken, + covariantToken, + lateToken, + varFinalOrConst, + count, + beginToken, + endToken); } @override @@ -875,6 +884,7 @@ class ForwardingListener implements Listener { @override void endMixinFields( + Token abstractToken, Token externalToken, Token staticToken, Token covariantToken, @@ -883,8 +893,16 @@ class ForwardingListener implements Listener { int count, Token beginToken, Token endToken) { - listener?.endMixinFields(externalToken, staticToken, covariantToken, - lateToken, varFinalOrConst, count, beginToken, endToken); + listener?.endMixinFields( + abstractToken, + externalToken, + staticToken, + covariantToken, + lateToken, + varFinalOrConst, + count, + beginToken, + endToken); } @override diff --git a/pkg/_fe_analyzer_shared/lib/src/parser/listener.dart b/pkg/_fe_analyzer_shared/lib/src/parser/listener.dart index 479289a759d..0a08fa0c87a 100644 --- a/pkg/_fe_analyzer_shared/lib/src/parser/listener.dart +++ b/pkg/_fe_analyzer_shared/lib/src/parser/listener.dart @@ -367,6 +367,7 @@ class Listener implements UnescapeErrorListener { /// /// Doesn't have a corresponding begin event, use [beginMember] instead. void endClassFields( + Token abstractToken, Token externalToken, Token staticToken, Token covariantToken, @@ -386,6 +387,7 @@ class Listener implements UnescapeErrorListener { /// /// Doesn't have a corresponding begin event, use [beginMember] instead. void endMixinFields( + Token abstractToken, Token externalToken, Token staticToken, Token covariantToken, @@ -395,8 +397,8 @@ class Listener implements UnescapeErrorListener { Token beginToken, Token endToken) { // TODO(danrubel): push implementation into subclasses - endClassFields(externalToken, staticToken, covariantToken, lateToken, - varFinalOrConst, count, beginToken, endToken); + endClassFields(abstractToken, externalToken, staticToken, covariantToken, + lateToken, varFinalOrConst, count, beginToken, endToken); } /// Handle the end of a extension field declaration. Substructures: @@ -416,7 +418,7 @@ class Listener implements UnescapeErrorListener { Token beginToken, Token endToken) { // TODO(danrubel): push implementation into subclasses - endClassFields(externalToken, staticToken, covariantToken, lateToken, + endClassFields(null, externalToken, staticToken, covariantToken, lateToken, varFinalOrConst, count, beginToken, endToken); } diff --git a/pkg/_fe_analyzer_shared/lib/src/parser/modifier_context.dart b/pkg/_fe_analyzer_shared/lib/src/parser/modifier_context.dart index 1ab8699fbc8..904871b57ef 100644 --- a/pkg/_fe_analyzer_shared/lib/src/parser/modifier_context.dart +++ b/pkg/_fe_analyzer_shared/lib/src/parser/modifier_context.dart @@ -97,10 +97,6 @@ class ModifierRecoveryContext { /// Parse modifiers for class methods and fields. Token parseClassMemberModifiers(Token token) { token = parseModifiers(token); - if (abstractToken != null) { - parser.reportRecoverableError( - abstractToken, codes.messageAbstractClassMember); - } reportExtraneousModifier(requiredToken); return token; } 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 3af7d85977a..e7b7d6f58b9 100644 --- a/pkg/_fe_analyzer_shared/lib/src/parser/parser_impl.dart +++ b/pkg/_fe_analyzer_shared/lib/src/parser/parser_impl.dart @@ -2464,6 +2464,7 @@ class Parser { } return parseFields( beforeStart, + /* abstractToken = */ null, externalToken, /* staticToken = */ null, /* covariantToken = */ null, @@ -2479,6 +2480,7 @@ class Parser { Token parseFields( Token beforeStart, + Token abstractToken, Token externalToken, Token staticToken, Token covariantToken, @@ -2563,18 +2565,42 @@ class Parser { } switch (kind) { case DeclarationKind.TopLevel: + if (abstractToken != null) { + reportRecoverableError( + abstractToken, codes.messageAbstractClassMember); + } listener.endTopLevelFields(externalToken, staticToken, covariantToken, lateToken, varFinalOrConst, fieldCount, beforeStart.next, token); break; case DeclarationKind.Class: - listener.endClassFields(externalToken, staticToken, covariantToken, - lateToken, varFinalOrConst, fieldCount, beforeStart.next, token); + listener.endClassFields( + abstractToken, + externalToken, + staticToken, + covariantToken, + lateToken, + varFinalOrConst, + fieldCount, + beforeStart.next, + token); break; case DeclarationKind.Mixin: - listener.endMixinFields(externalToken, staticToken, covariantToken, - lateToken, varFinalOrConst, fieldCount, beforeStart.next, token); + listener.endMixinFields( + abstractToken, + externalToken, + staticToken, + covariantToken, + lateToken, + varFinalOrConst, + fieldCount, + beforeStart.next, + token); break; case DeclarationKind.Extension: + if (abstractToken != null) { + reportRecoverableError( + abstractToken, codes.messageAbstractClassMember); + } if (staticToken == null && externalToken == null) { reportRecoverableError( firstName, codes.messageExtensionDeclaresInstanceField); @@ -3192,6 +3218,7 @@ class Parser { Token token, DeclarationKind kind, String enclosingDeclarationName) { Token beforeStart = token = parseMetadataStar(token); + Token abstractToken; Token covariantToken; Token externalToken; Token lateToken; @@ -3232,6 +3259,7 @@ class Parser { } if (isModifier(next)) { ModifierRecoveryContext context = new ModifierRecoveryContext(this) + ..abstractToken = abstractToken ..covariantToken = covariantToken ..externalToken = externalToken ..lateToken = lateToken @@ -3241,6 +3269,7 @@ class Parser { token = context.parseClassMemberModifiers(token); next = token.next; + abstractToken = context.abstractToken; covariantToken = context.covariantToken; externalToken = context.externalToken; lateToken = context.lateToken; @@ -3285,8 +3314,8 @@ class Parser { if (beforeType != token) { reportRecoverableError(token, codes.messageTypeBeforeFactory); } - token = parseFactoryMethod(token, kind, beforeStart, externalToken, - staticToken ?? covariantToken, varFinalOrConst); + token = parseFactoryMethod(token, kind, beforeStart, abstractToken, + externalToken, staticToken ?? covariantToken, varFinalOrConst); listener.endMember(); return token; } @@ -3299,6 +3328,7 @@ class Parser { if (next2.isUserDefinableOperator && typeParam == noTypeParamOrArg) { token = parseMethod( beforeStart, + abstractToken, externalToken, staticToken, covariantToken, @@ -3321,6 +3351,7 @@ class Parser { // Recovery: Invalid operator return parseInvalidOperatorDeclaration( beforeStart, + abstractToken, externalToken, staticToken, covariantToken, @@ -3333,6 +3364,7 @@ class Parser { // Recovery token = parseMethod( beforeStart, + abstractToken, externalToken, staticToken, covariantToken, @@ -3357,6 +3389,7 @@ class Parser { return recoverFromInvalidMember( token, beforeStart, + abstractToken, externalToken, staticToken, covariantToken, @@ -3378,6 +3411,7 @@ class Parser { // Recovery: Missing `operator` keyword return parseInvalidOperatorDeclaration( beforeStart, + abstractToken, externalToken, staticToken, covariantToken, @@ -3411,6 +3445,7 @@ class Parser { identical(value, '=>')) { token = parseMethod( beforeStart, + abstractToken, externalToken, staticToken, covariantToken, @@ -3430,6 +3465,7 @@ class Parser { } token = parseFields( beforeStart, + abstractToken, externalToken, staticToken, covariantToken, @@ -3448,6 +3484,7 @@ class Parser { Token parseMethod( Token beforeStart, + Token abstractToken, Token externalToken, Token staticToken, Token covariantToken, @@ -3460,6 +3497,9 @@ class Parser { DeclarationKind kind, String enclosingDeclarationName, bool nameIsRecovered) { + if (abstractToken != null) { + reportRecoverableError(abstractToken, codes.messageAbstractClassMember); + } if (lateToken != null) { reportRecoverableErrorWithToken( lateToken, codes.templateExtraneousModifier); @@ -3685,8 +3725,14 @@ class Parser { return token; } - Token parseFactoryMethod(Token token, DeclarationKind kind, Token beforeStart, - Token externalToken, Token staticOrCovariant, Token varFinalOrConst) { + Token parseFactoryMethod( + Token token, + DeclarationKind kind, + Token beforeStart, + Token abstractToken, + Token externalToken, + Token staticOrCovariant, + Token varFinalOrConst) { Token factoryKeyword = token = token.next; assert(optional('factory', factoryKeyword)); @@ -3706,6 +3752,9 @@ class Parser { context = null; } + if (abstractToken != null) { + reportRecoverableError(abstractToken, codes.messageAbstractClassMember); + } if (staticOrCovariant != null) { reportRecoverableErrorWithToken( staticOrCovariant, codes.templateExtraneousModifier); @@ -6898,6 +6947,7 @@ class Parser { /// (and events have already been generated). Token parseInvalidOperatorDeclaration( Token beforeStart, + Token abstractToken, Token externalToken, Token staticToken, Token covariantToken, @@ -6945,6 +6995,7 @@ class Parser { Token token = parseMethod( beforeStart, + abstractToken, externalToken, staticToken, covariantToken, @@ -6967,6 +7018,7 @@ class Parser { Token recoverFromInvalidMember( Token token, Token beforeStart, + Token abstractToken, Token externalToken, Token staticToken, Token covariantToken, @@ -6989,6 +7041,7 @@ class Parser { } else if (next.isOperator && next.endGroup == null) { return parseInvalidOperatorDeclaration( beforeStart, + abstractToken, externalToken, staticToken, covariantToken, @@ -7005,6 +7058,7 @@ class Parser { identical(value, '{')) { token = parseMethod( beforeStart, + abstractToken, externalToken, staticToken, covariantToken, @@ -7028,6 +7082,7 @@ class Parser { } else { token = parseFields( beforeStart, + abstractToken, externalToken, staticToken, covariantToken, diff --git a/pkg/analyzer/lib/src/fasta/ast_builder.dart b/pkg/analyzer/lib/src/fasta/ast_builder.dart index ceda59124cc..38199127702 100644 --- a/pkg/analyzer/lib/src/fasta/ast_builder.dart +++ b/pkg/analyzer/lib/src/fasta/ast_builder.dart @@ -7,6 +7,7 @@ import 'package:_fe_analyzer_shared/src/messages/codes.dart' LocatedMessage, Message, MessageCode, + messageAbstractClassMember, messageConstConstructorWithBody, messageConstructorWithTypeParameters, messageDirectiveAfterDeclaration, @@ -20,8 +21,8 @@ import 'package:_fe_analyzer_shared/src/messages/codes.dart' messageInvalidThisInInitializer, messageMissingAssignableSelector, messageNativeClauseShouldBeAnnotation, - messageTypedefNotFunction, messageOperatorWithTypeParameters, + messageTypedefNotFunction, templateDuplicateLabelInSwitchStatement, templateExpectedButGot, templateExpectedIdentifier, @@ -836,6 +837,7 @@ class AstBuilder extends StackListener { @override void endClassFields( + Token abstractToken, Token externalToken, Token staticToken, Token covariantToken, @@ -847,6 +849,10 @@ class AstBuilder extends StackListener { assert(optional(';', semicolon)); debugEvent("Fields"); + if (abstractToken != null) { + handleRecoverableError( + messageAbstractClassMember, abstractToken, abstractToken); + } if (externalToken != null) { handleRecoverableError( messageExternalField, externalToken, externalToken); @@ -1218,7 +1224,7 @@ class AstBuilder extends StackListener { // an error at this point, but we include them in order to get navigation, // search, etc. } - endClassFields(externalToken, staticToken, covariantToken, lateToken, + endClassFields(null, externalToken, staticToken, covariantToken, lateToken, varFinalOrConst, count, beginToken, endToken); } @@ -1842,6 +1848,7 @@ class AstBuilder extends StackListener { @override void endMixinFields( + Token abstractToken, Token externalToken, Token staticToken, Token covariantToken, @@ -1850,8 +1857,8 @@ class AstBuilder extends StackListener { int count, Token beginToken, Token endToken) { - endClassFields(externalToken, staticToken, covariantToken, lateToken, - varFinalOrConst, count, beginToken, endToken); + endClassFields(abstractToken, externalToken, staticToken, covariantToken, + lateToken, varFinalOrConst, count, beginToken, endToken); } @override diff --git a/pkg/analyzer/test/generated/parser_fasta_listener.dart b/pkg/analyzer/test/generated/parser_fasta_listener.dart index b75416d4d9c..e45c9ac3105 100644 --- a/pkg/analyzer/test/generated/parser_fasta_listener.dart +++ b/pkg/analyzer/test/generated/parser_fasta_listener.dart @@ -621,6 +621,7 @@ class ForwardingTestListener extends ForwardingListener { @override void endClassFields( + Token abstractToken, Token externalToken, Token staticToken, Token covariantToken, @@ -631,8 +632,16 @@ class ForwardingTestListener extends ForwardingListener { Token endToken) { // beginMember --> endClassFields, endMember expectIn('Member'); - super.endClassFields(externalToken, staticToken, covariantToken, lateToken, - varFinalOrConst, count, beginToken, endToken); + super.endClassFields( + abstractToken, + externalToken, + staticToken, + covariantToken, + lateToken, + varFinalOrConst, + count, + beginToken, + endToken); } @override @@ -1005,6 +1014,7 @@ class ForwardingTestListener extends ForwardingListener { @override void endMixinFields( + Token abstractToken, Token externalToken, Token staticToken, Token covariantToken, @@ -1015,8 +1025,16 @@ class ForwardingTestListener extends ForwardingListener { Token endToken) { // beginMember --> endMixinFields, endMember expectIn('Member'); - super.endMixinFields(externalToken, staticToken, covariantToken, lateToken, - varFinalOrConst, count, beginToken, endToken); + super.endMixinFields( + abstractToken, + externalToken, + staticToken, + covariantToken, + lateToken, + varFinalOrConst, + count, + beginToken, + endToken); } @override diff --git a/pkg/analyzer/test/generated/parser_test.dart b/pkg/analyzer/test/generated/parser_test.dart index 61362bfaf79..03037931f54 100644 --- a/pkg/analyzer/test/generated/parser_test.dart +++ b/pkg/analyzer/test/generated/parser_test.dart @@ -2456,12 +2456,7 @@ mixin ErrorParserTestMixin implements AbstractParserTestCase { void test_classInClass_abstract() { parseCompilationUnit("class C { abstract class B {} }", - errors: usingFastaParser - ? [ - expectedError(ParserErrorCode.ABSTRACT_CLASS_MEMBER, 10, 8), - expectedError(ParserErrorCode.CLASS_IN_CLASS, 19, 5) - ] - : [expectedError(ParserErrorCode.CLASS_IN_CLASS, 19, 5)]); + errors: [expectedError(ParserErrorCode.CLASS_IN_CLASS, 19, 5)]); } void test_classInClass_nonAbstract() { diff --git a/pkg/front_end/lib/src/fasta/kernel/body_builder.dart b/pkg/front_end/lib/src/fasta/kernel/body_builder.dart index 06fb9b2fd67..980c9fc4cf3 100644 --- a/pkg/front_end/lib/src/fasta/kernel/body_builder.dart +++ b/pkg/front_end/lib/src/fasta/kernel/body_builder.dart @@ -696,6 +696,7 @@ class BodyBuilder extends ScopeListener @override void endClassFields( + Token abstractToken, Token externalToken, Token staticToken, Token covariantToken, @@ -705,6 +706,10 @@ class BodyBuilder extends ScopeListener Token beginToken, Token endToken) { debugEvent("Fields"); + if (abstractToken != null) { + handleRecoverableError( + fasta.messageAbstractClassMember, abstractToken, abstractToken); + } if (!libraryBuilder.isNonNullableByDefault) { reportNonNullableModifierError(lateToken); if (externalToken != null) { diff --git a/pkg/front_end/lib/src/fasta/source/diet_listener.dart b/pkg/front_end/lib/src/fasta/source/diet_listener.dart index bf3499e29a4..bc81fc64a2c 100644 --- a/pkg/front_end/lib/src/fasta/source/diet_listener.dart +++ b/pkg/front_end/lib/src/fasta/source/diet_listener.dart @@ -326,6 +326,7 @@ class DietListener extends StackListenerImpl { @override void endClassFields( + Token abstractToken, Token externalToken, Token staticToken, Token covariantToken, diff --git a/pkg/front_end/lib/src/fasta/source/outline_builder.dart b/pkg/front_end/lib/src/fasta/source/outline_builder.dart index 37a953559e6..da097845617 100644 --- a/pkg/front_end/lib/src/fasta/source/outline_builder.dart +++ b/pkg/front_end/lib/src/fasta/source/outline_builder.dart @@ -1711,6 +1711,7 @@ class OutlineBuilder extends StackListenerImpl { @override void endClassFields( + Token abstractToken, Token externalToken, Token staticToken, Token covariantToken, @@ -1720,6 +1721,10 @@ class OutlineBuilder extends StackListenerImpl { Token beginToken, Token endToken) { debugEvent("Fields"); + if (abstractToken != null) { + handleRecoverableError( + messageAbstractClassMember, abstractToken, abstractToken); + } if (lateToken != null && !libraryBuilder.isNonNullableByDefault) { reportNonNullableModifierError(lateToken); if (externalToken != null) { diff --git a/pkg/front_end/lib/src/fasta/util/textual_outline.dart b/pkg/front_end/lib/src/fasta/util/textual_outline.dart index c3401cb5acf..f9e6ced0b6d 100644 --- a/pkg/front_end/lib/src/fasta/util/textual_outline.dart +++ b/pkg/front_end/lib/src/fasta/util/textual_outline.dart @@ -388,6 +388,7 @@ class TextualOutlineListener extends DirectiveListener { @override void endClassFields( + Token abstractToken, Token externalToken, Token staticToken, Token covariantToken, 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 5b5ca89463b..75db5c67562 100644 --- a/pkg/front_end/parser_testcases/error_recovery/bracket_mismatch_01.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/error_recovery/bracket_mismatch_01.dart.intertwined.expect @@ -33,7 +33,7 @@ parseUnit(class) listener: endMetadataStar(0) listener: beginMember() isReservedKeyword(() - parseMethod({, null, null, null, null, null, {, Instance of 'NoType', null, C, DeclarationKind.Class, C, false) + parseMethod({, null, null, null, null, null, null, {, Instance of 'NoType', null, C, DeclarationKind.Class, C, false) listener: beginMethod(null, null, null, null, null, C) listener: handleNoType({) ensureIdentifierPotentiallyRecovered({, methodDeclaration, false) @@ -76,7 +76,7 @@ parseUnit(class) listener: beginMetadataStar(C) listener: endMetadataStar(0) listener: beginMember() - parseMethod(;, null, null, null, null, null, ;, Instance of 'SimpleType', null, m, DeclarationKind.Class, C, false) + parseMethod(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', null, m, DeclarationKind.Class, C, false) listener: beginMethod(null, null, null, null, null, m) listener: handleIdentifier(C, typeReference) listener: handleNoTypeArguments(m) @@ -278,7 +278,7 @@ parseUnit(class) listener: endMetadataStar(0) listener: beginMember() isReservedKeyword(() - parseMethod({, null, null, null, null, null, {, Instance of 'NoType', null, D, DeclarationKind.Class, D, false) + parseMethod({, null, null, null, null, null, null, {, Instance of 'NoType', null, D, DeclarationKind.Class, D, false) listener: beginMethod(null, null, null, null, null, D) listener: handleNoType({) ensureIdentifierPotentiallyRecovered({, methodDeclaration, false) @@ -321,7 +321,7 @@ parseUnit(class) listener: beginMetadataStar(D) listener: endMetadataStar(0) listener: beginMember() - parseMethod(;, null, null, null, null, null, ;, Instance of 'SimpleType', null, m, DeclarationKind.Class, D, false) + parseMethod(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', null, m, DeclarationKind.Class, D, false) listener: beginMethod(null, null, null, null, null, m) listener: handleIdentifier(D, typeReference) listener: handleNoTypeArguments(m) 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 fec79f8144e..d3cc8be40db 100644 --- a/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_bad_name_general.crash_dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_bad_name_general.crash_dart.intertwined.expect @@ -33,7 +33,7 @@ parseUnit(class) listener: endMetadataStar(0) listener: beginMember() isReservedKeyword(.) - parseMethod({, null, null, null, null, null, {, Instance of 'NoType', null, foo, DeclarationKind.Class, Foo, false) + parseMethod({, null, null, null, null, null, null, {, Instance of 'NoType', null, foo, DeclarationKind.Class, Foo, false) listener: beginMethod(null, null, null, null, null, foo) listener: handleNoType({) ensureIdentifierPotentiallyRecovered({, methodDeclaration, false) @@ -71,7 +71,7 @@ parseUnit(class) listener: endMetadataStar(0) listener: beginMember() isReservedKeyword(.) - parseMethod(}, null, null, null, null, null, }, Instance of 'NoType', null, foo, DeclarationKind.Class, Foo, false) + parseMethod(}, null, null, null, null, null, null, }, Instance of 'NoType', null, foo, DeclarationKind.Class, Foo, false) listener: beginMethod(null, null, null, null, null, foo) listener: handleNoType(}) ensureIdentifierPotentiallyRecovered(}, methodDeclaration, false) @@ -133,7 +133,7 @@ parseUnit(class) listener: endMetadataStar(0) listener: beginMember() isReservedKeyword(() - parseMethod(}, null, null, null, null, null, }, Instance of 'NoType', null, foo, DeclarationKind.Class, Foo, false) + parseMethod(}, null, null, null, null, null, null, }, Instance of 'NoType', null, foo, DeclarationKind.Class, Foo, false) listener: beginMethod(null, null, null, null, null, foo) listener: handleNoType(}) ensureIdentifierPotentiallyRecovered(}, methodDeclaration, false) @@ -190,7 +190,7 @@ parseUnit(class) listener: beginMetadataStar(get) listener: endMetadataStar(0) listener: beginMember() - parseMethod(}, null, null, null, null, null, }, Instance of 'NoType', get, Foo, DeclarationKind.Class, Foo, false) + parseMethod(}, null, null, null, null, null, null, }, Instance of 'NoType', get, Foo, DeclarationKind.Class, Foo, false) listener: beginMethod(null, null, null, null, get, Foo) listener: handleNoType(}) ensureIdentifierPotentiallyRecovered(get, methodDeclaration, false) @@ -227,7 +227,7 @@ parseUnit(class) listener: beginMetadataStar(get) listener: endMetadataStar(0) listener: beginMember() - parseMethod(;, null, null, null, null, null, ;, Instance of 'NoType', get, Foo, DeclarationKind.Class, Foo, false) + parseMethod(;, null, null, null, null, null, null, ;, Instance of 'NoType', get, Foo, DeclarationKind.Class, Foo, false) listener: beginMethod(null, null, null, null, get, Foo) listener: handleNoType(;) ensureIdentifierPotentiallyRecovered(get, methodDeclaration, false) @@ -271,7 +271,7 @@ parseUnit(class) listener: beginMetadataStar(get) listener: endMetadataStar(0) listener: beginMember() - parseMethod(}, null, null, null, null, null, }, Instance of 'NoType', get, Foo, DeclarationKind.Class, Foo, false) + parseMethod(}, null, null, null, null, null, null, }, Instance of 'NoType', get, Foo, DeclarationKind.Class, Foo, false) listener: beginMethod(null, null, null, null, get, Foo) listener: handleNoType(}) ensureIdentifierPotentiallyRecovered(get, methodDeclaration, false) @@ -318,7 +318,7 @@ parseUnit(class) listener: beginMetadataStar(get) listener: endMetadataStar(0) listener: beginMember() - parseMethod(;, null, null, null, null, null, ;, Instance of 'NoType', get, Foo, DeclarationKind.Class, Foo, false) + parseMethod(;, null, null, null, null, null, null, ;, Instance of 'NoType', get, Foo, DeclarationKind.Class, Foo, false) listener: beginMethod(null, null, null, null, get, Foo) listener: handleNoType(;) ensureIdentifierPotentiallyRecovered(get, methodDeclaration, false) @@ -372,7 +372,7 @@ parseUnit(class) listener: beginMetadataStar(get) listener: endMetadataStar(0) listener: beginMember() - parseMethod(}, null, null, null, null, null, }, Instance of 'NoType', get, Foo, DeclarationKind.Class, Foo, false) + parseMethod(}, null, null, null, null, null, null, }, Instance of 'NoType', get, Foo, DeclarationKind.Class, Foo, false) listener: beginMethod(null, null, null, null, get, Foo) listener: handleNoType(}) ensureIdentifierPotentiallyRecovered(get, methodDeclaration, false) @@ -439,7 +439,7 @@ parseUnit(class) listener: beginMetadataStar(get) listener: endMetadataStar(0) listener: beginMember() - parseMethod(;, null, null, null, null, null, ;, Instance of 'NoType', get, Foo, DeclarationKind.Class, Foo, false) + parseMethod(;, null, null, null, null, null, null, ;, Instance of 'NoType', get, Foo, DeclarationKind.Class, Foo, false) listener: beginMethod(null, null, null, null, get, Foo) listener: handleNoType(;) ensureIdentifierPotentiallyRecovered(get, methodDeclaration, false) @@ -517,7 +517,7 @@ parseUnit(class) listener: beginMetadataStar(set) listener: endMetadataStar(0) listener: beginMember() - parseMethod(}, null, null, null, null, null, }, Instance of 'NoType', set, Foo, DeclarationKind.Class, Foo, false) + parseMethod(}, null, null, null, null, null, null, }, Instance of 'NoType', set, Foo, DeclarationKind.Class, Foo, false) listener: beginMethod(null, null, null, null, set, Foo) listener: handleNoType(}) ensureIdentifierPotentiallyRecovered(set, methodDeclaration, false) @@ -560,7 +560,7 @@ parseUnit(class) listener: beginMetadataStar(set) listener: endMetadataStar(0) listener: beginMember() - parseMethod(;, null, null, null, null, null, ;, Instance of 'NoType', set, Foo, DeclarationKind.Class, Foo, false) + parseMethod(;, null, null, null, null, null, null, ;, Instance of 'NoType', set, Foo, DeclarationKind.Class, Foo, false) listener: beginMethod(null, null, null, null, set, Foo) listener: handleNoType(;) ensureIdentifierPotentiallyRecovered(set, methodDeclaration, false) @@ -610,7 +610,7 @@ parseUnit(class) listener: beginMetadataStar(set) listener: endMetadataStar(0) listener: beginMember() - parseMethod(}, null, null, null, null, null, }, Instance of 'NoType', set, Foo, DeclarationKind.Class, Foo, false) + parseMethod(}, null, null, null, null, null, null, }, Instance of 'NoType', set, Foo, DeclarationKind.Class, Foo, false) listener: beginMethod(null, null, null, null, set, Foo) listener: handleNoType(}) ensureIdentifierPotentiallyRecovered(set, methodDeclaration, false) @@ -657,7 +657,7 @@ parseUnit(class) listener: beginMetadataStar(set) listener: endMetadataStar(0) listener: beginMember() - parseMethod(;, null, null, null, null, null, ;, Instance of 'NoType', set, Foo, DeclarationKind.Class, Foo, false) + parseMethod(;, null, null, null, null, null, null, ;, Instance of 'NoType', set, Foo, DeclarationKind.Class, Foo, false) listener: beginMethod(null, null, null, null, set, Foo) listener: handleNoType(;) ensureIdentifierPotentiallyRecovered(set, methodDeclaration, false) @@ -711,7 +711,7 @@ parseUnit(class) listener: beginMetadataStar(set) listener: endMetadataStar(0) listener: beginMember() - parseMethod(}, null, null, null, null, null, }, Instance of 'NoType', set, Foo, DeclarationKind.Class, Foo, false) + parseMethod(}, null, null, null, null, null, null, }, Instance of 'NoType', set, Foo, DeclarationKind.Class, Foo, false) listener: beginMethod(null, null, null, null, set, Foo) listener: handleNoType(}) ensureIdentifierPotentiallyRecovered(set, methodDeclaration, false) @@ -778,7 +778,7 @@ parseUnit(class) listener: beginMetadataStar(set) listener: endMetadataStar(0) listener: beginMember() - parseMethod(;, null, null, null, null, null, ;, Instance of 'NoType', set, Foo, DeclarationKind.Class, Foo, false) + parseMethod(;, null, null, null, null, null, null, ;, Instance of 'NoType', set, Foo, DeclarationKind.Class, Foo, false) listener: beginMethod(null, null, null, null, set, Foo) listener: handleNoType(;) ensureIdentifierPotentiallyRecovered(set, methodDeclaration, false) @@ -857,7 +857,7 @@ parseUnit(class) listener: endMetadataStar(0) listener: beginMember() isReservedKeyword(() - parseMethod(}, external, null, null, null, null, external, Instance of 'NoType', null, Foo, DeclarationKind.Class, Foo, false) + parseMethod(}, null, external, null, null, null, null, external, Instance of 'NoType', null, Foo, DeclarationKind.Class, Foo, false) listener: beginMethod(external, null, null, null, null, Foo) listener: handleNoType(external) ensureIdentifierPotentiallyRecovered(external, methodDeclaration, false) @@ -913,7 +913,7 @@ parseUnit(class) listener: endMetadataStar(0) listener: beginMember() isReservedKeyword(.) - parseMethod(;, external, null, null, null, null, external, Instance of 'NoType', null, Foo, DeclarationKind.Class, Foo, false) + parseMethod(;, null, external, null, null, null, null, external, Instance of 'NoType', null, Foo, DeclarationKind.Class, Foo, false) listener: beginMethod(external, null, null, null, null, Foo) listener: handleNoType(external) ensureIdentifierPotentiallyRecovered(external, methodDeclaration, false) @@ -990,7 +990,7 @@ parseUnit(class) listener: beginMetadataStar(int) listener: endMetadataStar(0) listener: beginMember() - parseFields(}, null, null, null, null, null, }, Instance of 'SimpleType', Foo, DeclarationKind.Class, Foo, false) + parseFields(}, null, null, null, null, null, null, }, Instance of 'SimpleType', Foo, DeclarationKind.Class, Foo, false) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(Foo) listener: handleType(int, null) @@ -1008,7 +1008,7 @@ parseUnit(class) listener: beginMetadataStar(int) listener: endMetadataStar(0) listener: beginMember() - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', A, DeclarationKind.Class, Foo, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', A, DeclarationKind.Class, Foo, false) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(A) listener: handleType(int, null) 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 c85db7e0bdb..5d87d5399e7 100644 --- a/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_bad_name_get.crash_dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_bad_name_get.crash_dart.intertwined.expect @@ -32,7 +32,7 @@ parseUnit(class) listener: beginMetadataStar(get) listener: endMetadataStar(0) listener: beginMember() - parseMethod({, null, null, null, null, null, {, Instance of 'NoType', get, foo, DeclarationKind.Class, Foo, false) + parseMethod({, null, null, null, null, null, null, {, Instance of 'NoType', get, foo, DeclarationKind.Class, Foo, false) listener: beginMethod(null, null, null, null, get, foo) listener: handleNoType({) ensureIdentifierPotentiallyRecovered(get, methodDeclaration, false) @@ -71,7 +71,7 @@ parseUnit(class) listener: beginMetadataStar(get) listener: endMetadataStar(0) listener: beginMember() - parseMethod(}, null, null, null, null, null, }, Instance of 'NoType', get, foo, DeclarationKind.Class, Foo, false) + parseMethod(}, null, null, null, null, null, null, }, Instance of 'NoType', get, foo, DeclarationKind.Class, Foo, false) listener: beginMethod(null, null, null, null, get, foo) listener: handleNoType(}) ensureIdentifierPotentiallyRecovered(get, methodDeclaration, false) @@ -134,7 +134,7 @@ parseUnit(class) listener: beginMetadataStar(get) listener: endMetadataStar(0) listener: beginMember() - parseMethod(}, null, null, null, null, null, }, Instance of 'NoType', get, foo, DeclarationKind.Class, Foo, false) + parseMethod(}, null, null, null, null, null, null, }, Instance of 'NoType', get, foo, DeclarationKind.Class, Foo, false) listener: beginMethod(null, null, null, null, get, foo) listener: handleNoType(}) ensureIdentifierPotentiallyRecovered(get, methodDeclaration, false) 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 65a470c6223..9fd9286cc2d 100644 --- a/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_bad_name_return_type.crash_dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_bad_name_return_type.crash_dart.intertwined.expect @@ -32,7 +32,7 @@ parseUnit(class) listener: beginMetadataStar(void) listener: endMetadataStar(0) listener: beginMember() - parseMethod({, null, null, null, null, null, {, Instance of 'VoidType', null, foo, DeclarationKind.Class, Foo, false) + parseMethod({, null, null, null, null, null, null, {, Instance of 'VoidType', null, foo, DeclarationKind.Class, Foo, false) listener: beginMethod(null, null, null, null, null, foo) listener: handleVoidKeyword(void) ensureIdentifierPotentiallyRecovered(void, methodDeclaration, false) @@ -71,7 +71,7 @@ parseUnit(class) listener: beginMetadataStar(void) listener: endMetadataStar(0) listener: beginMember() - parseMethod(}, null, null, null, null, null, }, Instance of 'VoidType', null, foo, DeclarationKind.Class, Foo, false) + parseMethod(}, null, null, null, null, null, null, }, Instance of 'VoidType', null, foo, DeclarationKind.Class, Foo, false) listener: beginMethod(null, null, null, null, null, foo) listener: handleVoidKeyword(void) ensureIdentifierPotentiallyRecovered(void, methodDeclaration, false) @@ -134,7 +134,7 @@ parseUnit(class) listener: beginMetadataStar(void) listener: endMetadataStar(0) listener: beginMember() - parseMethod(}, null, null, null, null, null, }, Instance of 'VoidType', null, foo, DeclarationKind.Class, Foo, false) + parseMethod(}, null, null, null, null, null, null, }, Instance of 'VoidType', null, foo, DeclarationKind.Class, Foo, false) listener: beginMethod(null, null, null, null, null, foo) listener: handleVoidKeyword(void) ensureIdentifierPotentiallyRecovered(void, methodDeclaration, false) 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 700b32fd2d7..41adc50312a 100644 --- a/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_bad_name_set.crash_dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_bad_name_set.crash_dart.intertwined.expect @@ -32,7 +32,7 @@ parseUnit(class) listener: beginMetadataStar(set) listener: endMetadataStar(0) listener: beginMember() - parseMethod({, null, null, null, null, null, {, Instance of 'NoType', set, foo, DeclarationKind.Class, Foo, false) + parseMethod({, null, null, null, null, null, null, {, Instance of 'NoType', set, foo, DeclarationKind.Class, Foo, false) listener: beginMethod(null, null, null, null, set, foo) listener: handleNoType({) ensureIdentifierPotentiallyRecovered(set, methodDeclaration, false) @@ -71,7 +71,7 @@ parseUnit(class) listener: beginMetadataStar(set) listener: endMetadataStar(0) listener: beginMember() - parseMethod(}, null, null, null, null, null, }, Instance of 'NoType', set, foo, DeclarationKind.Class, Foo, false) + parseMethod(}, null, null, null, null, null, null, }, Instance of 'NoType', set, foo, DeclarationKind.Class, Foo, false) listener: beginMethod(null, null, null, null, set, foo) listener: handleNoType(}) ensureIdentifierPotentiallyRecovered(set, methodDeclaration, false) @@ -134,7 +134,7 @@ parseUnit(class) listener: beginMetadataStar(set) listener: endMetadataStar(0) listener: beginMember() - parseMethod(}, null, null, null, null, null, }, Instance of 'NoType', set, foo, DeclarationKind.Class, Foo, false) + parseMethod(}, null, null, null, null, null, null, }, Instance of 'NoType', set, foo, DeclarationKind.Class, Foo, false) listener: beginMethod(null, null, null, null, set, foo) listener: handleNoType(}) ensureIdentifierPotentiallyRecovered(set, methodDeclaration, false) 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 942c9f8dc3e..8dd739870fe 100644 --- a/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_get.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_get.dart.intertwined.expect @@ -32,7 +32,7 @@ parseUnit(class) listener: beginMetadataStar(get) listener: endMetadataStar(0) listener: beginMember() - parseMethod({, null, null, null, null, null, {, Instance of 'NoType', get, Foo, DeclarationKind.Class, Foo, false) + parseMethod({, null, null, null, null, null, null, {, Instance of 'NoType', get, Foo, DeclarationKind.Class, Foo, false) listener: beginMethod(null, null, null, null, get, Foo) listener: handleNoType({) ensureIdentifierPotentiallyRecovered(get, methodDeclaration, false) @@ -67,7 +67,7 @@ parseUnit(class) listener: beginMetadataStar(get) listener: endMetadataStar(0) listener: beginMember() - parseMethod(}, null, null, null, null, null, }, Instance of 'NoType', get, Foo, DeclarationKind.Class, Foo, false) + parseMethod(}, null, null, null, null, null, null, }, Instance of 'NoType', get, Foo, DeclarationKind.Class, Foo, false) listener: beginMethod(null, null, null, null, get, Foo) listener: handleNoType(}) ensureIdentifierPotentiallyRecovered(get, methodDeclaration, false) @@ -126,7 +126,7 @@ parseUnit(class) listener: beginMetadataStar(get) listener: endMetadataStar(0) listener: beginMember() - parseMethod(}, null, null, null, null, null, }, Instance of 'NoType', get, Foo, DeclarationKind.Class, Foo, false) + parseMethod(}, null, null, null, null, null, null, }, Instance of 'NoType', get, Foo, DeclarationKind.Class, Foo, false) listener: beginMethod(null, null, null, null, get, Foo) listener: handleNoType(}) ensureIdentifierPotentiallyRecovered(get, methodDeclaration, false) @@ -163,7 +163,7 @@ parseUnit(class) listener: beginMetadataStar(get) listener: endMetadataStar(0) listener: beginMember() - parseMethod(}, null, null, null, null, null, }, Instance of 'NoType', get, Foo, DeclarationKind.Class, Foo, false) + parseMethod(}, null, null, null, null, null, null, }, Instance of 'NoType', get, Foo, DeclarationKind.Class, Foo, false) listener: beginMethod(null, null, null, null, get, Foo) listener: handleNoType(}) ensureIdentifierPotentiallyRecovered(get, methodDeclaration, false) 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 fa9e6738190..742aa8bcae3 100644 --- a/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_ok.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_ok.dart.intertwined.expect @@ -33,7 +33,7 @@ parseUnit(class) listener: endMetadataStar(0) listener: beginMember() isReservedKeyword(() - parseMethod({, null, null, null, null, null, {, Instance of 'NoType', null, Foo, DeclarationKind.Class, Foo, false) + parseMethod({, null, null, null, null, null, null, {, Instance of 'NoType', null, Foo, DeclarationKind.Class, Foo, false) listener: beginMethod(null, null, null, null, null, Foo) listener: handleNoType({) ensureIdentifierPotentiallyRecovered({, methodDeclaration, false) @@ -65,7 +65,7 @@ parseUnit(class) listener: endMetadataStar(0) listener: beginMember() isReservedKeyword(() - parseMethod(}, null, null, null, null, null, }, Instance of 'NoType', null, Foo, DeclarationKind.Class, Foo, false) + parseMethod(}, null, null, null, null, null, null, }, Instance of 'NoType', null, Foo, DeclarationKind.Class, Foo, false) listener: beginMethod(null, null, null, null, null, Foo) listener: handleNoType(}) ensureIdentifierPotentiallyRecovered(}, methodDeclaration, false) @@ -121,7 +121,7 @@ parseUnit(class) listener: endMetadataStar(0) listener: beginMember() isReservedKeyword(.) - parseMethod(}, null, null, null, null, null, }, Instance of 'NoType', null, Foo, DeclarationKind.Class, Foo, false) + parseMethod(}, null, null, null, null, null, null, }, Instance of 'NoType', null, Foo, DeclarationKind.Class, Foo, false) listener: beginMethod(null, null, null, null, null, Foo) listener: handleNoType(}) ensureIdentifierPotentiallyRecovered(}, methodDeclaration, false) @@ -157,7 +157,7 @@ parseUnit(class) listener: endMetadataStar(0) listener: beginMember() isReservedKeyword(.) - parseMethod(}, null, null, null, null, null, }, Instance of 'NoType', null, Foo, DeclarationKind.Class, Foo, false) + parseMethod(}, null, null, null, null, null, null, }, Instance of 'NoType', null, Foo, DeclarationKind.Class, Foo, false) listener: beginMethod(null, null, null, null, null, Foo) listener: handleNoType(}) ensureIdentifierPotentiallyRecovered(}, methodDeclaration, false) 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 83c7426085c..a03511905f7 100644 --- a/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_operator.crash_dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_operator.crash_dart.intertwined.expect @@ -33,7 +33,7 @@ parseUnit(class) listener: endMetadataStar(0) listener: beginMember() isReservedKeyword(() - parseMethod({, null, null, null, null, null, {, Instance of 'NoType', null, Foo, DeclarationKind.Class, Foo, false) + parseMethod({, null, null, null, null, null, null, {, Instance of 'NoType', null, Foo, DeclarationKind.Class, Foo, false) listener: beginMethod(null, null, null, null, null, Foo) listener: handleNoType({) ensureIdentifierPotentiallyRecovered({, methodDeclaration, false) @@ -68,12 +68,12 @@ parseUnit(class) listener: beginMetadataStar(/) listener: endMetadataStar(0) listener: beginMember() - recoverFromInvalidMember(}, }, null, null, null, null, null, }, Instance of 'NoType', null, DeclarationKind.Class, Foo) - parseInvalidOperatorDeclaration(}, null, null, null, null, null, }, DeclarationKind.Class, Foo) + recoverFromInvalidMember(}, }, null, null, null, null, null, null, }, Instance of 'NoType', null, DeclarationKind.Class, Foo) + parseInvalidOperatorDeclaration(}, null, null, null, null, null, null, }, DeclarationKind.Class, Foo) reportRecoverableError(/, MissingOperatorKeyword) listener: handleRecoverableError(MissingOperatorKeyword, /, /) rewriter() - parseMethod(}, null, null, null, null, null, }, Instance of 'NoType', null, operator, DeclarationKind.Class, Foo, false) + parseMethod(}, null, null, null, null, null, null, }, Instance of 'NoType', null, operator, DeclarationKind.Class, Foo, false) listener: beginMethod(null, null, null, null, null, operator) listener: handleNoType(}) parseOperatorName(}) @@ -128,7 +128,7 @@ parseUnit(class) listener: endMetadataStar(0) listener: beginMember() isReservedKeyword(() - parseMethod(}, null, null, null, null, null, }, Instance of 'NoType', null, Foo, DeclarationKind.Class, Foo, false) + parseMethod(}, null, null, null, null, null, null, }, Instance of 'NoType', null, Foo, DeclarationKind.Class, Foo, false) listener: beginMethod(null, null, null, null, null, Foo) listener: handleNoType(}) ensureIdentifierPotentiallyRecovered(}, methodDeclaration, false) @@ -163,7 +163,7 @@ parseUnit(class) listener: beginMetadataStar(.) listener: endMetadataStar(0) listener: beginMember() - recoverFromInvalidMember(}, }, null, null, null, null, null, }, Instance of 'NoType', null, DeclarationKind.Class, Foo) + recoverFromInvalidMember(}, }, null, null, null, null, null, null, }, Instance of 'NoType', null, DeclarationKind.Class, Foo) reportRecoverableErrorWithToken(., Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[ExpectedClassMember, Expected a class member, but got '.'., null, {token: .}], ., .) listener: handleInvalidMember(.) @@ -174,12 +174,12 @@ parseUnit(class) listener: beginMetadataStar(/) listener: endMetadataStar(0) listener: beginMember() - recoverFromInvalidMember(., ., null, null, null, null, null, ., Instance of 'NoType', null, DeclarationKind.Class, Foo) - parseInvalidOperatorDeclaration(., null, null, null, null, null, ., DeclarationKind.Class, Foo) + recoverFromInvalidMember(., ., null, null, null, null, null, null, ., Instance of 'NoType', null, DeclarationKind.Class, Foo) + parseInvalidOperatorDeclaration(., null, null, null, null, null, null, ., DeclarationKind.Class, Foo) reportRecoverableError(/, MissingOperatorKeyword) listener: handleRecoverableError(MissingOperatorKeyword, /, /) rewriter() - parseMethod(., null, null, null, null, null, ., Instance of 'NoType', null, operator, DeclarationKind.Class, Foo, false) + parseMethod(., null, null, null, null, null, null, ., Instance of 'NoType', null, operator, DeclarationKind.Class, Foo, false) listener: beginMethod(null, null, null, null, null, operator) listener: handleNoType(.) parseOperatorName(.) @@ -234,7 +234,7 @@ parseUnit(class) listener: endMetadataStar(0) listener: beginMember() isReservedKeyword(() - parseMethod(}, null, null, null, null, null, }, Instance of 'NoType', null, foo, DeclarationKind.Class, Foo, false) + parseMethod(}, null, null, null, null, null, null, }, Instance of 'NoType', null, foo, DeclarationKind.Class, Foo, false) listener: beginMethod(null, null, null, null, null, foo) listener: handleNoType(}) ensureIdentifierPotentiallyRecovered(}, methodDeclaration, false) @@ -269,12 +269,12 @@ parseUnit(class) listener: beginMetadataStar(/) listener: endMetadataStar(0) listener: beginMember() - recoverFromInvalidMember(}, }, null, null, null, null, null, }, Instance of 'NoType', null, DeclarationKind.Class, Foo) - parseInvalidOperatorDeclaration(}, null, null, null, null, null, }, DeclarationKind.Class, Foo) + recoverFromInvalidMember(}, }, null, null, null, null, null, null, }, Instance of 'NoType', null, DeclarationKind.Class, Foo) + parseInvalidOperatorDeclaration(}, null, null, null, null, null, null, }, DeclarationKind.Class, Foo) reportRecoverableError(/, MissingOperatorKeyword) listener: handleRecoverableError(MissingOperatorKeyword, /, /) rewriter() - parseMethod(}, null, null, null, null, null, }, Instance of 'NoType', null, operator, DeclarationKind.Class, Foo, false) + parseMethod(}, null, null, null, null, null, null, }, Instance of 'NoType', null, operator, DeclarationKind.Class, Foo, false) listener: beginMethod(null, null, null, null, null, operator) listener: handleNoType(}) parseOperatorName(}) @@ -329,7 +329,7 @@ parseUnit(class) listener: endMetadataStar(0) listener: beginMember() isReservedKeyword(() - parseMethod(}, null, null, null, null, null, }, Instance of 'NoType', null, foo, DeclarationKind.Class, Foo, false) + parseMethod(}, null, null, null, null, null, null, }, Instance of 'NoType', null, foo, DeclarationKind.Class, Foo, false) listener: beginMethod(null, null, null, null, null, foo) listener: handleNoType(}) ensureIdentifierPotentiallyRecovered(}, methodDeclaration, false) @@ -364,7 +364,7 @@ parseUnit(class) listener: beginMetadataStar(.) listener: endMetadataStar(0) listener: beginMember() - recoverFromInvalidMember(}, }, null, null, null, null, null, }, Instance of 'NoType', null, DeclarationKind.Class, Foo) + recoverFromInvalidMember(}, }, null, null, null, null, null, null, }, Instance of 'NoType', null, DeclarationKind.Class, Foo) reportRecoverableErrorWithToken(., Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[ExpectedClassMember, Expected a class member, but got '.'., null, {token: .}], ., .) listener: handleInvalidMember(.) @@ -375,12 +375,12 @@ parseUnit(class) listener: beginMetadataStar(/) listener: endMetadataStar(0) listener: beginMember() - recoverFromInvalidMember(., ., null, null, null, null, null, ., Instance of 'NoType', null, DeclarationKind.Class, Foo) - parseInvalidOperatorDeclaration(., null, null, null, null, null, ., DeclarationKind.Class, Foo) + recoverFromInvalidMember(., ., null, null, null, null, null, null, ., Instance of 'NoType', null, DeclarationKind.Class, Foo) + parseInvalidOperatorDeclaration(., null, null, null, null, null, null, ., DeclarationKind.Class, Foo) reportRecoverableError(/, MissingOperatorKeyword) listener: handleRecoverableError(MissingOperatorKeyword, /, /) rewriter() - parseMethod(., null, null, null, null, null, ., Instance of 'NoType', null, operator, DeclarationKind.Class, Foo, false) + parseMethod(., null, null, null, null, null, null, ., Instance of 'NoType', null, operator, DeclarationKind.Class, Foo, false) listener: beginMethod(null, null, null, null, null, operator) listener: handleNoType(.) parseOperatorName(.) 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 b1b218db441..4bbafcbdaa0 100644 --- a/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_return_type.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_return_type.dart.intertwined.expect @@ -32,7 +32,7 @@ parseUnit(class) listener: beginMetadataStar(void) listener: endMetadataStar(0) listener: beginMember() - parseMethod({, null, null, null, null, null, {, Instance of 'VoidType', null, Foo, DeclarationKind.Class, Foo, false) + parseMethod({, null, null, null, null, null, null, {, Instance of 'VoidType', null, Foo, DeclarationKind.Class, Foo, false) listener: beginMethod(null, null, null, null, null, Foo) listener: handleVoidKeyword(void) ensureIdentifierPotentiallyRecovered(void, methodDeclaration, false) @@ -65,7 +65,7 @@ parseUnit(class) listener: beginMetadataStar(void) listener: endMetadataStar(0) listener: beginMember() - parseMethod(}, null, null, null, null, null, }, Instance of 'VoidType', null, Foo, DeclarationKind.Class, Foo, false) + parseMethod(}, null, null, null, null, null, null, }, Instance of 'VoidType', null, Foo, DeclarationKind.Class, Foo, false) listener: beginMethod(null, null, null, null, null, Foo) listener: handleVoidKeyword(void) ensureIdentifierPotentiallyRecovered(void, methodDeclaration, false) @@ -122,7 +122,7 @@ parseUnit(class) listener: beginMetadataStar(void) listener: endMetadataStar(0) listener: beginMember() - parseMethod(}, null, null, null, null, null, }, Instance of 'VoidType', null, Foo, DeclarationKind.Class, Foo, false) + parseMethod(}, null, null, null, null, null, null, }, Instance of 'VoidType', null, Foo, DeclarationKind.Class, Foo, false) listener: beginMethod(null, null, null, null, null, Foo) listener: handleVoidKeyword(void) ensureIdentifierPotentiallyRecovered(void, methodDeclaration, false) @@ -159,7 +159,7 @@ parseUnit(class) listener: beginMetadataStar(void) listener: endMetadataStar(0) listener: beginMember() - parseMethod(}, null, null, null, null, null, }, Instance of 'VoidType', null, Foo, DeclarationKind.Class, Foo, false) + parseMethod(}, null, null, null, null, null, null, }, Instance of 'VoidType', null, Foo, DeclarationKind.Class, Foo, false) listener: beginMethod(null, null, null, null, null, Foo) listener: handleVoidKeyword(void) ensureIdentifierPotentiallyRecovered(void, methodDeclaration, false) 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 572e2e537f8..223fd143e76 100644 --- a/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_set.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_set.dart.intertwined.expect @@ -32,7 +32,7 @@ parseUnit(class) listener: beginMetadataStar(set) listener: endMetadataStar(0) listener: beginMember() - parseMethod({, null, null, null, null, null, {, Instance of 'NoType', set, Foo, DeclarationKind.Class, Foo, false) + parseMethod({, null, null, null, null, null, null, {, Instance of 'NoType', set, Foo, DeclarationKind.Class, Foo, false) listener: beginMethod(null, null, null, null, set, Foo) listener: handleNoType({) ensureIdentifierPotentiallyRecovered(set, methodDeclaration, false) @@ -65,7 +65,7 @@ parseUnit(class) listener: beginMetadataStar(set) listener: endMetadataStar(0) listener: beginMember() - parseMethod(}, null, null, null, null, null, }, Instance of 'NoType', set, Foo, DeclarationKind.Class, Foo, false) + parseMethod(}, null, null, null, null, null, null, }, Instance of 'NoType', set, Foo, DeclarationKind.Class, Foo, false) listener: beginMethod(null, null, null, null, set, Foo) listener: handleNoType(}) ensureIdentifierPotentiallyRecovered(set, methodDeclaration, false) @@ -122,7 +122,7 @@ parseUnit(class) listener: beginMetadataStar(set) listener: endMetadataStar(0) listener: beginMember() - parseMethod(}, null, null, null, null, null, }, Instance of 'NoType', set, Foo, DeclarationKind.Class, Foo, false) + parseMethod(}, null, null, null, null, null, null, }, Instance of 'NoType', set, Foo, DeclarationKind.Class, Foo, false) listener: beginMethod(null, null, null, null, set, Foo) listener: handleNoType(}) ensureIdentifierPotentiallyRecovered(set, methodDeclaration, false) @@ -159,7 +159,7 @@ parseUnit(class) listener: beginMetadataStar(set) listener: endMetadataStar(0) listener: beginMember() - parseMethod(}, null, null, null, null, null, }, Instance of 'NoType', set, Foo, DeclarationKind.Class, Foo, false) + parseMethod(}, null, null, null, null, null, null, }, Instance of 'NoType', set, Foo, DeclarationKind.Class, Foo, false) listener: beginMethod(null, null, null, null, set, Foo) listener: handleNoType(}) ensureIdentifierPotentiallyRecovered(set, methodDeclaration, false) diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_39026.crash_dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/issue_39026.crash_dart.intertwined.expect index a1825402235..740482cf049 100644 --- a/pkg/front_end/parser_testcases/error_recovery/issue_39026.crash_dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/error_recovery/issue_39026.crash_dart.intertwined.expect @@ -32,11 +32,11 @@ parseUnit(class) listener: beginMetadataStar(co) listener: endMetadataStar(0) listener: beginMember() - parseInvalidOperatorDeclaration({, null, null, null, null, null, {, DeclarationKind.Class, A) + parseInvalidOperatorDeclaration({, null, null, null, null, null, null, {, DeclarationKind.Class, A) reportRecoverableError(<, MissingOperatorKeyword) listener: handleRecoverableError(MissingOperatorKeyword, <, <) rewriter() - parseMethod({, null, null, null, null, null, {, Instance of 'SimpleType', null, operator, DeclarationKind.Class, A, false) + parseMethod({, null, null, null, null, null, null, {, Instance of 'SimpleType', null, operator, DeclarationKind.Class, A, false) listener: beginMethod(null, null, null, null, null, operator) listener: handleIdentifier(co, typeReference) listener: handleNoTypeArguments(operator) diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_39026_prime.crash_dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/issue_39026_prime.crash_dart.intertwined.expect index cc5f5021a59..cb81bbacbf9 100644 --- a/pkg/front_end/parser_testcases/error_recovery/issue_39026_prime.crash_dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/error_recovery/issue_39026_prime.crash_dart.intertwined.expect @@ -32,7 +32,7 @@ parseUnit(class) listener: beginMetadataStar(co) listener: endMetadataStar(0) listener: beginMember() - parseMethod({, null, null, null, null, null, {, Instance of 'SimpleType', null, operator, DeclarationKind.Class, A, false) + parseMethod({, null, null, null, null, null, null, {, Instance of 'SimpleType', null, operator, DeclarationKind.Class, A, false) listener: beginMethod(null, null, null, null, null, operator) listener: handleIdentifier(co, typeReference) listener: handleNoTypeArguments(operator) diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_39202.crash_dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/issue_39202.crash_dart.intertwined.expect index bcf47c683e3..663212893f0 100644 --- a/pkg/front_end/parser_testcases/error_recovery/issue_39202.crash_dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/error_recovery/issue_39202.crash_dart.intertwined.expect @@ -75,7 +75,7 @@ parseUnit(() listener: endMetadataStar(0) parseTopLevelMemberImpl(;) listener: beginTopLevelMember(b) - parseFields(;, null, null, null, null, null, ;, Instance of 'ComplexTypeInfo', $, DeclarationKind.TopLevel, null, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'ComplexTypeInfo', $, DeclarationKind.TopLevel, null, false) ensureIdentifier(;, typeReference) listener: handleIdentifier(b, typeReference) listener: beginTypeArguments(<) 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 2310e8eeb3a..3784f8cb71d 100644 --- a/pkg/front_end/parser_testcases/error_recovery/issue_39230.crash_dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/error_recovery/issue_39230.crash_dart.intertwined.expect @@ -33,7 +33,7 @@ parseUnit(class) listener: endMetadataStar(0) listener: beginMember() isReservedKeyword(() - parseMethod({, null, null, null, null, null, {, Instance of 'NoType', null, C, DeclarationKind.Class, C, false) + parseMethod({, null, null, null, null, null, null, {, Instance of 'NoType', null, C, DeclarationKind.Class, C, false) listener: beginMethod(null, null, null, null, null, C) listener: handleNoType({) ensureIdentifierPotentiallyRecovered({, methodDeclaration, false) @@ -68,12 +68,12 @@ parseUnit(class) listener: beginMetadataStar(/) listener: endMetadataStar(0) listener: beginMember() - recoverFromInvalidMember(}, }, null, null, null, null, null, }, Instance of 'NoType', null, DeclarationKind.Class, C) - parseInvalidOperatorDeclaration(}, null, null, null, null, null, }, DeclarationKind.Class, C) + recoverFromInvalidMember(}, }, null, null, null, null, null, null, }, Instance of 'NoType', null, DeclarationKind.Class, C) + parseInvalidOperatorDeclaration(}, null, null, null, null, null, null, }, DeclarationKind.Class, C) reportRecoverableError(/, MissingOperatorKeyword) listener: handleRecoverableError(MissingOperatorKeyword, /, /) rewriter() - parseMethod(}, null, null, null, null, null, }, Instance of 'NoType', null, operator, DeclarationKind.Class, C, false) + parseMethod(}, null, null, null, null, null, null, }, Instance of 'NoType', null, operator, DeclarationKind.Class, C, false) listener: beginMethod(null, null, null, null, null, operator) listener: handleNoType(}) parseOperatorName(}) diff --git a/pkg/front_end/parser_testcases/error_recovery/keyword_named_class_fields.dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/keyword_named_class_fields.dart.intertwined.expect index 880586ee7b5..d6f63123f63 100644 --- a/pkg/front_end/parser_testcases/error_recovery/keyword_named_class_fields.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/error_recovery/keyword_named_class_fields.dart.intertwined.expect @@ -32,7 +32,7 @@ parseUnit(class) listener: beginMetadataStar(int) listener: endMetadataStar(0) listener: beginMember() - parseFields({, null, null, null, null, null, {, Instance of 'SimpleType', abstract, DeclarationKind.Class, WrapperClass, false) + parseFields({, null, null, null, null, null, null, {, Instance of 'SimpleType', abstract, DeclarationKind.Class, WrapperClass, false) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(abstract) listener: handleType(int, null) @@ -55,7 +55,7 @@ parseUnit(class) listener: beginMetadataStar(int) listener: endMetadataStar(0) listener: beginMember() - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', as, DeclarationKind.Class, WrapperClass, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', as, DeclarationKind.Class, WrapperClass, false) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(as) listener: handleType(int, null) @@ -80,7 +80,7 @@ parseUnit(class) listener: beginMember() isReservedKeyword(assert) indicatesMethodOrField(=) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', assert, DeclarationKind.Class, WrapperClass, true) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', assert, DeclarationKind.Class, WrapperClass, true) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(assert) listener: handleType(int, null) @@ -105,7 +105,7 @@ parseUnit(class) listener: beginMetadataStar(int) listener: endMetadataStar(0) listener: beginMember() - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', async, DeclarationKind.Class, WrapperClass, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', async, DeclarationKind.Class, WrapperClass, false) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(async) listener: handleType(int, null) @@ -128,7 +128,7 @@ parseUnit(class) listener: beginMetadataStar(int) listener: endMetadataStar(0) listener: beginMember() - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', await, DeclarationKind.Class, WrapperClass, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', await, DeclarationKind.Class, WrapperClass, false) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(await) listener: handleType(int, null) @@ -153,7 +153,7 @@ parseUnit(class) listener: beginMember() isReservedKeyword(break) indicatesMethodOrField(=) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', break, DeclarationKind.Class, WrapperClass, true) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', break, DeclarationKind.Class, WrapperClass, true) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(break) listener: handleType(int, null) @@ -180,7 +180,7 @@ parseUnit(class) listener: beginMember() isReservedKeyword(case) indicatesMethodOrField(=) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', case, DeclarationKind.Class, WrapperClass, true) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', case, DeclarationKind.Class, WrapperClass, true) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(case) listener: handleType(int, null) @@ -207,7 +207,7 @@ parseUnit(class) listener: beginMember() isReservedKeyword(catch) indicatesMethodOrField(=) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', catch, DeclarationKind.Class, WrapperClass, true) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', catch, DeclarationKind.Class, WrapperClass, true) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(catch) listener: handleType(int, null) @@ -234,7 +234,7 @@ parseUnit(class) listener: beginMember() isReservedKeyword(class) indicatesMethodOrField(=) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', class, DeclarationKind.Class, WrapperClass, true) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', class, DeclarationKind.Class, WrapperClass, true) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(class) listener: handleType(int, null) @@ -261,7 +261,7 @@ parseUnit(class) listener: beginMember() isReservedKeyword(const) indicatesMethodOrField(=) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', const, DeclarationKind.Class, WrapperClass, true) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', const, DeclarationKind.Class, WrapperClass, true) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(const) listener: handleType(int, null) @@ -288,7 +288,7 @@ parseUnit(class) listener: beginMember() isReservedKeyword(continue) indicatesMethodOrField(=) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', continue, DeclarationKind.Class, WrapperClass, true) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', continue, DeclarationKind.Class, WrapperClass, true) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(continue) listener: handleType(int, null) @@ -313,7 +313,7 @@ parseUnit(class) listener: beginMetadataStar(int) listener: endMetadataStar(0) listener: beginMember() - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', covariant, DeclarationKind.Class, WrapperClass, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', covariant, DeclarationKind.Class, WrapperClass, false) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(covariant) listener: handleType(int, null) @@ -338,7 +338,7 @@ parseUnit(class) listener: beginMember() isReservedKeyword(default) indicatesMethodOrField(=) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', default, DeclarationKind.Class, WrapperClass, true) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', default, DeclarationKind.Class, WrapperClass, true) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(default) listener: handleType(int, null) @@ -363,7 +363,7 @@ parseUnit(class) listener: beginMetadataStar(int) listener: endMetadataStar(0) listener: beginMember() - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', deferred, DeclarationKind.Class, WrapperClass, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', deferred, DeclarationKind.Class, WrapperClass, false) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(deferred) listener: handleType(int, null) @@ -388,7 +388,7 @@ parseUnit(class) listener: beginMember() isReservedKeyword(do) indicatesMethodOrField(=) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', do, DeclarationKind.Class, WrapperClass, true) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', do, DeclarationKind.Class, WrapperClass, true) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(do) listener: handleType(int, null) @@ -413,7 +413,7 @@ parseUnit(class) listener: beginMetadataStar(int) listener: endMetadataStar(0) listener: beginMember() - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', dynamic, DeclarationKind.Class, WrapperClass, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', dynamic, DeclarationKind.Class, WrapperClass, false) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(dynamic) listener: handleType(int, null) @@ -438,7 +438,7 @@ parseUnit(class) listener: beginMember() isReservedKeyword(else) indicatesMethodOrField(=) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', else, DeclarationKind.Class, WrapperClass, true) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', else, DeclarationKind.Class, WrapperClass, true) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(else) listener: handleType(int, null) @@ -465,7 +465,7 @@ parseUnit(class) listener: beginMember() isReservedKeyword(enum) indicatesMethodOrField(=) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', enum, DeclarationKind.Class, WrapperClass, true) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', enum, DeclarationKind.Class, WrapperClass, true) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(enum) listener: handleType(int, null) @@ -490,7 +490,7 @@ parseUnit(class) listener: beginMetadataStar(int) listener: endMetadataStar(0) listener: beginMember() - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', export, DeclarationKind.Class, WrapperClass, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', export, DeclarationKind.Class, WrapperClass, false) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(export) listener: handleType(int, null) @@ -515,7 +515,7 @@ parseUnit(class) listener: beginMember() isReservedKeyword(extends) indicatesMethodOrField(=) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', extends, DeclarationKind.Class, WrapperClass, true) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', extends, DeclarationKind.Class, WrapperClass, true) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(extends) listener: handleType(int, null) @@ -540,7 +540,7 @@ parseUnit(class) listener: beginMetadataStar(int) listener: endMetadataStar(0) listener: beginMember() - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', extension, DeclarationKind.Class, WrapperClass, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', extension, DeclarationKind.Class, WrapperClass, false) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(extension) listener: handleType(int, null) @@ -563,7 +563,7 @@ parseUnit(class) listener: beginMetadataStar(int) listener: endMetadataStar(0) listener: beginMember() - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', external, DeclarationKind.Class, WrapperClass, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', external, DeclarationKind.Class, WrapperClass, false) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(external) listener: handleType(int, null) @@ -586,7 +586,7 @@ parseUnit(class) listener: beginMetadataStar(int) listener: endMetadataStar(0) listener: beginMember() - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', factory, DeclarationKind.Class, WrapperClass, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', factory, DeclarationKind.Class, WrapperClass, false) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(factory) listener: handleType(int, null) @@ -611,7 +611,7 @@ parseUnit(class) listener: beginMember() isReservedKeyword(false) indicatesMethodOrField(=) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', false, DeclarationKind.Class, WrapperClass, true) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', false, DeclarationKind.Class, WrapperClass, true) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(false) listener: handleType(int, null) @@ -638,7 +638,7 @@ parseUnit(class) listener: beginMember() isReservedKeyword(final) indicatesMethodOrField(=) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', final, DeclarationKind.Class, WrapperClass, true) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', final, DeclarationKind.Class, WrapperClass, true) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(final) listener: handleType(int, null) @@ -665,7 +665,7 @@ parseUnit(class) listener: beginMember() isReservedKeyword(finally) indicatesMethodOrField(=) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', finally, DeclarationKind.Class, WrapperClass, true) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', finally, DeclarationKind.Class, WrapperClass, true) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(finally) listener: handleType(int, null) @@ -692,7 +692,7 @@ parseUnit(class) listener: beginMember() isReservedKeyword(for) indicatesMethodOrField(=) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', for, DeclarationKind.Class, WrapperClass, true) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', for, DeclarationKind.Class, WrapperClass, true) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(for) listener: handleType(int, null) @@ -717,7 +717,7 @@ parseUnit(class) listener: beginMetadataStar(int) listener: endMetadataStar(0) listener: beginMember() - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', Function, DeclarationKind.Class, WrapperClass, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', Function, DeclarationKind.Class, WrapperClass, false) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(Function) listener: handleType(int, null) @@ -741,7 +741,7 @@ parseUnit(class) listener: endMetadataStar(0) listener: beginMember() isReservedKeyword(=) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', get, DeclarationKind.Class, WrapperClass, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', get, DeclarationKind.Class, WrapperClass, false) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(get) listener: handleType(int, null) @@ -764,7 +764,7 @@ parseUnit(class) listener: beginMetadataStar(int) listener: endMetadataStar(0) listener: beginMember() - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', hide, DeclarationKind.Class, WrapperClass, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', hide, DeclarationKind.Class, WrapperClass, false) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(hide) listener: handleType(int, null) @@ -789,7 +789,7 @@ parseUnit(class) listener: beginMember() isReservedKeyword(if) indicatesMethodOrField(=) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', if, DeclarationKind.Class, WrapperClass, true) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', if, DeclarationKind.Class, WrapperClass, true) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(if) listener: handleType(int, null) @@ -814,7 +814,7 @@ parseUnit(class) listener: beginMetadataStar(int) listener: endMetadataStar(0) listener: beginMember() - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', implements, DeclarationKind.Class, WrapperClass, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', implements, DeclarationKind.Class, WrapperClass, false) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(implements) listener: handleType(int, null) @@ -837,7 +837,7 @@ parseUnit(class) listener: beginMetadataStar(int) listener: endMetadataStar(0) listener: beginMember() - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', import, DeclarationKind.Class, WrapperClass, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', import, DeclarationKind.Class, WrapperClass, false) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(import) listener: handleType(int, null) @@ -862,7 +862,7 @@ parseUnit(class) listener: beginMember() isReservedKeyword(in) indicatesMethodOrField(=) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', in, DeclarationKind.Class, WrapperClass, true) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', in, DeclarationKind.Class, WrapperClass, true) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(in) listener: handleType(int, null) @@ -887,7 +887,7 @@ parseUnit(class) listener: beginMetadataStar(int) listener: endMetadataStar(0) listener: beginMember() - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', inout, DeclarationKind.Class, WrapperClass, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', inout, DeclarationKind.Class, WrapperClass, false) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(inout) listener: handleType(int, null) @@ -910,7 +910,7 @@ parseUnit(class) listener: beginMetadataStar(int) listener: endMetadataStar(0) listener: beginMember() - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', interface, DeclarationKind.Class, WrapperClass, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', interface, DeclarationKind.Class, WrapperClass, false) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(interface) listener: handleType(int, null) @@ -935,7 +935,7 @@ parseUnit(class) listener: beginMember() isReservedKeyword(is) indicatesMethodOrField(=) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', is, DeclarationKind.Class, WrapperClass, true) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', is, DeclarationKind.Class, WrapperClass, true) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(is) listener: handleType(int, null) @@ -960,7 +960,7 @@ parseUnit(class) listener: beginMetadataStar(int) listener: endMetadataStar(0) listener: beginMember() - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', late, DeclarationKind.Class, WrapperClass, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', late, DeclarationKind.Class, WrapperClass, false) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(late) listener: handleType(int, null) @@ -983,7 +983,7 @@ parseUnit(class) listener: beginMetadataStar(int) listener: endMetadataStar(0) listener: beginMember() - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', library, DeclarationKind.Class, WrapperClass, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', library, DeclarationKind.Class, WrapperClass, false) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(library) listener: handleType(int, null) @@ -1006,7 +1006,7 @@ parseUnit(class) listener: beginMetadataStar(int) listener: endMetadataStar(0) listener: beginMember() - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', mixin, DeclarationKind.Class, WrapperClass, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', mixin, DeclarationKind.Class, WrapperClass, false) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(mixin) listener: handleType(int, null) @@ -1029,7 +1029,7 @@ parseUnit(class) listener: beginMetadataStar(int) listener: endMetadataStar(0) listener: beginMember() - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', native, DeclarationKind.Class, WrapperClass, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', native, DeclarationKind.Class, WrapperClass, false) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(native) listener: handleType(int, null) @@ -1054,7 +1054,7 @@ parseUnit(class) listener: beginMember() isReservedKeyword(new) indicatesMethodOrField(=) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', new, DeclarationKind.Class, WrapperClass, true) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', new, DeclarationKind.Class, WrapperClass, true) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(new) listener: handleType(int, null) @@ -1081,7 +1081,7 @@ parseUnit(class) listener: beginMember() isReservedKeyword(null) indicatesMethodOrField(=) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', null, DeclarationKind.Class, WrapperClass, true) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', null, DeclarationKind.Class, WrapperClass, true) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(null) listener: handleType(int, null) @@ -1106,7 +1106,7 @@ parseUnit(class) listener: beginMetadataStar(int) listener: endMetadataStar(0) listener: beginMember() - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', of, DeclarationKind.Class, WrapperClass, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', of, DeclarationKind.Class, WrapperClass, false) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(of) listener: handleType(int, null) @@ -1129,7 +1129,7 @@ parseUnit(class) listener: beginMetadataStar(int) listener: endMetadataStar(0) listener: beginMember() - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', on, DeclarationKind.Class, WrapperClass, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', on, DeclarationKind.Class, WrapperClass, false) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(on) listener: handleType(int, null) @@ -1153,7 +1153,7 @@ parseUnit(class) listener: endMetadataStar(0) listener: beginMember() isUnaryMinus(=) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', operator, DeclarationKind.Class, WrapperClass, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', operator, DeclarationKind.Class, WrapperClass, false) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(operator) listener: handleType(int, null) @@ -1176,7 +1176,7 @@ parseUnit(class) listener: beginMetadataStar(int) listener: endMetadataStar(0) listener: beginMember() - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', out, DeclarationKind.Class, WrapperClass, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', out, DeclarationKind.Class, WrapperClass, false) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(out) listener: handleType(int, null) @@ -1199,7 +1199,7 @@ parseUnit(class) listener: beginMetadataStar(int) listener: endMetadataStar(0) listener: beginMember() - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', part, DeclarationKind.Class, WrapperClass, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', part, DeclarationKind.Class, WrapperClass, false) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(part) listener: handleType(int, null) @@ -1222,7 +1222,7 @@ parseUnit(class) listener: beginMetadataStar(int) listener: endMetadataStar(0) listener: beginMember() - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', patch, DeclarationKind.Class, WrapperClass, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', patch, DeclarationKind.Class, WrapperClass, false) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(patch) listener: handleType(int, null) @@ -1245,7 +1245,7 @@ parseUnit(class) listener: beginMetadataStar(int) listener: endMetadataStar(0) listener: beginMember() - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', required, DeclarationKind.Class, WrapperClass, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', required, DeclarationKind.Class, WrapperClass, false) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(required) listener: handleType(int, null) @@ -1270,7 +1270,7 @@ parseUnit(class) listener: beginMember() isReservedKeyword(rethrow) indicatesMethodOrField(=) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', rethrow, DeclarationKind.Class, WrapperClass, true) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', rethrow, DeclarationKind.Class, WrapperClass, true) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(rethrow) listener: handleType(int, null) @@ -1297,7 +1297,7 @@ parseUnit(class) listener: beginMember() isReservedKeyword(return) indicatesMethodOrField(=) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', return, DeclarationKind.Class, WrapperClass, true) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', return, DeclarationKind.Class, WrapperClass, true) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(return) listener: handleType(int, null) @@ -1323,7 +1323,7 @@ parseUnit(class) listener: endMetadataStar(0) listener: beginMember() isReservedKeyword(=) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', set, DeclarationKind.Class, WrapperClass, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', set, DeclarationKind.Class, WrapperClass, false) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(set) listener: handleType(int, null) @@ -1346,7 +1346,7 @@ parseUnit(class) listener: beginMetadataStar(int) listener: endMetadataStar(0) listener: beginMember() - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', show, DeclarationKind.Class, WrapperClass, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', show, DeclarationKind.Class, WrapperClass, false) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(show) listener: handleType(int, null) @@ -1369,7 +1369,7 @@ parseUnit(class) listener: beginMetadataStar(int) listener: endMetadataStar(0) listener: beginMember() - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', source, DeclarationKind.Class, WrapperClass, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', source, DeclarationKind.Class, WrapperClass, false) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(source) listener: handleType(int, null) @@ -1392,7 +1392,7 @@ parseUnit(class) listener: beginMetadataStar(int) listener: endMetadataStar(0) listener: beginMember() - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', static, DeclarationKind.Class, WrapperClass, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', static, DeclarationKind.Class, WrapperClass, false) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(static) listener: handleType(int, null) @@ -1417,7 +1417,7 @@ parseUnit(class) listener: beginMember() isReservedKeyword(super) indicatesMethodOrField(=) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', super, DeclarationKind.Class, WrapperClass, true) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', super, DeclarationKind.Class, WrapperClass, true) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(super) listener: handleType(int, null) @@ -1444,7 +1444,7 @@ parseUnit(class) listener: beginMember() isReservedKeyword(switch) indicatesMethodOrField(=) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', switch, DeclarationKind.Class, WrapperClass, true) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', switch, DeclarationKind.Class, WrapperClass, true) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(switch) listener: handleType(int, null) @@ -1469,7 +1469,7 @@ parseUnit(class) listener: beginMetadataStar(int) listener: endMetadataStar(0) listener: beginMember() - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', sync, DeclarationKind.Class, WrapperClass, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', sync, DeclarationKind.Class, WrapperClass, false) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(sync) listener: handleType(int, null) @@ -1492,8 +1492,8 @@ parseUnit(class) listener: beginMetadataStar(int) listener: endMetadataStar(0) listener: beginMember() - recoverFromInvalidMember(int, ;, null, null, null, null, null, ;, Instance of 'SimpleType', null, DeclarationKind.Class, WrapperClass) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', this, DeclarationKind.Class, WrapperClass, false) + recoverFromInvalidMember(int, ;, null, null, null, null, null, null, ;, Instance of 'SimpleType', null, DeclarationKind.Class, WrapperClass) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', this, DeclarationKind.Class, WrapperClass, false) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(this) listener: handleType(int, null) @@ -1520,7 +1520,7 @@ parseUnit(class) listener: beginMember() isReservedKeyword(throw) indicatesMethodOrField(=) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', throw, DeclarationKind.Class, WrapperClass, true) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', throw, DeclarationKind.Class, WrapperClass, true) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(throw) listener: handleType(int, null) @@ -1547,7 +1547,7 @@ parseUnit(class) listener: beginMember() isReservedKeyword(true) indicatesMethodOrField(=) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', true, DeclarationKind.Class, WrapperClass, true) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', true, DeclarationKind.Class, WrapperClass, true) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(true) listener: handleType(int, null) @@ -1574,7 +1574,7 @@ parseUnit(class) listener: beginMember() isReservedKeyword(try) indicatesMethodOrField(=) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', try, DeclarationKind.Class, WrapperClass, true) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', try, DeclarationKind.Class, WrapperClass, true) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(try) listener: handleType(int, null) @@ -1599,7 +1599,7 @@ parseUnit(class) listener: beginMetadataStar(int) listener: endMetadataStar(0) listener: beginMember() - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', typedef, DeclarationKind.Class, WrapperClass, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', typedef, DeclarationKind.Class, WrapperClass, false) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(typedef) listener: handleType(int, null) @@ -1624,7 +1624,7 @@ parseUnit(class) listener: beginMember() isReservedKeyword(var) indicatesMethodOrField(=) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', var, DeclarationKind.Class, WrapperClass, true) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', var, DeclarationKind.Class, WrapperClass, true) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(var) listener: handleType(int, null) @@ -1651,7 +1651,7 @@ parseUnit(class) listener: beginMember() isReservedKeyword(void) indicatesMethodOrField(=) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', void, DeclarationKind.Class, WrapperClass, true) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', void, DeclarationKind.Class, WrapperClass, true) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(void) listener: handleType(int, null) @@ -1678,7 +1678,7 @@ parseUnit(class) listener: beginMember() isReservedKeyword(while) indicatesMethodOrField(=) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', while, DeclarationKind.Class, WrapperClass, true) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', while, DeclarationKind.Class, WrapperClass, true) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(while) listener: handleType(int, null) @@ -1705,7 +1705,7 @@ parseUnit(class) listener: beginMember() isReservedKeyword(with) indicatesMethodOrField(=) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', with, DeclarationKind.Class, WrapperClass, true) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', with, DeclarationKind.Class, WrapperClass, true) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(with) listener: handleType(int, null) @@ -1730,7 +1730,7 @@ parseUnit(class) listener: beginMetadataStar(int) listener: endMetadataStar(0) listener: beginMember() - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', yield, DeclarationKind.Class, WrapperClass, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', yield, DeclarationKind.Class, WrapperClass, false) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(yield) listener: handleType(int, null) diff --git a/pkg/front_end/parser_testcases/error_recovery/keyword_named_class_methods.dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/keyword_named_class_methods.dart.intertwined.expect index 06383d3b2a0..cca26ecf2ea 100644 --- a/pkg/front_end/parser_testcases/error_recovery/keyword_named_class_methods.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/error_recovery/keyword_named_class_methods.dart.intertwined.expect @@ -32,7 +32,7 @@ parseUnit(class) listener: beginMetadataStar(int) listener: endMetadataStar(0) listener: beginMember() - parseMethod({, null, null, null, null, null, {, Instance of 'SimpleType', null, abstract, DeclarationKind.Class, WrapperClass, false) + parseMethod({, null, null, null, null, null, null, {, Instance of 'SimpleType', null, abstract, DeclarationKind.Class, WrapperClass, false) listener: beginMethod(null, null, null, null, null, abstract) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(abstract) @@ -173,7 +173,7 @@ parseUnit(class) listener: beginMetadataStar(int) listener: endMetadataStar(0) listener: beginMember() - parseMethod(}, null, null, null, null, null, }, Instance of 'SimpleType', null, as, DeclarationKind.Class, WrapperClass, false) + parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', null, as, DeclarationKind.Class, WrapperClass, false) listener: beginMethod(null, null, null, null, null, as) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(as) @@ -316,7 +316,7 @@ parseUnit(class) listener: beginMember() isReservedKeyword(assert) indicatesMethodOrField(() - parseMethod(}, null, null, null, null, null, }, Instance of 'SimpleType', null, assert, DeclarationKind.Class, WrapperClass, true) + parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', null, assert, DeclarationKind.Class, WrapperClass, true) listener: beginMethod(null, null, null, null, null, assert) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(assert) @@ -451,7 +451,7 @@ parseUnit(class) listener: beginMetadataStar(int) listener: endMetadataStar(0) listener: beginMember() - parseMethod(}, null, null, null, null, null, }, Instance of 'SimpleType', null, async, DeclarationKind.Class, WrapperClass, false) + parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', null, async, DeclarationKind.Class, WrapperClass, false) listener: beginMethod(null, null, null, null, null, async) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(async) @@ -592,7 +592,7 @@ parseUnit(class) listener: beginMetadataStar(int) listener: endMetadataStar(0) listener: beginMember() - parseMethod(}, null, null, null, null, null, }, Instance of 'SimpleType', null, await, DeclarationKind.Class, WrapperClass, false) + parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', null, await, DeclarationKind.Class, WrapperClass, false) listener: beginMethod(null, null, null, null, null, await) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(await) @@ -738,7 +738,7 @@ parseUnit(class) listener: beginMember() isReservedKeyword(break) indicatesMethodOrField(() - parseMethod(}, null, null, null, null, null, }, Instance of 'SimpleType', null, break, DeclarationKind.Class, WrapperClass, true) + parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', null, break, DeclarationKind.Class, WrapperClass, true) listener: beginMethod(null, null, null, null, null, break) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(break) @@ -914,7 +914,7 @@ parseUnit(class) listener: beginMember() isReservedKeyword(case) indicatesMethodOrField(() - parseMethod(}, null, null, null, null, null, }, Instance of 'SimpleType', null, case, DeclarationKind.Class, WrapperClass, true) + parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', null, case, DeclarationKind.Class, WrapperClass, true) listener: beginMethod(null, null, null, null, null, case) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(case) @@ -1058,7 +1058,7 @@ parseUnit(class) listener: beginMember() isReservedKeyword(catch) indicatesMethodOrField(() - parseMethod(}, null, null, null, null, null, }, Instance of 'SimpleType', null, catch, DeclarationKind.Class, WrapperClass, true) + parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', null, catch, DeclarationKind.Class, WrapperClass, true) listener: beginMethod(null, null, null, null, null, catch) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(catch) @@ -1202,7 +1202,7 @@ parseUnit(class) listener: beginMember() isReservedKeyword(class) indicatesMethodOrField(() - parseMethod(}, null, null, null, null, null, }, Instance of 'SimpleType', null, class, DeclarationKind.Class, WrapperClass, true) + parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', null, class, DeclarationKind.Class, WrapperClass, true) listener: beginMethod(null, null, null, null, null, class) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(class) @@ -1346,7 +1346,7 @@ parseUnit(class) listener: beginMember() isReservedKeyword(const) indicatesMethodOrField(() - parseMethod(}, null, null, null, null, null, }, Instance of 'SimpleType', null, const, DeclarationKind.Class, WrapperClass, true) + parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', null, const, DeclarationKind.Class, WrapperClass, true) listener: beginMethod(null, null, null, null, null, const) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(const) @@ -1496,7 +1496,7 @@ parseUnit(class) listener: beginMember() isReservedKeyword(continue) indicatesMethodOrField(() - parseMethod(}, null, null, null, null, null, }, Instance of 'SimpleType', null, continue, DeclarationKind.Class, WrapperClass, true) + parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', null, continue, DeclarationKind.Class, WrapperClass, true) listener: beginMethod(null, null, null, null, null, continue) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(continue) @@ -1670,7 +1670,7 @@ parseUnit(class) listener: beginMetadataStar(int) listener: endMetadataStar(0) listener: beginMember() - parseMethod(}, null, null, null, null, null, }, Instance of 'SimpleType', null, covariant, DeclarationKind.Class, WrapperClass, false) + parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', null, covariant, DeclarationKind.Class, WrapperClass, false) listener: beginMethod(null, null, null, null, null, covariant) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(covariant) @@ -1813,7 +1813,7 @@ parseUnit(class) listener: beginMember() isReservedKeyword(default) indicatesMethodOrField(() - parseMethod(}, null, null, null, null, null, }, Instance of 'SimpleType', null, default, DeclarationKind.Class, WrapperClass, true) + parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', null, default, DeclarationKind.Class, WrapperClass, true) listener: beginMethod(null, null, null, null, null, default) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(default) @@ -1955,7 +1955,7 @@ parseUnit(class) listener: beginMetadataStar(int) listener: endMetadataStar(0) listener: beginMember() - parseMethod(}, null, null, null, null, null, }, Instance of 'SimpleType', null, deferred, DeclarationKind.Class, WrapperClass, false) + parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', null, deferred, DeclarationKind.Class, WrapperClass, false) listener: beginMethod(null, null, null, null, null, deferred) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(deferred) @@ -2098,7 +2098,7 @@ parseUnit(class) listener: beginMember() isReservedKeyword(do) indicatesMethodOrField(() - parseMethod(}, null, null, null, null, null, }, Instance of 'SimpleType', null, do, DeclarationKind.Class, WrapperClass, true) + parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', null, do, DeclarationKind.Class, WrapperClass, true) listener: beginMethod(null, null, null, null, null, do) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(do) @@ -2295,7 +2295,7 @@ parseUnit(class) listener: beginMetadataStar(int) listener: endMetadataStar(0) listener: beginMember() - parseMethod(}, null, null, null, null, null, }, Instance of 'SimpleType', null, dynamic, DeclarationKind.Class, WrapperClass, false) + parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', null, dynamic, DeclarationKind.Class, WrapperClass, false) listener: beginMethod(null, null, null, null, null, dynamic) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(dynamic) @@ -2438,7 +2438,7 @@ parseUnit(class) listener: beginMember() isReservedKeyword(else) indicatesMethodOrField(() - parseMethod(}, null, null, null, null, null, }, Instance of 'SimpleType', null, else, DeclarationKind.Class, WrapperClass, true) + parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', null, else, DeclarationKind.Class, WrapperClass, true) listener: beginMethod(null, null, null, null, null, else) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(else) @@ -2631,7 +2631,7 @@ parseUnit(class) listener: beginMember() isReservedKeyword(enum) indicatesMethodOrField(() - parseMethod(}, null, null, null, null, null, }, Instance of 'SimpleType', null, enum, DeclarationKind.Class, WrapperClass, true) + parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', null, enum, DeclarationKind.Class, WrapperClass, true) listener: beginMethod(null, null, null, null, null, enum) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(enum) @@ -2773,7 +2773,7 @@ parseUnit(class) listener: beginMetadataStar(int) listener: endMetadataStar(0) listener: beginMember() - parseMethod(}, null, null, null, null, null, }, Instance of 'SimpleType', null, export, DeclarationKind.Class, WrapperClass, false) + parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', null, export, DeclarationKind.Class, WrapperClass, false) listener: beginMethod(null, null, null, null, null, export) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(export) @@ -2916,7 +2916,7 @@ parseUnit(class) listener: beginMember() isReservedKeyword(extends) indicatesMethodOrField(() - parseMethod(}, null, null, null, null, null, }, Instance of 'SimpleType', null, extends, DeclarationKind.Class, WrapperClass, true) + parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', null, extends, DeclarationKind.Class, WrapperClass, true) listener: beginMethod(null, null, null, null, null, extends) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(extends) @@ -3058,7 +3058,7 @@ parseUnit(class) listener: beginMetadataStar(int) listener: endMetadataStar(0) listener: beginMember() - parseMethod(}, null, null, null, null, null, }, Instance of 'SimpleType', null, extension, DeclarationKind.Class, WrapperClass, false) + parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', null, extension, DeclarationKind.Class, WrapperClass, false) listener: beginMethod(null, null, null, null, null, extension) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(extension) @@ -3199,7 +3199,7 @@ parseUnit(class) listener: beginMetadataStar(int) listener: endMetadataStar(0) listener: beginMember() - parseMethod(}, null, null, null, null, null, }, Instance of 'SimpleType', null, external, DeclarationKind.Class, WrapperClass, false) + parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', null, external, DeclarationKind.Class, WrapperClass, false) listener: beginMethod(null, null, null, null, null, external) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(external) @@ -3340,7 +3340,7 @@ parseUnit(class) listener: beginMetadataStar(int) listener: endMetadataStar(0) listener: beginMember() - parseMethod(}, null, null, null, null, null, }, Instance of 'SimpleType', null, factory, DeclarationKind.Class, WrapperClass, false) + parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', null, factory, DeclarationKind.Class, WrapperClass, false) listener: beginMethod(null, null, null, null, null, factory) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(factory) @@ -3483,7 +3483,7 @@ parseUnit(class) listener: beginMember() isReservedKeyword(false) indicatesMethodOrField(() - parseMethod(}, null, null, null, null, null, }, Instance of 'SimpleType', null, false, DeclarationKind.Class, WrapperClass, true) + parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', null, false, DeclarationKind.Class, WrapperClass, true) listener: beginMethod(null, null, null, null, null, false) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(false) @@ -3623,7 +3623,7 @@ parseUnit(class) listener: beginMember() isReservedKeyword(final) indicatesMethodOrField(() - parseMethod(}, null, null, null, null, null, }, Instance of 'SimpleType', null, final, DeclarationKind.Class, WrapperClass, true) + parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', null, final, DeclarationKind.Class, WrapperClass, true) listener: beginMethod(null, null, null, null, null, final) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(final) @@ -3857,7 +3857,7 @@ parseUnit(class) listener: beginMember() isReservedKeyword(finally) indicatesMethodOrField(() - parseMethod(}, null, null, null, null, null, }, Instance of 'SimpleType', null, finally, DeclarationKind.Class, WrapperClass, true) + parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', null, finally, DeclarationKind.Class, WrapperClass, true) listener: beginMethod(null, null, null, null, null, finally) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(finally) @@ -4001,7 +4001,7 @@ parseUnit(class) listener: beginMember() isReservedKeyword(for) indicatesMethodOrField(() - parseMethod(}, null, null, null, null, null, }, Instance of 'SimpleType', null, for, DeclarationKind.Class, WrapperClass, true) + parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', null, for, DeclarationKind.Class, WrapperClass, true) listener: beginMethod(null, null, null, null, null, for) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(for) @@ -4208,7 +4208,7 @@ parseUnit(class) listener: beginMetadataStar(int) listener: endMetadataStar(0) listener: beginMember() - parseMethod(}, null, null, null, null, null, }, Instance of 'SimpleType', null, Function, DeclarationKind.Class, WrapperClass, false) + parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', null, Function, DeclarationKind.Class, WrapperClass, false) listener: beginMethod(null, null, null, null, null, Function) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(Function) @@ -4350,7 +4350,7 @@ parseUnit(class) listener: endMetadataStar(0) listener: beginMember() isReservedKeyword(() - parseMethod(}, null, null, null, null, null, }, Instance of 'SimpleType', null, get, DeclarationKind.Class, WrapperClass, false) + parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', null, get, DeclarationKind.Class, WrapperClass, false) listener: beginMethod(null, null, null, null, null, get) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(get) @@ -4491,7 +4491,7 @@ parseUnit(class) listener: beginMetadataStar(int) listener: endMetadataStar(0) listener: beginMember() - parseMethod(}, null, null, null, null, null, }, Instance of 'SimpleType', null, hide, DeclarationKind.Class, WrapperClass, false) + parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', null, hide, DeclarationKind.Class, WrapperClass, false) listener: beginMethod(null, null, null, null, null, hide) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(hide) @@ -4634,7 +4634,7 @@ parseUnit(class) listener: beginMember() isReservedKeyword(if) indicatesMethodOrField(() - parseMethod(}, null, null, null, null, null, }, Instance of 'SimpleType', null, if, DeclarationKind.Class, WrapperClass, true) + parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', null, if, DeclarationKind.Class, WrapperClass, true) listener: beginMethod(null, null, null, null, null, if) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(if) @@ -4813,7 +4813,7 @@ parseUnit(class) listener: beginMetadataStar(int) listener: endMetadataStar(0) listener: beginMember() - parseMethod(}, null, null, null, null, null, }, Instance of 'SimpleType', null, implements, DeclarationKind.Class, WrapperClass, false) + parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', null, implements, DeclarationKind.Class, WrapperClass, false) listener: beginMethod(null, null, null, null, null, implements) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(implements) @@ -4954,7 +4954,7 @@ parseUnit(class) listener: beginMetadataStar(int) listener: endMetadataStar(0) listener: beginMember() - parseMethod(}, null, null, null, null, null, }, Instance of 'SimpleType', null, import, DeclarationKind.Class, WrapperClass, false) + parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', null, import, DeclarationKind.Class, WrapperClass, false) listener: beginMethod(null, null, null, null, null, import) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(import) @@ -5097,7 +5097,7 @@ parseUnit(class) listener: beginMember() isReservedKeyword(in) indicatesMethodOrField(() - parseMethod(}, null, null, null, null, null, }, Instance of 'SimpleType', null, in, DeclarationKind.Class, WrapperClass, true) + parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', null, in, DeclarationKind.Class, WrapperClass, true) listener: beginMethod(null, null, null, null, null, in) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(in) @@ -5239,7 +5239,7 @@ parseUnit(class) listener: beginMetadataStar(int) listener: endMetadataStar(0) listener: beginMember() - parseMethod(}, null, null, null, null, null, }, Instance of 'SimpleType', null, inout, DeclarationKind.Class, WrapperClass, false) + parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', null, inout, DeclarationKind.Class, WrapperClass, false) listener: beginMethod(null, null, null, null, null, inout) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(inout) @@ -5380,7 +5380,7 @@ parseUnit(class) listener: beginMetadataStar(int) listener: endMetadataStar(0) listener: beginMember() - parseMethod(}, null, null, null, null, null, }, Instance of 'SimpleType', null, interface, DeclarationKind.Class, WrapperClass, false) + parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', null, interface, DeclarationKind.Class, WrapperClass, false) listener: beginMethod(null, null, null, null, null, interface) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(interface) @@ -5523,7 +5523,7 @@ parseUnit(class) listener: beginMember() isReservedKeyword(is) indicatesMethodOrField(() - parseMethod(}, null, null, null, null, null, }, Instance of 'SimpleType', null, is, DeclarationKind.Class, WrapperClass, true) + parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', null, is, DeclarationKind.Class, WrapperClass, true) listener: beginMethod(null, null, null, null, null, is) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(is) @@ -5697,7 +5697,7 @@ parseUnit(class) listener: beginMetadataStar(int) listener: endMetadataStar(0) listener: beginMember() - parseMethod(}, null, null, null, null, null, }, Instance of 'SimpleType', null, late, DeclarationKind.Class, WrapperClass, false) + parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', null, late, DeclarationKind.Class, WrapperClass, false) listener: beginMethod(null, null, null, null, null, late) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(late) @@ -5838,7 +5838,7 @@ parseUnit(class) listener: beginMetadataStar(int) listener: endMetadataStar(0) listener: beginMember() - parseMethod(}, null, null, null, null, null, }, Instance of 'SimpleType', null, library, DeclarationKind.Class, WrapperClass, false) + parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', null, library, DeclarationKind.Class, WrapperClass, false) listener: beginMethod(null, null, null, null, null, library) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(library) @@ -5979,7 +5979,7 @@ parseUnit(class) listener: beginMetadataStar(int) listener: endMetadataStar(0) listener: beginMember() - parseMethod(}, null, null, null, null, null, }, Instance of 'SimpleType', null, mixin, DeclarationKind.Class, WrapperClass, false) + parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', null, mixin, DeclarationKind.Class, WrapperClass, false) listener: beginMethod(null, null, null, null, null, mixin) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(mixin) @@ -6120,7 +6120,7 @@ parseUnit(class) listener: beginMetadataStar(int) listener: endMetadataStar(0) listener: beginMember() - parseMethod(}, null, null, null, null, null, }, Instance of 'SimpleType', null, native, DeclarationKind.Class, WrapperClass, false) + parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', null, native, DeclarationKind.Class, WrapperClass, false) listener: beginMethod(null, null, null, null, null, native) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(native) @@ -6263,7 +6263,7 @@ parseUnit(class) listener: beginMember() isReservedKeyword(new) indicatesMethodOrField(() - parseMethod(}, null, null, null, null, null, }, Instance of 'SimpleType', null, new, DeclarationKind.Class, WrapperClass, true) + parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', null, new, DeclarationKind.Class, WrapperClass, true) listener: beginMethod(null, null, null, null, null, new) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(new) @@ -6413,7 +6413,7 @@ parseUnit(class) listener: beginMember() isReservedKeyword(null) indicatesMethodOrField(() - parseMethod(}, null, null, null, null, null, }, Instance of 'SimpleType', null, null, DeclarationKind.Class, WrapperClass, true) + parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', null, null, DeclarationKind.Class, WrapperClass, true) listener: beginMethod(null, null, null, null, null, null) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(null) @@ -6551,7 +6551,7 @@ parseUnit(class) listener: beginMetadataStar(int) listener: endMetadataStar(0) listener: beginMember() - parseMethod(}, null, null, null, null, null, }, Instance of 'SimpleType', null, of, DeclarationKind.Class, WrapperClass, false) + parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', null, of, DeclarationKind.Class, WrapperClass, false) listener: beginMethod(null, null, null, null, null, of) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(of) @@ -6692,7 +6692,7 @@ parseUnit(class) listener: beginMetadataStar(int) listener: endMetadataStar(0) listener: beginMember() - parseMethod(}, null, null, null, null, null, }, Instance of 'SimpleType', null, on, DeclarationKind.Class, WrapperClass, false) + parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', null, on, DeclarationKind.Class, WrapperClass, false) listener: beginMethod(null, null, null, null, null, on) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(on) @@ -6834,7 +6834,7 @@ parseUnit(class) listener: endMetadataStar(0) listener: beginMember() isUnaryMinus(() - parseMethod(}, null, null, null, null, null, }, Instance of 'SimpleType', null, operator, DeclarationKind.Class, WrapperClass, false) + parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', null, operator, DeclarationKind.Class, WrapperClass, false) isUnaryMinus(() listener: beginMethod(null, null, null, null, null, operator) listener: handleIdentifier(int, typeReference) @@ -6976,7 +6976,7 @@ parseUnit(class) listener: beginMetadataStar(int) listener: endMetadataStar(0) listener: beginMember() - parseMethod(}, null, null, null, null, null, }, Instance of 'SimpleType', null, out, DeclarationKind.Class, WrapperClass, false) + parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', null, out, DeclarationKind.Class, WrapperClass, false) listener: beginMethod(null, null, null, null, null, out) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(out) @@ -7117,7 +7117,7 @@ parseUnit(class) listener: beginMetadataStar(int) listener: endMetadataStar(0) listener: beginMember() - parseMethod(}, null, null, null, null, null, }, Instance of 'SimpleType', null, part, DeclarationKind.Class, WrapperClass, false) + parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', null, part, DeclarationKind.Class, WrapperClass, false) listener: beginMethod(null, null, null, null, null, part) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(part) @@ -7258,7 +7258,7 @@ parseUnit(class) listener: beginMetadataStar(int) listener: endMetadataStar(0) listener: beginMember() - parseMethod(}, null, null, null, null, null, }, Instance of 'SimpleType', null, patch, DeclarationKind.Class, WrapperClass, false) + parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', null, patch, DeclarationKind.Class, WrapperClass, false) listener: beginMethod(null, null, null, null, null, patch) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(patch) @@ -7399,7 +7399,7 @@ parseUnit(class) listener: beginMetadataStar(int) listener: endMetadataStar(0) listener: beginMember() - parseMethod(}, null, null, null, null, null, }, Instance of 'SimpleType', null, required, DeclarationKind.Class, WrapperClass, false) + parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', null, required, DeclarationKind.Class, WrapperClass, false) listener: beginMethod(null, null, null, null, null, required) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(required) @@ -7542,7 +7542,7 @@ parseUnit(class) listener: beginMember() isReservedKeyword(rethrow) indicatesMethodOrField(() - parseMethod(}, null, null, null, null, null, }, Instance of 'SimpleType', null, rethrow, DeclarationKind.Class, WrapperClass, true) + parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', null, rethrow, DeclarationKind.Class, WrapperClass, true) listener: beginMethod(null, null, null, null, null, rethrow) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(rethrow) @@ -7686,7 +7686,7 @@ parseUnit(class) listener: beginMember() isReservedKeyword(return) indicatesMethodOrField(() - parseMethod(}, null, null, null, null, null, }, Instance of 'SimpleType', null, return, DeclarationKind.Class, WrapperClass, true) + parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', null, return, DeclarationKind.Class, WrapperClass, true) listener: beginMethod(null, null, null, null, null, return) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(return) @@ -7826,7 +7826,7 @@ parseUnit(class) listener: endMetadataStar(0) listener: beginMember() isReservedKeyword(() - parseMethod(}, null, null, null, null, null, }, Instance of 'SimpleType', null, set, DeclarationKind.Class, WrapperClass, false) + parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', null, set, DeclarationKind.Class, WrapperClass, false) listener: beginMethod(null, null, null, null, null, set) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(set) @@ -7967,7 +7967,7 @@ parseUnit(class) listener: beginMetadataStar(int) listener: endMetadataStar(0) listener: beginMember() - parseMethod(}, null, null, null, null, null, }, Instance of 'SimpleType', null, show, DeclarationKind.Class, WrapperClass, false) + parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', null, show, DeclarationKind.Class, WrapperClass, false) listener: beginMethod(null, null, null, null, null, show) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(show) @@ -8108,7 +8108,7 @@ parseUnit(class) listener: beginMetadataStar(int) listener: endMetadataStar(0) listener: beginMember() - parseMethod(}, null, null, null, null, null, }, Instance of 'SimpleType', null, source, DeclarationKind.Class, WrapperClass, false) + parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', null, source, DeclarationKind.Class, WrapperClass, false) listener: beginMethod(null, null, null, null, null, source) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(source) @@ -8249,7 +8249,7 @@ parseUnit(class) listener: beginMetadataStar(int) listener: endMetadataStar(0) listener: beginMember() - parseMethod(}, null, null, null, null, null, }, Instance of 'SimpleType', null, static, DeclarationKind.Class, WrapperClass, false) + parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', null, static, DeclarationKind.Class, WrapperClass, false) listener: beginMethod(null, null, null, null, null, static) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(static) @@ -8392,7 +8392,7 @@ parseUnit(class) listener: beginMember() isReservedKeyword(super) indicatesMethodOrField(() - parseMethod(}, null, null, null, null, null, }, Instance of 'SimpleType', null, super, DeclarationKind.Class, WrapperClass, true) + parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', null, super, DeclarationKind.Class, WrapperClass, true) listener: beginMethod(null, null, null, null, null, super) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(super) @@ -8531,7 +8531,7 @@ parseUnit(class) listener: beginMember() isReservedKeyword(switch) indicatesMethodOrField(() - parseMethod(}, null, null, null, null, null, }, Instance of 'SimpleType', null, switch, DeclarationKind.Class, WrapperClass, true) + parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', null, switch, DeclarationKind.Class, WrapperClass, true) listener: beginMethod(null, null, null, null, null, switch) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(switch) @@ -8719,7 +8719,7 @@ parseUnit(class) listener: beginMetadataStar(int) listener: endMetadataStar(0) listener: beginMember() - parseMethod(}, null, null, null, null, null, }, Instance of 'SimpleType', null, sync, DeclarationKind.Class, WrapperClass, false) + parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', null, sync, DeclarationKind.Class, WrapperClass, false) listener: beginMethod(null, null, null, null, null, sync) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(sync) @@ -8860,8 +8860,8 @@ parseUnit(class) listener: beginMetadataStar(int) listener: endMetadataStar(0) listener: beginMember() - recoverFromInvalidMember(int, }, null, null, null, null, null, }, Instance of 'SimpleType', null, DeclarationKind.Class, WrapperClass) - parseFields(}, null, null, null, null, null, }, Instance of 'SimpleType', this, DeclarationKind.Class, WrapperClass, false) + recoverFromInvalidMember(int, }, null, null, null, null, null, null, }, Instance of 'SimpleType', null, DeclarationKind.Class, WrapperClass) + parseFields(}, null, null, null, null, null, null, }, Instance of 'SimpleType', this, DeclarationKind.Class, WrapperClass, false) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(this) listener: handleType(int, null) @@ -8883,8 +8883,8 @@ parseUnit(class) listener: beginMetadataStar(() listener: endMetadataStar(0) listener: beginMember() - recoverFromInvalidMember(;, ;, null, null, null, null, null, ;, Instance of 'NoType', null, DeclarationKind.Class, WrapperClass) - parseMethod(;, null, null, null, null, null, ;, Instance of 'NoType', null, (, DeclarationKind.Class, WrapperClass, false) + recoverFromInvalidMember(;, ;, null, null, null, null, null, null, ;, Instance of 'NoType', null, DeclarationKind.Class, WrapperClass) + parseMethod(;, null, null, null, null, null, null, ;, Instance of 'NoType', null, (, DeclarationKind.Class, WrapperClass, false) listener: beginMethod(null, null, null, null, null, () listener: handleNoType(;) ensureIdentifierPotentiallyRecovered(;, methodDeclaration, false) @@ -9023,7 +9023,7 @@ parseUnit(class) listener: beginMember() isReservedKeyword(throw) indicatesMethodOrField(() - parseMethod(}, null, null, null, null, null, }, Instance of 'SimpleType', null, throw, DeclarationKind.Class, WrapperClass, true) + parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', null, throw, DeclarationKind.Class, WrapperClass, true) listener: beginMethod(null, null, null, null, null, throw) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(throw) @@ -9163,7 +9163,7 @@ parseUnit(class) listener: beginMember() isReservedKeyword(true) indicatesMethodOrField(() - parseMethod(}, null, null, null, null, null, }, Instance of 'SimpleType', null, true, DeclarationKind.Class, WrapperClass, true) + parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', null, true, DeclarationKind.Class, WrapperClass, true) listener: beginMethod(null, null, null, null, null, true) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(true) @@ -9303,7 +9303,7 @@ parseUnit(class) listener: beginMember() isReservedKeyword(try) indicatesMethodOrField(() - parseMethod(}, null, null, null, null, null, }, Instance of 'SimpleType', null, try, DeclarationKind.Class, WrapperClass, true) + parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', null, try, DeclarationKind.Class, WrapperClass, true) listener: beginMethod(null, null, null, null, null, try) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(try) @@ -9483,7 +9483,7 @@ parseUnit(class) listener: beginMetadataStar(int) listener: endMetadataStar(0) listener: beginMember() - parseMethod(}, null, null, null, null, null, }, Instance of 'SimpleType', null, typedef, DeclarationKind.Class, WrapperClass, false) + parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', null, typedef, DeclarationKind.Class, WrapperClass, false) listener: beginMethod(null, null, null, null, null, typedef) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(typedef) @@ -9626,7 +9626,7 @@ parseUnit(class) listener: beginMember() isReservedKeyword(var) indicatesMethodOrField(() - parseMethod(}, null, null, null, null, null, }, Instance of 'SimpleType', null, var, DeclarationKind.Class, WrapperClass, true) + parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', null, var, DeclarationKind.Class, WrapperClass, true) listener: beginMethod(null, null, null, null, null, var) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(var) @@ -9860,7 +9860,7 @@ parseUnit(class) listener: beginMember() isReservedKeyword(void) indicatesMethodOrField(() - parseMethod(}, null, null, null, null, null, }, Instance of 'SimpleType', null, void, DeclarationKind.Class, WrapperClass, true) + parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', null, void, DeclarationKind.Class, WrapperClass, true) listener: beginMethod(null, null, null, null, null, void) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(void) @@ -10095,7 +10095,7 @@ parseUnit(class) listener: beginMember() isReservedKeyword(while) indicatesMethodOrField(() - parseMethod(}, null, null, null, null, null, }, Instance of 'SimpleType', null, while, DeclarationKind.Class, WrapperClass, true) + parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', null, while, DeclarationKind.Class, WrapperClass, true) listener: beginMethod(null, null, null, null, null, while) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(while) @@ -10276,7 +10276,7 @@ parseUnit(class) listener: beginMember() isReservedKeyword(with) indicatesMethodOrField(() - parseMethod(}, null, null, null, null, null, }, Instance of 'SimpleType', null, with, DeclarationKind.Class, WrapperClass, true) + parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', null, with, DeclarationKind.Class, WrapperClass, true) listener: beginMethod(null, null, null, null, null, with) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(with) @@ -10418,7 +10418,7 @@ parseUnit(class) listener: beginMetadataStar(int) listener: endMetadataStar(0) listener: beginMember() - parseMethod(}, null, null, null, null, null, }, Instance of 'SimpleType', null, yield, DeclarationKind.Class, WrapperClass, false) + parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', null, yield, DeclarationKind.Class, WrapperClass, false) listener: beginMethod(null, null, null, null, null, yield) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(yield) diff --git a/pkg/front_end/parser_testcases/error_recovery/keyword_named_top_level_fields.dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/keyword_named_top_level_fields.dart.intertwined.expect index 20430f0d03e..c6badc4acbe 100644 --- a/pkg/front_end/parser_testcases/error_recovery/keyword_named_top_level_fields.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/error_recovery/keyword_named_top_level_fields.dart.intertwined.expect @@ -8,7 +8,7 @@ parseUnit(int) listener: endMetadataStar(0) parseTopLevelMemberImpl() listener: beginTopLevelMember(int) - parseFields(, null, null, null, null, null, , Instance of 'SimpleType', abstract, DeclarationKind.TopLevel, null, false) + parseFields(, null, null, null, null, null, null, , Instance of 'SimpleType', abstract, DeclarationKind.TopLevel, null, false) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(abstract) listener: handleType(int, null) @@ -31,7 +31,7 @@ parseUnit(int) listener: endMetadataStar(0) parseTopLevelMemberImpl(;) listener: beginTopLevelMember(int) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', as, DeclarationKind.TopLevel, null, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', as, DeclarationKind.TopLevel, null, false) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(as) listener: handleType(int, null) @@ -56,7 +56,7 @@ parseUnit(int) listener: beginTopLevelMember(int) isReservedKeyword(assert) indicatesMethodOrField(=) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', assert, DeclarationKind.TopLevel, null, true) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', assert, DeclarationKind.TopLevel, null, true) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(assert) listener: handleType(int, null) @@ -81,7 +81,7 @@ parseUnit(int) listener: endMetadataStar(0) parseTopLevelMemberImpl(;) listener: beginTopLevelMember(int) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', async, DeclarationKind.TopLevel, null, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', async, DeclarationKind.TopLevel, null, false) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(async) listener: handleType(int, null) @@ -104,7 +104,7 @@ parseUnit(int) listener: endMetadataStar(0) parseTopLevelMemberImpl(;) listener: beginTopLevelMember(int) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', await, DeclarationKind.TopLevel, null, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', await, DeclarationKind.TopLevel, null, false) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(await) listener: handleType(int, null) @@ -129,7 +129,7 @@ parseUnit(int) listener: beginTopLevelMember(int) isReservedKeyword(break) indicatesMethodOrField(=) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', break, DeclarationKind.TopLevel, null, true) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', break, DeclarationKind.TopLevel, null, true) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(break) listener: handleType(int, null) @@ -156,7 +156,7 @@ parseUnit(int) listener: beginTopLevelMember(int) isReservedKeyword(case) indicatesMethodOrField(=) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', case, DeclarationKind.TopLevel, null, true) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', case, DeclarationKind.TopLevel, null, true) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(case) listener: handleType(int, null) @@ -183,7 +183,7 @@ parseUnit(int) listener: beginTopLevelMember(int) isReservedKeyword(catch) indicatesMethodOrField(=) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', catch, DeclarationKind.TopLevel, null, true) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', catch, DeclarationKind.TopLevel, null, true) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(catch) listener: handleType(int, null) @@ -210,7 +210,7 @@ parseUnit(int) listener: beginTopLevelMember(int) isReservedKeyword(class) indicatesMethodOrField(=) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', class, DeclarationKind.TopLevel, null, true) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', class, DeclarationKind.TopLevel, null, true) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(class) listener: handleType(int, null) @@ -237,7 +237,7 @@ parseUnit(int) listener: beginTopLevelMember(int) isReservedKeyword(const) indicatesMethodOrField(=) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', const, DeclarationKind.TopLevel, null, true) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', const, DeclarationKind.TopLevel, null, true) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(const) listener: handleType(int, null) @@ -264,7 +264,7 @@ parseUnit(int) listener: beginTopLevelMember(int) isReservedKeyword(continue) indicatesMethodOrField(=) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', continue, DeclarationKind.TopLevel, null, true) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', continue, DeclarationKind.TopLevel, null, true) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(continue) listener: handleType(int, null) @@ -289,7 +289,7 @@ parseUnit(int) listener: endMetadataStar(0) parseTopLevelMemberImpl(;) listener: beginTopLevelMember(int) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', covariant, DeclarationKind.TopLevel, null, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', covariant, DeclarationKind.TopLevel, null, false) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(covariant) listener: handleType(int, null) @@ -314,7 +314,7 @@ parseUnit(int) listener: beginTopLevelMember(int) isReservedKeyword(default) indicatesMethodOrField(=) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', default, DeclarationKind.TopLevel, null, true) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', default, DeclarationKind.TopLevel, null, true) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(default) listener: handleType(int, null) @@ -339,7 +339,7 @@ parseUnit(int) listener: endMetadataStar(0) parseTopLevelMemberImpl(;) listener: beginTopLevelMember(int) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', deferred, DeclarationKind.TopLevel, null, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', deferred, DeclarationKind.TopLevel, null, false) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(deferred) listener: handleType(int, null) @@ -364,7 +364,7 @@ parseUnit(int) listener: beginTopLevelMember(int) isReservedKeyword(do) indicatesMethodOrField(=) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', do, DeclarationKind.TopLevel, null, true) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', do, DeclarationKind.TopLevel, null, true) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(do) listener: handleType(int, null) @@ -389,7 +389,7 @@ parseUnit(int) listener: endMetadataStar(0) parseTopLevelMemberImpl(;) listener: beginTopLevelMember(int) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', dynamic, DeclarationKind.TopLevel, null, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', dynamic, DeclarationKind.TopLevel, null, false) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(dynamic) listener: handleType(int, null) @@ -414,7 +414,7 @@ parseUnit(int) listener: beginTopLevelMember(int) isReservedKeyword(else) indicatesMethodOrField(=) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', else, DeclarationKind.TopLevel, null, true) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', else, DeclarationKind.TopLevel, null, true) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(else) listener: handleType(int, null) @@ -441,7 +441,7 @@ parseUnit(int) listener: beginTopLevelMember(int) isReservedKeyword(enum) indicatesMethodOrField(=) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', enum, DeclarationKind.TopLevel, null, true) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', enum, DeclarationKind.TopLevel, null, true) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(enum) listener: handleType(int, null) @@ -466,7 +466,7 @@ parseUnit(int) listener: endMetadataStar(0) parseTopLevelMemberImpl(;) listener: beginTopLevelMember(int) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', export, DeclarationKind.TopLevel, null, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', export, DeclarationKind.TopLevel, null, false) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(export) listener: handleType(int, null) @@ -491,7 +491,7 @@ parseUnit(int) listener: beginTopLevelMember(int) isReservedKeyword(extends) indicatesMethodOrField(=) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', extends, DeclarationKind.TopLevel, null, true) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', extends, DeclarationKind.TopLevel, null, true) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(extends) listener: handleType(int, null) @@ -516,7 +516,7 @@ parseUnit(int) listener: endMetadataStar(0) parseTopLevelMemberImpl(;) listener: beginTopLevelMember(int) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', extension, DeclarationKind.TopLevel, null, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', extension, DeclarationKind.TopLevel, null, false) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(extension) listener: handleType(int, null) @@ -539,7 +539,7 @@ parseUnit(int) listener: endMetadataStar(0) parseTopLevelMemberImpl(;) listener: beginTopLevelMember(int) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', external, DeclarationKind.TopLevel, null, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', external, DeclarationKind.TopLevel, null, false) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(external) listener: handleType(int, null) @@ -562,7 +562,7 @@ parseUnit(int) listener: endMetadataStar(0) parseTopLevelMemberImpl(;) listener: beginTopLevelMember(int) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', factory, DeclarationKind.TopLevel, null, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', factory, DeclarationKind.TopLevel, null, false) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(factory) listener: handleType(int, null) @@ -587,7 +587,7 @@ parseUnit(int) listener: beginTopLevelMember(int) isReservedKeyword(false) indicatesMethodOrField(=) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', false, DeclarationKind.TopLevel, null, true) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', false, DeclarationKind.TopLevel, null, true) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(false) listener: handleType(int, null) @@ -614,7 +614,7 @@ parseUnit(int) listener: beginTopLevelMember(int) isReservedKeyword(final) indicatesMethodOrField(=) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', final, DeclarationKind.TopLevel, null, true) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', final, DeclarationKind.TopLevel, null, true) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(final) listener: handleType(int, null) @@ -641,7 +641,7 @@ parseUnit(int) listener: beginTopLevelMember(int) isReservedKeyword(finally) indicatesMethodOrField(=) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', finally, DeclarationKind.TopLevel, null, true) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', finally, DeclarationKind.TopLevel, null, true) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(finally) listener: handleType(int, null) @@ -668,7 +668,7 @@ parseUnit(int) listener: beginTopLevelMember(int) isReservedKeyword(for) indicatesMethodOrField(=) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', for, DeclarationKind.TopLevel, null, true) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', for, DeclarationKind.TopLevel, null, true) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(for) listener: handleType(int, null) @@ -693,7 +693,7 @@ parseUnit(int) listener: endMetadataStar(0) parseTopLevelMemberImpl(;) listener: beginTopLevelMember(int) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', Function, DeclarationKind.TopLevel, null, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', Function, DeclarationKind.TopLevel, null, false) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(Function) listener: handleType(int, null) @@ -716,7 +716,7 @@ parseUnit(int) listener: endMetadataStar(0) parseTopLevelMemberImpl(;) listener: beginTopLevelMember(int) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', get, DeclarationKind.TopLevel, null, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', get, DeclarationKind.TopLevel, null, false) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(get) listener: handleType(int, null) @@ -739,7 +739,7 @@ parseUnit(int) listener: endMetadataStar(0) parseTopLevelMemberImpl(;) listener: beginTopLevelMember(int) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', hide, DeclarationKind.TopLevel, null, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', hide, DeclarationKind.TopLevel, null, false) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(hide) listener: handleType(int, null) @@ -764,7 +764,7 @@ parseUnit(int) listener: beginTopLevelMember(int) isReservedKeyword(if) indicatesMethodOrField(=) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', if, DeclarationKind.TopLevel, null, true) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', if, DeclarationKind.TopLevel, null, true) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(if) listener: handleType(int, null) @@ -789,7 +789,7 @@ parseUnit(int) listener: endMetadataStar(0) parseTopLevelMemberImpl(;) listener: beginTopLevelMember(int) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', implements, DeclarationKind.TopLevel, null, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', implements, DeclarationKind.TopLevel, null, false) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(implements) listener: handleType(int, null) @@ -812,7 +812,7 @@ parseUnit(int) listener: endMetadataStar(0) parseTopLevelMemberImpl(;) listener: beginTopLevelMember(int) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', import, DeclarationKind.TopLevel, null, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', import, DeclarationKind.TopLevel, null, false) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(import) listener: handleType(int, null) @@ -837,7 +837,7 @@ parseUnit(int) listener: beginTopLevelMember(int) isReservedKeyword(in) indicatesMethodOrField(=) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', in, DeclarationKind.TopLevel, null, true) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', in, DeclarationKind.TopLevel, null, true) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(in) listener: handleType(int, null) @@ -862,7 +862,7 @@ parseUnit(int) listener: endMetadataStar(0) parseTopLevelMemberImpl(;) listener: beginTopLevelMember(int) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', inout, DeclarationKind.TopLevel, null, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', inout, DeclarationKind.TopLevel, null, false) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(inout) listener: handleType(int, null) @@ -885,7 +885,7 @@ parseUnit(int) listener: endMetadataStar(0) parseTopLevelMemberImpl(;) listener: beginTopLevelMember(int) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', interface, DeclarationKind.TopLevel, null, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', interface, DeclarationKind.TopLevel, null, false) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(interface) listener: handleType(int, null) @@ -910,7 +910,7 @@ parseUnit(int) listener: beginTopLevelMember(int) isReservedKeyword(is) indicatesMethodOrField(=) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', is, DeclarationKind.TopLevel, null, true) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', is, DeclarationKind.TopLevel, null, true) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(is) listener: handleType(int, null) @@ -935,7 +935,7 @@ parseUnit(int) listener: endMetadataStar(0) parseTopLevelMemberImpl(;) listener: beginTopLevelMember(int) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', late, DeclarationKind.TopLevel, null, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', late, DeclarationKind.TopLevel, null, false) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(late) listener: handleType(int, null) @@ -958,7 +958,7 @@ parseUnit(int) listener: endMetadataStar(0) parseTopLevelMemberImpl(;) listener: beginTopLevelMember(int) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', library, DeclarationKind.TopLevel, null, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', library, DeclarationKind.TopLevel, null, false) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(library) listener: handleType(int, null) @@ -981,7 +981,7 @@ parseUnit(int) listener: endMetadataStar(0) parseTopLevelMemberImpl(;) listener: beginTopLevelMember(int) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', mixin, DeclarationKind.TopLevel, null, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', mixin, DeclarationKind.TopLevel, null, false) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(mixin) listener: handleType(int, null) @@ -1004,7 +1004,7 @@ parseUnit(int) listener: endMetadataStar(0) parseTopLevelMemberImpl(;) listener: beginTopLevelMember(int) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', native, DeclarationKind.TopLevel, null, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', native, DeclarationKind.TopLevel, null, false) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(native) listener: handleType(int, null) @@ -1029,7 +1029,7 @@ parseUnit(int) listener: beginTopLevelMember(int) isReservedKeyword(new) indicatesMethodOrField(=) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', new, DeclarationKind.TopLevel, null, true) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', new, DeclarationKind.TopLevel, null, true) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(new) listener: handleType(int, null) @@ -1056,7 +1056,7 @@ parseUnit(int) listener: beginTopLevelMember(int) isReservedKeyword(null) indicatesMethodOrField(=) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', null, DeclarationKind.TopLevel, null, true) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', null, DeclarationKind.TopLevel, null, true) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(null) listener: handleType(int, null) @@ -1081,7 +1081,7 @@ parseUnit(int) listener: endMetadataStar(0) parseTopLevelMemberImpl(;) listener: beginTopLevelMember(int) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', of, DeclarationKind.TopLevel, null, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', of, DeclarationKind.TopLevel, null, false) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(of) listener: handleType(int, null) @@ -1104,7 +1104,7 @@ parseUnit(int) listener: endMetadataStar(0) parseTopLevelMemberImpl(;) listener: beginTopLevelMember(int) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', on, DeclarationKind.TopLevel, null, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', on, DeclarationKind.TopLevel, null, false) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(on) listener: handleType(int, null) @@ -1127,7 +1127,7 @@ parseUnit(int) listener: endMetadataStar(0) parseTopLevelMemberImpl(;) listener: beginTopLevelMember(int) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', operator, DeclarationKind.TopLevel, null, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', operator, DeclarationKind.TopLevel, null, false) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(operator) listener: handleType(int, null) @@ -1150,7 +1150,7 @@ parseUnit(int) listener: endMetadataStar(0) parseTopLevelMemberImpl(;) listener: beginTopLevelMember(int) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', out, DeclarationKind.TopLevel, null, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', out, DeclarationKind.TopLevel, null, false) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(out) listener: handleType(int, null) @@ -1173,7 +1173,7 @@ parseUnit(int) listener: endMetadataStar(0) parseTopLevelMemberImpl(;) listener: beginTopLevelMember(int) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', part, DeclarationKind.TopLevel, null, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', part, DeclarationKind.TopLevel, null, false) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(part) listener: handleType(int, null) @@ -1196,7 +1196,7 @@ parseUnit(int) listener: endMetadataStar(0) parseTopLevelMemberImpl(;) listener: beginTopLevelMember(int) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', patch, DeclarationKind.TopLevel, null, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', patch, DeclarationKind.TopLevel, null, false) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(patch) listener: handleType(int, null) @@ -1219,7 +1219,7 @@ parseUnit(int) listener: endMetadataStar(0) parseTopLevelMemberImpl(;) listener: beginTopLevelMember(int) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', required, DeclarationKind.TopLevel, null, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', required, DeclarationKind.TopLevel, null, false) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(required) listener: handleType(int, null) @@ -1244,7 +1244,7 @@ parseUnit(int) listener: beginTopLevelMember(int) isReservedKeyword(rethrow) indicatesMethodOrField(=) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', rethrow, DeclarationKind.TopLevel, null, true) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', rethrow, DeclarationKind.TopLevel, null, true) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(rethrow) listener: handleType(int, null) @@ -1271,7 +1271,7 @@ parseUnit(int) listener: beginTopLevelMember(int) isReservedKeyword(return) indicatesMethodOrField(=) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', return, DeclarationKind.TopLevel, null, true) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', return, DeclarationKind.TopLevel, null, true) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(return) listener: handleType(int, null) @@ -1296,7 +1296,7 @@ parseUnit(int) listener: endMetadataStar(0) parseTopLevelMemberImpl(;) listener: beginTopLevelMember(int) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', set, DeclarationKind.TopLevel, null, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', set, DeclarationKind.TopLevel, null, false) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(set) listener: handleType(int, null) @@ -1319,7 +1319,7 @@ parseUnit(int) listener: endMetadataStar(0) parseTopLevelMemberImpl(;) listener: beginTopLevelMember(int) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', show, DeclarationKind.TopLevel, null, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', show, DeclarationKind.TopLevel, null, false) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(show) listener: handleType(int, null) @@ -1342,7 +1342,7 @@ parseUnit(int) listener: endMetadataStar(0) parseTopLevelMemberImpl(;) listener: beginTopLevelMember(int) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', source, DeclarationKind.TopLevel, null, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', source, DeclarationKind.TopLevel, null, false) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(source) listener: handleType(int, null) @@ -1365,7 +1365,7 @@ parseUnit(int) listener: endMetadataStar(0) parseTopLevelMemberImpl(;) listener: beginTopLevelMember(int) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', static, DeclarationKind.TopLevel, null, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', static, DeclarationKind.TopLevel, null, false) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(static) listener: handleType(int, null) @@ -1390,7 +1390,7 @@ parseUnit(int) listener: beginTopLevelMember(int) isReservedKeyword(super) indicatesMethodOrField(=) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', super, DeclarationKind.TopLevel, null, true) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', super, DeclarationKind.TopLevel, null, true) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(super) listener: handleType(int, null) @@ -1417,7 +1417,7 @@ parseUnit(int) listener: beginTopLevelMember(int) isReservedKeyword(switch) indicatesMethodOrField(=) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', switch, DeclarationKind.TopLevel, null, true) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', switch, DeclarationKind.TopLevel, null, true) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(switch) listener: handleType(int, null) @@ -1442,7 +1442,7 @@ parseUnit(int) listener: endMetadataStar(0) parseTopLevelMemberImpl(;) listener: beginTopLevelMember(int) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', sync, DeclarationKind.TopLevel, null, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', sync, DeclarationKind.TopLevel, null, false) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(sync) listener: handleType(int, null) @@ -1465,7 +1465,7 @@ parseUnit(int) listener: endMetadataStar(0) parseTopLevelMemberImpl(;) listener: beginTopLevelMember(int) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', this, DeclarationKind.TopLevel, null, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', this, DeclarationKind.TopLevel, null, false) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(this) listener: handleType(int, null) @@ -1492,7 +1492,7 @@ parseUnit(int) listener: beginTopLevelMember(int) isReservedKeyword(throw) indicatesMethodOrField(=) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', throw, DeclarationKind.TopLevel, null, true) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', throw, DeclarationKind.TopLevel, null, true) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(throw) listener: handleType(int, null) @@ -1519,7 +1519,7 @@ parseUnit(int) listener: beginTopLevelMember(int) isReservedKeyword(true) indicatesMethodOrField(=) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', true, DeclarationKind.TopLevel, null, true) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', true, DeclarationKind.TopLevel, null, true) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(true) listener: handleType(int, null) @@ -1546,7 +1546,7 @@ parseUnit(int) listener: beginTopLevelMember(int) isReservedKeyword(try) indicatesMethodOrField(=) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', try, DeclarationKind.TopLevel, null, true) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', try, DeclarationKind.TopLevel, null, true) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(try) listener: handleType(int, null) @@ -1571,7 +1571,7 @@ parseUnit(int) listener: endMetadataStar(0) parseTopLevelMemberImpl(;) listener: beginTopLevelMember(int) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', typedef, DeclarationKind.TopLevel, null, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', typedef, DeclarationKind.TopLevel, null, false) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(typedef) listener: handleType(int, null) @@ -1596,7 +1596,7 @@ parseUnit(int) listener: beginTopLevelMember(int) isReservedKeyword(var) indicatesMethodOrField(=) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', var, DeclarationKind.TopLevel, null, true) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', var, DeclarationKind.TopLevel, null, true) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(var) listener: handleType(int, null) @@ -1623,7 +1623,7 @@ parseUnit(int) listener: beginTopLevelMember(int) isReservedKeyword(void) indicatesMethodOrField(=) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', void, DeclarationKind.TopLevel, null, true) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', void, DeclarationKind.TopLevel, null, true) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(void) listener: handleType(int, null) @@ -1650,7 +1650,7 @@ parseUnit(int) listener: beginTopLevelMember(int) isReservedKeyword(while) indicatesMethodOrField(=) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', while, DeclarationKind.TopLevel, null, true) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', while, DeclarationKind.TopLevel, null, true) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(while) listener: handleType(int, null) @@ -1677,7 +1677,7 @@ parseUnit(int) listener: beginTopLevelMember(int) isReservedKeyword(with) indicatesMethodOrField(=) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', with, DeclarationKind.TopLevel, null, true) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', with, DeclarationKind.TopLevel, null, true) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(with) listener: handleType(int, null) @@ -1702,7 +1702,7 @@ parseUnit(int) listener: endMetadataStar(0) parseTopLevelMemberImpl(;) listener: beginTopLevelMember(int) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', yield, DeclarationKind.TopLevel, null, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', yield, DeclarationKind.TopLevel, null, false) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(yield) listener: handleType(int, null) diff --git a/pkg/front_end/parser_testcases/error_recovery/method_called_with.dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/method_called_with.dart.intertwined.expect index 34e33bbdfc1..eb905f59bda 100644 --- a/pkg/front_end/parser_testcases/error_recovery/method_called_with.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/error_recovery/method_called_with.dart.intertwined.expect @@ -34,7 +34,7 @@ parseUnit(class) listener: beginMember() isReservedKeyword(with) indicatesMethodOrField(() - parseMethod({, null, null, null, null, null, {, Instance of 'SimpleType', null, with, DeclarationKind.Class, C, true) + parseMethod({, null, null, null, null, null, null, {, Instance of 'SimpleType', null, with, DeclarationKind.Class, C, true) listener: beginMethod(null, null, null, null, null, with) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(with) @@ -78,7 +78,7 @@ parseUnit(class) listener: beginMember() isReservedKeyword(with) indicatesMethodOrField(=) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', with, DeclarationKind.Class, C, true) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', with, DeclarationKind.Class, C, true) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(with) listener: handleType(int, null) @@ -105,7 +105,7 @@ parseUnit(class) listener: beginMember() isReservedKeyword(with) indicatesMethodOrField(=>) - parseMethod(;, null, null, null, null, null, ;, Instance of 'SimpleType', get, with, DeclarationKind.Class, C, true) + parseMethod(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', get, with, DeclarationKind.Class, C, true) listener: beginMethod(null, null, null, null, get, with) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(get) @@ -146,7 +146,7 @@ parseUnit(class) listener: beginMember() isReservedKeyword(with) indicatesMethodOrField(() - parseMethod(;, null, null, null, null, null, ;, Instance of 'VoidType', set, with, DeclarationKind.Class, C, true) + parseMethod(;, null, null, null, null, null, null, ;, Instance of 'VoidType', set, with, DeclarationKind.Class, C, true) listener: beginMethod(null, null, null, null, set, with) listener: handleVoidKeyword(void) ensureIdentifierPotentiallyRecovered(set, methodDeclaration, true) @@ -237,7 +237,7 @@ parseUnit(class) listener: beginTopLevelMember(int) isReservedKeyword(with) indicatesMethodOrField(=) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', with, DeclarationKind.TopLevel, null, true) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', with, DeclarationKind.TopLevel, null, true) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(with) listener: handleType(int, null) diff --git a/pkg/front_end/parser_testcases/error_recovery/method_called_with_prime.dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/method_called_with_prime.dart.intertwined.expect index bd0176aa70b..c691def94b9 100644 --- a/pkg/front_end/parser_testcases/error_recovery/method_called_with_prime.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/error_recovery/method_called_with_prime.dart.intertwined.expect @@ -32,7 +32,7 @@ parseUnit(class) listener: beginMetadataStar(int) listener: endMetadataStar(0) listener: beginMember() - parseMethod({, null, null, null, null, null, {, Instance of 'SimpleType', null, With, DeclarationKind.Class, C, false) + parseMethod({, null, null, null, null, null, null, {, Instance of 'SimpleType', null, With, DeclarationKind.Class, C, false) listener: beginMethod(null, null, null, null, null, With) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(With) @@ -72,7 +72,7 @@ parseUnit(class) listener: beginMetadataStar(int) listener: endMetadataStar(0) listener: beginMember() - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', With, DeclarationKind.Class, C, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', With, DeclarationKind.Class, C, false) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(With) listener: handleType(int, null) @@ -95,7 +95,7 @@ parseUnit(class) listener: beginMetadataStar(int) listener: endMetadataStar(0) listener: beginMember() - parseMethod(;, null, null, null, null, null, ;, Instance of 'SimpleType', get, With, DeclarationKind.Class, C, false) + parseMethod(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', get, With, DeclarationKind.Class, C, false) listener: beginMethod(null, null, null, null, get, With) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(get) @@ -132,7 +132,7 @@ parseUnit(class) listener: beginMetadataStar(void) listener: endMetadataStar(0) listener: beginMember() - parseMethod(;, null, null, null, null, null, ;, Instance of 'VoidType', set, With, DeclarationKind.Class, C, false) + parseMethod(;, null, null, null, null, null, null, ;, Instance of 'VoidType', set, With, DeclarationKind.Class, C, false) listener: beginMethod(null, null, null, null, set, With) listener: handleVoidKeyword(void) ensureIdentifierPotentiallyRecovered(set, methodDeclaration, false) @@ -215,7 +215,7 @@ parseUnit(class) listener: endMetadataStar(0) parseTopLevelMemberImpl(;) listener: beginTopLevelMember(int) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', With, DeclarationKind.TopLevel, null, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', With, DeclarationKind.TopLevel, null, false) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(With) listener: handleType(int, null) diff --git a/pkg/front_end/parser_testcases/error_recovery/method_called_with_prime2.dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/method_called_with_prime2.dart.intertwined.expect index 1dcb53c45e3..ef200eac672 100644 --- a/pkg/front_end/parser_testcases/error_recovery/method_called_with_prime2.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/error_recovery/method_called_with_prime2.dart.intertwined.expect @@ -38,7 +38,7 @@ parseUnit(class) listener: beginTopLevelMember(foo) isReservedKeyword(class) indicatesMethodOrField(M1) - parseFields(}, null, null, null, null, null, }, Instance of 'NoType', foo, DeclarationKind.TopLevel, null, false) + parseFields(}, null, null, null, null, null, null, }, Instance of 'NoType', foo, DeclarationKind.TopLevel, null, false) reportRecoverableError(foo, MissingConstFinalVarOrType) listener: handleRecoverableError(MissingConstFinalVarOrType, foo, foo) listener: handleNoType(}) @@ -84,7 +84,7 @@ parseUnit(class) listener: beginMember() isReservedKeyword(class) indicatesMethodOrField(M2) - parseFields({, null, null, null, null, null, {, Instance of 'NoType', foo, DeclarationKind.Class, M1, false) + parseFields({, null, null, null, null, null, null, {, Instance of 'NoType', foo, DeclarationKind.Class, M1, false) reportRecoverableError(foo, MissingConstFinalVarOrType) listener: handleRecoverableError(MissingConstFinalVarOrType, foo, foo) listener: handleNoType({) @@ -104,7 +104,7 @@ parseUnit(class) listener: beginMetadataStar(class) listener: endMetadataStar(0) listener: beginMember() - recoverFromInvalidMember(;, ;, null, null, null, null, null, ;, Instance of 'NoType', null, DeclarationKind.Class, M1) + recoverFromInvalidMember(;, ;, null, null, null, null, null, null, ;, Instance of 'NoType', null, DeclarationKind.Class, M1) reportAndSkipClassInClass(class) reportRecoverableError(class, ClassInClass) listener: handleRecoverableError(ClassInClass, class, class) diff --git a/pkg/front_end/parser_testcases/error_recovery/utf_16_le_content.crash_dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/utf_16_le_content.crash_dart.intertwined.expect index 3759bb88b60..fa71da259b8 100644 --- a/pkg/front_end/parser_testcases/error_recovery/utf_16_le_content.crash_dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/error_recovery/utf_16_le_content.crash_dart.intertwined.expect @@ -28,7 +28,7 @@ parseUnit(EncodingErrorToken()) listener: endMetadataStar(0) parseTopLevelMemberImpl(/) listener: beginTopLevelMember(C) - parseFields(/, null, null, null, null, null, /, Instance of 'SimpleType', o, DeclarationKind.TopLevel, null, false) + parseFields(/, null, null, null, null, null, null, /, Instance of 'SimpleType', o, DeclarationKind.TopLevel, null, false) listener: handleIdentifier(C, typeReference) listener: handleNoTypeArguments(o) listener: handleType(C, null) @@ -48,7 +48,7 @@ parseUnit(EncodingErrorToken()) listener: endMetadataStar(0) parseTopLevelMemberImpl(;) listener: beginTopLevelMember(p) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', y, DeclarationKind.TopLevel, null, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', y, DeclarationKind.TopLevel, null, false) listener: handleIdentifier(p, typeReference) listener: handleNoTypeArguments(y) listener: handleType(p, null) @@ -68,7 +68,7 @@ parseUnit(EncodingErrorToken()) listener: endMetadataStar(0) parseTopLevelMemberImpl(;) listener: beginTopLevelMember(r) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', i, DeclarationKind.TopLevel, null, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', i, DeclarationKind.TopLevel, null, false) listener: handleIdentifier(r, typeReference) listener: handleNoTypeArguments(i) listener: handleType(r, null) @@ -88,7 +88,7 @@ parseUnit(EncodingErrorToken()) listener: endMetadataStar(0) parseTopLevelMemberImpl(;) listener: beginTopLevelMember(g) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', h, DeclarationKind.TopLevel, null, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', h, DeclarationKind.TopLevel, null, false) listener: handleIdentifier(g, typeReference) listener: handleNoTypeArguments(h) listener: handleType(g, null) @@ -200,7 +200,7 @@ parseUnit(EncodingErrorToken()) listener: endMetadataStar(0) parseTopLevelMemberImpl(,) listener: beginTopLevelMember(t) - parseFields(,, null, null, null, null, null, ,, Instance of 'SimpleType', h, DeclarationKind.TopLevel, null, false) + parseFields(,, null, null, null, null, null, null, ,, Instance of 'SimpleType', h, DeclarationKind.TopLevel, null, false) listener: handleIdentifier(t, typeReference) listener: handleNoTypeArguments(h) listener: handleType(t, null) @@ -220,7 +220,7 @@ parseUnit(EncodingErrorToken()) listener: endMetadataStar(0) parseTopLevelMemberImpl(;) listener: beginTopLevelMember(e) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', D, DeclarationKind.TopLevel, null, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', D, DeclarationKind.TopLevel, null, false) listener: handleIdentifier(e, typeReference) listener: handleNoTypeArguments(D) listener: handleType(e, null) @@ -240,7 +240,7 @@ parseUnit(EncodingErrorToken()) listener: endMetadataStar(0) parseTopLevelMemberImpl(;) listener: beginTopLevelMember(a) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', r, DeclarationKind.TopLevel, null, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', r, DeclarationKind.TopLevel, null, false) listener: handleIdentifier(a, typeReference) listener: handleNoTypeArguments(r) listener: handleType(a, null) @@ -260,7 +260,7 @@ parseUnit(EncodingErrorToken()) listener: endMetadataStar(0) parseTopLevelMemberImpl(;) listener: beginTopLevelMember(t) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', p, DeclarationKind.TopLevel, null, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', p, DeclarationKind.TopLevel, null, false) listener: handleIdentifier(t, typeReference) listener: handleNoTypeArguments(p) listener: handleType(t, null) @@ -280,7 +280,7 @@ parseUnit(EncodingErrorToken()) listener: endMetadataStar(0) parseTopLevelMemberImpl(;) listener: beginTopLevelMember(r) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', o, DeclarationKind.TopLevel, null, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', o, DeclarationKind.TopLevel, null, false) listener: handleIdentifier(r, typeReference) listener: handleNoTypeArguments(o) listener: handleType(r, null) @@ -300,7 +300,7 @@ parseUnit(EncodingErrorToken()) listener: endMetadataStar(0) parseTopLevelMemberImpl(;) listener: beginTopLevelMember(j) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', e, DeclarationKind.TopLevel, null, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', e, DeclarationKind.TopLevel, null, false) listener: handleIdentifier(j, typeReference) listener: handleNoTypeArguments(e) listener: handleType(j, null) @@ -320,7 +320,7 @@ parseUnit(EncodingErrorToken()) listener: endMetadataStar(0) parseTopLevelMemberImpl(;) listener: beginTopLevelMember(c) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', t, DeclarationKind.TopLevel, null, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', t, DeclarationKind.TopLevel, null, false) listener: handleIdentifier(c, typeReference) listener: handleNoTypeArguments(t) listener: handleType(c, null) @@ -340,7 +340,7 @@ parseUnit(EncodingErrorToken()) listener: endMetadataStar(0) parseTopLevelMemberImpl(;) listener: beginTopLevelMember(a) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', u, DeclarationKind.TopLevel, null, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', u, DeclarationKind.TopLevel, null, false) listener: handleIdentifier(a, typeReference) listener: handleNoTypeArguments(u) listener: handleType(a, null) @@ -360,7 +360,7 @@ parseUnit(EncodingErrorToken()) listener: endMetadataStar(0) parseTopLevelMemberImpl(;) listener: beginTopLevelMember(t) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', h, DeclarationKind.TopLevel, null, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', h, DeclarationKind.TopLevel, null, false) listener: handleIdentifier(t, typeReference) listener: handleNoTypeArguments(h) listener: handleType(t, null) @@ -380,7 +380,7 @@ parseUnit(EncodingErrorToken()) listener: endMetadataStar(0) parseTopLevelMemberImpl(;) listener: beginTopLevelMember(o) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', r, DeclarationKind.TopLevel, null, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', r, DeclarationKind.TopLevel, null, false) listener: handleIdentifier(o, typeReference) listener: handleNoTypeArguments(r) listener: handleType(o, null) @@ -400,7 +400,7 @@ parseUnit(EncodingErrorToken()) listener: endMetadataStar(0) parseTopLevelMemberImpl(;) listener: beginTopLevelMember(s) - parseFields(;, null, null, null, null, null, ;, Instance of 'PrefixedType', l, DeclarationKind.TopLevel, null, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'PrefixedType', l, DeclarationKind.TopLevel, null, false) listener: handleIdentifier(s, prefixedTypeReference) listener: handleIdentifier(P, typeReferenceContinuation) listener: handleQualified(.) @@ -422,7 +422,7 @@ parseUnit(EncodingErrorToken()) listener: endMetadataStar(0) parseTopLevelMemberImpl(;) listener: beginTopLevelMember(e) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', a, DeclarationKind.TopLevel, null, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', a, DeclarationKind.TopLevel, null, false) listener: handleIdentifier(e, typeReference) listener: handleNoTypeArguments(a) listener: handleType(e, null) @@ -442,7 +442,7 @@ parseUnit(EncodingErrorToken()) listener: endMetadataStar(0) parseTopLevelMemberImpl(;) listener: beginTopLevelMember(s) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', e, DeclarationKind.TopLevel, null, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', e, DeclarationKind.TopLevel, null, false) listener: handleIdentifier(s, typeReference) listener: handleNoTypeArguments(e) listener: handleType(s, null) @@ -462,7 +462,7 @@ parseUnit(EncodingErrorToken()) listener: endMetadataStar(0) parseTopLevelMemberImpl(;) listener: beginTopLevelMember(s) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', e, DeclarationKind.TopLevel, null, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', e, DeclarationKind.TopLevel, null, false) listener: handleIdentifier(s, typeReference) listener: handleNoTypeArguments(e) listener: handleType(s, null) @@ -482,7 +482,7 @@ parseUnit(EncodingErrorToken()) listener: endMetadataStar(0) parseTopLevelMemberImpl(;) listener: beginTopLevelMember(e) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', t, DeclarationKind.TopLevel, null, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', t, DeclarationKind.TopLevel, null, false) listener: handleIdentifier(e, typeReference) listener: handleNoTypeArguments(t) listener: handleType(e, null) @@ -502,7 +502,7 @@ parseUnit(EncodingErrorToken()) listener: endMetadataStar(0) parseTopLevelMemberImpl(;) listener: beginTopLevelMember(h) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', e, DeclarationKind.TopLevel, null, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', e, DeclarationKind.TopLevel, null, false) listener: handleIdentifier(h, typeReference) listener: handleNoTypeArguments(e) listener: handleType(h, null) @@ -522,7 +522,7 @@ parseUnit(EncodingErrorToken()) listener: endMetadataStar(0) parseTopLevelMemberImpl(;) listener: beginTopLevelMember(A) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', U, DeclarationKind.TopLevel, null, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', U, DeclarationKind.TopLevel, null, false) listener: handleIdentifier(A, typeReference) listener: handleNoTypeArguments(U) listener: handleType(A, null) @@ -542,7 +542,7 @@ parseUnit(EncodingErrorToken()) listener: endMetadataStar(0) parseTopLevelMemberImpl(;) listener: beginTopLevelMember(T) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', H, DeclarationKind.TopLevel, null, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', H, DeclarationKind.TopLevel, null, false) listener: handleIdentifier(T, typeReference) listener: handleNoTypeArguments(H) listener: handleType(T, null) @@ -562,7 +562,7 @@ parseUnit(EncodingErrorToken()) listener: endMetadataStar(0) parseTopLevelMemberImpl(;) listener: beginTopLevelMember(O) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', R, DeclarationKind.TopLevel, null, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', R, DeclarationKind.TopLevel, null, false) listener: handleIdentifier(O, typeReference) listener: handleNoTypeArguments(R) listener: handleType(O, null) @@ -582,7 +582,7 @@ parseUnit(EncodingErrorToken()) listener: endMetadataStar(0) parseTopLevelMemberImpl(;) listener: beginTopLevelMember(S) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', f, DeclarationKind.TopLevel, null, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', f, DeclarationKind.TopLevel, null, false) listener: handleIdentifier(S, typeReference) listener: handleNoTypeArguments(f) listener: handleType(S, null) @@ -602,7 +602,7 @@ parseUnit(EncodingErrorToken()) listener: endMetadataStar(0) parseTopLevelMemberImpl(;) listener: beginTopLevelMember(i) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', l, DeclarationKind.TopLevel, null, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', l, DeclarationKind.TopLevel, null, false) listener: handleIdentifier(i, typeReference) listener: handleNoTypeArguments(l) listener: handleType(i, null) @@ -623,7 +623,7 @@ parseUnit(EncodingErrorToken()) parseTopLevelMemberImpl(;) listener: beginTopLevelMember(e) isReservedKeyword(/) - parseFields(;, null, null, null, null, null, ;, Instance of 'NoType', e, DeclarationKind.TopLevel, null, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'NoType', e, DeclarationKind.TopLevel, null, false) reportRecoverableError(e, MissingConstFinalVarOrType) listener: handleRecoverableError(MissingConstFinalVarOrType, e, e) listener: handleNoType(;) @@ -663,7 +663,7 @@ parseUnit(EncodingErrorToken()) listener: endMetadataStar(0) parseTopLevelMemberImpl(/) listener: beginTopLevelMember(f) - parseFields(/, null, null, null, null, null, /, Instance of 'SimpleType', o, DeclarationKind.TopLevel, null, false) + parseFields(/, null, null, null, null, null, null, /, Instance of 'SimpleType', o, DeclarationKind.TopLevel, null, false) listener: handleIdentifier(f, typeReference) listener: handleNoTypeArguments(o) listener: handleType(f, null) @@ -683,7 +683,7 @@ parseUnit(EncodingErrorToken()) listener: endMetadataStar(0) parseTopLevelMemberImpl(;) listener: beginTopLevelMember(r) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', d, DeclarationKind.TopLevel, null, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', d, DeclarationKind.TopLevel, null, false) listener: handleIdentifier(r, typeReference) listener: handleNoTypeArguments(d) listener: handleType(r, null) @@ -703,7 +703,7 @@ parseUnit(EncodingErrorToken()) listener: endMetadataStar(0) parseTopLevelMemberImpl(;) listener: beginTopLevelMember(e) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', t, DeclarationKind.TopLevel, null, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', t, DeclarationKind.TopLevel, null, false) listener: handleIdentifier(e, typeReference) listener: handleNoTypeArguments(t) listener: handleType(e, null) @@ -723,7 +723,7 @@ parseUnit(EncodingErrorToken()) listener: endMetadataStar(0) parseTopLevelMemberImpl(;) listener: beginTopLevelMember(a) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', i, DeclarationKind.TopLevel, null, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', i, DeclarationKind.TopLevel, null, false) listener: handleIdentifier(a, typeReference) listener: handleNoTypeArguments(i) listener: handleType(a, null) @@ -789,7 +789,7 @@ parseUnit(EncodingErrorToken()) listener: endMetadataStar(0) parseTopLevelMemberImpl(.) listener: beginTopLevelMember(A) - parseFields(., null, null, null, null, null, ., Instance of 'SimpleType', l, DeclarationKind.TopLevel, null, false) + parseFields(., null, null, null, null, null, null, ., Instance of 'SimpleType', l, DeclarationKind.TopLevel, null, false) listener: handleIdentifier(A, typeReference) listener: handleNoTypeArguments(l) listener: handleType(A, null) @@ -809,7 +809,7 @@ parseUnit(EncodingErrorToken()) listener: endMetadataStar(0) parseTopLevelMemberImpl(;) listener: beginTopLevelMember(l) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', r, DeclarationKind.TopLevel, null, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', r, DeclarationKind.TopLevel, null, false) listener: handleIdentifier(l, typeReference) listener: handleNoTypeArguments(r) listener: handleType(l, null) @@ -829,7 +829,7 @@ parseUnit(EncodingErrorToken()) listener: endMetadataStar(0) parseTopLevelMemberImpl(;) listener: beginTopLevelMember(i) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', g, DeclarationKind.TopLevel, null, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', g, DeclarationKind.TopLevel, null, false) listener: handleIdentifier(i, typeReference) listener: handleNoTypeArguments(g) listener: handleType(i, null) @@ -849,7 +849,7 @@ parseUnit(EncodingErrorToken()) listener: endMetadataStar(0) parseTopLevelMemberImpl(;) listener: beginTopLevelMember(h) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', t, DeclarationKind.TopLevel, null, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', t, DeclarationKind.TopLevel, null, false) listener: handleIdentifier(h, typeReference) listener: handleNoTypeArguments(t) listener: handleType(h, null) @@ -869,7 +869,7 @@ parseUnit(EncodingErrorToken()) listener: endMetadataStar(0) parseTopLevelMemberImpl(;) listener: beginTopLevelMember(s) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', r, DeclarationKind.TopLevel, null, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', r, DeclarationKind.TopLevel, null, false) listener: handleIdentifier(s, typeReference) listener: handleNoTypeArguments(r) listener: handleType(s, null) @@ -889,7 +889,7 @@ parseUnit(EncodingErrorToken()) listener: endMetadataStar(0) parseTopLevelMemberImpl(;) listener: beginTopLevelMember(e) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', s, DeclarationKind.TopLevel, null, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', s, DeclarationKind.TopLevel, null, false) listener: handleIdentifier(e, typeReference) listener: handleNoTypeArguments(s) listener: handleType(e, null) @@ -909,7 +909,7 @@ parseUnit(EncodingErrorToken()) listener: endMetadataStar(0) parseTopLevelMemberImpl(;) listener: beginTopLevelMember(e) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', r, DeclarationKind.TopLevel, null, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', r, DeclarationKind.TopLevel, null, false) listener: handleIdentifier(e, typeReference) listener: handleNoTypeArguments(r) listener: handleType(e, null) @@ -929,7 +929,7 @@ parseUnit(EncodingErrorToken()) listener: endMetadataStar(0) parseTopLevelMemberImpl(;) listener: beginTopLevelMember(v) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', e, DeclarationKind.TopLevel, null, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', e, DeclarationKind.TopLevel, null, false) listener: handleIdentifier(v, typeReference) listener: handleNoTypeArguments(e) listener: handleType(v, null) @@ -949,7 +949,7 @@ parseUnit(EncodingErrorToken()) listener: endMetadataStar(0) parseTopLevelMemberImpl(;) listener: beginTopLevelMember(d) - parseFields(;, null, null, null, null, null, ;, Instance of 'PrefixedType', s, DeclarationKind.TopLevel, null, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'PrefixedType', s, DeclarationKind.TopLevel, null, false) listener: handleIdentifier(d, prefixedTypeReference) listener: handleIdentifier(U, typeReferenceContinuation) listener: handleQualified(.) @@ -971,7 +971,7 @@ parseUnit(EncodingErrorToken()) listener: endMetadataStar(0) parseTopLevelMemberImpl(;) listener: beginTopLevelMember(e) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', o, DeclarationKind.TopLevel, null, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', o, DeclarationKind.TopLevel, null, false) listener: handleIdentifier(e, typeReference) listener: handleNoTypeArguments(o) listener: handleType(e, null) @@ -991,7 +991,7 @@ parseUnit(EncodingErrorToken()) listener: endMetadataStar(0) parseTopLevelMemberImpl(;) listener: beginTopLevelMember(f) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', t, DeclarationKind.TopLevel, null, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', t, DeclarationKind.TopLevel, null, false) listener: handleIdentifier(f, typeReference) listener: handleNoTypeArguments(t) listener: handleType(f, null) @@ -1011,7 +1011,7 @@ parseUnit(EncodingErrorToken()) listener: endMetadataStar(0) parseTopLevelMemberImpl(;) listener: beginTopLevelMember(h) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', i, DeclarationKind.TopLevel, null, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', i, DeclarationKind.TopLevel, null, false) listener: handleIdentifier(h, typeReference) listener: handleNoTypeArguments(i) listener: handleType(h, null) @@ -1031,7 +1031,7 @@ parseUnit(EncodingErrorToken()) listener: endMetadataStar(0) parseTopLevelMemberImpl(;) listener: beginTopLevelMember(s) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', s, DeclarationKind.TopLevel, null, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', s, DeclarationKind.TopLevel, null, false) listener: handleIdentifier(s, typeReference) listener: handleNoTypeArguments(s) listener: handleType(s, null) @@ -1051,7 +1051,7 @@ parseUnit(EncodingErrorToken()) listener: endMetadataStar(0) parseTopLevelMemberImpl(;) listener: beginTopLevelMember(o) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', u, DeclarationKind.TopLevel, null, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', u, DeclarationKind.TopLevel, null, false) listener: handleIdentifier(o, typeReference) listener: handleNoTypeArguments(u) listener: handleType(o, null) @@ -1071,7 +1071,7 @@ parseUnit(EncodingErrorToken()) listener: endMetadataStar(0) parseTopLevelMemberImpl(;) listener: beginTopLevelMember(r) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', c, DeclarationKind.TopLevel, null, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', c, DeclarationKind.TopLevel, null, false) listener: handleIdentifier(r, typeReference) listener: handleNoTypeArguments(c) listener: handleType(r, null) @@ -1091,7 +1091,7 @@ parseUnit(EncodingErrorToken()) listener: endMetadataStar(0) parseTopLevelMemberImpl(;) listener: beginTopLevelMember(e) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', c, DeclarationKind.TopLevel, null, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', c, DeclarationKind.TopLevel, null, false) listener: handleIdentifier(e, typeReference) listener: handleNoTypeArguments(c) listener: handleType(e, null) @@ -1111,7 +1111,7 @@ parseUnit(EncodingErrorToken()) listener: endMetadataStar(0) parseTopLevelMemberImpl(;) listener: beginTopLevelMember(o) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', d, DeclarationKind.TopLevel, null, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', d, DeclarationKind.TopLevel, null, false) listener: handleIdentifier(o, typeReference) listener: handleNoTypeArguments(d) listener: handleType(o, null) @@ -1131,7 +1131,7 @@ parseUnit(EncodingErrorToken()) listener: endMetadataStar(0) parseTopLevelMemberImpl(;) listener: beginTopLevelMember(e) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', i, DeclarationKind.TopLevel, null, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', i, DeclarationKind.TopLevel, null, false) listener: handleIdentifier(e, typeReference) listener: handleNoTypeArguments(i) listener: handleType(e, null) @@ -1151,7 +1151,7 @@ parseUnit(EncodingErrorToken()) listener: endMetadataStar(0) parseTopLevelMemberImpl(;) listener: beginTopLevelMember(s) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', g, DeclarationKind.TopLevel, null, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', g, DeclarationKind.TopLevel, null, false) listener: handleIdentifier(s, typeReference) listener: handleNoTypeArguments(g) listener: handleType(s, null) @@ -1171,7 +1171,7 @@ parseUnit(EncodingErrorToken()) listener: endMetadataStar(0) parseTopLevelMemberImpl(;) listener: beginTopLevelMember(o) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', v, DeclarationKind.TopLevel, null, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', v, DeclarationKind.TopLevel, null, false) listener: handleIdentifier(o, typeReference) listener: handleNoTypeArguments(v) listener: handleType(o, null) @@ -1191,7 +1191,7 @@ parseUnit(EncodingErrorToken()) listener: endMetadataStar(0) parseTopLevelMemberImpl(;) listener: beginTopLevelMember(e) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', r, DeclarationKind.TopLevel, null, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', r, DeclarationKind.TopLevel, null, false) listener: handleIdentifier(e, typeReference) listener: handleNoTypeArguments(r) listener: handleType(e, null) @@ -1211,7 +1211,7 @@ parseUnit(EncodingErrorToken()) listener: endMetadataStar(0) parseTopLevelMemberImpl(;) listener: beginTopLevelMember(n) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', e, DeclarationKind.TopLevel, null, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', e, DeclarationKind.TopLevel, null, false) listener: handleIdentifier(n, typeReference) listener: handleNoTypeArguments(e) listener: handleType(n, null) @@ -1231,7 +1231,7 @@ parseUnit(EncodingErrorToken()) listener: endMetadataStar(0) parseTopLevelMemberImpl(;) listener: beginTopLevelMember(d) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', b, DeclarationKind.TopLevel, null, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', b, DeclarationKind.TopLevel, null, false) listener: handleIdentifier(d, typeReference) listener: handleNoTypeArguments(b) listener: handleType(d, null) @@ -1251,7 +1251,7 @@ parseUnit(EncodingErrorToken()) listener: endMetadataStar(0) parseTopLevelMemberImpl(;) listener: beginTopLevelMember(y) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', a, DeclarationKind.TopLevel, null, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', a, DeclarationKind.TopLevel, null, false) listener: handleIdentifier(y, typeReference) listener: handleNoTypeArguments(a) listener: handleType(y, null) @@ -1291,7 +1291,7 @@ parseUnit(EncodingErrorToken()) listener: endMetadataStar(0) parseTopLevelMemberImpl(/) listener: beginTopLevelMember(B) - parseFields(/, null, null, null, null, null, /, Instance of 'SimpleType', S, DeclarationKind.TopLevel, null, false) + parseFields(/, null, null, null, null, null, null, /, Instance of 'SimpleType', S, DeclarationKind.TopLevel, null, false) listener: handleIdentifier(B, typeReference) listener: handleNoTypeArguments(S) listener: handleType(B, null) @@ -1312,7 +1312,7 @@ parseUnit(EncodingErrorToken()) parseTopLevelMemberImpl(;) listener: beginTopLevelMember(D) isReservedKeyword(-) - parseFields(;, null, null, null, null, null, ;, Instance of 'NoType', D, DeclarationKind.TopLevel, null, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'NoType', D, DeclarationKind.TopLevel, null, false) reportRecoverableError(D, MissingConstFinalVarOrType) listener: handleRecoverableError(MissingConstFinalVarOrType, D, D) listener: handleNoType(;) @@ -1342,7 +1342,7 @@ parseUnit(EncodingErrorToken()) listener: endMetadataStar(0) parseTopLevelMemberImpl(-) listener: beginTopLevelMember(s) - parseFields(-, null, null, null, null, null, -, Instance of 'SimpleType', t, DeclarationKind.TopLevel, null, false) + parseFields(-, null, null, null, null, null, null, -, Instance of 'SimpleType', t, DeclarationKind.TopLevel, null, false) listener: handleIdentifier(s, typeReference) listener: handleNoTypeArguments(t) listener: handleType(s, null) @@ -1362,7 +1362,7 @@ parseUnit(EncodingErrorToken()) listener: endMetadataStar(0) parseTopLevelMemberImpl(;) listener: beginTopLevelMember(y) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', l, DeclarationKind.TopLevel, null, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', l, DeclarationKind.TopLevel, null, false) listener: handleIdentifier(y, typeReference) listener: handleNoTypeArguments(l) listener: handleType(y, null) @@ -1382,7 +1382,7 @@ parseUnit(EncodingErrorToken()) listener: endMetadataStar(0) parseTopLevelMemberImpl(;) listener: beginTopLevelMember(e) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', l, DeclarationKind.TopLevel, null, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', l, DeclarationKind.TopLevel, null, false) listener: handleIdentifier(e, typeReference) listener: handleNoTypeArguments(l) listener: handleType(e, null) @@ -1402,7 +1402,7 @@ parseUnit(EncodingErrorToken()) listener: endMetadataStar(0) parseTopLevelMemberImpl(;) listener: beginTopLevelMember(i) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', c, DeclarationKind.TopLevel, null, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', c, DeclarationKind.TopLevel, null, false) listener: handleIdentifier(i, typeReference) listener: handleNoTypeArguments(c) listener: handleType(i, null) @@ -1422,7 +1422,7 @@ parseUnit(EncodingErrorToken()) listener: endMetadataStar(0) parseTopLevelMemberImpl(;) listener: beginTopLevelMember(e) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', n, DeclarationKind.TopLevel, null, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', n, DeclarationKind.TopLevel, null, false) listener: handleIdentifier(e, typeReference) listener: handleNoTypeArguments(n) listener: handleType(e, null) @@ -1442,7 +1442,7 @@ parseUnit(EncodingErrorToken()) listener: endMetadataStar(0) parseTopLevelMemberImpl(;) listener: beginTopLevelMember(s) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', e, DeclarationKind.TopLevel, null, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', e, DeclarationKind.TopLevel, null, false) listener: handleIdentifier(s, typeReference) listener: handleNoTypeArguments(e) listener: handleType(s, null) @@ -1462,7 +1462,7 @@ parseUnit(EncodingErrorToken()) listener: endMetadataStar(0) parseTopLevelMemberImpl(;) listener: beginTopLevelMember(t) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', h, DeclarationKind.TopLevel, null, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', h, DeclarationKind.TopLevel, null, false) listener: handleIdentifier(t, typeReference) listener: handleNoTypeArguments(h) listener: handleType(t, null) @@ -1482,7 +1482,7 @@ parseUnit(EncodingErrorToken()) listener: endMetadataStar(0) parseTopLevelMemberImpl(;) listener: beginTopLevelMember(a) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', t, DeclarationKind.TopLevel, null, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', t, DeclarationKind.TopLevel, null, false) listener: handleIdentifier(a, typeReference) listener: handleNoTypeArguments(t) listener: handleType(a, null) @@ -1502,7 +1502,7 @@ parseUnit(EncodingErrorToken()) listener: endMetadataStar(0) parseTopLevelMemberImpl(;) listener: beginTopLevelMember(c) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', a, DeclarationKind.TopLevel, null, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', a, DeclarationKind.TopLevel, null, false) listener: handleIdentifier(c, typeReference) listener: handleNoTypeArguments(a) listener: handleType(c, null) @@ -1522,7 +1522,7 @@ parseUnit(EncodingErrorToken()) listener: endMetadataStar(0) parseTopLevelMemberImpl(;) listener: beginTopLevelMember(n) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', b, DeclarationKind.TopLevel, null, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', b, DeclarationKind.TopLevel, null, false) listener: handleIdentifier(n, typeReference) listener: handleNoTypeArguments(b) listener: handleType(n, null) @@ -1542,7 +1542,7 @@ parseUnit(EncodingErrorToken()) listener: endMetadataStar(0) parseTopLevelMemberImpl(;) listener: beginTopLevelMember(e) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', f, DeclarationKind.TopLevel, null, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', f, DeclarationKind.TopLevel, null, false) listener: handleIdentifier(e, typeReference) listener: handleNoTypeArguments(f) listener: handleType(e, null) @@ -1562,7 +1562,7 @@ parseUnit(EncodingErrorToken()) listener: endMetadataStar(0) parseTopLevelMemberImpl(;) listener: beginTopLevelMember(o) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', u, DeclarationKind.TopLevel, null, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', u, DeclarationKind.TopLevel, null, false) listener: handleIdentifier(o, typeReference) listener: handleNoTypeArguments(u) listener: handleType(o, null) @@ -1582,7 +1582,7 @@ parseUnit(EncodingErrorToken()) listener: endMetadataStar(0) parseTopLevelMemberImpl(;) listener: beginTopLevelMember(n) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', d, DeclarationKind.TopLevel, null, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', d, DeclarationKind.TopLevel, null, false) listener: handleIdentifier(n, typeReference) listener: handleNoTypeArguments(d) listener: handleType(n, null) @@ -1602,7 +1602,7 @@ parseUnit(EncodingErrorToken()) listener: endMetadataStar(0) parseTopLevelMemberImpl(;) listener: beginTopLevelMember(i) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', n, DeclarationKind.TopLevel, null, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', n, DeclarationKind.TopLevel, null, false) listener: handleIdentifier(i, typeReference) listener: handleNoTypeArguments(n) listener: handleType(i, null) @@ -1622,7 +1622,7 @@ parseUnit(EncodingErrorToken()) listener: endMetadataStar(0) parseTopLevelMemberImpl(;) listener: beginTopLevelMember(t) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', h, DeclarationKind.TopLevel, null, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', h, DeclarationKind.TopLevel, null, false) listener: handleIdentifier(t, typeReference) listener: handleNoTypeArguments(h) listener: handleType(t, null) @@ -1642,7 +1642,7 @@ parseUnit(EncodingErrorToken()) listener: endMetadataStar(0) parseTopLevelMemberImpl(;) listener: beginTopLevelMember(e) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', L, DeclarationKind.TopLevel, null, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', L, DeclarationKind.TopLevel, null, false) listener: handleIdentifier(e, typeReference) listener: handleNoTypeArguments(L) listener: handleType(e, null) @@ -1662,7 +1662,7 @@ parseUnit(EncodingErrorToken()) listener: endMetadataStar(0) parseTopLevelMemberImpl(;) listener: beginTopLevelMember(I) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', C, DeclarationKind.TopLevel, null, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', C, DeclarationKind.TopLevel, null, false) listener: handleIdentifier(I, typeReference) listener: handleNoTypeArguments(C) listener: handleType(I, null) @@ -1682,7 +1682,7 @@ parseUnit(EncodingErrorToken()) listener: endMetadataStar(0) parseTopLevelMemberImpl(;) listener: beginTopLevelMember(E) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', N, DeclarationKind.TopLevel, null, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', N, DeclarationKind.TopLevel, null, false) listener: handleIdentifier(E, typeReference) listener: handleNoTypeArguments(N) listener: handleType(E, null) @@ -1748,7 +1748,7 @@ parseUnit(EncodingErrorToken()) listener: endMetadataStar(0) parseTopLevelMemberImpl(.) listener: beginTopLevelMember(m) - parseFields(., null, null, null, null, null, ., Instance of 'SimpleType', d, DeclarationKind.TopLevel, null, false) + parseFields(., null, null, null, null, null, null, ., Instance of 'SimpleType', d, DeclarationKind.TopLevel, null, false) listener: handleIdentifier(m, typeReference) listener: handleNoTypeArguments(d) listener: handleType(m, null) @@ -1768,7 +1768,7 @@ parseUnit(EncodingErrorToken()) listener: endMetadataStar(0) parseTopLevelMemberImpl(;) listener: beginTopLevelMember(f) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', i, DeclarationKind.TopLevel, null, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', i, DeclarationKind.TopLevel, null, false) listener: handleIdentifier(f, typeReference) listener: handleNoTypeArguments(i) listener: handleType(f, null) @@ -1854,7 +1854,7 @@ parseUnit(EncodingErrorToken()) listener: endMetadataStar(0) parseTopLevelMemberImpl(/) listener: beginTopLevelMember(T) - parseFields(/, null, null, null, null, null, /, Instance of 'SimpleType', h, DeclarationKind.TopLevel, null, false) + parseFields(/, null, null, null, null, null, null, /, Instance of 'SimpleType', h, DeclarationKind.TopLevel, null, false) listener: handleIdentifier(T, typeReference) listener: handleNoTypeArguments(h) listener: handleType(T, null) @@ -1874,7 +1874,7 @@ parseUnit(EncodingErrorToken()) listener: endMetadataStar(0) parseTopLevelMemberImpl(;) listener: beginTopLevelMember(i) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', s, DeclarationKind.TopLevel, null, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', s, DeclarationKind.TopLevel, null, false) listener: handleIdentifier(i, typeReference) listener: handleNoTypeArguments(s) listener: handleType(i, null) @@ -1894,7 +1894,7 @@ parseUnit(EncodingErrorToken()) listener: endMetadataStar(0) parseTopLevelMemberImpl(;) listener: beginTopLevelMember(f) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', i, DeclarationKind.TopLevel, null, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', i, DeclarationKind.TopLevel, null, false) listener: handleIdentifier(f, typeReference) listener: handleNoTypeArguments(i) listener: handleType(f, null) @@ -1914,7 +1914,7 @@ parseUnit(EncodingErrorToken()) listener: endMetadataStar(0) parseTopLevelMemberImpl(;) listener: beginTopLevelMember(l) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', e, DeclarationKind.TopLevel, null, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', e, DeclarationKind.TopLevel, null, false) listener: handleIdentifier(l, typeReference) listener: handleNoTypeArguments(e) listener: handleType(l, null) @@ -1934,7 +1934,7 @@ parseUnit(EncodingErrorToken()) listener: endMetadataStar(0) parseTopLevelMemberImpl(;) listener: beginTopLevelMember(i) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', s, DeclarationKind.TopLevel, null, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', s, DeclarationKind.TopLevel, null, false) listener: handleIdentifier(i, typeReference) listener: handleNoTypeArguments(s) listener: handleType(i, null) @@ -1954,7 +1954,7 @@ parseUnit(EncodingErrorToken()) listener: endMetadataStar(0) parseTopLevelMemberImpl(;) listener: beginTopLevelMember(s) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', a, DeclarationKind.TopLevel, null, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', a, DeclarationKind.TopLevel, null, false) listener: handleIdentifier(s, typeReference) listener: handleNoTypeArguments(a) listener: handleType(s, null) @@ -1974,7 +1974,7 @@ parseUnit(EncodingErrorToken()) listener: endMetadataStar(0) parseTopLevelMemberImpl(;) listener: beginTopLevelMember(v) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', e, DeclarationKind.TopLevel, null, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', e, DeclarationKind.TopLevel, null, false) listener: handleIdentifier(v, typeReference) listener: handleNoTypeArguments(e) listener: handleType(v, null) @@ -1994,7 +1994,7 @@ parseUnit(EncodingErrorToken()) listener: endMetadataStar(0) parseTopLevelMemberImpl(;) listener: beginTopLevelMember(d) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', a, DeclarationKind.TopLevel, null, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', a, DeclarationKind.TopLevel, null, false) listener: handleIdentifier(d, typeReference) listener: handleNoTypeArguments(a) listener: handleType(d, null) @@ -2014,7 +2014,7 @@ parseUnit(EncodingErrorToken()) listener: endMetadataStar(0) parseTopLevelMemberImpl(;) listener: beginTopLevelMember(s) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', U, DeclarationKind.TopLevel, null, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', U, DeclarationKind.TopLevel, null, false) listener: handleIdentifier(s, typeReference) listener: handleNoTypeArguments(U) listener: handleType(s, null) @@ -2034,7 +2034,7 @@ parseUnit(EncodingErrorToken()) listener: endMetadataStar(0) parseTopLevelMemberImpl(;) listener: beginTopLevelMember(T) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', F, DeclarationKind.TopLevel, null, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', F, DeclarationKind.TopLevel, null, false) listener: handleIdentifier(T, typeReference) listener: handleNoTypeArguments(F) listener: handleType(T, null) @@ -2130,7 +2130,7 @@ parseUnit(EncodingErrorToken()) listener: endMetadataStar(0) parseTopLevelMemberImpl(.) listener: beginTopLevelMember(m) - parseFields(., null, null, null, null, null, ., Instance of 'SimpleType', a, DeclarationKind.TopLevel, null, false) + parseFields(., null, null, null, null, null, null, ., Instance of 'SimpleType', a, DeclarationKind.TopLevel, null, false) listener: handleIdentifier(m, typeReference) listener: handleNoTypeArguments(a) listener: handleType(m, null) diff --git a/pkg/front_end/parser_testcases/extensions/covariant.dart.intertwined.expect b/pkg/front_end/parser_testcases/extensions/covariant.dart.intertwined.expect index 6f54ea63ff2..a6bfc1c96e5 100644 --- a/pkg/front_end/parser_testcases/extensions/covariant.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/extensions/covariant.dart.intertwined.expect @@ -82,7 +82,7 @@ parseUnit(class) listener: endMetadataStar(0) listener: beginMember() isReservedKeyword(() - parseMethod({, null, null, null, null, null, {, Instance of 'NoType', null, addChild, DeclarationKind.Extension, null, false) + parseMethod({, null, null, null, null, null, null, {, Instance of 'NoType', null, addChild, DeclarationKind.Extension, null, false) listener: beginMethod(null, null, null, null, null, addChild) listener: handleNoType({) ensureIdentifierPotentiallyRecovered({, methodDeclaration, false) diff --git a/pkg/front_end/parser_testcases/extensions/not_covariant.dart.intertwined.expect b/pkg/front_end/parser_testcases/extensions/not_covariant.dart.intertwined.expect index 309c3b2a09d..9bfe405d62a 100644 --- a/pkg/front_end/parser_testcases/extensions/not_covariant.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/extensions/not_covariant.dart.intertwined.expect @@ -82,7 +82,7 @@ parseUnit(class) listener: endMetadataStar(0) listener: beginMember() isReservedKeyword(() - parseMethod({, null, null, null, null, null, {, Instance of 'NoType', null, addChild, DeclarationKind.Extension, null, false) + parseMethod({, null, null, null, null, null, null, {, Instance of 'NoType', null, addChild, DeclarationKind.Extension, null, false) listener: beginMethod(null, null, null, null, null, addChild) listener: handleNoType({) ensureIdentifierPotentiallyRecovered({, methodDeclaration, false) diff --git a/pkg/front_end/parser_testcases/extensions/static.dart.intertwined.expect b/pkg/front_end/parser_testcases/extensions/static.dart.intertwined.expect index 8c2fff7331d..cd427aba97a 100644 --- a/pkg/front_end/parser_testcases/extensions/static.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/extensions/static.dart.intertwined.expect @@ -82,7 +82,7 @@ parseUnit(class) listener: endMetadataStar(0) listener: beginMember() isReservedKeyword(() - parseMethod({, null, static, null, null, null, static, Instance of 'NoType', null, addChild, DeclarationKind.Extension, null, false) + parseMethod({, null, null, static, null, null, null, static, Instance of 'NoType', null, addChild, DeclarationKind.Extension, null, false) listener: beginMethod(null, static, null, null, null, addChild) listener: handleNoType(static) ensureIdentifierPotentiallyRecovered(static, methodDeclaration, false) diff --git a/pkg/front_end/parser_testcases/extensions/static_covariant.dart.intertwined.expect b/pkg/front_end/parser_testcases/extensions/static_covariant.dart.intertwined.expect index e53f220b5fb..ff30f70d4be 100644 --- a/pkg/front_end/parser_testcases/extensions/static_covariant.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/extensions/static_covariant.dart.intertwined.expect @@ -82,7 +82,7 @@ parseUnit(class) listener: endMetadataStar(0) listener: beginMember() isReservedKeyword(() - parseMethod({, null, static, null, null, null, static, Instance of 'NoType', null, addChild, DeclarationKind.Extension, null, false) + parseMethod({, null, null, static, null, null, null, static, Instance of 'NoType', null, addChild, DeclarationKind.Extension, null, false) listener: beginMethod(null, static, null, null, null, addChild) listener: handleNoType(static) ensureIdentifierPotentiallyRecovered(static, methodDeclaration, false) diff --git a/pkg/front_end/parser_testcases/general/ambiguous_builder_01.dart.intertwined.expect b/pkg/front_end/parser_testcases/general/ambiguous_builder_01.dart.intertwined.expect index e4575dbd117..5f6d123c69c 100644 --- a/pkg/front_end/parser_testcases/general/ambiguous_builder_01.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/general/ambiguous_builder_01.dart.intertwined.expect @@ -54,7 +54,7 @@ parseUnit(x) parseTopLevelMemberImpl(.) listener: beginTopLevelMember(y) isReservedKeyword(=) - parseFields(., null, null, null, null, null, ., Instance of 'NoType', y, DeclarationKind.TopLevel, null, false) + parseFields(., null, null, null, null, null, null, ., Instance of 'NoType', y, DeclarationKind.TopLevel, null, false) reportRecoverableError(y, MissingConstFinalVarOrType) listener: handleRecoverableError(MissingConstFinalVarOrType, y, y) listener: handleNoType(.) @@ -123,7 +123,7 @@ parseUnit(x) parseTopLevelMemberImpl(.) listener: beginTopLevelMember(z) isReservedKeyword(=) - parseFields(., null, null, null, null, null, ., Instance of 'NoType', z, DeclarationKind.TopLevel, null, false) + parseFields(., null, null, null, null, null, null, ., Instance of 'NoType', z, DeclarationKind.TopLevel, null, false) reportRecoverableError(z, MissingConstFinalVarOrType) listener: handleRecoverableError(MissingConstFinalVarOrType, z, z) listener: handleNoType(.) diff --git a/pkg/front_end/parser_testcases/general/built_in_identifier_class_fields.dart.intertwined.expect b/pkg/front_end/parser_testcases/general/built_in_identifier_class_fields.dart.intertwined.expect index 82ec9c3c173..1e5cd132b7b 100644 --- a/pkg/front_end/parser_testcases/general/built_in_identifier_class_fields.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/general/built_in_identifier_class_fields.dart.intertwined.expect @@ -32,7 +32,7 @@ parseUnit(class) listener: beginMetadataStar(int) listener: endMetadataStar(0) listener: beginMember() - parseFields({, null, null, null, null, null, {, Instance of 'SimpleType', abstract, DeclarationKind.Class, WrapperClass, false) + parseFields({, null, null, null, null, null, null, {, Instance of 'SimpleType', abstract, DeclarationKind.Class, WrapperClass, false) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(abstract) listener: handleType(int, null) @@ -55,7 +55,7 @@ parseUnit(class) listener: beginMetadataStar(int) listener: endMetadataStar(0) listener: beginMember() - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', as, DeclarationKind.Class, WrapperClass, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', as, DeclarationKind.Class, WrapperClass, false) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(as) listener: handleType(int, null) @@ -78,7 +78,7 @@ parseUnit(class) listener: beginMetadataStar(int) listener: endMetadataStar(0) listener: beginMember() - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', covariant, DeclarationKind.Class, WrapperClass, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', covariant, DeclarationKind.Class, WrapperClass, false) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(covariant) listener: handleType(int, null) @@ -101,7 +101,7 @@ parseUnit(class) listener: beginMetadataStar(int) listener: endMetadataStar(0) listener: beginMember() - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', deferred, DeclarationKind.Class, WrapperClass, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', deferred, DeclarationKind.Class, WrapperClass, false) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(deferred) listener: handleType(int, null) @@ -124,7 +124,7 @@ parseUnit(class) listener: beginMetadataStar(int) listener: endMetadataStar(0) listener: beginMember() - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', dynamic, DeclarationKind.Class, WrapperClass, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', dynamic, DeclarationKind.Class, WrapperClass, false) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(dynamic) listener: handleType(int, null) @@ -147,7 +147,7 @@ parseUnit(class) listener: beginMetadataStar(int) listener: endMetadataStar(0) listener: beginMember() - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', export, DeclarationKind.Class, WrapperClass, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', export, DeclarationKind.Class, WrapperClass, false) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(export) listener: handleType(int, null) @@ -170,7 +170,7 @@ parseUnit(class) listener: beginMetadataStar(int) listener: endMetadataStar(0) listener: beginMember() - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', external, DeclarationKind.Class, WrapperClass, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', external, DeclarationKind.Class, WrapperClass, false) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(external) listener: handleType(int, null) @@ -193,7 +193,7 @@ parseUnit(class) listener: beginMetadataStar(int) listener: endMetadataStar(0) listener: beginMember() - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', factory, DeclarationKind.Class, WrapperClass, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', factory, DeclarationKind.Class, WrapperClass, false) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(factory) listener: handleType(int, null) @@ -216,7 +216,7 @@ parseUnit(class) listener: beginMetadataStar(int) listener: endMetadataStar(0) listener: beginMember() - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', Function, DeclarationKind.Class, WrapperClass, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', Function, DeclarationKind.Class, WrapperClass, false) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(Function) listener: handleType(int, null) @@ -240,7 +240,7 @@ parseUnit(class) listener: endMetadataStar(0) listener: beginMember() isReservedKeyword(=) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', get, DeclarationKind.Class, WrapperClass, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', get, DeclarationKind.Class, WrapperClass, false) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(get) listener: handleType(int, null) @@ -263,7 +263,7 @@ parseUnit(class) listener: beginMetadataStar(int) listener: endMetadataStar(0) listener: beginMember() - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', implements, DeclarationKind.Class, WrapperClass, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', implements, DeclarationKind.Class, WrapperClass, false) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(implements) listener: handleType(int, null) @@ -286,7 +286,7 @@ parseUnit(class) listener: beginMetadataStar(int) listener: endMetadataStar(0) listener: beginMember() - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', import, DeclarationKind.Class, WrapperClass, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', import, DeclarationKind.Class, WrapperClass, false) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(import) listener: handleType(int, null) @@ -309,7 +309,7 @@ parseUnit(class) listener: beginMetadataStar(int) listener: endMetadataStar(0) listener: beginMember() - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', interface, DeclarationKind.Class, WrapperClass, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', interface, DeclarationKind.Class, WrapperClass, false) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(interface) listener: handleType(int, null) @@ -332,7 +332,7 @@ parseUnit(class) listener: beginMetadataStar(int) listener: endMetadataStar(0) listener: beginMember() - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', library, DeclarationKind.Class, WrapperClass, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', library, DeclarationKind.Class, WrapperClass, false) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(library) listener: handleType(int, null) @@ -356,7 +356,7 @@ parseUnit(class) listener: endMetadataStar(0) listener: beginMember() isUnaryMinus(=) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', operator, DeclarationKind.Class, WrapperClass, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', operator, DeclarationKind.Class, WrapperClass, false) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(operator) listener: handleType(int, null) @@ -379,7 +379,7 @@ parseUnit(class) listener: beginMetadataStar(int) listener: endMetadataStar(0) listener: beginMember() - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', mixin, DeclarationKind.Class, WrapperClass, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', mixin, DeclarationKind.Class, WrapperClass, false) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(mixin) listener: handleType(int, null) @@ -402,7 +402,7 @@ parseUnit(class) listener: beginMetadataStar(int) listener: endMetadataStar(0) listener: beginMember() - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', part, DeclarationKind.Class, WrapperClass, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', part, DeclarationKind.Class, WrapperClass, false) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(part) listener: handleType(int, null) @@ -426,7 +426,7 @@ parseUnit(class) listener: endMetadataStar(0) listener: beginMember() isReservedKeyword(=) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', set, DeclarationKind.Class, WrapperClass, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', set, DeclarationKind.Class, WrapperClass, false) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(set) listener: handleType(int, null) @@ -449,7 +449,7 @@ parseUnit(class) listener: beginMetadataStar(int) listener: endMetadataStar(0) listener: beginMember() - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', static, DeclarationKind.Class, WrapperClass, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', static, DeclarationKind.Class, WrapperClass, false) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(static) listener: handleType(int, null) @@ -472,7 +472,7 @@ parseUnit(class) listener: beginMetadataStar(int) listener: endMetadataStar(0) listener: beginMember() - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', typedef, DeclarationKind.Class, WrapperClass, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', typedef, DeclarationKind.Class, WrapperClass, false) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(typedef) listener: handleType(int, null) diff --git a/pkg/front_end/parser_testcases/general/built_in_identifier_class_methods.dart.intertwined.expect b/pkg/front_end/parser_testcases/general/built_in_identifier_class_methods.dart.intertwined.expect index 70d5893d491..b7770f9547f 100644 --- a/pkg/front_end/parser_testcases/general/built_in_identifier_class_methods.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/general/built_in_identifier_class_methods.dart.intertwined.expect @@ -32,7 +32,7 @@ parseUnit(class) listener: beginMetadataStar(int) listener: endMetadataStar(0) listener: beginMember() - parseMethod({, null, null, null, null, null, {, Instance of 'SimpleType', null, abstract, DeclarationKind.Class, WrapperClass, false) + parseMethod({, null, null, null, null, null, null, {, Instance of 'SimpleType', null, abstract, DeclarationKind.Class, WrapperClass, false) listener: beginMethod(null, null, null, null, null, abstract) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(abstract) @@ -166,7 +166,7 @@ parseUnit(class) listener: beginMetadataStar(int) listener: endMetadataStar(0) listener: beginMember() - parseMethod(}, null, null, null, null, null, }, Instance of 'SimpleType', null, as, DeclarationKind.Class, WrapperClass, false) + parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', null, as, DeclarationKind.Class, WrapperClass, false) listener: beginMethod(null, null, null, null, null, as) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(as) @@ -300,7 +300,7 @@ parseUnit(class) listener: beginMetadataStar(int) listener: endMetadataStar(0) listener: beginMember() - parseMethod(}, null, null, null, null, null, }, Instance of 'SimpleType', null, covariant, DeclarationKind.Class, WrapperClass, false) + parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', null, covariant, DeclarationKind.Class, WrapperClass, false) listener: beginMethod(null, null, null, null, null, covariant) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(covariant) @@ -434,7 +434,7 @@ parseUnit(class) listener: beginMetadataStar(int) listener: endMetadataStar(0) listener: beginMember() - parseMethod(}, null, null, null, null, null, }, Instance of 'SimpleType', null, deferred, DeclarationKind.Class, WrapperClass, false) + parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', null, deferred, DeclarationKind.Class, WrapperClass, false) listener: beginMethod(null, null, null, null, null, deferred) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(deferred) @@ -568,7 +568,7 @@ parseUnit(class) listener: beginMetadataStar(int) listener: endMetadataStar(0) listener: beginMember() - parseMethod(}, null, null, null, null, null, }, Instance of 'SimpleType', null, dynamic, DeclarationKind.Class, WrapperClass, false) + parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', null, dynamic, DeclarationKind.Class, WrapperClass, false) listener: beginMethod(null, null, null, null, null, dynamic) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(dynamic) @@ -702,7 +702,7 @@ parseUnit(class) listener: beginMetadataStar(int) listener: endMetadataStar(0) listener: beginMember() - parseMethod(}, null, null, null, null, null, }, Instance of 'SimpleType', null, export, DeclarationKind.Class, WrapperClass, false) + parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', null, export, DeclarationKind.Class, WrapperClass, false) listener: beginMethod(null, null, null, null, null, export) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(export) @@ -836,7 +836,7 @@ parseUnit(class) listener: beginMetadataStar(int) listener: endMetadataStar(0) listener: beginMember() - parseMethod(}, null, null, null, null, null, }, Instance of 'SimpleType', null, external, DeclarationKind.Class, WrapperClass, false) + parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', null, external, DeclarationKind.Class, WrapperClass, false) listener: beginMethod(null, null, null, null, null, external) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(external) @@ -970,7 +970,7 @@ parseUnit(class) listener: beginMetadataStar(int) listener: endMetadataStar(0) listener: beginMember() - parseMethod(}, null, null, null, null, null, }, Instance of 'SimpleType', null, factory, DeclarationKind.Class, WrapperClass, false) + parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', null, factory, DeclarationKind.Class, WrapperClass, false) listener: beginMethod(null, null, null, null, null, factory) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(factory) @@ -1104,7 +1104,7 @@ parseUnit(class) listener: beginMetadataStar(int) listener: endMetadataStar(0) listener: beginMember() - parseMethod(}, null, null, null, null, null, }, Instance of 'SimpleType', null, Function, DeclarationKind.Class, WrapperClass, false) + parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', null, Function, DeclarationKind.Class, WrapperClass, false) listener: beginMethod(null, null, null, null, null, Function) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(Function) @@ -1239,7 +1239,7 @@ parseUnit(class) listener: endMetadataStar(0) listener: beginMember() isReservedKeyword(() - parseMethod(}, null, null, null, null, null, }, Instance of 'SimpleType', null, get, DeclarationKind.Class, WrapperClass, false) + parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', null, get, DeclarationKind.Class, WrapperClass, false) listener: beginMethod(null, null, null, null, null, get) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(get) @@ -1373,7 +1373,7 @@ parseUnit(class) listener: beginMetadataStar(int) listener: endMetadataStar(0) listener: beginMember() - parseMethod(}, null, null, null, null, null, }, Instance of 'SimpleType', null, implements, DeclarationKind.Class, WrapperClass, false) + parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', null, implements, DeclarationKind.Class, WrapperClass, false) listener: beginMethod(null, null, null, null, null, implements) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(implements) @@ -1507,7 +1507,7 @@ parseUnit(class) listener: beginMetadataStar(int) listener: endMetadataStar(0) listener: beginMember() - parseMethod(}, null, null, null, null, null, }, Instance of 'SimpleType', null, import, DeclarationKind.Class, WrapperClass, false) + parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', null, import, DeclarationKind.Class, WrapperClass, false) listener: beginMethod(null, null, null, null, null, import) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(import) @@ -1641,7 +1641,7 @@ parseUnit(class) listener: beginMetadataStar(int) listener: endMetadataStar(0) listener: beginMember() - parseMethod(}, null, null, null, null, null, }, Instance of 'SimpleType', null, interface, DeclarationKind.Class, WrapperClass, false) + parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', null, interface, DeclarationKind.Class, WrapperClass, false) listener: beginMethod(null, null, null, null, null, interface) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(interface) @@ -1775,7 +1775,7 @@ parseUnit(class) listener: beginMetadataStar(int) listener: endMetadataStar(0) listener: beginMember() - parseMethod(}, null, null, null, null, null, }, Instance of 'SimpleType', null, library, DeclarationKind.Class, WrapperClass, false) + parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', null, library, DeclarationKind.Class, WrapperClass, false) listener: beginMethod(null, null, null, null, null, library) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(library) @@ -1910,7 +1910,7 @@ parseUnit(class) listener: endMetadataStar(0) listener: beginMember() isUnaryMinus(() - parseMethod(}, null, null, null, null, null, }, Instance of 'SimpleType', null, operator, DeclarationKind.Class, WrapperClass, false) + parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', null, operator, DeclarationKind.Class, WrapperClass, false) isUnaryMinus(() listener: beginMethod(null, null, null, null, null, operator) listener: handleIdentifier(int, typeReference) @@ -2045,7 +2045,7 @@ parseUnit(class) listener: beginMetadataStar(int) listener: endMetadataStar(0) listener: beginMember() - parseMethod(}, null, null, null, null, null, }, Instance of 'SimpleType', null, mixin, DeclarationKind.Class, WrapperClass, false) + parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', null, mixin, DeclarationKind.Class, WrapperClass, false) listener: beginMethod(null, null, null, null, null, mixin) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(mixin) @@ -2179,7 +2179,7 @@ parseUnit(class) listener: beginMetadataStar(int) listener: endMetadataStar(0) listener: beginMember() - parseMethod(}, null, null, null, null, null, }, Instance of 'SimpleType', null, part, DeclarationKind.Class, WrapperClass, false) + parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', null, part, DeclarationKind.Class, WrapperClass, false) listener: beginMethod(null, null, null, null, null, part) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(part) @@ -2314,7 +2314,7 @@ parseUnit(class) listener: endMetadataStar(0) listener: beginMember() isReservedKeyword(() - parseMethod(}, null, null, null, null, null, }, Instance of 'SimpleType', null, set, DeclarationKind.Class, WrapperClass, false) + parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', null, set, DeclarationKind.Class, WrapperClass, false) listener: beginMethod(null, null, null, null, null, set) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(set) @@ -2448,7 +2448,7 @@ parseUnit(class) listener: beginMetadataStar(int) listener: endMetadataStar(0) listener: beginMember() - parseMethod(}, null, null, null, null, null, }, Instance of 'SimpleType', null, static, DeclarationKind.Class, WrapperClass, false) + parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', null, static, DeclarationKind.Class, WrapperClass, false) listener: beginMethod(null, null, null, null, null, static) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(static) @@ -2582,7 +2582,7 @@ parseUnit(class) listener: beginMetadataStar(int) listener: endMetadataStar(0) listener: beginMember() - parseMethod(}, null, null, null, null, null, }, Instance of 'SimpleType', null, typedef, DeclarationKind.Class, WrapperClass, false) + parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', null, typedef, DeclarationKind.Class, WrapperClass, false) listener: beginMethod(null, null, null, null, null, typedef) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(typedef) diff --git a/pkg/front_end/parser_testcases/general/built_in_identifier_top_level_fields.dart.intertwined.expect b/pkg/front_end/parser_testcases/general/built_in_identifier_top_level_fields.dart.intertwined.expect index 33c529acb30..88907bac924 100644 --- a/pkg/front_end/parser_testcases/general/built_in_identifier_top_level_fields.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/general/built_in_identifier_top_level_fields.dart.intertwined.expect @@ -8,7 +8,7 @@ parseUnit(int) listener: endMetadataStar(0) parseTopLevelMemberImpl() listener: beginTopLevelMember(int) - parseFields(, null, null, null, null, null, , Instance of 'SimpleType', abstract, DeclarationKind.TopLevel, null, false) + parseFields(, null, null, null, null, null, null, , Instance of 'SimpleType', abstract, DeclarationKind.TopLevel, null, false) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(abstract) listener: handleType(int, null) @@ -31,7 +31,7 @@ parseUnit(int) listener: endMetadataStar(0) parseTopLevelMemberImpl(;) listener: beginTopLevelMember(int) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', as, DeclarationKind.TopLevel, null, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', as, DeclarationKind.TopLevel, null, false) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(as) listener: handleType(int, null) @@ -54,7 +54,7 @@ parseUnit(int) listener: endMetadataStar(0) parseTopLevelMemberImpl(;) listener: beginTopLevelMember(int) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', covariant, DeclarationKind.TopLevel, null, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', covariant, DeclarationKind.TopLevel, null, false) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(covariant) listener: handleType(int, null) @@ -77,7 +77,7 @@ parseUnit(int) listener: endMetadataStar(0) parseTopLevelMemberImpl(;) listener: beginTopLevelMember(int) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', deferred, DeclarationKind.TopLevel, null, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', deferred, DeclarationKind.TopLevel, null, false) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(deferred) listener: handleType(int, null) @@ -100,7 +100,7 @@ parseUnit(int) listener: endMetadataStar(0) parseTopLevelMemberImpl(;) listener: beginTopLevelMember(int) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', dynamic, DeclarationKind.TopLevel, null, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', dynamic, DeclarationKind.TopLevel, null, false) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(dynamic) listener: handleType(int, null) @@ -123,7 +123,7 @@ parseUnit(int) listener: endMetadataStar(0) parseTopLevelMemberImpl(;) listener: beginTopLevelMember(int) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', export, DeclarationKind.TopLevel, null, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', export, DeclarationKind.TopLevel, null, false) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(export) listener: handleType(int, null) @@ -146,7 +146,7 @@ parseUnit(int) listener: endMetadataStar(0) parseTopLevelMemberImpl(;) listener: beginTopLevelMember(int) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', external, DeclarationKind.TopLevel, null, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', external, DeclarationKind.TopLevel, null, false) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(external) listener: handleType(int, null) @@ -169,7 +169,7 @@ parseUnit(int) listener: endMetadataStar(0) parseTopLevelMemberImpl(;) listener: beginTopLevelMember(int) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', factory, DeclarationKind.TopLevel, null, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', factory, DeclarationKind.TopLevel, null, false) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(factory) listener: handleType(int, null) @@ -192,7 +192,7 @@ parseUnit(int) listener: endMetadataStar(0) parseTopLevelMemberImpl(;) listener: beginTopLevelMember(int) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', Function, DeclarationKind.TopLevel, null, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', Function, DeclarationKind.TopLevel, null, false) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(Function) listener: handleType(int, null) @@ -215,7 +215,7 @@ parseUnit(int) listener: endMetadataStar(0) parseTopLevelMemberImpl(;) listener: beginTopLevelMember(int) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', get, DeclarationKind.TopLevel, null, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', get, DeclarationKind.TopLevel, null, false) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(get) listener: handleType(int, null) @@ -238,7 +238,7 @@ parseUnit(int) listener: endMetadataStar(0) parseTopLevelMemberImpl(;) listener: beginTopLevelMember(int) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', implements, DeclarationKind.TopLevel, null, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', implements, DeclarationKind.TopLevel, null, false) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(implements) listener: handleType(int, null) @@ -261,7 +261,7 @@ parseUnit(int) listener: endMetadataStar(0) parseTopLevelMemberImpl(;) listener: beginTopLevelMember(int) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', import, DeclarationKind.TopLevel, null, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', import, DeclarationKind.TopLevel, null, false) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(import) listener: handleType(int, null) @@ -284,7 +284,7 @@ parseUnit(int) listener: endMetadataStar(0) parseTopLevelMemberImpl(;) listener: beginTopLevelMember(int) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', interface, DeclarationKind.TopLevel, null, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', interface, DeclarationKind.TopLevel, null, false) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(interface) listener: handleType(int, null) @@ -307,7 +307,7 @@ parseUnit(int) listener: endMetadataStar(0) parseTopLevelMemberImpl(;) listener: beginTopLevelMember(int) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', library, DeclarationKind.TopLevel, null, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', library, DeclarationKind.TopLevel, null, false) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(library) listener: handleType(int, null) @@ -330,7 +330,7 @@ parseUnit(int) listener: endMetadataStar(0) parseTopLevelMemberImpl(;) listener: beginTopLevelMember(int) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', operator, DeclarationKind.TopLevel, null, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', operator, DeclarationKind.TopLevel, null, false) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(operator) listener: handleType(int, null) @@ -353,7 +353,7 @@ parseUnit(int) listener: endMetadataStar(0) parseTopLevelMemberImpl(;) listener: beginTopLevelMember(int) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', mixin, DeclarationKind.TopLevel, null, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', mixin, DeclarationKind.TopLevel, null, false) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(mixin) listener: handleType(int, null) @@ -376,7 +376,7 @@ parseUnit(int) listener: endMetadataStar(0) parseTopLevelMemberImpl(;) listener: beginTopLevelMember(int) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', part, DeclarationKind.TopLevel, null, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', part, DeclarationKind.TopLevel, null, false) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(part) listener: handleType(int, null) @@ -399,7 +399,7 @@ parseUnit(int) listener: endMetadataStar(0) parseTopLevelMemberImpl(;) listener: beginTopLevelMember(int) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', set, DeclarationKind.TopLevel, null, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', set, DeclarationKind.TopLevel, null, false) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(set) listener: handleType(int, null) @@ -422,7 +422,7 @@ parseUnit(int) listener: endMetadataStar(0) parseTopLevelMemberImpl(;) listener: beginTopLevelMember(int) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', static, DeclarationKind.TopLevel, null, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', static, DeclarationKind.TopLevel, null, false) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(static) listener: handleType(int, null) @@ -445,7 +445,7 @@ parseUnit(int) listener: endMetadataStar(0) parseTopLevelMemberImpl(;) listener: beginTopLevelMember(int) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', typedef, DeclarationKind.TopLevel, null, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', typedef, DeclarationKind.TopLevel, null, false) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(typedef) listener: handleType(int, null) diff --git a/pkg/front_end/parser_testcases/general/issue_41121.dart.intertwined.expect b/pkg/front_end/parser_testcases/general/issue_41121.dart.intertwined.expect index af39092688d..8aace526ebf 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 @@ -32,7 +32,7 @@ parseUnit(class) listener: beginMetadataStar(Configuration) listener: endMetadataStar(0) listener: beginMember() - parseFields({, null, null, null, null, null, {, Instance of 'SimpleType', _configuration, DeclarationKind.Class, ConfigurationService, false) + parseFields({, null, null, null, null, null, null, {, Instance of 'SimpleType', _configuration, DeclarationKind.Class, ConfigurationService, false) listener: handleIdentifier(Configuration, typeReference) listener: handleNoTypeArguments(_configuration) listener: handleType(Configuration, null) @@ -49,7 +49,7 @@ parseUnit(class) listener: endMetadataStar(0) listener: beginMember() isReservedKeyword(() - parseMethod(;, null, null, null, null, null, ;, Instance of 'NoType', null, ConfigurationService, DeclarationKind.Class, ConfigurationService, false) + parseMethod(;, null, null, null, null, null, null, ;, Instance of 'NoType', null, ConfigurationService, DeclarationKind.Class, ConfigurationService, false) listener: beginMethod(null, null, null, null, null, ConfigurationService) listener: handleNoType(;) ensureIdentifierPotentiallyRecovered(;, methodDeclaration, false) @@ -147,7 +147,7 @@ parseUnit(class) listener: beginMetadataStar(void) listener: endMetadataStar(0) listener: beginMember() - parseMethod(}, null, null, null, null, null, }, Instance of 'VoidType', set, configuration, DeclarationKind.Class, ConfigurationService, false) + parseMethod(}, null, null, null, null, null, null, }, Instance of 'VoidType', set, configuration, DeclarationKind.Class, ConfigurationService, false) listener: beginMethod(null, null, null, null, set, configuration) listener: handleVoidKeyword(void) ensureIdentifierPotentiallyRecovered(set, methodDeclaration, false) @@ -251,7 +251,7 @@ parseUnit(class) listener: beginMetadataStar(Configuration) listener: endMetadataStar(0) listener: beginMember() - parseMethod(}, null, null, null, null, null, }, Instance of 'SimpleType', get, configuration, DeclarationKind.Class, ConfigurationService, false) + parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', get, configuration, DeclarationKind.Class, ConfigurationService, false) listener: beginMethod(null, null, null, null, get, configuration) listener: handleIdentifier(Configuration, typeReference) listener: handleNoTypeArguments(get) @@ -378,7 +378,7 @@ parseUnit(class) listener: beginMetadataStar(void) listener: endMetadataStar(0) listener: beginMember() - parseMethod(}, null, null, null, null, null, }, Instance of 'VoidType', null, method, DeclarationKind.Class, ConfigurationService, false) + parseMethod(}, null, null, null, null, null, null, }, Instance of 'VoidType', null, method, DeclarationKind.Class, ConfigurationService, false) listener: beginMethod(null, null, null, null, null, method) listener: handleVoidKeyword(void) ensureIdentifierPotentiallyRecovered(void, methodDeclaration, false) @@ -438,7 +438,7 @@ parseUnit(class) listener: endMetadataStar(0) listener: beginMember() isReservedKeyword(() - parseMethod(}, null, null, null, null, null, }, Instance of 'NoType', null, Foo, DeclarationKind.Class, ConfigurationService, false) + parseMethod(}, null, null, null, null, null, null, }, Instance of 'NoType', null, Foo, DeclarationKind.Class, ConfigurationService, false) listener: beginMethod(null, null, null, null, null, Foo) listener: handleNoType(}) ensureIdentifierPotentiallyRecovered(}, methodDeclaration, false) @@ -523,7 +523,7 @@ parseUnit(class) listener: beginMetadataStar(Configuration) listener: endMetadataStar(0) listener: beginMember() - parseMethod({, null, null, null, null, null, {, Instance of 'SimpleType', get, foo, DeclarationKind.Class, Configuration, false) + parseMethod({, null, null, null, null, null, null, {, Instance of 'SimpleType', get, foo, DeclarationKind.Class, Configuration, false) listener: beginMethod(null, null, null, null, get, foo) listener: handleIdentifier(Configuration, typeReference) listener: handleNoTypeArguments(get) 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 0f64958f87d..beab6b78c97 100644 --- a/pkg/front_end/parser_testcases/general/operator_hat_class.crash_dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/general/operator_hat_class.crash_dart.intertwined.expect @@ -34,7 +34,7 @@ parseUnit(class) listener: beginMetadataStar(operator) listener: endMetadataStar(0) listener: beginMember() - parseMethod({, null, null, null, null, null, {, Instance of 'NoType', null, operator, DeclarationKind.Class, operator, false) + parseMethod({, null, null, null, null, null, null, {, Instance of 'NoType', null, operator, DeclarationKind.Class, operator, false) listener: beginMethod(null, null, null, null, null, operator) listener: handleNoType({) parseOperatorName({) diff --git a/pkg/front_end/parser_testcases/nnbd/issue_39723.dart.intertwined.expect b/pkg/front_end/parser_testcases/nnbd/issue_39723.dart.intertwined.expect index 8ae8297c60e..183b2378f50 100644 --- a/pkg/front_end/parser_testcases/nnbd/issue_39723.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/nnbd/issue_39723.dart.intertwined.expect @@ -32,7 +32,7 @@ parseUnit(class) listener: beginMetadataStar(operator) listener: endMetadataStar(0) listener: beginMember() - parseMethod({, null, null, null, null, null, {, Instance of 'NoType', null, operator, DeclarationKind.Class, A, false) + parseMethod({, null, null, null, null, null, null, {, Instance of 'NoType', null, operator, DeclarationKind.Class, A, false) listener: beginMethod(null, null, null, null, null, operator) listener: handleNoType({) parseOperatorName({) diff --git a/pkg/front_end/parser_testcases/nnbd/issue_39723_prime.dart.intertwined.expect b/pkg/front_end/parser_testcases/nnbd/issue_39723_prime.dart.intertwined.expect index 2c432719ed5..3af839317d6 100644 --- a/pkg/front_end/parser_testcases/nnbd/issue_39723_prime.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/nnbd/issue_39723_prime.dart.intertwined.expect @@ -32,7 +32,7 @@ parseUnit(class) listener: beginMetadataStar(operator) listener: endMetadataStar(0) listener: beginMember() - parseMethod({, null, null, null, null, null, {, Instance of 'NoType', null, operator, DeclarationKind.Class, A, false) + parseMethod({, null, null, null, null, null, null, {, Instance of 'NoType', null, operator, DeclarationKind.Class, A, false) listener: beginMethod(null, null, null, null, null, operator) listener: handleNoType({) parseOperatorName({) diff --git a/pkg/front_end/parser_testcases/nnbd/issue_39858.dart.intertwined.expect b/pkg/front_end/parser_testcases/nnbd/issue_39858.dart.intertwined.expect index f4f808b25cb..1daa4b75a75 100644 --- a/pkg/front_end/parser_testcases/nnbd/issue_39858.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/nnbd/issue_39858.dart.intertwined.expect @@ -33,7 +33,7 @@ parseUnit(class) listener: endMetadataStar(0) listener: beginMember() isReservedKeyword(;) - parseFields({, null, null, null, late, null, late, Instance of 'NoType', x1, DeclarationKind.Class, X, false) + parseFields({, null, null, null, null, late, null, late, Instance of 'NoType', x1, DeclarationKind.Class, X, false) reportRecoverableError(x1, MissingConstFinalVarOrType) listener: handleRecoverableError(MissingConstFinalVarOrType, x1, x1) listener: handleNoType(late) @@ -50,7 +50,7 @@ parseUnit(class) listener: endMetadataStar(0) listener: beginMember() isReservedKeyword(;) - parseFields(;, null, static, null, late, null, late, Instance of 'NoType', x2, DeclarationKind.Class, X, false) + parseFields(;, null, null, static, null, late, null, late, Instance of 'NoType', x2, DeclarationKind.Class, X, false) reportRecoverableError(x2, MissingConstFinalVarOrType) listener: handleRecoverableError(MissingConstFinalVarOrType, x2, x2) listener: handleNoType(late) @@ -67,7 +67,7 @@ parseUnit(class) listener: endMetadataStar(0) listener: beginMember() isReservedKeyword(;) - parseFields(;, null, null, covariant, late, null, late, Instance of 'NoType', x3, DeclarationKind.Class, X, false) + parseFields(;, null, null, null, covariant, late, null, late, Instance of 'NoType', x3, DeclarationKind.Class, X, false) reportRecoverableError(x3, MissingConstFinalVarOrType) listener: handleRecoverableError(MissingConstFinalVarOrType, x3, x3) listener: handleNoType(late) @@ -84,7 +84,7 @@ parseUnit(class) listener: endMetadataStar(0) listener: beginMember() isReservedKeyword(=) - parseFields(;, null, null, null, late, null, late, Instance of 'NoType', x4, DeclarationKind.Class, X, false) + parseFields(;, null, null, null, null, late, null, late, Instance of 'NoType', x4, DeclarationKind.Class, X, false) reportRecoverableError(x4, MissingConstFinalVarOrType) listener: handleRecoverableError(MissingConstFinalVarOrType, x4, x4) listener: handleNoType(late) @@ -108,7 +108,7 @@ parseUnit(class) listener: endMetadataStar(0) listener: beginMember() isReservedKeyword(=) - parseFields(;, null, static, null, late, null, late, Instance of 'NoType', x5, DeclarationKind.Class, X, false) + parseFields(;, null, null, static, null, late, null, late, Instance of 'NoType', x5, DeclarationKind.Class, X, false) reportRecoverableError(x5, MissingConstFinalVarOrType) listener: handleRecoverableError(MissingConstFinalVarOrType, x5, x5) listener: handleNoType(late) @@ -132,7 +132,7 @@ parseUnit(class) listener: endMetadataStar(0) listener: beginMember() isReservedKeyword(=) - parseFields(;, null, null, covariant, late, null, late, Instance of 'NoType', x6, DeclarationKind.Class, X, false) + parseFields(;, null, null, null, covariant, late, null, late, Instance of 'NoType', x6, DeclarationKind.Class, X, false) reportRecoverableError(x6, MissingConstFinalVarOrType) listener: handleRecoverableError(MissingConstFinalVarOrType, x6, x6) listener: handleNoType(late) diff --git a/pkg/front_end/parser_testcases/nnbd/issue_39858_prime1.dart.intertwined.expect b/pkg/front_end/parser_testcases/nnbd/issue_39858_prime1.dart.intertwined.expect index d224ea7e779..ede2d2e77a1 100644 --- a/pkg/front_end/parser_testcases/nnbd/issue_39858_prime1.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/nnbd/issue_39858_prime1.dart.intertwined.expect @@ -32,7 +32,7 @@ parseUnit(class) listener: beginMetadataStar(var) listener: endMetadataStar(0) listener: beginMember() - parseFields({, null, null, null, null, var, var, Instance of 'NoType', x1, DeclarationKind.Class, X, false) + parseFields({, null, null, null, null, null, var, var, Instance of 'NoType', x1, DeclarationKind.Class, X, false) listener: handleNoType(var) ensureIdentifierPotentiallyRecovered(var, fieldDeclaration, false) listener: handleIdentifier(x1, fieldDeclaration) @@ -46,7 +46,7 @@ parseUnit(class) listener: beginMetadataStar(static) listener: endMetadataStar(0) listener: beginMember() - parseFields(;, null, static, null, null, var, var, Instance of 'NoType', x2, DeclarationKind.Class, X, false) + parseFields(;, null, null, static, null, null, var, var, Instance of 'NoType', x2, DeclarationKind.Class, X, false) listener: handleNoType(var) ensureIdentifierPotentiallyRecovered(var, fieldDeclaration, false) listener: handleIdentifier(x2, fieldDeclaration) @@ -60,7 +60,7 @@ parseUnit(class) listener: beginMetadataStar(covariant) listener: endMetadataStar(0) listener: beginMember() - parseFields(;, null, null, covariant, null, var, var, Instance of 'NoType', x3, DeclarationKind.Class, X, false) + parseFields(;, null, null, null, covariant, null, var, var, Instance of 'NoType', x3, DeclarationKind.Class, X, false) listener: handleNoType(var) ensureIdentifierPotentiallyRecovered(var, fieldDeclaration, false) listener: handleIdentifier(x3, fieldDeclaration) @@ -74,7 +74,7 @@ parseUnit(class) listener: beginMetadataStar(var) listener: endMetadataStar(0) listener: beginMember() - parseFields(;, null, null, null, null, var, var, Instance of 'NoType', x4, DeclarationKind.Class, X, false) + parseFields(;, null, null, null, null, null, var, var, Instance of 'NoType', x4, DeclarationKind.Class, X, false) listener: handleNoType(var) ensureIdentifierPotentiallyRecovered(var, fieldDeclaration, false) listener: handleIdentifier(x4, fieldDeclaration) @@ -95,7 +95,7 @@ parseUnit(class) listener: beginMetadataStar(static) listener: endMetadataStar(0) listener: beginMember() - parseFields(;, null, static, null, null, var, var, Instance of 'NoType', x5, DeclarationKind.Class, X, false) + parseFields(;, null, null, static, null, null, var, var, Instance of 'NoType', x5, DeclarationKind.Class, X, false) listener: handleNoType(var) ensureIdentifierPotentiallyRecovered(var, fieldDeclaration, false) listener: handleIdentifier(x5, fieldDeclaration) @@ -116,7 +116,7 @@ parseUnit(class) listener: beginMetadataStar(covariant) listener: endMetadataStar(0) listener: beginMember() - parseFields(;, null, null, covariant, null, var, var, Instance of 'NoType', x6, DeclarationKind.Class, X, false) + parseFields(;, null, null, null, covariant, null, var, var, Instance of 'NoType', x6, DeclarationKind.Class, X, false) listener: handleNoType(var) ensureIdentifierPotentiallyRecovered(var, fieldDeclaration, false) listener: handleIdentifier(x6, fieldDeclaration) diff --git a/pkg/front_end/parser_testcases/nnbd/issue_40805_01.dart.intertwined.expect b/pkg/front_end/parser_testcases/nnbd/issue_40805_01.dart.intertwined.expect index d815fea64ed..f0f981bc3fa 100644 --- a/pkg/front_end/parser_testcases/nnbd/issue_40805_01.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/nnbd/issue_40805_01.dart.intertwined.expect @@ -32,7 +32,7 @@ parseUnit(class) listener: beginMetadataStar(covariant) listener: endMetadataStar(0) listener: beginMember() - parseFields({, null, null, covariant, late, final, final, Instance of 'SimpleType', x, DeclarationKind.Class, C, false) + parseFields({, null, null, null, covariant, late, final, final, Instance of 'SimpleType', x, DeclarationKind.Class, C, false) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(x) listener: handleType(int, null) diff --git a/pkg/front_end/parser_testcases/nnbd/issue_40805_02.dart.intertwined.expect b/pkg/front_end/parser_testcases/nnbd/issue_40805_02.dart.intertwined.expect index ca8c3f6969f..085de55b120 100644 --- a/pkg/front_end/parser_testcases/nnbd/issue_40805_02.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/nnbd/issue_40805_02.dart.intertwined.expect @@ -32,7 +32,7 @@ parseUnit(class) listener: beginMetadataStar(covariant) listener: endMetadataStar(0) listener: beginMember() - parseFields({, null, null, covariant, late, final, final, Instance of 'SimpleType', x, DeclarationKind.Class, C, false) + parseFields({, null, null, null, covariant, late, final, final, Instance of 'SimpleType', x, DeclarationKind.Class, C, false) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(x) listener: handleType(int, null) diff --git a/pkg/front_end/parser_testcases/nnbd/issue_40805_03.dart.intertwined.expect b/pkg/front_end/parser_testcases/nnbd/issue_40805_03.dart.intertwined.expect index 9854745a1de..d1c1d0f8bf3 100644 --- a/pkg/front_end/parser_testcases/nnbd/issue_40805_03.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/nnbd/issue_40805_03.dart.intertwined.expect @@ -32,7 +32,7 @@ parseUnit(class) listener: beginMetadataStar(covariant) listener: endMetadataStar(0) listener: beginMember() - parseFields({, null, null, covariant, null, final, final, Instance of 'SimpleType', x, DeclarationKind.Class, C, false) + parseFields({, null, null, null, covariant, null, final, final, Instance of 'SimpleType', x, DeclarationKind.Class, C, false) reportRecoverableError(covariant, FinalAndCovariant) listener: handleRecoverableError(FinalAndCovariant, covariant, covariant) listener: handleIdentifier(int, typeReference) 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 3f329b4cd1f..75f44cb8a4c 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 @@ -32,7 +32,7 @@ parseUnit(class) listener: beginMetadataStar(String) listener: endMetadataStar(0) listener: beginMember() - parseFields({, null, null, null, null, null, {, Instance of 'SimpleNullableType', x, DeclarationKind.Class, Foo, false) + parseFields({, null, null, null, null, null, null, {, Instance of 'SimpleNullableType', x, DeclarationKind.Class, Foo, false) listener: handleIdentifier(String, typeReference) listener: handleNoTypeArguments(?) listener: handleType(String, ?) @@ -48,7 +48,7 @@ parseUnit(class) listener: beginMetadataStar(int) listener: endMetadataStar(0) listener: beginMember() - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', y, DeclarationKind.Class, Foo, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', y, DeclarationKind.Class, Foo, false) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(y) listener: handleType(int, null) @@ -65,7 +65,7 @@ parseUnit(class) listener: endMetadataStar(0) listener: beginMember() isReservedKeyword(() - parseMethod(;, null, null, null, null, null, ;, Instance of 'NoType', null, Foo, DeclarationKind.Class, Foo, false) + parseMethod(;, null, null, null, null, null, null, ;, Instance of 'NoType', null, Foo, DeclarationKind.Class, Foo, false) listener: beginMethod(null, null, null, null, null, Foo) listener: handleNoType(;) ensureIdentifierPotentiallyRecovered(;, methodDeclaration, false) @@ -168,7 +168,7 @@ parseUnit(class) listener: endMetadataStar(0) listener: beginMember() isReservedKeyword(.) - parseMethod(;, null, null, null, null, null, ;, Instance of 'NoType', null, Foo, DeclarationKind.Class, Foo, false) + parseMethod(;, null, null, null, null, null, null, ;, Instance of 'NoType', null, Foo, DeclarationKind.Class, Foo, false) listener: beginMethod(null, null, null, null, null, Foo) listener: handleNoType(;) ensureIdentifierPotentiallyRecovered(;, methodDeclaration, false) @@ -308,7 +308,7 @@ parseUnit(class) listener: endMetadataStar(0) listener: beginMember() isReservedKeyword(.) - parseMethod(;, null, null, null, null, null, ;, Instance of 'NoType', null, Foo, DeclarationKind.Class, Foo, false) + parseMethod(;, null, null, null, null, null, null, ;, Instance of 'NoType', null, Foo, DeclarationKind.Class, Foo, false) listener: beginMethod(null, null, null, null, null, Foo) listener: handleNoType(;) ensureIdentifierPotentiallyRecovered(;, methodDeclaration, false) @@ -448,7 +448,7 @@ parseUnit(class) listener: endMetadataStar(0) listener: beginMember() isReservedKeyword(.) - parseMethod(;, null, null, null, null, null, ;, Instance of 'NoType', null, Foo, DeclarationKind.Class, Foo, false) + parseMethod(;, null, null, null, null, null, null, ;, Instance of 'NoType', null, Foo, DeclarationKind.Class, Foo, false) listener: beginMethod(null, null, null, null, null, Foo) listener: handleNoType(;) ensureIdentifierPotentiallyRecovered(;, methodDeclaration, false) @@ -588,7 +588,7 @@ parseUnit(class) listener: endMetadataStar(0) listener: beginMember() isReservedKeyword(.) - parseMethod(;, null, null, null, null, null, ;, Instance of 'NoType', null, Foo, DeclarationKind.Class, Foo, false) + parseMethod(;, null, null, null, null, null, null, ;, Instance of 'NoType', null, Foo, DeclarationKind.Class, Foo, false) listener: beginMethod(null, null, null, null, null, Foo) listener: handleNoType(;) ensureIdentifierPotentiallyRecovered(;, methodDeclaration, false) 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 b87bd16a4b1..b32e70ce691 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 @@ -32,7 +32,7 @@ parseUnit(class) listener: beginMetadataStar(String) listener: endMetadataStar(0) listener: beginMember() - parseFields({, null, null, null, null, null, {, Instance of 'SimpleNullableType', x, DeclarationKind.Class, Foo, false) + parseFields({, null, null, null, null, null, null, {, Instance of 'SimpleNullableType', x, DeclarationKind.Class, Foo, false) listener: handleIdentifier(String, typeReference) listener: handleNoTypeArguments(?) listener: handleType(String, ?) @@ -48,7 +48,7 @@ parseUnit(class) listener: beginMetadataStar(int) listener: endMetadataStar(0) listener: beginMember() - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', y, DeclarationKind.Class, Foo, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', y, DeclarationKind.Class, Foo, false) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(y) listener: handleType(int, null) @@ -65,7 +65,7 @@ parseUnit(class) listener: endMetadataStar(0) listener: beginMember() isReservedKeyword(() - parseMethod(;, null, null, null, null, null, ;, Instance of 'NoType', null, Foo, DeclarationKind.Class, Foo, false) + parseMethod(;, null, null, null, null, null, null, ;, Instance of 'NoType', null, Foo, DeclarationKind.Class, Foo, false) listener: beginMethod(null, null, null, null, null, Foo) listener: handleNoType(;) ensureIdentifierPotentiallyRecovered(;, methodDeclaration, false) 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 a2ada8419c3..df8402301d8 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 @@ -32,7 +32,7 @@ parseUnit(class) listener: beginMetadataStar(String) listener: endMetadataStar(0) listener: beginMember() - parseFields({, null, null, null, null, null, {, Instance of 'SimpleNullableType', x, DeclarationKind.Class, Foo, false) + parseFields({, null, null, null, null, null, null, {, Instance of 'SimpleNullableType', x, DeclarationKind.Class, Foo, false) listener: handleIdentifier(String, typeReference) listener: handleNoTypeArguments(?) listener: handleType(String, ?) @@ -48,7 +48,7 @@ parseUnit(class) listener: beginMetadataStar(int) listener: endMetadataStar(0) listener: beginMember() - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', y, DeclarationKind.Class, Foo, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', y, DeclarationKind.Class, Foo, false) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(y) listener: handleType(int, null) @@ -65,7 +65,7 @@ parseUnit(class) listener: endMetadataStar(0) listener: beginMember() isReservedKeyword(() - parseMethod(;, null, null, null, null, null, ;, Instance of 'NoType', null, Foo, DeclarationKind.Class, Foo, false) + parseMethod(;, null, null, null, null, null, null, ;, Instance of 'NoType', null, Foo, DeclarationKind.Class, Foo, false) listener: beginMethod(null, null, null, null, null, Foo) listener: handleNoType(;) ensureIdentifierPotentiallyRecovered(;, methodDeclaration, false) @@ -197,7 +197,7 @@ parseUnit(class) listener: beginMetadataStar(void) listener: endMetadataStar(0) listener: beginMember() - parseMethod(;, null, null, null, null, null, ;, Instance of 'VoidType', null, foo, DeclarationKind.Class, Foo, false) + parseMethod(;, null, null, null, null, null, null, ;, Instance of 'VoidType', null, foo, DeclarationKind.Class, Foo, false) listener: beginMethod(null, null, null, null, null, foo) listener: handleVoidKeyword(void) ensureIdentifierPotentiallyRecovered(void, methodDeclaration, false) @@ -336,7 +336,7 @@ parseUnit(class) listener: beginMetadataStar(void) listener: endMetadataStar(0) listener: beginMember() - parseMethod(}, null, null, null, null, null, }, Instance of 'VoidType', null, bar, DeclarationKind.Class, Foo, false) + parseMethod(}, null, null, null, null, null, null, }, Instance of 'VoidType', null, bar, DeclarationKind.Class, Foo, false) listener: beginMethod(null, null, null, null, null, bar) listener: handleVoidKeyword(void) ensureIdentifierPotentiallyRecovered(void, methodDeclaration, false) 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 0aa114d4870..06150d745f4 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 @@ -8,7 +8,7 @@ parseUnit(bool) listener: endMetadataStar(0) parseTopLevelMemberImpl() listener: beginTopLevelMember(bool) - parseFields(, null, null, null, null, null, , Instance of 'SimpleType', x, DeclarationKind.TopLevel, null, false) + parseFields(, null, null, null, null, null, null, , Instance of 'SimpleType', x, DeclarationKind.TopLevel, null, false) listener: handleIdentifier(bool, typeReference) listener: handleNoTypeArguments(x) listener: handleType(bool, null) @@ -24,7 +24,7 @@ parseUnit(bool) listener: endMetadataStar(0) parseTopLevelMemberImpl(;) listener: beginTopLevelMember(bool) - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', x, DeclarationKind.TopLevel, null, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', x, DeclarationKind.TopLevel, null, false) listener: handleIdentifier(bool, typeReference) listener: handleNoTypeArguments(x) listener: handleType(bool, null) @@ -205,7 +205,7 @@ parseUnit(bool) listener: endMetadataStar(0) listener: beginMember() isReservedKeyword(.) - parseMethod({, null, null, null, null, null, {, Instance of 'NoType', null, C, DeclarationKind.Class, C, false) + parseMethod({, null, null, null, null, null, null, {, Instance of 'NoType', null, C, DeclarationKind.Class, C, false) listener: beginMethod(null, null, null, null, null, C) listener: handleNoType({) ensureIdentifierPotentiallyRecovered({, methodDeclaration, false) @@ -258,7 +258,7 @@ parseUnit(bool) listener: endMetadataStar(0) listener: beginMember() isReservedKeyword(.) - parseMethod(;, null, null, null, null, null, ;, Instance of 'NoType', null, C, DeclarationKind.Class, C, false) + parseMethod(;, null, null, null, null, null, null, ;, Instance of 'NoType', null, C, DeclarationKind.Class, C, false) listener: beginMethod(null, null, null, null, null, C) listener: handleNoType(;) ensureIdentifierPotentiallyRecovered(;, methodDeclaration, false) diff --git a/pkg/front_end/parser_testcases/nnbd/issue_42621.dart.intertwined.expect b/pkg/front_end/parser_testcases/nnbd/issue_42621.dart.intertwined.expect index 81ee7f4c866..4613ff7327e 100644 --- a/pkg/front_end/parser_testcases/nnbd/issue_42621.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/nnbd/issue_42621.dart.intertwined.expect @@ -642,7 +642,7 @@ parseUnit(Order) listener: beginMetadataStar(List) listener: endMetadataStar(0) listener: beginMember() - parseFields({, null, null, null, null, null, {, Instance of 'SimpleNullableType', x, DeclarationKind.Class, Order, false) + parseFields({, null, null, null, null, null, null, {, Instance of 'SimpleNullableType', x, DeclarationKind.Class, Order, false) listener: handleIdentifier(List, typeReference) listener: handleNoTypeArguments(?) listener: handleType(List, ?) @@ -658,7 +658,7 @@ parseUnit(Order) listener: beginMetadataStar(int) listener: endMetadataStar(0) listener: beginMember() - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleNullableType', y, DeclarationKind.Class, Order, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleNullableType', y, DeclarationKind.Class, Order, false) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(?) listener: handleType(int, ?) diff --git a/pkg/front_end/parser_testcases/nnbd/late_member.dart.intertwined.expect b/pkg/front_end/parser_testcases/nnbd/late_member.dart.intertwined.expect index ca211fe1e7d..5360def056c 100644 --- a/pkg/front_end/parser_testcases/nnbd/late_member.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/nnbd/late_member.dart.intertwined.expect @@ -341,7 +341,7 @@ parseUnit(main) listener: beginMetadataStar(late) listener: endMetadataStar(0) listener: beginMember() - parseMethod({, null, null, null, null, null, {, Instance of 'NoType', null, late, DeclarationKind.Class, X, false) + parseMethod({, null, null, null, null, null, null, {, Instance of 'NoType', null, late, DeclarationKind.Class, X, false) listener: beginMethod(null, null, null, null, null, late) listener: handleNoType({) ensureIdentifierPotentiallyRecovered({, methodDeclaration, false) @@ -432,7 +432,7 @@ parseUnit(main) listener: beginMetadataStar(int) listener: endMetadataStar(0) listener: beginMember() - parseFields({, null, null, null, null, null, {, Instance of 'SimpleType', late, DeclarationKind.Class, Y, false) + parseFields({, null, null, null, null, null, null, {, Instance of 'SimpleType', late, DeclarationKind.Class, Y, false) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(late) listener: handleType(int, null) diff --git a/pkg/front_end/parser_testcases/nnbd/late_modifier.dart.intertwined.expect b/pkg/front_end/parser_testcases/nnbd/late_modifier.dart.intertwined.expect index d56e7d04c82..7a8116e0956 100644 --- a/pkg/front_end/parser_testcases/nnbd/late_modifier.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/nnbd/late_modifier.dart.intertwined.expect @@ -389,7 +389,7 @@ parseUnit(main) listener: beginMetadataStar(late) listener: endMetadataStar(0) listener: beginMember() - parseMethod({, null, null, null, null, null, {, Instance of 'NoType', null, late, DeclarationKind.Class, X, false) + parseMethod({, null, null, null, null, null, null, {, Instance of 'NoType', null, late, DeclarationKind.Class, X, false) listener: beginMethod(null, null, null, null, null, late) listener: handleNoType({) ensureIdentifierPotentiallyRecovered({, methodDeclaration, false) @@ -480,7 +480,7 @@ parseUnit(main) listener: beginMetadataStar(int) listener: endMetadataStar(0) listener: beginMember() - parseFields({, null, null, null, null, null, {, Instance of 'SimpleType', late, DeclarationKind.Class, Y, false) + parseFields({, null, null, null, null, null, null, {, Instance of 'SimpleType', late, DeclarationKind.Class, Y, false) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(late) listener: handleType(int, null) diff --git a/pkg/front_end/parser_testcases/nnbd/null_shorting_index.dart.intertwined.expect b/pkg/front_end/parser_testcases/nnbd/null_shorting_index.dart.intertwined.expect index f1d7c9b4a78..2a6ddbafa2e 100644 --- a/pkg/front_end/parser_testcases/nnbd/null_shorting_index.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/nnbd/null_shorting_index.dart.intertwined.expect @@ -32,7 +32,7 @@ parseUnit(class) listener: beginMetadataStar(int) listener: endMetadataStar(0) listener: beginMember() - parseMethod({, null, null, null, null, null, {, Instance of 'SimpleType', null, operator, DeclarationKind.Class, Class1, false) + parseMethod({, null, null, null, null, null, null, {, Instance of 'SimpleType', null, operator, DeclarationKind.Class, Class1, false) listener: beginMethod(null, null, null, null, null, operator) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(operator) @@ -89,7 +89,7 @@ parseUnit(class) listener: beginMetadataStar(void) listener: endMetadataStar(0) listener: beginMember() - parseMethod(;, null, null, null, null, null, ;, Instance of 'VoidType', null, operator, DeclarationKind.Class, Class1, false) + parseMethod(;, null, null, null, null, null, null, ;, Instance of 'VoidType', null, operator, DeclarationKind.Class, Class1, false) listener: beginMethod(null, null, null, null, null, operator) listener: handleVoidKeyword(void) parseOperatorName(void) diff --git a/pkg/front_end/parser_testcases/nnbd/required_member.dart.intertwined.expect b/pkg/front_end/parser_testcases/nnbd/required_member.dart.intertwined.expect index 993b8d5e06f..ef93713f409 100644 --- a/pkg/front_end/parser_testcases/nnbd/required_member.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/nnbd/required_member.dart.intertwined.expect @@ -341,7 +341,7 @@ parseUnit(main) listener: beginMetadataStar(required) listener: endMetadataStar(0) listener: beginMember() - parseMethod({, null, null, null, null, null, {, Instance of 'NoType', null, required, DeclarationKind.Class, X, false) + parseMethod({, null, null, null, null, null, null, {, Instance of 'NoType', null, required, DeclarationKind.Class, X, false) listener: beginMethod(null, null, null, null, null, required) listener: handleNoType({) ensureIdentifierPotentiallyRecovered({, methodDeclaration, false) @@ -432,7 +432,7 @@ parseUnit(main) listener: beginMetadataStar(int) listener: endMetadataStar(0) listener: beginMember() - parseFields({, null, null, null, null, null, {, Instance of 'SimpleType', required, DeclarationKind.Class, Y, false) + parseFields({, null, null, null, null, null, null, {, Instance of 'SimpleType', required, DeclarationKind.Class, Y, false) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(required) listener: handleType(int, null) diff --git a/pkg/front_end/parser_testcases/nnbd/required_modifier.dart.intertwined.expect b/pkg/front_end/parser_testcases/nnbd/required_modifier.dart.intertwined.expect index a8ff973927e..f3ed245ade9 100644 --- a/pkg/front_end/parser_testcases/nnbd/required_modifier.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/nnbd/required_modifier.dart.intertwined.expect @@ -357,7 +357,7 @@ parseUnit(main) listener: beginMetadataStar(required) listener: endMetadataStar(0) listener: beginMember() - parseMethod({, null, null, null, null, null, {, Instance of 'NoType', null, required, DeclarationKind.Class, X, false) + parseMethod({, null, null, null, null, null, null, {, Instance of 'NoType', null, required, DeclarationKind.Class, X, false) listener: beginMethod(null, null, null, null, null, required) listener: handleNoType({) ensureIdentifierPotentiallyRecovered({, methodDeclaration, false) @@ -448,7 +448,7 @@ parseUnit(main) listener: beginMetadataStar(int) listener: endMetadataStar(0) listener: beginMember() - parseFields({, null, null, null, null, null, {, Instance of 'SimpleType', required, DeclarationKind.Class, Y, false) + parseFields({, null, null, null, null, null, null, {, Instance of 'SimpleType', required, DeclarationKind.Class, Y, false) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(required) listener: handleType(int, null) diff --git a/pkg/front_end/parser_testcases/non-nnbd/issue_40267_conditional_4.dart.intertwined.expect b/pkg/front_end/parser_testcases/non-nnbd/issue_40267_conditional_4.dart.intertwined.expect index 4ff79122aab..ca09847156a 100644 --- a/pkg/front_end/parser_testcases/non-nnbd/issue_40267_conditional_4.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/non-nnbd/issue_40267_conditional_4.dart.intertwined.expect @@ -8,7 +8,7 @@ parseUnit(var) listener: endMetadataStar(0) parseTopLevelMemberImpl() listener: beginTopLevelMember(var) - parseFields(, null, null, null, null, var, var, Instance of 'NoType', a, DeclarationKind.TopLevel, null, false) + parseFields(, null, null, null, null, null, var, var, Instance of 'NoType', a, DeclarationKind.TopLevel, null, false) listener: handleNoType(var) ensureIdentifierPotentiallyRecovered(var, topLevelVariableDeclaration, false) listener: handleIdentifier(a, topLevelVariableDeclaration) diff --git a/pkg/front_end/parser_testcases/non-nnbd/issue_40288.dart.intertwined.expect b/pkg/front_end/parser_testcases/non-nnbd/issue_40288.dart.intertwined.expect index 223ac8e9b4f..4088a3a790c 100644 --- a/pkg/front_end/parser_testcases/non-nnbd/issue_40288.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/non-nnbd/issue_40288.dart.intertwined.expect @@ -32,7 +32,7 @@ parseUnit(class) listener: beginMetadataStar(int) listener: endMetadataStar(0) listener: beginMember() - parseMethod({, null, null, null, null, null, {, Instance of 'SimpleType', get, g, DeclarationKind.Class, late, false) + parseMethod({, null, null, null, null, null, null, {, Instance of 'SimpleType', get, g, DeclarationKind.Class, late, false) listener: beginMethod(null, null, null, null, get, g) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(get) @@ -97,7 +97,7 @@ parseUnit(class) listener: beginMetadataStar(int) listener: endMetadataStar(0) listener: beginMember() - parseMethod({, null, null, null, null, null, {, Instance of 'SimpleType', get, g, DeclarationKind.Class, required, false) + parseMethod({, null, null, null, null, null, null, {, Instance of 'SimpleType', get, g, DeclarationKind.Class, required, false) listener: beginMethod(null, null, null, null, get, g) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(get) @@ -162,7 +162,7 @@ parseUnit(class) listener: beginMetadataStar(late) listener: endMetadataStar(0) listener: beginMember() - parseFields({, null, null, null, null, null, {, Instance of 'SimpleType', l, DeclarationKind.Class, C, false) + parseFields({, null, null, null, null, null, null, {, Instance of 'SimpleType', l, DeclarationKind.Class, C, false) listener: handleIdentifier(late, typeReference) listener: handleNoTypeArguments(l) listener: handleType(late, null) @@ -195,7 +195,7 @@ parseUnit(class) listener: beginMetadataStar(required) listener: endMetadataStar(0) listener: beginMember() - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', r, DeclarationKind.Class, C, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', r, DeclarationKind.Class, C, false) listener: handleIdentifier(required, typeReference) listener: handleNoTypeArguments(r) listener: handleType(required, null) diff --git a/pkg/front_end/parser_testcases/non-nnbd/issue_40288_prime.dart.intertwined.expect b/pkg/front_end/parser_testcases/non-nnbd/issue_40288_prime.dart.intertwined.expect index 0d8062698f2..f950e1d51b9 100644 --- a/pkg/front_end/parser_testcases/non-nnbd/issue_40288_prime.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/non-nnbd/issue_40288_prime.dart.intertwined.expect @@ -32,7 +32,7 @@ parseUnit(class) listener: beginMetadataStar(int) listener: endMetadataStar(0) listener: beginMember() - parseMethod({, null, null, null, null, null, {, Instance of 'SimpleType', get, g, DeclarationKind.Class, Xlate, false) + parseMethod({, null, null, null, null, null, null, {, Instance of 'SimpleType', get, g, DeclarationKind.Class, Xlate, false) listener: beginMethod(null, null, null, null, get, g) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(get) @@ -97,7 +97,7 @@ parseUnit(class) listener: beginMetadataStar(int) listener: endMetadataStar(0) listener: beginMember() - parseMethod({, null, null, null, null, null, {, Instance of 'SimpleType', get, g, DeclarationKind.Class, Xrequired, false) + parseMethod({, null, null, null, null, null, null, {, Instance of 'SimpleType', get, g, DeclarationKind.Class, Xrequired, false) listener: beginMethod(null, null, null, null, get, g) listener: handleIdentifier(int, typeReference) listener: handleNoTypeArguments(get) @@ -162,7 +162,7 @@ parseUnit(class) listener: beginMetadataStar(Xlate) listener: endMetadataStar(0) listener: beginMember() - parseFields({, null, null, null, null, null, {, Instance of 'SimpleType', l, DeclarationKind.Class, C, false) + parseFields({, null, null, null, null, null, null, {, Instance of 'SimpleType', l, DeclarationKind.Class, C, false) listener: handleIdentifier(Xlate, typeReference) listener: handleNoTypeArguments(l) listener: handleType(Xlate, null) @@ -195,7 +195,7 @@ parseUnit(class) listener: beginMetadataStar(Xrequired) listener: endMetadataStar(0) listener: beginMember() - parseFields(;, null, null, null, null, null, ;, Instance of 'SimpleType', r, DeclarationKind.Class, C, false) + parseFields(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', r, DeclarationKind.Class, C, false) listener: handleIdentifier(Xrequired, typeReference) listener: handleNoTypeArguments(r) listener: handleType(Xrequired, null) diff --git a/pkg/front_end/test/lint_suite.dart b/pkg/front_end/test/lint_suite.dart index 5ae80a753a1..d047ab7674d 100644 --- a/pkg/front_end/test/lint_suite.dart +++ b/pkg/front_end/test/lint_suite.dart @@ -233,6 +233,7 @@ class ExplicitTypeLintListener extends LintListener { } void endClassFields( + Token abstractToken, Token externalToken, Token staticToken, Token covariantToken, diff --git a/pkg/front_end/test/parser_test_listener.dart b/pkg/front_end/test/parser_test_listener.dart index e0aa81873c4..64f47ce34d0 100644 --- a/pkg/front_end/test/parser_test_listener.dart +++ b/pkg/front_end/test/parser_test_listener.dart @@ -520,6 +520,7 @@ class ParserTestListener implements Listener { } void endClassFields( + Token abstractToken, Token externalToken, Token staticToken, Token covariantToken, @@ -529,6 +530,7 @@ class ParserTestListener implements Listener { Token beginToken, Token endToken) { indent--; + seen(abstractToken); seen(staticToken); seen(covariantToken); seen(lateToken); @@ -546,6 +548,7 @@ class ParserTestListener implements Listener { } void endMixinFields( + Token abstractToken, Token externalToken, Token staticToken, Token covariantToken, @@ -555,6 +558,7 @@ class ParserTestListener implements Listener { Token beginToken, Token endToken) { indent--; + seen(abstractToken); seen(staticToken); seen(covariantToken); seen(lateToken); diff --git a/pkg/front_end/test/parser_test_parser.dart b/pkg/front_end/test/parser_test_parser.dart index a0499fb6ea1..2a28bd3438e 100644 --- a/pkg/front_end/test/parser_test_parser.dart +++ b/pkg/front_end/test/parser_test_parser.dart @@ -694,6 +694,7 @@ class TestParser extends Parser { Token parseFields( Token beforeStart, + Token abstractToken, Token externalToken, Token staticToken, Token covariantToken, @@ -707,6 +708,7 @@ class TestParser extends Parser { bool nameIsRecovered) { doPrint('parseFields(' '$beforeStart, ' + '$abstractToken, ' '$externalToken, ' '$staticToken, ' '$covariantToken, ' @@ -721,6 +723,7 @@ class TestParser extends Parser { indent++; var result = super.parseFields( beforeStart, + abstractToken, externalToken, staticToken, covariantToken, @@ -1004,6 +1007,7 @@ class TestParser extends Parser { Token parseMethod( Token beforeStart, + Token abstractToken, Token externalToken, Token staticToken, Token covariantToken, @@ -1018,6 +1022,7 @@ class TestParser extends Parser { bool nameIsRecovered) { doPrint('parseMethod(' '$beforeStart, ' + '$abstractToken, ' '$externalToken, ' '$staticToken, ' '$covariantToken, ' @@ -1033,6 +1038,7 @@ class TestParser extends Parser { indent++; var result = super.parseMethod( beforeStart, + abstractToken, externalToken, staticToken, covariantToken, @@ -1049,8 +1055,14 @@ class TestParser extends Parser { return result; } - Token parseFactoryMethod(Token token, DeclarationKind kind, Token beforeStart, - Token externalToken, Token staticOrCovariant, Token varFinalOrConst) { + Token parseFactoryMethod( + Token token, + DeclarationKind kind, + Token beforeStart, + Token abstractToken, + Token externalToken, + Token staticOrCovariant, + Token varFinalOrConst) { doPrint('parseFactoryMethod(' '$token, ' '$kind, ' @@ -1060,7 +1072,7 @@ class TestParser extends Parser { '$varFinalOrConst)'); indent++; var result = super.parseFactoryMethod(token, kind, beforeStart, - externalToken, staticOrCovariant, varFinalOrConst); + abstractToken, externalToken, staticOrCovariant, varFinalOrConst); indent--; return result; } @@ -1948,6 +1960,7 @@ class TestParser extends Parser { Token parseInvalidOperatorDeclaration( Token beforeStart, + Token abstractToken, Token externalToken, Token staticToken, Token covariantToken, @@ -1958,6 +1971,7 @@ class TestParser extends Parser { String enclosingDeclarationName) { doPrint('parseInvalidOperatorDeclaration(' '$beforeStart, ' + '$abstractToken, ' '$externalToken, ' '$staticToken, ' '$covariantToken, ' @@ -1969,6 +1983,7 @@ class TestParser extends Parser { indent++; var result = super.parseInvalidOperatorDeclaration( beforeStart, + abstractToken, externalToken, staticToken, covariantToken, @@ -1984,6 +1999,7 @@ class TestParser extends Parser { Token recoverFromInvalidMember( Token token, Token beforeStart, + Token abstractToken, Token externalToken, Token staticToken, Token covariantToken, @@ -1997,6 +2013,7 @@ class TestParser extends Parser { doPrint('recoverFromInvalidMember(' '$token, ' '$beforeStart, ' + '$abstractToken, ' '$externalToken, ' '$staticToken, ' '$covariantToken, ' @@ -2011,6 +2028,7 @@ class TestParser extends Parser { var result = super.recoverFromInvalidMember( token, beforeStart, + abstractToken, externalToken, staticToken, covariantToken,