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 174167f55e2..880d256a464 100644 --- a/pkg/_fe_analyzer_shared/lib/src/parser/forwarding_listener.dart +++ b/pkg/_fe_analyzer_shared/lib/src/parser/forwarding_listener.dart @@ -66,10 +66,16 @@ class ForwardingListener implements Listener { } @override - void beginClassDeclaration(Token begin, Token? abstractToken, - Token? macroToken, Token? viewToken, Token? augmentToken, Token name) { - listener?.beginClassDeclaration( - begin, abstractToken, macroToken, viewToken, augmentToken, name); + void beginClassDeclaration( + Token begin, + Token? abstractToken, + Token? macroToken, + Token? viewToken, + Token? sealedToken, + Token? augmentToken, + Token name) { + listener?.beginClassDeclaration(begin, abstractToken, macroToken, viewToken, + sealedToken, augmentToken, name); } @override diff --git a/pkg/_fe_analyzer_shared/lib/src/parser/listener.dart b/pkg/_fe_analyzer_shared/lib/src/parser/listener.dart index be187d88a8c..f4de40efb17 100644 --- a/pkg/_fe_analyzer_shared/lib/src/parser/listener.dart +++ b/pkg/_fe_analyzer_shared/lib/src/parser/listener.dart @@ -133,8 +133,14 @@ class Listener implements UnescapeErrorListener { /// (or extraneous modifiers in the case of recovery) preceding [name]. /// /// At this point we have parsed the name and type parameter declarations. - void beginClassDeclaration(Token begin, Token? abstractToken, - Token? macroToken, Token? viewToken, Token? augmentToken, Token name) {} + void beginClassDeclaration( + Token begin, + Token? abstractToken, + Token? macroToken, + Token? viewToken, + Token? sealedToken, + Token? augmentToken, + Token name) {} /// Handle an extends clause in a class declaration. Substructures: /// - supertype (may be a mixin application) 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 9dc7bea579f..f307f54b33c 100644 --- a/pkg/_fe_analyzer_shared/lib/src/parser/parser_impl.dart +++ b/pkg/_fe_analyzer_shared/lib/src/parser/parser_impl.dart @@ -512,6 +512,7 @@ class Parser { /* keyword = */ next, /* macroToken = */ null, /* viewToken = */ null, + /* sealedToken = */ null, directiveState); } Token start = token; @@ -533,6 +534,7 @@ class Parser { next = token.next!; Token? macroToken; Token? viewToken; + Token? sealedToken; if (next.isIdentifier && next.lexeme == 'view' && optional('class', next.next!)) { @@ -543,6 +545,11 @@ class Parser { optional('class', next.next!)) { macroToken = next; next = next.next!; + } else if (next.isIdentifier && + next.lexeme == 'sealed' && + optional('class', next.next!)) { + sealedToken = next; + next = next.next!; } if (next.isTopLevelKeyword) { return parseTopLevelKeywordDeclaration( @@ -550,6 +557,7 @@ class Parser { /* keyword = */ next, /* macroToken = */ macroToken, /* viewToken = */ viewToken, + /* sealedToken = */ sealedToken, directiveState); } else if (next.isKeywordOrIdentifier) { // TODO(danrubel): improve parseTopLevelMember @@ -582,8 +590,13 @@ class Parser { /// Parse any top-level declaration that begins with a keyword. /// [start] is the token before any modifiers preceding [keyword]. - Token parseTopLevelKeywordDeclaration(Token start, Token keyword, - Token? macroToken, Token? viewToken, DirectiveContext? directiveState) { + Token parseTopLevelKeywordDeclaration( + Token start, + Token keyword, + Token? macroToken, + Token? viewToken, + Token? sealedToken, + DirectiveContext? directiveState) { assert(keyword.isTopLevelKeyword); final String? value = keyword.stringValue; if (identical(value, 'class')) { @@ -592,8 +605,8 @@ class Parser { context.parseClassModifiers(start, keyword); Token? abstractToken = context.abstractToken; Token? augmentToken = context.augmentToken; - return parseClassOrNamedMixinApplication( - abstractToken, macroToken, viewToken, augmentToken, keyword); + return parseClassOrNamedMixinApplication(abstractToken, macroToken, + viewToken, sealedToken, augmentToken, keyword); } else if (identical(value, 'enum')) { directiveState?.checkDeclaration(); ModifierContext context = new ModifierContext(this); @@ -2433,6 +2446,7 @@ class Parser { Token? abstractToken, Token? macroToken, Token? viewToken, + Token? sealedToken, Token? augmentToken, Token classKeyword) { assert(optional('class', classKeyword)); @@ -2448,8 +2462,8 @@ class Parser { begin, abstractToken, macroToken, viewToken, augmentToken, name); return parseNamedMixinApplication(token, begin, classKeyword); } else { - listener.beginClassDeclaration( - begin, abstractToken, macroToken, viewToken, augmentToken, name); + listener.beginClassDeclaration(begin, abstractToken, macroToken, + viewToken, sealedToken, augmentToken, name); return parseClass(token, begin, classKeyword, name.lexeme); } } diff --git a/pkg/analyzer/lib/src/dart/ast/ast.dart b/pkg/analyzer/lib/src/dart/ast/ast.dart index afb36618b5b..40327f95ead 100644 --- a/pkg/analyzer/lib/src/dart/ast/ast.dart +++ b/pkg/analyzer/lib/src/dart/ast/ast.dart @@ -1848,6 +1848,9 @@ class ClassDeclarationImpl extends NamedCompilationUnitMemberImpl /// The 'view' keyword, or `null` if the keyword was absent. final Token? viewKeyword; + /// The 'sealed' keyword, or `null` if the keyword was absent. + final Token? sealedKeyword; + /// The 'augment' keyword, or `null` if the keyword was absent. final Token? augmentKeyword; @@ -1903,6 +1906,7 @@ class ClassDeclarationImpl extends NamedCompilationUnitMemberImpl required this.abstractKeyword, required this.macroKeyword, required this.viewKeyword, + required this.sealedKeyword, required this.augmentKeyword, required this.classKeyword, required super.name, @@ -1946,6 +1950,7 @@ class ClassDeclarationImpl extends NamedCompilationUnitMemberImpl return abstractKeyword ?? macroKeyword ?? viewKeyword ?? + sealedKeyword ?? augmentKeyword ?? classKeyword; } @@ -1986,6 +1991,7 @@ class ClassDeclarationImpl extends NamedCompilationUnitMemberImpl ..addToken('abstractKeyword', abstractKeyword) ..addToken('macroKeyword', macroKeyword) ..addToken('viewKeyword', viewKeyword) + ..addToken('sealedKeyword', sealedKeyword) ..addToken('augmentKeyword', augmentKeyword) ..addToken('classKeyword', classKeyword) ..addToken('name', name) diff --git a/pkg/analyzer/lib/src/fasta/ast_builder.dart b/pkg/analyzer/lib/src/fasta/ast_builder.dart index 00ac521e48b..1221886402e 100644 --- a/pkg/analyzer/lib/src/fasta/ast_builder.dart +++ b/pkg/analyzer/lib/src/fasta/ast_builder.dart @@ -146,6 +146,9 @@ class AstBuilder extends StackListener { /// `true` if views are enabled final bool enableViews; + /// `true` if sealed-class is enabled + final bool enableSealedClass; + final FeatureSet _featureSet; final LineInfo _lineInfo; @@ -171,6 +174,7 @@ class AstBuilder extends StackListener { enableUnnamedLibraries = _featureSet.isEnabled(Feature.unnamedLibraries), enableViews = _featureSet.isEnabled(Feature.views), + enableSealedClass = _featureSet.isEnabled(Feature.sealed_class), uri = uri ?? fileUri; @override @@ -212,8 +216,14 @@ class AstBuilder extends StackListener { } @override - void beginClassDeclaration(Token begin, Token? abstractToken, - Token? macroToken, Token? viewToken, Token? augmentToken, Token name) { + void beginClassDeclaration( + Token begin, + Token? abstractToken, + Token? macroToken, + Token? viewToken, + Token? sealedToken, + Token? augmentToken, + Token name) { assert(_classLikeBuilder == null); push(_Modifiers()..abstractKeyword = abstractToken); if (!enableMacros) { @@ -236,8 +246,19 @@ class AstBuilder extends StackListener { viewToken = null; } } + if (!enableSealedClass) { + if (sealedToken != null) { + _reportFeatureNotEnabled( + feature: ExperimentalFeatures.sealed_class, + startToken: sealedToken, + ); + // Pretend that 'sealed' didn't occur while this feature is incomplete. + sealedToken = null; + } + } push(macroToken ?? NullValue.Token); push(viewToken ?? NullValue.Token); + push(sealedToken ?? NullValue.Token); push(augmentToken ?? NullValue.Token); } @@ -599,6 +620,7 @@ class AstBuilder extends StackListener { abstractKeyword: null, macroKeyword: null, viewKeyword: null, + sealedKeyword: null, augmentKeyword: null, classKeyword: Token(Keyword.CLASS, 0), name: StringToken(TokenType.STRING, className, -1), @@ -3495,6 +3517,7 @@ class AstBuilder extends StackListener { var withClause = pop(NullValue.WithClause) as WithClauseImpl?; var extendsClause = pop(NullValue.ExtendsClause) as ExtendsClauseImpl?; var augmentKeyword = pop(NullValue.Token) as Token?; + var sealedKeyword = pop(NullValue.Token) as Token?; var viewKeyword = pop(NullValue.Token) as Token?; var macroKeyword = pop(NullValue.Token) as Token?; var modifiers = pop() as _Modifiers?; @@ -3511,6 +3534,7 @@ class AstBuilder extends StackListener { abstractKeyword: abstractKeyword, macroKeyword: macroKeyword, viewKeyword: viewKeyword, + sealedKeyword: sealedKeyword, augmentKeyword: augmentKeyword, classKeyword: classKeyword, name: name.token, @@ -5321,6 +5345,7 @@ class _ClassDeclarationBuilder extends _ClassLikeDeclarationBuilder { final Token? abstractKeyword; final Token? macroKeyword; final Token? viewKeyword; + final Token? sealedKeyword; final Token? augmentKeyword; final Token classKeyword; final Token name; @@ -5338,6 +5363,7 @@ class _ClassDeclarationBuilder extends _ClassLikeDeclarationBuilder { required this.abstractKeyword, required this.macroKeyword, required this.viewKeyword, + required this.sealedKeyword, required this.augmentKeyword, required this.classKeyword, required this.name, @@ -5354,6 +5380,7 @@ class _ClassDeclarationBuilder extends _ClassLikeDeclarationBuilder { abstractKeyword: abstractKeyword, macroKeyword: macroKeyword, viewKeyword: viewKeyword, + sealedKeyword: sealedKeyword, augmentKeyword: augmentKeyword, classKeyword: classKeyword, name: name, diff --git a/pkg/analyzer/test/generated/parser_fasta_listener.dart b/pkg/analyzer/test/generated/parser_fasta_listener.dart index e68c7e2d74e..a472c3700e3 100644 --- a/pkg/analyzer/test/generated/parser_fasta_listener.dart +++ b/pkg/analyzer/test/generated/parser_fasta_listener.dart @@ -86,10 +86,16 @@ class ForwardingTestListener extends ForwardingListener { } @override - void beginClassDeclaration(Token beginToken, Token? abstractToken, - Token? macroToken, Token? viewToken, Token? augmentToken, Token name) { - super.beginClassDeclaration( - beginToken, abstractToken, macroToken, viewToken, augmentToken, name); + void beginClassDeclaration( + Token beginToken, + Token? abstractToken, + Token? macroToken, + Token? viewToken, + Token? sealedToken, + Token? augmentToken, + Token name) { + super.beginClassDeclaration(beginToken, abstractToken, macroToken, + viewToken, sealedToken, augmentToken, name); begin('ClassDeclaration'); } diff --git a/pkg/analyzer/test/src/fasta/ast_builder_test.dart b/pkg/analyzer/test/src/fasta/ast_builder_test.dart index ab9a5c813d5..3996f1dfa47 100644 --- a/pkg/analyzer/test/src/fasta/ast_builder_test.dart +++ b/pkg/analyzer/test/src/fasta/ast_builder_test.dart @@ -277,6 +277,23 @@ ClassDeclaration '''); } + void test_class_sealed() { + var parseResult = parseStringWithErrors(r''' +sealed class A {} +'''); + parseResult.assertNoErrors(); + + var node = parseResult.findNode.classDeclaration('class A {}'); + assertParsedNodeText(node, r''' +ClassDeclaration + sealedKeyword: sealed + classKeyword: class + name: A + leftBracket: { + rightBracket: } +'''); + } + void test_class_view() { var parseResult = parseStringWithErrors(r''' view class A {} diff --git a/pkg/analyzer/test/util/feature_sets.dart b/pkg/analyzer/test/util/feature_sets.dart index ddea2919098..018acd0a031 100644 --- a/pkg/analyzer/test/util/feature_sets.dart +++ b/pkg/analyzer/test/util/feature_sets.dart @@ -53,6 +53,7 @@ class FeatureSets { EnableString.named_arguments_anywhere, EnableString.patterns, EnableString.records, + EnableString.sealed_class, EnableString.super_parameters, EnableString.unnamed_libraries, EnableString.views, diff --git a/pkg/front_end/lib/src/fasta/kernel/macro/annotation_parser.dart b/pkg/front_end/lib/src/fasta/kernel/macro/annotation_parser.dart index 0a6c1062e9d..4416a45adad 100644 --- a/pkg/front_end/lib/src/fasta/kernel/macro/annotation_parser.dart +++ b/pkg/front_end/lib/src/fasta/kernel/macro/annotation_parser.dart @@ -488,8 +488,14 @@ class _MacroListener implements Listener { } @override - void beginClassDeclaration(Token begin, Token? abstractToken, - Token? macroToken, Token? viewToken, Token? augmentToken, Token name) { + void beginClassDeclaration( + Token begin, + Token? abstractToken, + Token? macroToken, + Token? viewToken, + Token? sealedToken, + Token? augmentToken, + Token name) { _unexpected(); } 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 295e20775c4..5ee42663a96 100644 --- a/pkg/front_end/lib/src/fasta/source/diet_listener.dart +++ b/pkg/front_end/lib/src/fasta/source/diet_listener.dart @@ -933,8 +933,14 @@ class DietListener extends StackListenerImpl { } @override - void beginClassDeclaration(Token begin, Token? abstractToken, - Token? macroToken, Token? viewToken, Token? augmentToken, Token name) { + void beginClassDeclaration( + Token begin, + Token? abstractToken, + Token? macroToken, + Token? viewToken, + Token? sealedToken, + Token? augmentToken, + Token name) { debugEvent("beginClassDeclaration"); push(begin); } 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 10d04457061..e812158b189 100644 --- a/pkg/front_end/lib/src/fasta/source/outline_builder.dart +++ b/pkg/front_end/lib/src/fasta/source/outline_builder.dart @@ -861,8 +861,14 @@ class OutlineBuilder extends StackListenerImpl { } @override - void beginClassDeclaration(Token begin, Token? abstractToken, - Token? macroToken, Token? viewToken, Token? augmentToken, Token name) { + void beginClassDeclaration( + Token begin, + Token? abstractToken, + Token? macroToken, + Token? viewToken, + Token? sealedToken, + Token? augmentToken, + Token name) { debugEvent("beginClassDeclaration"); popDeclarationContext( DeclarationContext.ClassOrMixinOrNamedMixinApplication); @@ -887,8 +893,15 @@ class OutlineBuilder extends StackListenerImpl { viewToken = null; } } + if (sealedToken != null) { + if (reportIfNotEnabled(libraryFeatures.sealedClass, + sealedToken.charOffset, sealedToken.length)) { + sealedToken = null; + } + } push(macroToken ?? NullValue.Token); push(viewToken ?? NullValue.Token); + push(sealedToken ?? NullValue.Token); push(augmentToken ?? NullValue.Token); } @@ -1143,6 +1156,7 @@ class OutlineBuilder extends StackListenerImpl { ValueKinds.ParserRecovery, ]), /* augment token */ ValueKinds.TokenOrNull, + /* sealed token */ ValueKinds.TokenOrNull, /* view token */ ValueKinds.TokenOrNull, /* macro token */ ValueKinds.TokenOrNull, /* modifiers */ ValueKinds.Integer, @@ -1160,6 +1174,9 @@ class OutlineBuilder extends StackListenerImpl { int supertypeOffset = popCharOffset(); TypeBuilder? supertype = nullIfParserRecovery(pop()) as TypeBuilder?; Token? augmentToken = pop(NullValue.Token) as Token?; + // TODO(kallentu): Support sealed in source library builder. + // ignore: unused_local_variable + Token? sealedToken = pop(NullValue.Token) as Token?; // TODO(johnniwinther): Create builder for view. // ignore: unused_local_variable Token? viewToken = pop(NullValue.Token) as Token?; diff --git a/pkg/front_end/lib/src/fasta/util/parser_ast_helper.dart b/pkg/front_end/lib/src/fasta/util/parser_ast_helper.dart index 453558f52da..b2e393b9be1 100644 --- a/pkg/front_end/lib/src/fasta/util/parser_ast_helper.dart +++ b/pkg/front_end/lib/src/fasta/util/parser_ast_helper.dart @@ -176,13 +176,20 @@ abstract class AbstractParserAstListener implements Listener { } @override - void beginClassDeclaration(Token begin, Token? abstractToken, - Token? macroToken, Token? viewToken, Token? augmentToken, Token name) { + void beginClassDeclaration( + Token begin, + Token? abstractToken, + Token? macroToken, + Token? viewToken, + Token? sealedToken, + Token? augmentToken, + Token name) { ClassDeclarationBegin data = new ClassDeclarationBegin(ParserAstType.BEGIN, begin: begin, abstractToken: abstractToken, macroToken: macroToken, viewToken: viewToken, + sealedToken: sealedToken, augmentToken: augmentToken, name: name); seen(data); @@ -3091,6 +3098,7 @@ class ClassDeclarationBegin extends ParserAstNode { final Token? abstractToken; final Token? macroToken; final Token? viewToken; + final Token? sealedToken; final Token? augmentToken; final Token name; @@ -3099,6 +3107,7 @@ class ClassDeclarationBegin extends ParserAstNode { this.abstractToken, this.macroToken, this.viewToken, + this.sealedToken, this.augmentToken, required this.name}) : super("ClassDeclaration", type); @@ -3109,6 +3118,7 @@ class ClassDeclarationBegin extends ParserAstNode { "abstractToken": abstractToken, "macroToken": macroToken, "viewToken": viewToken, + "sealedToken": sealedToken, "augmentToken": augmentToken, "name": name, }; diff --git a/pkg/front_end/parser_testcases/augmentation/augment_super.dart.expect b/pkg/front_end/parser_testcases/augmentation/augment_super.dart.expect index 7225b0e0844..f3c5c7e5884 100644 --- a/pkg/front_end/parser_testcases/augmentation/augment_super.dart.expect +++ b/pkg/front_end/parser_testcases/augmentation/augment_super.dart.expect @@ -185,7 +185,7 @@ beginCompilationUnit(augment) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(Class, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, augment, Class) + beginClassDeclaration(class, null, null, null, null, augment, Class) handleNoType(Class) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/augmentation/augment_super.dart.intertwined.expect b/pkg/front_end/parser_testcases/augmentation/augment_super.dart.intertwined.expect index cdac83b6191..9c622dbb29e 100644 --- a/pkg/front_end/parser_testcases/augmentation/augment_super.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/augmentation/augment_super.dart.intertwined.expect @@ -411,13 +411,13 @@ parseUnit(augment) parseMetadataStar(}) listener: beginMetadataStar(augment) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(}, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, augment, class) + parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, augment, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(Class, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, augment, Class) + listener: beginClassDeclaration(class, null, null, null, null, augment, Class) parseClass(Class, class, class, Class) parseClassHeaderOpt(Class, class, class) parseClassExtendsOpt(Class) diff --git a/pkg/front_end/parser_testcases/augmentation/member_declarations.dart.expect b/pkg/front_end/parser_testcases/augmentation/member_declarations.dart.expect index 030a2832d41..84eb1840761 100644 --- a/pkg/front_end/parser_testcases/augmentation/member_declarations.dart.expect +++ b/pkg/front_end/parser_testcases/augmentation/member_declarations.dart.expect @@ -4,7 +4,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(Class, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, Class) + beginClassDeclaration(class, null, null, null, null, null, Class) handleNoType(Class) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/augmentation/member_declarations.dart.intertwined.expect b/pkg/front_end/parser_testcases/augmentation/member_declarations.dart.intertwined.expect index ab20a0c2789..077df064ad9 100644 --- a/pkg/front_end/parser_testcases/augmentation/member_declarations.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/augmentation/member_declarations.dart.intertwined.expect @@ -6,13 +6,13 @@ parseUnit(class) parseMetadataStar() listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(Class, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, Class) + listener: beginClassDeclaration(class, null, null, null, null, null, Class) parseClass(Class, class, class, Class) parseClassHeaderOpt(Class, class, class) parseClassExtendsOpt(Class) @@ -707,7 +707,7 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(mixin) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(}, mixin, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(}, mixin, null, null, null, Instance of 'DirectiveContext') parseMixin(null, mixin) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(mixin) ensureIdentifier(mixin, classOrMixinDeclaration) diff --git a/pkg/front_end/parser_testcases/augmentation/member_errors.dart.expect b/pkg/front_end/parser_testcases/augmentation/member_errors.dart.expect index cc47c46f07d..bc33dc0492e 100644 --- a/pkg/front_end/parser_testcases/augmentation/member_errors.dart.expect +++ b/pkg/front_end/parser_testcases/augmentation/member_errors.dart.expect @@ -250,7 +250,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(Class, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, Class) + beginClassDeclaration(class, null, null, null, null, null, Class) handleNoType(Class) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/augmentation/member_errors.dart.intertwined.expect b/pkg/front_end/parser_testcases/augmentation/member_errors.dart.intertwined.expect index 6958a10de55..cfe11a766eb 100644 --- a/pkg/front_end/parser_testcases/augmentation/member_errors.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/augmentation/member_errors.dart.intertwined.expect @@ -6,13 +6,13 @@ parseUnit(class) parseMetadataStar() listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(Class, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, Class) + listener: beginClassDeclaration(class, null, null, null, null, null, Class) parseClass(Class, class, class, Class) parseClassHeaderOpt(Class, class, class) parseClassExtendsOpt(Class) diff --git a/pkg/front_end/parser_testcases/augmentation/top_level_declarations.dart.expect b/pkg/front_end/parser_testcases/augmentation/top_level_declarations.dart.expect index 48b1bdb16a2..85c26b4f5e7 100644 --- a/pkg/front_end/parser_testcases/augmentation/top_level_declarations.dart.expect +++ b/pkg/front_end/parser_testcases/augmentation/top_level_declarations.dart.expect @@ -173,7 +173,7 @@ beginCompilationUnit(augment) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(Class, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, augment, Class) + beginClassDeclaration(class, null, null, null, null, augment, Class) handleNoType(Class) handleClassExtends(null, 1) handleClassNoWithClause() @@ -188,7 +188,7 @@ beginCompilationUnit(augment) beginClassOrMixinOrNamedMixinApplicationPrelude(abstract) handleIdentifier(Class, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(abstract, abstract, null, null, augment, Class) + beginClassDeclaration(abstract, abstract, null, null, null, augment, Class) handleNoType(Class) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/augmentation/top_level_declarations.dart.intertwined.expect b/pkg/front_end/parser_testcases/augmentation/top_level_declarations.dart.intertwined.expect index 029405d777d..01043cba2af 100644 --- a/pkg/front_end/parser_testcases/augmentation/top_level_declarations.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/augmentation/top_level_declarations.dart.intertwined.expect @@ -324,13 +324,13 @@ parseUnit(augment) parseMetadataStar(;) listener: beginMetadataStar(augment) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, augment, class) + parseTopLevelKeywordDeclaration(;, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, augment, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(Class, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, augment, Class) + listener: beginClassDeclaration(class, null, null, null, null, augment, Class) parseClass(Class, class, class, Class) parseClassHeaderOpt(Class, class, class) parseClassExtendsOpt(Class) @@ -351,13 +351,13 @@ parseUnit(augment) parseMetadataStar(}) listener: beginMetadataStar(augment) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(}, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(abstract, null, null, augment, class) + parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(abstract, null, null, null, augment, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(abstract) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(Class, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(abstract, abstract, null, null, augment, Class) + listener: beginClassDeclaration(abstract, abstract, null, null, null, augment, Class) parseClass(Class, abstract, class, Class) parseClassHeaderOpt(Class, abstract, class) parseClassExtendsOpt(Class) @@ -378,8 +378,8 @@ parseUnit(augment) parseMetadataStar(}) listener: beginMetadataStar(augment) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(}, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, augment, class) + parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, augment, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(Class, classOrMixinDeclaration) @@ -404,8 +404,8 @@ parseUnit(augment) parseMetadataStar(;) listener: beginMetadataStar(augment) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(abstract, null, null, augment, class) + parseTopLevelKeywordDeclaration(;, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(abstract, null, null, null, augment, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(abstract) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(Class, classOrMixinDeclaration) @@ -430,7 +430,7 @@ parseUnit(augment) parseMetadataStar(;) listener: beginMetadataStar(augment) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, mixin, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, mixin, null, null, null, Instance of 'DirectiveContext') parseMixin(augment, mixin) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(mixin) ensureIdentifier(mixin, classOrMixinDeclaration) diff --git a/pkg/front_end/parser_testcases/augmentation/top_level_errors.dart.expect b/pkg/front_end/parser_testcases/augmentation/top_level_errors.dart.expect index 116b9fbeb14..c1dfcec03ea 100644 --- a/pkg/front_end/parser_testcases/augmentation/top_level_errors.dart.expect +++ b/pkg/front_end/parser_testcases/augmentation/top_level_errors.dart.expect @@ -491,7 +491,7 @@ beginCompilationUnit(augment) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(Class, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, augment, Class) + beginClassDeclaration(class, null, null, null, null, augment, Class) handleNoType(Class) handleClassExtends(null, 1) handleClassNoWithClause() @@ -507,7 +507,7 @@ beginCompilationUnit(augment) beginClassOrMixinOrNamedMixinApplicationPrelude(abstract) handleIdentifier(Class, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(abstract, abstract, null, null, augment, Class) + beginClassDeclaration(abstract, abstract, null, null, null, augment, Class) handleNoType(Class) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/augmentation/top_level_errors.dart.intertwined.expect b/pkg/front_end/parser_testcases/augmentation/top_level_errors.dart.intertwined.expect index 6f832ecf4b1..b70eb525a2a 100644 --- a/pkg/front_end/parser_testcases/augmentation/top_level_errors.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/augmentation/top_level_errors.dart.intertwined.expect @@ -690,15 +690,15 @@ parseUnit(augment) parseMetadataStar(;) listener: beginMetadataStar(augment) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, class, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, class, null, null, null, Instance of 'DirectiveContext') reportRecoverableErrorWithToken(augment, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[DuplicatedModifier, The modifier 'augment' was already specified., Try removing all but one occurrence of the modifier., {lexeme: augment}], augment, augment) - parseClassOrNamedMixinApplication(null, null, null, augment, class) + parseClassOrNamedMixinApplication(null, null, null, null, augment, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(Class, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, augment, Class) + listener: beginClassDeclaration(class, null, null, null, null, augment, Class) parseClass(Class, class, class, Class) parseClassHeaderOpt(Class, class, class) parseClassExtendsOpt(Class) @@ -719,15 +719,15 @@ parseUnit(augment) parseMetadataStar(}) listener: beginMetadataStar(abstract) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(}, class, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') reportRecoverableError(augment, Message[ModifierOutOfOrder, The modifier 'augment' should be before the modifier 'abstract'., Try re-ordering the modifiers., {string: augment, string2: abstract}]) listener: handleRecoverableError(Message[ModifierOutOfOrder, The modifier 'augment' should be before the modifier 'abstract'., Try re-ordering the modifiers., {string: augment, string2: abstract}], augment, augment) - parseClassOrNamedMixinApplication(abstract, null, null, augment, class) + parseClassOrNamedMixinApplication(abstract, null, null, null, augment, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(abstract) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(Class, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(abstract, abstract, null, null, augment, Class) + listener: beginClassDeclaration(abstract, abstract, null, null, null, augment, Class) parseClass(Class, abstract, class, Class) parseClassHeaderOpt(Class, abstract, class) parseClassExtendsOpt(Class) @@ -748,10 +748,10 @@ parseUnit(augment) parseMetadataStar(}) listener: beginMetadataStar(augment) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(}, class, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') reportRecoverableErrorWithToken(augment, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[DuplicatedModifier, The modifier 'augment' was already specified., Try removing all but one occurrence of the modifier., {lexeme: augment}], augment, augment) - parseClassOrNamedMixinApplication(null, null, null, augment, class) + parseClassOrNamedMixinApplication(null, null, null, null, augment, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(Class, classOrMixinDeclaration) @@ -776,10 +776,10 @@ parseUnit(augment) parseMetadataStar(;) listener: beginMetadataStar(abstract) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, class, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, class, null, null, null, Instance of 'DirectiveContext') reportRecoverableError(augment, Message[ModifierOutOfOrder, The modifier 'augment' should be before the modifier 'abstract'., Try re-ordering the modifiers., {string: augment, string2: abstract}]) listener: handleRecoverableError(Message[ModifierOutOfOrder, The modifier 'augment' should be before the modifier 'abstract'., Try re-ordering the modifiers., {string: augment, string2: abstract}], augment, augment) - parseClassOrNamedMixinApplication(abstract, null, null, augment, class) + parseClassOrNamedMixinApplication(abstract, null, null, null, augment, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(abstract) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(Class, classOrMixinDeclaration) @@ -804,7 +804,7 @@ parseUnit(augment) parseMetadataStar(;) listener: beginMetadataStar(augment) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, mixin, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, mixin, null, null, null, Instance of 'DirectiveContext') reportRecoverableErrorWithToken(augment, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[DuplicatedModifier, The modifier 'augment' was already specified., Try removing all but one occurrence of the modifier., {lexeme: augment}], augment, augment) parseMixin(augment, mixin) diff --git a/pkg/front_end/parser_testcases/enhanced_enums/entries_with_type_arguments.dart.intertwined.expect b/pkg/front_end/parser_testcases/enhanced_enums/entries_with_type_arguments.dart.intertwined.expect index 33f40b414c6..0e3cc986b6d 100644 --- a/pkg/front_end/parser_testcases/enhanced_enums/entries_with_type_arguments.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/enhanced_enums/entries_with_type_arguments.dart.intertwined.expect @@ -6,7 +6,7 @@ parseUnit(enum) parseMetadataStar() listener: beginMetadataStar(enum) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(, enum, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(, enum, null, null, null, Instance of 'DirectiveContext') parseEnum(enum) listener: beginUncategorizedTopLevelDeclaration(enum) ensureIdentifier(enum, enumDeclaration) diff --git a/pkg/front_end/parser_testcases/error_recovery/bracket_mismatch_01.dart.expect b/pkg/front_end/parser_testcases/error_recovery/bracket_mismatch_01.dart.expect index 5ba9ee4bbc0..a58428b8fd5 100644 --- a/pkg/front_end/parser_testcases/error_recovery/bracket_mismatch_01.dart.expect +++ b/pkg/front_end/parser_testcases/error_recovery/bracket_mismatch_01.dart.expect @@ -14,7 +14,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, C) handleNoType(C) handleClassExtends(null, 1) handleClassNoWithClause() @@ -114,7 +114,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(D, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, D) + beginClassDeclaration(class, null, null, null, null, null, D) handleNoType(D) handleClassExtends(null, 1) handleClassNoWithClause() 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 831fd952045..26ea586260f 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 @@ -6,13 +6,13 @@ parseUnit(class) parseMetadataStar() listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, C) parseClass(C, class, class, C) parseClassHeaderOpt(C, class, class) parseClassExtendsOpt(C) @@ -257,13 +257,13 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(}, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(D, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, D) + listener: beginClassDeclaration(class, null, null, null, null, null, D) parseClass(D, class, class, D) parseClassHeaderOpt(D, class, class) parseClassExtendsOpt(D) diff --git a/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_bad_name_general.crash_dart.expect b/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_bad_name_general.crash_dart.expect index e0cf686a3b1..b98b58d14a0 100644 --- a/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_bad_name_general.crash_dart.expect +++ b/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_bad_name_general.crash_dart.expect @@ -126,7 +126,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(Foo, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, Foo) + beginClassDeclaration(class, null, null, null, null, null, Foo) handleNoType(Foo) handleClassExtends(null, 1) handleClassNoWithClause() 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 e82e2a5d0d0..a317d0917ee 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 @@ -6,13 +6,13 @@ parseUnit(class) parseMetadataStar() listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(Foo, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, Foo) + listener: beginClassDeclaration(class, null, null, null, null, null, Foo) parseClass(Foo, class, class, Foo) parseClassHeaderOpt(Foo, class, class) parseClassExtendsOpt(Foo) diff --git a/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_bad_name_get.crash_dart.expect b/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_bad_name_get.crash_dart.expect index d692e56b78d..617b8637472 100644 --- a/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_bad_name_get.crash_dart.expect +++ b/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_bad_name_get.crash_dart.expect @@ -34,7 +34,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(Foo, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, Foo) + beginClassDeclaration(class, null, null, null, null, null, Foo) handleNoType(Foo) handleClassExtends(null, 1) handleClassNoWithClause() 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 d0d390ad597..348c43e5939 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 @@ -6,13 +6,13 @@ parseUnit(class) parseMetadataStar() listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(Foo, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, Foo) + listener: beginClassDeclaration(class, null, null, null, null, null, Foo) parseClass(Foo, class, class, Foo) parseClassHeaderOpt(Foo, class, class) parseClassExtendsOpt(Foo) diff --git a/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_bad_name_return_type.crash_dart.expect b/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_bad_name_return_type.crash_dart.expect index da1d2a19f2e..de5fe6fa55c 100644 --- a/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_bad_name_return_type.crash_dart.expect +++ b/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_bad_name_return_type.crash_dart.expect @@ -30,7 +30,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(Foo, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, Foo) + beginClassDeclaration(class, null, null, null, null, null, Foo) handleNoType(Foo) handleClassExtends(null, 1) handleClassNoWithClause() 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 6133a97d8cb..4dba3144b48 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 @@ -6,13 +6,13 @@ parseUnit(class) parseMetadataStar() listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(Foo, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, Foo) + listener: beginClassDeclaration(class, null, null, null, null, null, Foo) parseClass(Foo, class, class, Foo) parseClassHeaderOpt(Foo, class, class) parseClassExtendsOpt(Foo) diff --git a/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_bad_name_set.crash_dart.expect b/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_bad_name_set.crash_dart.expect index 4560f67bba3..8a95673ae56 100644 --- a/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_bad_name_set.crash_dart.expect +++ b/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_bad_name_set.crash_dart.expect @@ -30,7 +30,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(Foo, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, Foo) + beginClassDeclaration(class, null, null, null, null, null, Foo) handleNoType(Foo) handleClassExtends(null, 1) handleClassNoWithClause() 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 005929a1d7b..439b272805c 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 @@ -6,13 +6,13 @@ parseUnit(class) parseMetadataStar() listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(Foo, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, Foo) + listener: beginClassDeclaration(class, null, null, null, null, null, Foo) parseClass(Foo, class, class, Foo) parseClassHeaderOpt(Foo, class, class) parseClassExtendsOpt(Foo) diff --git a/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_get.dart.expect b/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_get.dart.expect index b5b9e38b5e8..7527c1cc88a 100644 --- a/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_get.dart.expect +++ b/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_get.dart.expect @@ -30,7 +30,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(Foo, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, Foo) + beginClassDeclaration(class, null, null, null, null, null, Foo) handleNoType(Foo) handleClassExtends(null, 1) handleClassNoWithClause() 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 c587b8d2ace..dd99a659a51 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 @@ -6,13 +6,13 @@ parseUnit(class) parseMetadataStar() listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(Foo, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, Foo) + listener: beginClassDeclaration(class, null, null, null, null, null, Foo) parseClass(Foo, class, class, Foo) parseClassHeaderOpt(Foo, class, class) parseClassExtendsOpt(Foo) diff --git a/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_ok.dart.expect b/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_ok.dart.expect index 7d78c8b5613..053abd52539 100644 --- a/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_ok.dart.expect +++ b/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_ok.dart.expect @@ -4,7 +4,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(Foo, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, Foo) + beginClassDeclaration(class, null, null, null, null, null, Foo) handleNoType(Foo) handleClassExtends(null, 1) handleClassNoWithClause() 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 cc66af4d8f0..532d94dd8c4 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 @@ -6,13 +6,13 @@ parseUnit(class) parseMetadataStar() listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(Foo, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, Foo) + listener: beginClassDeclaration(class, null, null, null, null, null, Foo) parseClass(Foo, class, class, Foo) parseClassHeaderOpt(Foo, class, class) parseClassExtendsOpt(Foo) diff --git a/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_operator.crash_dart.expect b/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_operator.crash_dart.expect index ef6f834b4db..e4987dce7b4 100644 --- a/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_operator.crash_dart.expect +++ b/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_operator.crash_dart.expect @@ -78,7 +78,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(Foo, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, Foo) + beginClassDeclaration(class, null, null, null, null, null, Foo) handleNoType(Foo) handleClassExtends(null, 1) handleClassNoWithClause() 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 7756241615e..8968204f366 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 @@ -6,13 +6,13 @@ parseUnit(class) parseMetadataStar() listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(Foo, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, Foo) + listener: beginClassDeclaration(class, null, null, null, null, null, Foo) parseClass(Foo, class, class, Foo) parseClassHeaderOpt(Foo, class, class) parseClassExtendsOpt(Foo) diff --git a/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_return_type.dart.expect b/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_return_type.dart.expect index 7a4ab684a36..921fb9677b6 100644 --- a/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_return_type.dart.expect +++ b/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_return_type.dart.expect @@ -22,7 +22,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(Foo, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, Foo) + beginClassDeclaration(class, null, null, null, null, null, Foo) handleNoType(Foo) handleClassExtends(null, 1) handleClassNoWithClause() 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 355f40b4e70..bd620398113 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 @@ -6,13 +6,13 @@ parseUnit(class) parseMetadataStar() listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(Foo, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, Foo) + listener: beginClassDeclaration(class, null, null, null, null, null, Foo) parseClass(Foo, class, class, Foo) parseClassHeaderOpt(Foo, class, class) parseClassExtendsOpt(Foo) diff --git a/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_set.dart.expect b/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_set.dart.expect index 167481a3bc7..753ad7a46eb 100644 --- a/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_set.dart.expect +++ b/pkg/front_end/parser_testcases/error_recovery/constructor_recovery_set.dart.expect @@ -22,7 +22,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(Foo, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, Foo) + beginClassDeclaration(class, null, null, null, null, null, Foo) handleNoType(Foo) handleClassExtends(null, 1) handleClassNoWithClause() 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 be544368162..347fc2458d1 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 @@ -6,13 +6,13 @@ parseUnit(class) parseMetadataStar() listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(Foo, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, Foo) + listener: beginClassDeclaration(class, null, null, null, null, null, Foo) parseClass(Foo, class, class, Foo) parseClassHeaderOpt(Foo, class, class) parseClassExtendsOpt(Foo) diff --git a/pkg/front_end/parser_testcases/error_recovery/extension_member_contributor_test_completion.dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/extension_member_contributor_test_completion.dart.intertwined.expect index 38f878fed81..41327a05ec7 100644 --- a/pkg/front_end/parser_testcases/error_recovery/extension_member_contributor_test_completion.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/error_recovery/extension_member_contributor_test_completion.dart.intertwined.expect @@ -6,7 +6,7 @@ parseUnit(extension) parseMetadataStar() listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(, extension, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(, extension, null, null, null, Instance of 'DirectiveContext') parseExtension(extension) listener: beginExtensionDeclarationPrelude(extension) listener: beginTypeVariables(<) diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_000032.dart.expect b/pkg/front_end/parser_testcases/error_recovery/issue_000032.dart.expect index 47a7f176e62..02e9752b374 100644 --- a/pkg/front_end/parser_testcases/error_recovery/issue_000032.dart.expect +++ b/pkg/front_end/parser_testcases/error_recovery/issue_000032.dart.expect @@ -26,7 +26,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, C) handleNoType(C) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_000032.dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/issue_000032.dart.intertwined.expect index 6d422830f32..40e0b544e43 100644 --- a/pkg/front_end/parser_testcases/error_recovery/issue_000032.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/error_recovery/issue_000032.dart.intertwined.expect @@ -6,13 +6,13 @@ parseUnit(class) parseMetadataStar() listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, C) parseClass(C, class, class, C) parseClassHeaderOpt(C, class, class) parseClassExtendsOpt(C) diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_22313.dart.expect b/pkg/front_end/parser_testcases/error_recovery/issue_22313.dart.expect index a8bb2a96e08..0f2372677b0 100644 --- a/pkg/front_end/parser_testcases/error_recovery/issue_22313.dart.expect +++ b/pkg/front_end/parser_testcases/error_recovery/issue_22313.dart.expect @@ -26,7 +26,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(A, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, A) + beginClassDeclaration(class, null, null, null, null, null, A) handleNoType(A) handleClassExtends(null, 1) handleClassNoWithClause() @@ -41,7 +41,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(B, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, B) + beginClassDeclaration(class, null, null, null, null, null, B) handleNoType(B) handleClassExtends(null, 1) handleClassNoWithClause() @@ -56,7 +56,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(Foo, classOrMixinDeclaration) handleNoTypeVariables(extends) - beginClassDeclaration(class, null, null, null, null, Foo) + beginClassDeclaration(class, null, null, null, null, null, Foo) handleIdentifier(A, typeReference) handleNoTypeArguments(,) handleType(A, null) @@ -92,7 +92,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(Bar, classOrMixinDeclaration) handleNoTypeVariables(extend) - beginClassDeclaration(class, null, null, null, null, Bar) + beginClassDeclaration(class, null, null, null, null, null, Bar) handleNoType(Bar) handleClassExtends(null, 1) handleClassNoWithClause() @@ -134,7 +134,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(Baz, classOrMixinDeclaration) handleNoTypeVariables(on) - beginClassDeclaration(class, null, null, null, null, Baz) + beginClassDeclaration(class, null, null, null, null, null, Baz) handleNoType(Baz) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_22313.dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/issue_22313.dart.intertwined.expect index 3521ae6fdd1..a960c666c2d 100644 --- a/pkg/front_end/parser_testcases/error_recovery/issue_22313.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/error_recovery/issue_22313.dart.intertwined.expect @@ -6,13 +6,13 @@ parseUnit(class) parseMetadataStar() listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(A, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, A) + listener: beginClassDeclaration(class, null, null, null, null, null, A) parseClass(A, class, class, A) parseClassHeaderOpt(A, class, class) parseClassExtendsOpt(A) @@ -33,13 +33,13 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(}, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(B, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, B) + listener: beginClassDeclaration(class, null, null, null, null, null, B) parseClass(B, class, class, B) parseClassHeaderOpt(B, class, class) parseClassExtendsOpt(B) @@ -60,13 +60,13 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(}, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(Foo, classOrMixinDeclaration) listener: handleNoTypeVariables(extends) - listener: beginClassDeclaration(class, null, null, null, null, Foo) + listener: beginClassDeclaration(class, null, null, null, null, null, Foo) parseClass(Foo, class, class, Foo) parseClassHeaderOpt(Foo, class, class) parseClassExtendsOpt(Foo) @@ -127,13 +127,13 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(}, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(Bar, classOrMixinDeclaration) listener: handleNoTypeVariables(extend) - listener: beginClassDeclaration(class, null, null, null, null, Bar) + listener: beginClassDeclaration(class, null, null, null, null, null, Bar) parseClass(Bar, class, class, Bar) parseClassHeaderOpt(Bar, class, class) parseClassExtendsOpt(Bar) @@ -210,13 +210,13 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(}, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(Baz, classOrMixinDeclaration) listener: handleNoTypeVariables(on) - listener: beginClassDeclaration(class, null, null, null, null, Baz) + listener: beginClassDeclaration(class, null, null, null, null, null, Baz) parseClass(Baz, class, class, Baz) parseClassHeaderOpt(Baz, class, class) parseClassExtendsOpt(Baz) diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_22314.dart.expect b/pkg/front_end/parser_testcases/error_recovery/issue_22314.dart.expect index 44857bacfb4..9d729a6685c 100644 --- a/pkg/front_end/parser_testcases/error_recovery/issue_22314.dart.expect +++ b/pkg/front_end/parser_testcases/error_recovery/issue_22314.dart.expect @@ -25,7 +25,7 @@ beginCompilationUnit(const) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(Annotation, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, Annotation) + beginClassDeclaration(class, null, null, null, null, null, Annotation) handleNoType(Annotation) handleClassExtends(null, 1) handleClassNoWithClause() @@ -80,7 +80,7 @@ beginCompilationUnit(const) handleNoType(E) endTypeVariable(>, 0, null, null) endTypeVariables(<, >) - beginClassDeclaration(class, null, null, null, null, A) + beginClassDeclaration(class, null, null, null, null, null, A) handleNoType(>) handleClassExtends(null, 1) handleClassNoWithClause() @@ -95,7 +95,7 @@ beginCompilationUnit(const) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, C) handleNoType(C) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_22314.dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/issue_22314.dart.intertwined.expect index a4b38c33045..47f52f26d22 100644 --- a/pkg/front_end/parser_testcases/error_recovery/issue_22314.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/error_recovery/issue_22314.dart.intertwined.expect @@ -28,13 +28,13 @@ parseUnit(const) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(;, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(Annotation, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, Annotation) + listener: beginClassDeclaration(class, null, null, null, null, null, Annotation) parseClass(Annotation, class, class, Annotation) parseClassHeaderOpt(Annotation, class, class) parseClassExtendsOpt(Annotation) @@ -111,8 +111,8 @@ parseUnit(const) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(}, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(A, classOrMixinDeclaration) @@ -125,7 +125,7 @@ parseUnit(const) listener: handleNoType(E) listener: endTypeVariable(>, 0, null, null) listener: endTypeVariables(<, >) - listener: beginClassDeclaration(class, null, null, null, null, A) + listener: beginClassDeclaration(class, null, null, null, null, null, A) parseClass(>, class, class, A) parseClassHeaderOpt(>, class, class) parseClassExtendsOpt(>) @@ -146,13 +146,13 @@ parseUnit(const) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(}, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, C) parseClass(C, class, class, C) parseClassHeaderOpt(C, class, class) parseClassExtendsOpt(C) diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_26073.dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/issue_26073.dart.intertwined.expect index 2f5d79f3fbf..60f5231ad57 100644 --- a/pkg/front_end/parser_testcases/error_recovery/issue_26073.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/error_recovery/issue_26073.dart.intertwined.expect @@ -6,7 +6,7 @@ parseUnit(typedef) parseMetadataStar() listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -43,7 +43,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -77,7 +77,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -117,7 +117,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -147,7 +147,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -191,7 +191,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -236,7 +236,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -292,7 +292,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -371,7 +371,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -442,7 +442,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -459,7 +459,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_26810.dart.expect b/pkg/front_end/parser_testcases/error_recovery/issue_26810.dart.expect index ceeb2539e2c..45b63a2f5a4 100644 --- a/pkg/front_end/parser_testcases/error_recovery/issue_26810.dart.expect +++ b/pkg/front_end/parser_testcases/error_recovery/issue_26810.dart.expect @@ -66,7 +66,7 @@ beginCompilationUnit(abstract) beginClassOrMixinOrNamedMixinApplicationPrelude(abstract) handleIdentifier(Key, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(abstract, abstract, null, null, null, Key) + beginClassDeclaration(abstract, abstract, null, null, null, null, Key) handleNoType(Key) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_26810.dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/issue_26810.dart.intertwined.expect index e50050ab7de..65a24560638 100644 --- a/pkg/front_end/parser_testcases/error_recovery/issue_26810.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/error_recovery/issue_26810.dart.intertwined.expect @@ -6,13 +6,13 @@ parseUnit(abstract) parseMetadataStar() listener: beginMetadataStar(abstract) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(abstract, null, null, null, class) + parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(abstract, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(abstract) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(Key, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(abstract, abstract, null, null, null, Key) + listener: beginClassDeclaration(abstract, abstract, null, null, null, null, Key) parseClass(Key, abstract, class, Key) parseClassHeaderOpt(Key, abstract, class) parseClassExtendsOpt(Key) diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_26810_and.dart.expect b/pkg/front_end/parser_testcases/error_recovery/issue_26810_and.dart.expect index 45b5a431fdb..3b86483f5b0 100644 --- a/pkg/front_end/parser_testcases/error_recovery/issue_26810_and.dart.expect +++ b/pkg/front_end/parser_testcases/error_recovery/issue_26810_and.dart.expect @@ -66,7 +66,7 @@ beginCompilationUnit(abstract) beginClassOrMixinOrNamedMixinApplicationPrelude(abstract) handleIdentifier(Key, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(abstract, abstract, null, null, null, Key) + beginClassDeclaration(abstract, abstract, null, null, null, null, Key) handleNoType(Key) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_26810_and.dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/issue_26810_and.dart.intertwined.expect index 9ac3d3224ac..b4c4c3abac1 100644 --- a/pkg/front_end/parser_testcases/error_recovery/issue_26810_and.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/error_recovery/issue_26810_and.dart.intertwined.expect @@ -6,13 +6,13 @@ parseUnit(abstract) parseMetadataStar() listener: beginMetadataStar(abstract) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(abstract, null, null, null, class) + parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(abstract, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(abstract) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(Key, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(abstract, abstract, null, null, null, Key) + listener: beginClassDeclaration(abstract, abstract, null, null, null, null, Key) parseClass(Key, abstract, class, Key) parseClassHeaderOpt(Key, abstract, class) parseClassExtendsOpt(Key) diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_26810_or.dart.expect b/pkg/front_end/parser_testcases/error_recovery/issue_26810_or.dart.expect index 75fdcfe3647..f1cb10782a6 100644 --- a/pkg/front_end/parser_testcases/error_recovery/issue_26810_or.dart.expect +++ b/pkg/front_end/parser_testcases/error_recovery/issue_26810_or.dart.expect @@ -66,7 +66,7 @@ beginCompilationUnit(abstract) beginClassOrMixinOrNamedMixinApplicationPrelude(abstract) handleIdentifier(Key, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(abstract, abstract, null, null, null, Key) + beginClassDeclaration(abstract, abstract, null, null, null, null, Key) handleNoType(Key) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_26810_or.dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/issue_26810_or.dart.intertwined.expect index 98b5ee308a2..23ced1a9844 100644 --- a/pkg/front_end/parser_testcases/error_recovery/issue_26810_or.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/error_recovery/issue_26810_or.dart.intertwined.expect @@ -6,13 +6,13 @@ parseUnit(abstract) parseMetadataStar() listener: beginMetadataStar(abstract) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(abstract, null, null, null, class) + parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(abstract, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(abstract) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(Key, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(abstract, abstract, null, null, null, Key) + listener: beginClassDeclaration(abstract, abstract, null, null, null, null, Key) parseClass(Key, abstract, class, Key) parseClassHeaderOpt(Key, abstract, class) parseClassExtendsOpt(Key) diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_39026.crash_dart.expect b/pkg/front_end/parser_testcases/error_recovery/issue_39026.crash_dart.expect index 8f1eaa939ee..f0b0191e004 100644 --- a/pkg/front_end/parser_testcases/error_recovery/issue_39026.crash_dart.expect +++ b/pkg/front_end/parser_testcases/error_recovery/issue_39026.crash_dart.expect @@ -14,7 +14,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(A, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, A) + beginClassDeclaration(class, null, null, null, null, null, A) handleNoType(A) handleClassExtends(null, 1) handleClassNoWithClause() 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 debbb824af1..5eb0f082b96 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 @@ -6,13 +6,13 @@ parseUnit(class) parseMetadataStar() listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(A, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, A) + listener: beginClassDeclaration(class, null, null, null, null, null, A) parseClass(A, class, class, A) parseClassHeaderOpt(A, class, class) parseClassExtendsOpt(A) diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_39026_prime.crash_dart.expect b/pkg/front_end/parser_testcases/error_recovery/issue_39026_prime.crash_dart.expect index 4ed6a390c25..0b2640f5ff7 100644 --- a/pkg/front_end/parser_testcases/error_recovery/issue_39026_prime.crash_dart.expect +++ b/pkg/front_end/parser_testcases/error_recovery/issue_39026_prime.crash_dart.expect @@ -10,7 +10,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(A, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, A) + beginClassDeclaration(class, null, null, null, null, null, A) handleNoType(A) handleClassExtends(null, 1) handleClassNoWithClause() 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 c358a1c238e..1e31dcb69eb 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 @@ -6,13 +6,13 @@ parseUnit(class) parseMetadataStar() listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(A, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, A) + listener: beginClassDeclaration(class, null, null, null, null, null, A) parseClass(A, class, class, A) parseClassHeaderOpt(A, class, class) parseClassExtendsOpt(A) diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_39033.crash_dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/issue_39033.crash_dart.intertwined.expect index dc366132f76..ca3ae33deed 100644 --- a/pkg/front_end/parser_testcases/error_recovery/issue_39033.crash_dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/error_recovery/issue_39033.crash_dart.intertwined.expect @@ -6,7 +6,7 @@ parseUnit(typedef) parseMetadataStar() listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_39230.crash_dart.expect b/pkg/front_end/parser_testcases/error_recovery/issue_39230.crash_dart.expect index 16d875d9d84..028c087ce7a 100644 --- a/pkg/front_end/parser_testcases/error_recovery/issue_39230.crash_dart.expect +++ b/pkg/front_end/parser_testcases/error_recovery/issue_39230.crash_dart.expect @@ -22,7 +22,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, C) handleNoType(C) handleClassExtends(null, 1) handleClassNoWithClause() 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 2a242ac7588..5e48edfdd25 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 @@ -6,13 +6,13 @@ parseUnit(class) parseMetadataStar() listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, C) parseClass(C, class, class, C) parseClassHeaderOpt(C, class, class) parseClassExtendsOpt(C) diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_41265.crash_dart.expect b/pkg/front_end/parser_testcases/error_recovery/issue_41265.crash_dart.expect index d72f63959ff..c5cb4d04782 100644 --- a/pkg/front_end/parser_testcases/error_recovery/issue_41265.crash_dart.expect +++ b/pkg/front_end/parser_testcases/error_recovery/issue_41265.crash_dart.expect @@ -18,7 +18,7 @@ beginCompilationUnit(class) handleNoType(T) endTypeVariable(>, 0, null, null) endTypeVariables(<, >) - beginClassDeclaration(class, null, null, null, null, A) + beginClassDeclaration(class, null, null, null, null, null, A) handleNoType(>) handleClassExtends(null, 1) handleClassNoWithClause() @@ -54,7 +54,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(DND1, classOrMixinDeclaration) handleNoTypeVariables(extends) - beginClassDeclaration(class, null, null, null, null, DND1) + beginClassDeclaration(class, null, null, null, null, null, DND1) handleIdentifier(Object, typeReference) handleNoTypeArguments(with) handleType(Object, null) diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_41265.crash_dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/issue_41265.crash_dart.intertwined.expect index 5cbccd5afdc..acf9547de06 100644 --- a/pkg/front_end/parser_testcases/error_recovery/issue_41265.crash_dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/error_recovery/issue_41265.crash_dart.intertwined.expect @@ -6,8 +6,8 @@ parseUnit(class) parseMetadataStar() listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(A, classOrMixinDeclaration) @@ -20,7 +20,7 @@ parseUnit(class) listener: handleNoType(T) listener: endTypeVariable(>, 0, null, null) listener: endTypeVariables(<, >) - listener: beginClassDeclaration(class, null, null, null, null, A) + listener: beginClassDeclaration(class, null, null, null, null, null, A) parseClass(>, class, class, A) parseClassHeaderOpt(>, class, class) parseClassExtendsOpt(>) @@ -41,7 +41,7 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(mixin) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(}, mixin, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(}, mixin, null, null, null, Instance of 'DirectiveContext') parseMixin(null, mixin) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(mixin) ensureIdentifier(mixin, classOrMixinDeclaration) @@ -72,13 +72,13 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(}, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(DND1, classOrMixinDeclaration) listener: handleNoTypeVariables(extends) - listener: beginClassDeclaration(class, null, null, null, null, DND1) + listener: beginClassDeclaration(class, null, null, null, null, null, DND1) parseClass(DND1, class, class, DND1) parseClassHeaderOpt(DND1, class, class) parseClassExtendsOpt(DND1) diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_43090.crash_dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/issue_43090.crash_dart.intertwined.expect index a1f5a14d501..f88c6225b52 100644 --- a/pkg/front_end/parser_testcases/error_recovery/issue_43090.crash_dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/error_recovery/issue_43090.crash_dart.intertwined.expect @@ -6,7 +6,7 @@ parseUnit(typedef) parseMetadataStar() listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_43090_prime_01.crash_dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/issue_43090_prime_01.crash_dart.intertwined.expect index 5e7a0bdfc80..22b6fbd4565 100644 --- a/pkg/front_end/parser_testcases/error_recovery/issue_43090_prime_01.crash_dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/error_recovery/issue_43090_prime_01.crash_dart.intertwined.expect @@ -6,7 +6,7 @@ parseUnit(typedef) parseMetadataStar() listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_43090_prime_02.crash_dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/issue_43090_prime_02.crash_dart.intertwined.expect index 43abeda239c..66ee890bc79 100644 --- a/pkg/front_end/parser_testcases/error_recovery/issue_43090_prime_02.crash_dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/error_recovery/issue_43090_prime_02.crash_dart.intertwined.expect @@ -6,7 +6,7 @@ parseUnit(typedef) parseMetadataStar() listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_45251.dart.expect b/pkg/front_end/parser_testcases/error_recovery/issue_45251.dart.expect index 2ef962831db..9ae8745ef90 100644 --- a/pkg/front_end/parser_testcases/error_recovery/issue_45251.dart.expect +++ b/pkg/front_end/parser_testcases/error_recovery/issue_45251.dart.expect @@ -22,7 +22,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(F, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, F) + beginClassDeclaration(class, null, null, null, null, null, F) handleNoType(F) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_45251.dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/issue_45251.dart.intertwined.expect index 5cc2451cb89..f039b0d8b08 100644 --- a/pkg/front_end/parser_testcases/error_recovery/issue_45251.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/error_recovery/issue_45251.dart.intertwined.expect @@ -6,13 +6,13 @@ parseUnit(class) parseMetadataStar() listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(F, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, F) + listener: beginClassDeclaration(class, null, null, null, null, null, F) parseClass(F, class, class, F) parseClassHeaderOpt(F, class, class) parseClassExtendsOpt(F) diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_45251_const.dart.expect b/pkg/front_end/parser_testcases/error_recovery/issue_45251_const.dart.expect index f93d90c3c69..d559b43d942 100644 --- a/pkg/front_end/parser_testcases/error_recovery/issue_45251_const.dart.expect +++ b/pkg/front_end/parser_testcases/error_recovery/issue_45251_const.dart.expect @@ -22,7 +22,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(F, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, F) + beginClassDeclaration(class, null, null, null, null, null, F) handleNoType(F) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_45251_const.dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/issue_45251_const.dart.intertwined.expect index 1b88386f00e..cb6f8150620 100644 --- a/pkg/front_end/parser_testcases/error_recovery/issue_45251_const.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/error_recovery/issue_45251_const.dart.intertwined.expect @@ -6,13 +6,13 @@ parseUnit(class) parseMetadataStar() listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(F, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, F) + listener: beginClassDeclaration(class, null, null, null, null, null, F) parseClass(F, class, class, F) parseClassHeaderOpt(F, class, class) parseClassExtendsOpt(F) diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_45251_list.dart.expect b/pkg/front_end/parser_testcases/error_recovery/issue_45251_list.dart.expect index 4cb8a91f35b..dee3b2f7713 100644 --- a/pkg/front_end/parser_testcases/error_recovery/issue_45251_list.dart.expect +++ b/pkg/front_end/parser_testcases/error_recovery/issue_45251_list.dart.expect @@ -18,7 +18,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(F, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, F) + beginClassDeclaration(class, null, null, null, null, null, F) handleNoType(F) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_45251_list.dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/issue_45251_list.dart.intertwined.expect index c87cbfb8f03..c2dee11ed63 100644 --- a/pkg/front_end/parser_testcases/error_recovery/issue_45251_list.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/error_recovery/issue_45251_list.dart.intertwined.expect @@ -6,13 +6,13 @@ parseUnit(class) parseMetadataStar() listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(F, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, F) + listener: beginClassDeclaration(class, null, null, null, null, null, F) parseClass(F, class, class, F) parseClassHeaderOpt(F, class, class) parseClassExtendsOpt(F) diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_45251_list_const.dart.expect b/pkg/front_end/parser_testcases/error_recovery/issue_45251_list_const.dart.expect index 12ee8db06be..66e8a3914c5 100644 --- a/pkg/front_end/parser_testcases/error_recovery/issue_45251_list_const.dart.expect +++ b/pkg/front_end/parser_testcases/error_recovery/issue_45251_list_const.dart.expect @@ -22,7 +22,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(F, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, F) + beginClassDeclaration(class, null, null, null, null, null, F) handleNoType(F) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_45251_list_const.dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/issue_45251_list_const.dart.intertwined.expect index a039f4c3ace..3383dc04f45 100644 --- a/pkg/front_end/parser_testcases/error_recovery/issue_45251_list_const.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/error_recovery/issue_45251_list_const.dart.intertwined.expect @@ -6,13 +6,13 @@ parseUnit(class) parseMetadataStar() listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(F, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, F) + listener: beginClassDeclaration(class, null, null, null, null, null, F) parseClass(F, class, class, F) parseClassHeaderOpt(F, class, class) parseClassExtendsOpt(F) diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_45251_list_new.dart.expect b/pkg/front_end/parser_testcases/error_recovery/issue_45251_list_new.dart.expect index c3befa2f7fe..caf07de200d 100644 --- a/pkg/front_end/parser_testcases/error_recovery/issue_45251_list_new.dart.expect +++ b/pkg/front_end/parser_testcases/error_recovery/issue_45251_list_new.dart.expect @@ -34,7 +34,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(F, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, F) + beginClassDeclaration(class, null, null, null, null, null, F) handleNoType(F) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_45251_list_new.dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/issue_45251_list_new.dart.intertwined.expect index b2bd1e0b8a6..528dfcd4110 100644 --- a/pkg/front_end/parser_testcases/error_recovery/issue_45251_list_new.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/error_recovery/issue_45251_list_new.dart.intertwined.expect @@ -6,13 +6,13 @@ parseUnit(class) parseMetadataStar() listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(F, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, F) + listener: beginClassDeclaration(class, null, null, null, null, null, F) parseClass(F, class, class, F) parseClassHeaderOpt(F, class, class) parseClassExtendsOpt(F) diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_45251_new.dart.expect b/pkg/front_end/parser_testcases/error_recovery/issue_45251_new.dart.expect index 751c11bfb70..7c2d5ea8b9e 100644 --- a/pkg/front_end/parser_testcases/error_recovery/issue_45251_new.dart.expect +++ b/pkg/front_end/parser_testcases/error_recovery/issue_45251_new.dart.expect @@ -34,7 +34,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(F, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, F) + beginClassDeclaration(class, null, null, null, null, null, F) handleNoType(F) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_45251_new.dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/issue_45251_new.dart.intertwined.expect index 73223698ffd..865bf255ee7 100644 --- a/pkg/front_end/parser_testcases/error_recovery/issue_45251_new.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/error_recovery/issue_45251_new.dart.intertwined.expect @@ -6,13 +6,13 @@ parseUnit(class) parseMetadataStar() listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(F, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, F) + listener: beginClassDeclaration(class, null, null, null, null, null, F) parseClass(F, class, class, F) parseClassHeaderOpt(F, class, class) parseClassExtendsOpt(F) diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_45251_set.dart.expect b/pkg/front_end/parser_testcases/error_recovery/issue_45251_set.dart.expect index 048860b3fd9..9df94f51d0e 100644 --- a/pkg/front_end/parser_testcases/error_recovery/issue_45251_set.dart.expect +++ b/pkg/front_end/parser_testcases/error_recovery/issue_45251_set.dart.expect @@ -22,7 +22,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(F, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, F) + beginClassDeclaration(class, null, null, null, null, null, F) handleNoType(F) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_45251_set.dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/issue_45251_set.dart.intertwined.expect index 70d28390686..ae30bddb678 100644 --- a/pkg/front_end/parser_testcases/error_recovery/issue_45251_set.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/error_recovery/issue_45251_set.dart.intertwined.expect @@ -6,13 +6,13 @@ parseUnit(class) parseMetadataStar() listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(F, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, F) + listener: beginClassDeclaration(class, null, null, null, null, null, F) parseClass(F, class, class, F) parseClassHeaderOpt(F, class, class) parseClassExtendsOpt(F) diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_45251_set_const.dart.expect b/pkg/front_end/parser_testcases/error_recovery/issue_45251_set_const.dart.expect index 92c7f82f628..c3f9652fbf6 100644 --- a/pkg/front_end/parser_testcases/error_recovery/issue_45251_set_const.dart.expect +++ b/pkg/front_end/parser_testcases/error_recovery/issue_45251_set_const.dart.expect @@ -22,7 +22,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(F, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, F) + beginClassDeclaration(class, null, null, null, null, null, F) handleNoType(F) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_45251_set_const.dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/issue_45251_set_const.dart.intertwined.expect index 04e0899d148..75707e76bc0 100644 --- a/pkg/front_end/parser_testcases/error_recovery/issue_45251_set_const.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/error_recovery/issue_45251_set_const.dart.intertwined.expect @@ -6,13 +6,13 @@ parseUnit(class) parseMetadataStar() listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(F, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, F) + listener: beginClassDeclaration(class, null, null, null, null, null, F) parseClass(F, class, class, F) parseClassHeaderOpt(F, class, class) parseClassExtendsOpt(F) diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_45251_set_new.dart.expect b/pkg/front_end/parser_testcases/error_recovery/issue_45251_set_new.dart.expect index e4c4f92258d..1df236c11cb 100644 --- a/pkg/front_end/parser_testcases/error_recovery/issue_45251_set_new.dart.expect +++ b/pkg/front_end/parser_testcases/error_recovery/issue_45251_set_new.dart.expect @@ -34,7 +34,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(F, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, F) + beginClassDeclaration(class, null, null, null, null, null, F) handleNoType(F) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_45251_set_new.dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/issue_45251_set_new.dart.intertwined.expect index aa6ba8ff6b2..6a5014957f8 100644 --- a/pkg/front_end/parser_testcases/error_recovery/issue_45251_set_new.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/error_recovery/issue_45251_set_new.dart.intertwined.expect @@ -6,13 +6,13 @@ parseUnit(class) parseMetadataStar() listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(F, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, F) + listener: beginClassDeclaration(class, null, null, null, null, null, F) parseClass(F, class, class, F) parseClassHeaderOpt(F, class, class) parseClassExtendsOpt(F) diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_45327_prime_1.crash_dart.expect b/pkg/front_end/parser_testcases/error_recovery/issue_45327_prime_1.crash_dart.expect index 509ded50e05..7cade0b3775 100644 --- a/pkg/front_end/parser_testcases/error_recovery/issue_45327_prime_1.crash_dart.expect +++ b/pkg/front_end/parser_testcases/error_recovery/issue_45327_prime_1.crash_dart.expect @@ -22,7 +22,7 @@ beginCompilationUnit(class) handleNoType(T) endTypeVariable(>, 0, null, null) endTypeVariables(<, >) - beginClassDeclaration(class, null, null, null, null, Foo) + beginClassDeclaration(class, null, null, null, null, null, Foo) handleNoType(>) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_45327_prime_1.crash_dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/issue_45327_prime_1.crash_dart.intertwined.expect index f34051d79cc..cce9a3c0c35 100644 --- a/pkg/front_end/parser_testcases/error_recovery/issue_45327_prime_1.crash_dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/error_recovery/issue_45327_prime_1.crash_dart.intertwined.expect @@ -6,8 +6,8 @@ parseUnit(UnmatchedToken(()) parseMetadataStar(UnmatchedToken(()) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(UnmatchedToken((), class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(UnmatchedToken((), class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(Foo, classOrMixinDeclaration) @@ -20,7 +20,7 @@ parseUnit(UnmatchedToken(()) listener: handleNoType(T) listener: endTypeVariable(>, 0, null, null) listener: endTypeVariables(<, >) - listener: beginClassDeclaration(class, null, null, null, null, Foo) + listener: beginClassDeclaration(class, null, null, null, null, null, Foo) parseClass(>, class, class, Foo) parseClassHeaderOpt(>, class, class) parseClassExtendsOpt(>) diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_46346.dart.expect b/pkg/front_end/parser_testcases/error_recovery/issue_46346.dart.expect index 1d2f310c285..f10ecca4507 100644 --- a/pkg/front_end/parser_testcases/error_recovery/issue_46346.dart.expect +++ b/pkg/front_end/parser_testcases/error_recovery/issue_46346.dart.expect @@ -231,7 +231,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[BuiltInIdentifierInDeclaration, Can't use 'abstract' as a name here., null, {lexeme: abstract}], abstract, abstract) handleIdentifier(abstract, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, abstract) + beginClassDeclaration(class, null, null, null, null, null, abstract) handleNoType(abstract) handleClassExtends(null, 1) handleClassNoWithClause() @@ -247,7 +247,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[BuiltInIdentifierInDeclaration, Can't use 'as' as a name here., null, {lexeme: as}], as, as) handleIdentifier(as, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, as) + beginClassDeclaration(class, null, null, null, null, null, as) handleNoType(as) handleClassExtends(null, 1) handleClassNoWithClause() @@ -263,7 +263,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'assert' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: assert}], assert, assert) handleIdentifier(assert, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, assert) + beginClassDeclaration(class, null, null, null, null, null, assert) handleNoType(assert) handleClassExtends(null, 1) handleClassNoWithClause() @@ -278,7 +278,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(async, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, async) + beginClassDeclaration(class, null, null, null, null, null, async) handleNoType(async) handleClassExtends(null, 1) handleClassNoWithClause() @@ -293,7 +293,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(await, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, await) + beginClassDeclaration(class, null, null, null, null, null, await) handleNoType(await) handleClassExtends(null, 1) handleClassNoWithClause() @@ -309,7 +309,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'break' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: break}], break, break) handleIdentifier(break, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, break) + beginClassDeclaration(class, null, null, null, null, null, break) handleNoType(break) handleClassExtends(null, 1) handleClassNoWithClause() @@ -325,7 +325,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'case' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: case}], case, case) handleIdentifier(case, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, case) + beginClassDeclaration(class, null, null, null, null, null, case) handleNoType(case) handleClassExtends(null, 1) handleClassNoWithClause() @@ -341,7 +341,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'catch' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: catch}], catch, catch) handleIdentifier(catch, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, catch) + beginClassDeclaration(class, null, null, null, null, null, catch) handleNoType(catch) handleClassExtends(null, 1) handleClassNoWithClause() @@ -357,7 +357,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'class' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: class}], class, class) handleIdentifier(class, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, class) + beginClassDeclaration(class, null, null, null, null, null, class) handleNoType(class) handleClassExtends(null, 1) handleClassNoWithClause() @@ -373,7 +373,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'const' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: const}], const, const) handleIdentifier(const, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, const) + beginClassDeclaration(class, null, null, null, null, null, const) handleNoType(const) handleClassExtends(null, 1) handleClassNoWithClause() @@ -389,7 +389,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'continue' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: continue}], continue, continue) handleIdentifier(continue, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, continue) + beginClassDeclaration(class, null, null, null, null, null, continue) handleNoType(continue) handleClassExtends(null, 1) handleClassNoWithClause() @@ -405,7 +405,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[BuiltInIdentifierInDeclaration, Can't use 'covariant' as a name here., null, {lexeme: covariant}], covariant, covariant) handleIdentifier(covariant, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, covariant) + beginClassDeclaration(class, null, null, null, null, null, covariant) handleNoType(covariant) handleClassExtends(null, 1) handleClassNoWithClause() @@ -421,7 +421,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'default' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: default}], default, default) handleIdentifier(default, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, default) + beginClassDeclaration(class, null, null, null, null, null, default) handleNoType(default) handleClassExtends(null, 1) handleClassNoWithClause() @@ -437,7 +437,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[BuiltInIdentifierInDeclaration, Can't use 'deferred' as a name here., null, {lexeme: deferred}], deferred, deferred) handleIdentifier(deferred, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, deferred) + beginClassDeclaration(class, null, null, null, null, null, deferred) handleNoType(deferred) handleClassExtends(null, 1) handleClassNoWithClause() @@ -453,7 +453,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'do' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: do}], do, do) handleIdentifier(do, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, do) + beginClassDeclaration(class, null, null, null, null, null, do) handleNoType(do) handleClassExtends(null, 1) handleClassNoWithClause() @@ -469,7 +469,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[BuiltInIdentifierInDeclaration, Can't use 'dynamic' as a name here., null, {lexeme: dynamic}], dynamic, dynamic) handleIdentifier(dynamic, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, dynamic) + beginClassDeclaration(class, null, null, null, null, null, dynamic) handleNoType(dynamic) handleClassExtends(null, 1) handleClassNoWithClause() @@ -485,7 +485,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'else' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: else}], else, else) handleIdentifier(else, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, else) + beginClassDeclaration(class, null, null, null, null, null, else) handleNoType(else) handleClassExtends(null, 1) handleClassNoWithClause() @@ -501,7 +501,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'enum' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: enum}], enum, enum) handleIdentifier(enum, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, enum) + beginClassDeclaration(class, null, null, null, null, null, enum) handleNoType(enum) handleClassExtends(null, 1) handleClassNoWithClause() @@ -517,7 +517,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[BuiltInIdentifierInDeclaration, Can't use 'export' as a name here., null, {lexeme: export}], export, export) handleIdentifier(export, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, export) + beginClassDeclaration(class, null, null, null, null, null, export) handleNoType(export) handleClassExtends(null, 1) handleClassNoWithClause() @@ -533,7 +533,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'extends' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: extends}], extends, extends) handleIdentifier(extends, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, extends) + beginClassDeclaration(class, null, null, null, null, null, extends) handleNoType(extends) handleClassExtends(null, 1) handleClassNoWithClause() @@ -549,7 +549,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[BuiltInIdentifierInDeclaration, Can't use 'extension' as a name here., null, {lexeme: extension}], extension, extension) handleIdentifier(extension, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, extension) + beginClassDeclaration(class, null, null, null, null, null, extension) handleNoType(extension) handleClassExtends(null, 1) handleClassNoWithClause() @@ -565,7 +565,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[BuiltInIdentifierInDeclaration, Can't use 'external' as a name here., null, {lexeme: external}], external, external) handleIdentifier(external, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, external) + beginClassDeclaration(class, null, null, null, null, null, external) handleNoType(external) handleClassExtends(null, 1) handleClassNoWithClause() @@ -581,7 +581,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[BuiltInIdentifierInDeclaration, Can't use 'factory' as a name here., null, {lexeme: factory}], factory, factory) handleIdentifier(factory, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, factory) + beginClassDeclaration(class, null, null, null, null, null, factory) handleNoType(factory) handleClassExtends(null, 1) handleClassNoWithClause() @@ -597,7 +597,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'false' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: false}], false, false) handleIdentifier(false, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, false) + beginClassDeclaration(class, null, null, null, null, null, false) handleNoType(false) handleClassExtends(null, 1) handleClassNoWithClause() @@ -613,7 +613,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'final' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: final}], final, final) handleIdentifier(final, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, final) + beginClassDeclaration(class, null, null, null, null, null, final) handleNoType(final) handleClassExtends(null, 1) handleClassNoWithClause() @@ -629,7 +629,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'finally' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: finally}], finally, finally) handleIdentifier(finally, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, finally) + beginClassDeclaration(class, null, null, null, null, null, finally) handleNoType(finally) handleClassExtends(null, 1) handleClassNoWithClause() @@ -645,7 +645,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'for' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: for}], for, for) handleIdentifier(for, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, for) + beginClassDeclaration(class, null, null, null, null, null, for) handleNoType(for) handleClassExtends(null, 1) handleClassNoWithClause() @@ -661,7 +661,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[BuiltInIdentifierInDeclaration, Can't use 'Function' as a name here., null, {lexeme: Function}], Function, Function) handleIdentifier(Function, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, Function) + beginClassDeclaration(class, null, null, null, null, null, Function) handleNoType(Function) handleClassExtends(null, 1) handleClassNoWithClause() @@ -677,7 +677,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[BuiltInIdentifierInDeclaration, Can't use 'get' as a name here., null, {lexeme: get}], get, get) handleIdentifier(get, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, get) + beginClassDeclaration(class, null, null, null, null, null, get) handleNoType(get) handleClassExtends(null, 1) handleClassNoWithClause() @@ -692,7 +692,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(hide, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, hide) + beginClassDeclaration(class, null, null, null, null, null, hide) handleNoType(hide) handleClassExtends(null, 1) handleClassNoWithClause() @@ -708,7 +708,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'if' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: if}], if, if) handleIdentifier(if, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, if) + beginClassDeclaration(class, null, null, null, null, null, if) handleNoType(if) handleClassExtends(null, 1) handleClassNoWithClause() @@ -724,7 +724,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[BuiltInIdentifierInDeclaration, Can't use 'implements' as a name here., null, {lexeme: implements}], implements, implements) handleIdentifier(implements, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, implements) + beginClassDeclaration(class, null, null, null, null, null, implements) handleNoType(implements) handleClassExtends(null, 1) handleClassNoWithClause() @@ -740,7 +740,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[BuiltInIdentifierInDeclaration, Can't use 'import' as a name here., null, {lexeme: import}], import, import) handleIdentifier(import, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, import) + beginClassDeclaration(class, null, null, null, null, null, import) handleNoType(import) handleClassExtends(null, 1) handleClassNoWithClause() @@ -756,7 +756,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'in' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: in}], in, in) handleIdentifier(in, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, in) + beginClassDeclaration(class, null, null, null, null, null, in) handleNoType(in) handleClassExtends(null, 1) handleClassNoWithClause() @@ -771,7 +771,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(inout, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, inout) + beginClassDeclaration(class, null, null, null, null, null, inout) handleNoType(inout) handleClassExtends(null, 1) handleClassNoWithClause() @@ -787,7 +787,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[BuiltInIdentifierInDeclaration, Can't use 'interface' as a name here., null, {lexeme: interface}], interface, interface) handleIdentifier(interface, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, interface) + beginClassDeclaration(class, null, null, null, null, null, interface) handleNoType(interface) handleClassExtends(null, 1) handleClassNoWithClause() @@ -803,7 +803,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'is' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: is}], is, is) handleIdentifier(is, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, is) + beginClassDeclaration(class, null, null, null, null, null, is) handleNoType(is) handleClassExtends(null, 1) handleClassNoWithClause() @@ -819,7 +819,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[BuiltInIdentifierInDeclaration, Can't use 'late' as a name here., null, {lexeme: late}], late, late) handleIdentifier(late, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, late) + beginClassDeclaration(class, null, null, null, null, null, late) handleNoType(late) handleClassExtends(null, 1) handleClassNoWithClause() @@ -835,7 +835,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[BuiltInIdentifierInDeclaration, Can't use 'library' as a name here., null, {lexeme: library}], library, library) handleIdentifier(library, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, library) + beginClassDeclaration(class, null, null, null, null, null, library) handleNoType(library) handleClassExtends(null, 1) handleClassNoWithClause() @@ -851,7 +851,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[BuiltInIdentifierInDeclaration, Can't use 'mixin' as a name here., null, {lexeme: mixin}], mixin, mixin) handleIdentifier(mixin, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, mixin) + beginClassDeclaration(class, null, null, null, null, null, mixin) handleNoType(mixin) handleClassExtends(null, 1) handleClassNoWithClause() @@ -866,7 +866,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(native, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, native) + beginClassDeclaration(class, null, null, null, null, null, native) handleNoType(native) handleClassExtends(null, 1) handleClassNoWithClause() @@ -882,7 +882,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'new' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: new}], new, new) handleIdentifier(new, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, new) + beginClassDeclaration(class, null, null, null, null, null, new) handleNoType(new) handleClassExtends(null, 1) handleClassNoWithClause() @@ -898,7 +898,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'null' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: null}], null, null) handleIdentifier(null, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, null) + beginClassDeclaration(class, null, null, null, null, null, null) handleNoType(null) handleClassExtends(null, 1) handleClassNoWithClause() @@ -913,7 +913,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(of, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, of) + beginClassDeclaration(class, null, null, null, null, null, of) handleNoType(of) handleClassExtends(null, 1) handleClassNoWithClause() @@ -928,7 +928,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(on, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, on) + beginClassDeclaration(class, null, null, null, null, null, on) handleNoType(on) handleClassExtends(null, 1) handleClassNoWithClause() @@ -944,7 +944,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[BuiltInIdentifierInDeclaration, Can't use 'operator' as a name here., null, {lexeme: operator}], operator, operator) handleIdentifier(operator, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, operator) + beginClassDeclaration(class, null, null, null, null, null, operator) handleNoType(operator) handleClassExtends(null, 1) handleClassNoWithClause() @@ -959,7 +959,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(out, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, out) + beginClassDeclaration(class, null, null, null, null, null, out) handleNoType(out) handleClassExtends(null, 1) handleClassNoWithClause() @@ -975,7 +975,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[BuiltInIdentifierInDeclaration, Can't use 'part' as a name here., null, {lexeme: part}], part, part) handleIdentifier(part, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, part) + beginClassDeclaration(class, null, null, null, null, null, part) handleNoType(part) handleClassExtends(null, 1) handleClassNoWithClause() @@ -990,7 +990,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(patch, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, patch) + beginClassDeclaration(class, null, null, null, null, null, patch) handleNoType(patch) handleClassExtends(null, 1) handleClassNoWithClause() @@ -1006,7 +1006,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[BuiltInIdentifierInDeclaration, Can't use 'required' as a name here., null, {lexeme: required}], required, required) handleIdentifier(required, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, required) + beginClassDeclaration(class, null, null, null, null, null, required) handleNoType(required) handleClassExtends(null, 1) handleClassNoWithClause() @@ -1022,7 +1022,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'rethrow' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: rethrow}], rethrow, rethrow) handleIdentifier(rethrow, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, rethrow) + beginClassDeclaration(class, null, null, null, null, null, rethrow) handleNoType(rethrow) handleClassExtends(null, 1) handleClassNoWithClause() @@ -1038,7 +1038,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'return' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: return}], return, return) handleIdentifier(return, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, return) + beginClassDeclaration(class, null, null, null, null, null, return) handleNoType(return) handleClassExtends(null, 1) handleClassNoWithClause() @@ -1054,7 +1054,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[BuiltInIdentifierInDeclaration, Can't use 'set' as a name here., null, {lexeme: set}], set, set) handleIdentifier(set, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, set) + beginClassDeclaration(class, null, null, null, null, null, set) handleNoType(set) handleClassExtends(null, 1) handleClassNoWithClause() @@ -1069,7 +1069,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(show, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, show) + beginClassDeclaration(class, null, null, null, null, null, show) handleNoType(show) handleClassExtends(null, 1) handleClassNoWithClause() @@ -1084,7 +1084,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(source, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, source) + beginClassDeclaration(class, null, null, null, null, null, source) handleNoType(source) handleClassExtends(null, 1) handleClassNoWithClause() @@ -1100,7 +1100,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[BuiltInIdentifierInDeclaration, Can't use 'static' as a name here., null, {lexeme: static}], static, static) handleIdentifier(static, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, static) + beginClassDeclaration(class, null, null, null, null, null, static) handleNoType(static) handleClassExtends(null, 1) handleClassNoWithClause() @@ -1116,7 +1116,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'super' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: super}], super, super) handleIdentifier(super, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, super) + beginClassDeclaration(class, null, null, null, null, null, super) handleNoType(super) handleClassExtends(null, 1) handleClassNoWithClause() @@ -1132,7 +1132,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'switch' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: switch}], switch, switch) handleIdentifier(switch, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, switch) + beginClassDeclaration(class, null, null, null, null, null, switch) handleNoType(switch) handleClassExtends(null, 1) handleClassNoWithClause() @@ -1147,7 +1147,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(sync, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, sync) + beginClassDeclaration(class, null, null, null, null, null, sync) handleNoType(sync) handleClassExtends(null, 1) handleClassNoWithClause() @@ -1163,7 +1163,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'this' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: this}], this, this) handleIdentifier(this, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, this) + beginClassDeclaration(class, null, null, null, null, null, this) handleNoType(this) handleClassExtends(null, 1) handleClassNoWithClause() @@ -1179,7 +1179,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'throw' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: throw}], throw, throw) handleIdentifier(throw, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, throw) + beginClassDeclaration(class, null, null, null, null, null, throw) handleNoType(throw) handleClassExtends(null, 1) handleClassNoWithClause() @@ -1195,7 +1195,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'true' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: true}], true, true) handleIdentifier(true, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, true) + beginClassDeclaration(class, null, null, null, null, null, true) handleNoType(true) handleClassExtends(null, 1) handleClassNoWithClause() @@ -1211,7 +1211,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'try' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: try}], try, try) handleIdentifier(try, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, try) + beginClassDeclaration(class, null, null, null, null, null, try) handleNoType(try) handleClassExtends(null, 1) handleClassNoWithClause() @@ -1227,7 +1227,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[BuiltInIdentifierInDeclaration, Can't use 'typedef' as a name here., null, {lexeme: typedef}], typedef, typedef) handleIdentifier(typedef, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, typedef) + beginClassDeclaration(class, null, null, null, null, null, typedef) handleNoType(typedef) handleClassExtends(null, 1) handleClassNoWithClause() @@ -1243,7 +1243,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'var' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: var}], var, var) handleIdentifier(var, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, var) + beginClassDeclaration(class, null, null, null, null, null, var) handleNoType(var) handleClassExtends(null, 1) handleClassNoWithClause() @@ -1259,7 +1259,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'void' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: void}], void, void) handleIdentifier(void, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, void) + beginClassDeclaration(class, null, null, null, null, null, void) handleNoType(void) handleClassExtends(null, 1) handleClassNoWithClause() @@ -1275,7 +1275,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'while' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: while}], while, while) handleIdentifier(while, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, while) + beginClassDeclaration(class, null, null, null, null, null, while) handleNoType(while) handleClassExtends(null, 1) handleClassNoWithClause() @@ -1291,7 +1291,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'with' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: with}], with, with) handleIdentifier(with, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, with) + beginClassDeclaration(class, null, null, null, null, null, with) handleNoType(with) handleClassExtends(null, 1) handleClassNoWithClause() @@ -1306,7 +1306,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(yield, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, yield) + beginClassDeclaration(class, null, null, null, null, null, yield) handleNoType(yield) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_46346.dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/issue_46346.dart.intertwined.expect index 81a02bdd3a7..4f7be02588e 100644 --- a/pkg/front_end/parser_testcases/error_recovery/issue_46346.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/error_recovery/issue_46346.dart.intertwined.expect @@ -6,15 +6,15 @@ parseUnit(class) parseMetadataStar() listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(abstract, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[BuiltInIdentifierInDeclaration, Can't use 'abstract' as a name here., null, {lexeme: abstract}], abstract, abstract) listener: handleIdentifier(abstract, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, abstract) + listener: beginClassDeclaration(class, null, null, null, null, null, abstract) parseClass(abstract, class, class, abstract) parseClassHeaderOpt(abstract, class, class) parseClassExtendsOpt(abstract) @@ -35,15 +35,15 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(}, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(as, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[BuiltInIdentifierInDeclaration, Can't use 'as' as a name here., null, {lexeme: as}], as, as) listener: handleIdentifier(as, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, as) + listener: beginClassDeclaration(class, null, null, null, null, null, as) parseClass(as, class, class, as) parseClassHeaderOpt(as, class, class) parseClassExtendsOpt(as) @@ -64,15 +64,15 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(}, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(assert, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'assert' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: assert}], assert, assert) listener: handleIdentifier(assert, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, assert) + listener: beginClassDeclaration(class, null, null, null, null, null, assert) parseClass(assert, class, class, assert) parseClassHeaderOpt(assert, class, class) parseClassExtendsOpt(assert) @@ -93,13 +93,13 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(}, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(async, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, async) + listener: beginClassDeclaration(class, null, null, null, null, null, async) parseClass(async, class, class, async) parseClassHeaderOpt(async, class, class) parseClassExtendsOpt(async) @@ -120,13 +120,13 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(}, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(await, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, await) + listener: beginClassDeclaration(class, null, null, null, null, null, await) parseClass(await, class, class, await) parseClassHeaderOpt(await, class, class) parseClassExtendsOpt(await) @@ -147,15 +147,15 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(}, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(break, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'break' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: break}], break, break) listener: handleIdentifier(break, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, break) + listener: beginClassDeclaration(class, null, null, null, null, null, break) parseClass(break, class, class, break) parseClassHeaderOpt(break, class, class) parseClassExtendsOpt(break) @@ -176,15 +176,15 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(}, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(case, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'case' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: case}], case, case) listener: handleIdentifier(case, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, case) + listener: beginClassDeclaration(class, null, null, null, null, null, case) parseClass(case, class, class, case) parseClassHeaderOpt(case, class, class) parseClassExtendsOpt(case) @@ -205,15 +205,15 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(}, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(catch, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'catch' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: catch}], catch, catch) listener: handleIdentifier(catch, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, catch) + listener: beginClassDeclaration(class, null, null, null, null, null, catch) parseClass(catch, class, class, catch) parseClassHeaderOpt(catch, class, class) parseClassExtendsOpt(catch) @@ -234,15 +234,15 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(}, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(class, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'class' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: class}], class, class) listener: handleIdentifier(class, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, class) + listener: beginClassDeclaration(class, null, null, null, null, null, class) parseClass(class, class, class, class) parseClassHeaderOpt(class, class, class) parseClassExtendsOpt(class) @@ -263,15 +263,15 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(}, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(const, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'const' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: const}], const, const) listener: handleIdentifier(const, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, const) + listener: beginClassDeclaration(class, null, null, null, null, null, const) parseClass(const, class, class, const) parseClassHeaderOpt(const, class, class) parseClassExtendsOpt(const) @@ -292,15 +292,15 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(}, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(continue, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'continue' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: continue}], continue, continue) listener: handleIdentifier(continue, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, continue) + listener: beginClassDeclaration(class, null, null, null, null, null, continue) parseClass(continue, class, class, continue) parseClassHeaderOpt(continue, class, class) parseClassExtendsOpt(continue) @@ -321,15 +321,15 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(}, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(covariant, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[BuiltInIdentifierInDeclaration, Can't use 'covariant' as a name here., null, {lexeme: covariant}], covariant, covariant) listener: handleIdentifier(covariant, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, covariant) + listener: beginClassDeclaration(class, null, null, null, null, null, covariant) parseClass(covariant, class, class, covariant) parseClassHeaderOpt(covariant, class, class) parseClassExtendsOpt(covariant) @@ -350,15 +350,15 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(}, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(default, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'default' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: default}], default, default) listener: handleIdentifier(default, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, default) + listener: beginClassDeclaration(class, null, null, null, null, null, default) parseClass(default, class, class, default) parseClassHeaderOpt(default, class, class) parseClassExtendsOpt(default) @@ -379,15 +379,15 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(}, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(deferred, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[BuiltInIdentifierInDeclaration, Can't use 'deferred' as a name here., null, {lexeme: deferred}], deferred, deferred) listener: handleIdentifier(deferred, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, deferred) + listener: beginClassDeclaration(class, null, null, null, null, null, deferred) parseClass(deferred, class, class, deferred) parseClassHeaderOpt(deferred, class, class) parseClassExtendsOpt(deferred) @@ -408,15 +408,15 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(}, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(do, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'do' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: do}], do, do) listener: handleIdentifier(do, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, do) + listener: beginClassDeclaration(class, null, null, null, null, null, do) parseClass(do, class, class, do) parseClassHeaderOpt(do, class, class) parseClassExtendsOpt(do) @@ -437,15 +437,15 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(}, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(dynamic, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[BuiltInIdentifierInDeclaration, Can't use 'dynamic' as a name here., null, {lexeme: dynamic}], dynamic, dynamic) listener: handleIdentifier(dynamic, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, dynamic) + listener: beginClassDeclaration(class, null, null, null, null, null, dynamic) parseClass(dynamic, class, class, dynamic) parseClassHeaderOpt(dynamic, class, class) parseClassExtendsOpt(dynamic) @@ -466,15 +466,15 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(}, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(else, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'else' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: else}], else, else) listener: handleIdentifier(else, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, else) + listener: beginClassDeclaration(class, null, null, null, null, null, else) parseClass(else, class, class, else) parseClassHeaderOpt(else, class, class) parseClassExtendsOpt(else) @@ -495,15 +495,15 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(}, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(enum, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'enum' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: enum}], enum, enum) listener: handleIdentifier(enum, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, enum) + listener: beginClassDeclaration(class, null, null, null, null, null, enum) parseClass(enum, class, class, enum) parseClassHeaderOpt(enum, class, class) parseClassExtendsOpt(enum) @@ -524,15 +524,15 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(}, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(export, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[BuiltInIdentifierInDeclaration, Can't use 'export' as a name here., null, {lexeme: export}], export, export) listener: handleIdentifier(export, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, export) + listener: beginClassDeclaration(class, null, null, null, null, null, export) parseClass(export, class, class, export) parseClassHeaderOpt(export, class, class) parseClassExtendsOpt(export) @@ -553,15 +553,15 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(}, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(extends, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'extends' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: extends}], extends, extends) listener: handleIdentifier(extends, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, extends) + listener: beginClassDeclaration(class, null, null, null, null, null, extends) parseClass(extends, class, class, extends) parseClassHeaderOpt(extends, class, class) parseClassExtendsOpt(extends) @@ -582,15 +582,15 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(}, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(extension, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[BuiltInIdentifierInDeclaration, Can't use 'extension' as a name here., null, {lexeme: extension}], extension, extension) listener: handleIdentifier(extension, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, extension) + listener: beginClassDeclaration(class, null, null, null, null, null, extension) parseClass(extension, class, class, extension) parseClassHeaderOpt(extension, class, class) parseClassExtendsOpt(extension) @@ -611,15 +611,15 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(}, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(external, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[BuiltInIdentifierInDeclaration, Can't use 'external' as a name here., null, {lexeme: external}], external, external) listener: handleIdentifier(external, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, external) + listener: beginClassDeclaration(class, null, null, null, null, null, external) parseClass(external, class, class, external) parseClassHeaderOpt(external, class, class) parseClassExtendsOpt(external) @@ -640,15 +640,15 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(}, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(factory, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[BuiltInIdentifierInDeclaration, Can't use 'factory' as a name here., null, {lexeme: factory}], factory, factory) listener: handleIdentifier(factory, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, factory) + listener: beginClassDeclaration(class, null, null, null, null, null, factory) parseClass(factory, class, class, factory) parseClassHeaderOpt(factory, class, class) parseClassExtendsOpt(factory) @@ -669,15 +669,15 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(}, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(false, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'false' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: false}], false, false) listener: handleIdentifier(false, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, false) + listener: beginClassDeclaration(class, null, null, null, null, null, false) parseClass(false, class, class, false) parseClassHeaderOpt(false, class, class) parseClassExtendsOpt(false) @@ -698,15 +698,15 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(}, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(final, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'final' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: final}], final, final) listener: handleIdentifier(final, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, final) + listener: beginClassDeclaration(class, null, null, null, null, null, final) parseClass(final, class, class, final) parseClassHeaderOpt(final, class, class) parseClassExtendsOpt(final) @@ -727,15 +727,15 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(}, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(finally, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'finally' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: finally}], finally, finally) listener: handleIdentifier(finally, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, finally) + listener: beginClassDeclaration(class, null, null, null, null, null, finally) parseClass(finally, class, class, finally) parseClassHeaderOpt(finally, class, class) parseClassExtendsOpt(finally) @@ -756,15 +756,15 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(}, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(for, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'for' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: for}], for, for) listener: handleIdentifier(for, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, for) + listener: beginClassDeclaration(class, null, null, null, null, null, for) parseClass(for, class, class, for) parseClassHeaderOpt(for, class, class) parseClassExtendsOpt(for) @@ -785,15 +785,15 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(}, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(Function, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[BuiltInIdentifierInDeclaration, Can't use 'Function' as a name here., null, {lexeme: Function}], Function, Function) listener: handleIdentifier(Function, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, Function) + listener: beginClassDeclaration(class, null, null, null, null, null, Function) parseClass(Function, class, class, Function) parseClassHeaderOpt(Function, class, class) parseClassExtendsOpt(Function) @@ -814,15 +814,15 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(}, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(get, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[BuiltInIdentifierInDeclaration, Can't use 'get' as a name here., null, {lexeme: get}], get, get) listener: handleIdentifier(get, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, get) + listener: beginClassDeclaration(class, null, null, null, null, null, get) parseClass(get, class, class, get) parseClassHeaderOpt(get, class, class) parseClassExtendsOpt(get) @@ -843,13 +843,13 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(}, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(hide, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, hide) + listener: beginClassDeclaration(class, null, null, null, null, null, hide) parseClass(hide, class, class, hide) parseClassHeaderOpt(hide, class, class) parseClassExtendsOpt(hide) @@ -870,15 +870,15 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(}, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(if, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'if' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: if}], if, if) listener: handleIdentifier(if, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, if) + listener: beginClassDeclaration(class, null, null, null, null, null, if) parseClass(if, class, class, if) parseClassHeaderOpt(if, class, class) parseClassExtendsOpt(if) @@ -899,15 +899,15 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(}, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(implements, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[BuiltInIdentifierInDeclaration, Can't use 'implements' as a name here., null, {lexeme: implements}], implements, implements) listener: handleIdentifier(implements, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, implements) + listener: beginClassDeclaration(class, null, null, null, null, null, implements) parseClass(implements, class, class, implements) parseClassHeaderOpt(implements, class, class) parseClassExtendsOpt(implements) @@ -928,15 +928,15 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(}, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(import, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[BuiltInIdentifierInDeclaration, Can't use 'import' as a name here., null, {lexeme: import}], import, import) listener: handleIdentifier(import, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, import) + listener: beginClassDeclaration(class, null, null, null, null, null, import) parseClass(import, class, class, import) parseClassHeaderOpt(import, class, class) parseClassExtendsOpt(import) @@ -957,15 +957,15 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(}, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(in, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'in' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: in}], in, in) listener: handleIdentifier(in, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, in) + listener: beginClassDeclaration(class, null, null, null, null, null, in) parseClass(in, class, class, in) parseClassHeaderOpt(in, class, class) parseClassExtendsOpt(in) @@ -986,13 +986,13 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(}, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(inout, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, inout) + listener: beginClassDeclaration(class, null, null, null, null, null, inout) parseClass(inout, class, class, inout) parseClassHeaderOpt(inout, class, class) parseClassExtendsOpt(inout) @@ -1013,15 +1013,15 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(}, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(interface, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[BuiltInIdentifierInDeclaration, Can't use 'interface' as a name here., null, {lexeme: interface}], interface, interface) listener: handleIdentifier(interface, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, interface) + listener: beginClassDeclaration(class, null, null, null, null, null, interface) parseClass(interface, class, class, interface) parseClassHeaderOpt(interface, class, class) parseClassExtendsOpt(interface) @@ -1042,15 +1042,15 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(}, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(is, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'is' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: is}], is, is) listener: handleIdentifier(is, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, is) + listener: beginClassDeclaration(class, null, null, null, null, null, is) parseClass(is, class, class, is) parseClassHeaderOpt(is, class, class) parseClassExtendsOpt(is) @@ -1071,15 +1071,15 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(}, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(late, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[BuiltInIdentifierInDeclaration, Can't use 'late' as a name here., null, {lexeme: late}], late, late) listener: handleIdentifier(late, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, late) + listener: beginClassDeclaration(class, null, null, null, null, null, late) parseClass(late, class, class, late) parseClassHeaderOpt(late, class, class) parseClassExtendsOpt(late) @@ -1100,15 +1100,15 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(}, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(library, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[BuiltInIdentifierInDeclaration, Can't use 'library' as a name here., null, {lexeme: library}], library, library) listener: handleIdentifier(library, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, library) + listener: beginClassDeclaration(class, null, null, null, null, null, library) parseClass(library, class, class, library) parseClassHeaderOpt(library, class, class) parseClassExtendsOpt(library) @@ -1129,15 +1129,15 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(}, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(mixin, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[BuiltInIdentifierInDeclaration, Can't use 'mixin' as a name here., null, {lexeme: mixin}], mixin, mixin) listener: handleIdentifier(mixin, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, mixin) + listener: beginClassDeclaration(class, null, null, null, null, null, mixin) parseClass(mixin, class, class, mixin) parseClassHeaderOpt(mixin, class, class) parseClassExtendsOpt(mixin) @@ -1158,13 +1158,13 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(}, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(native, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, native) + listener: beginClassDeclaration(class, null, null, null, null, null, native) parseClass(native, class, class, native) parseClassHeaderOpt(native, class, class) parseClassExtendsOpt(native) @@ -1185,15 +1185,15 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(}, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(new, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'new' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: new}], new, new) listener: handleIdentifier(new, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, new) + listener: beginClassDeclaration(class, null, null, null, null, null, new) parseClass(new, class, class, new) parseClassHeaderOpt(new, class, class) parseClassExtendsOpt(new) @@ -1214,15 +1214,15 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(}, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(null, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'null' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: null}], null, null) listener: handleIdentifier(null, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, null) + listener: beginClassDeclaration(class, null, null, null, null, null, null) parseClass(null, class, class, null) parseClassHeaderOpt(null, class, class) parseClassExtendsOpt(null) @@ -1243,13 +1243,13 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(}, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(of, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, of) + listener: beginClassDeclaration(class, null, null, null, null, null, of) parseClass(of, class, class, of) parseClassHeaderOpt(of, class, class) parseClassExtendsOpt(of) @@ -1270,13 +1270,13 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(}, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(on, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, on) + listener: beginClassDeclaration(class, null, null, null, null, null, on) parseClass(on, class, class, on) parseClassHeaderOpt(on, class, class) parseClassExtendsOpt(on) @@ -1297,15 +1297,15 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(}, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(operator, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[BuiltInIdentifierInDeclaration, Can't use 'operator' as a name here., null, {lexeme: operator}], operator, operator) listener: handleIdentifier(operator, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, operator) + listener: beginClassDeclaration(class, null, null, null, null, null, operator) parseClass(operator, class, class, operator) parseClassHeaderOpt(operator, class, class) parseClassExtendsOpt(operator) @@ -1326,13 +1326,13 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(}, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(out, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, out) + listener: beginClassDeclaration(class, null, null, null, null, null, out) parseClass(out, class, class, out) parseClassHeaderOpt(out, class, class) parseClassExtendsOpt(out) @@ -1353,15 +1353,15 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(}, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(part, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[BuiltInIdentifierInDeclaration, Can't use 'part' as a name here., null, {lexeme: part}], part, part) listener: handleIdentifier(part, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, part) + listener: beginClassDeclaration(class, null, null, null, null, null, part) parseClass(part, class, class, part) parseClassHeaderOpt(part, class, class) parseClassExtendsOpt(part) @@ -1382,13 +1382,13 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(}, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(patch, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, patch) + listener: beginClassDeclaration(class, null, null, null, null, null, patch) parseClass(patch, class, class, patch) parseClassHeaderOpt(patch, class, class) parseClassExtendsOpt(patch) @@ -1409,15 +1409,15 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(}, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(required, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[BuiltInIdentifierInDeclaration, Can't use 'required' as a name here., null, {lexeme: required}], required, required) listener: handleIdentifier(required, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, required) + listener: beginClassDeclaration(class, null, null, null, null, null, required) parseClass(required, class, class, required) parseClassHeaderOpt(required, class, class) parseClassExtendsOpt(required) @@ -1438,15 +1438,15 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(}, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(rethrow, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'rethrow' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: rethrow}], rethrow, rethrow) listener: handleIdentifier(rethrow, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, rethrow) + listener: beginClassDeclaration(class, null, null, null, null, null, rethrow) parseClass(rethrow, class, class, rethrow) parseClassHeaderOpt(rethrow, class, class) parseClassExtendsOpt(rethrow) @@ -1467,15 +1467,15 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(}, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(return, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'return' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: return}], return, return) listener: handleIdentifier(return, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, return) + listener: beginClassDeclaration(class, null, null, null, null, null, return) parseClass(return, class, class, return) parseClassHeaderOpt(return, class, class) parseClassExtendsOpt(return) @@ -1496,15 +1496,15 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(}, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(set, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[BuiltInIdentifierInDeclaration, Can't use 'set' as a name here., null, {lexeme: set}], set, set) listener: handleIdentifier(set, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, set) + listener: beginClassDeclaration(class, null, null, null, null, null, set) parseClass(set, class, class, set) parseClassHeaderOpt(set, class, class) parseClassExtendsOpt(set) @@ -1525,13 +1525,13 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(}, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(show, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, show) + listener: beginClassDeclaration(class, null, null, null, null, null, show) parseClass(show, class, class, show) parseClassHeaderOpt(show, class, class) parseClassExtendsOpt(show) @@ -1552,13 +1552,13 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(}, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(source, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, source) + listener: beginClassDeclaration(class, null, null, null, null, null, source) parseClass(source, class, class, source) parseClassHeaderOpt(source, class, class) parseClassExtendsOpt(source) @@ -1579,15 +1579,15 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(}, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(static, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[BuiltInIdentifierInDeclaration, Can't use 'static' as a name here., null, {lexeme: static}], static, static) listener: handleIdentifier(static, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, static) + listener: beginClassDeclaration(class, null, null, null, null, null, static) parseClass(static, class, class, static) parseClassHeaderOpt(static, class, class) parseClassExtendsOpt(static) @@ -1608,15 +1608,15 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(}, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(super, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'super' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: super}], super, super) listener: handleIdentifier(super, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, super) + listener: beginClassDeclaration(class, null, null, null, null, null, super) parseClass(super, class, class, super) parseClassHeaderOpt(super, class, class) parseClassExtendsOpt(super) @@ -1637,15 +1637,15 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(}, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(switch, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'switch' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: switch}], switch, switch) listener: handleIdentifier(switch, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, switch) + listener: beginClassDeclaration(class, null, null, null, null, null, switch) parseClass(switch, class, class, switch) parseClassHeaderOpt(switch, class, class) parseClassExtendsOpt(switch) @@ -1666,13 +1666,13 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(}, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(sync, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, sync) + listener: beginClassDeclaration(class, null, null, null, null, null, sync) parseClass(sync, class, class, sync) parseClassHeaderOpt(sync, class, class) parseClassExtendsOpt(sync) @@ -1693,15 +1693,15 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(}, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(this, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'this' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: this}], this, this) listener: handleIdentifier(this, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, this) + listener: beginClassDeclaration(class, null, null, null, null, null, this) parseClass(this, class, class, this) parseClassHeaderOpt(this, class, class) parseClassExtendsOpt(this) @@ -1722,15 +1722,15 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(}, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(throw, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'throw' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: throw}], throw, throw) listener: handleIdentifier(throw, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, throw) + listener: beginClassDeclaration(class, null, null, null, null, null, throw) parseClass(throw, class, class, throw) parseClassHeaderOpt(throw, class, class) parseClassExtendsOpt(throw) @@ -1751,15 +1751,15 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(}, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(true, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'true' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: true}], true, true) listener: handleIdentifier(true, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, true) + listener: beginClassDeclaration(class, null, null, null, null, null, true) parseClass(true, class, class, true) parseClassHeaderOpt(true, class, class) parseClassExtendsOpt(true) @@ -1780,15 +1780,15 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(}, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(try, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'try' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: try}], try, try) listener: handleIdentifier(try, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, try) + listener: beginClassDeclaration(class, null, null, null, null, null, try) parseClass(try, class, class, try) parseClassHeaderOpt(try, class, class) parseClassExtendsOpt(try) @@ -1809,15 +1809,15 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(}, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(typedef, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[BuiltInIdentifierInDeclaration, Can't use 'typedef' as a name here., null, {lexeme: typedef}], typedef, typedef) listener: handleIdentifier(typedef, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, typedef) + listener: beginClassDeclaration(class, null, null, null, null, null, typedef) parseClass(typedef, class, class, typedef) parseClassHeaderOpt(typedef, class, class) parseClassExtendsOpt(typedef) @@ -1838,15 +1838,15 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(}, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(var, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'var' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: var}], var, var) listener: handleIdentifier(var, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, var) + listener: beginClassDeclaration(class, null, null, null, null, null, var) parseClass(var, class, class, var) parseClassHeaderOpt(var, class, class) parseClassExtendsOpt(var) @@ -1867,15 +1867,15 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(}, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(void, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'void' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: void}], void, void) listener: handleIdentifier(void, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, void) + listener: beginClassDeclaration(class, null, null, null, null, null, void) parseClass(void, class, class, void) parseClassHeaderOpt(void, class, class) parseClassExtendsOpt(void) @@ -1896,15 +1896,15 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(}, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(while, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'while' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: while}], while, while) listener: handleIdentifier(while, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, while) + listener: beginClassDeclaration(class, null, null, null, null, null, while) parseClass(while, class, class, while) parseClassHeaderOpt(while, class, class) parseClassExtendsOpt(while) @@ -1925,15 +1925,15 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(}, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(with, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'with' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: with}], with, with) listener: handleIdentifier(with, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, with) + listener: beginClassDeclaration(class, null, null, null, null, null, with) parseClass(with, class, class, with) parseClassHeaderOpt(with, class, class) parseClassExtendsOpt(with) @@ -1954,13 +1954,13 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(}, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(yield, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, yield) + listener: beginClassDeclaration(class, null, null, null, null, null, yield) parseClass(yield, class, class, yield) parseClassHeaderOpt(yield, class, class) parseClassExtendsOpt(yield) diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_46346_prime_1.dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/issue_46346_prime_1.dart.intertwined.expect index ae3e3aed2b9..a405423fad1 100644 --- a/pkg/front_end/parser_testcases/error_recovery/issue_46346_prime_1.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/error_recovery/issue_46346_prime_1.dart.intertwined.expect @@ -6,8 +6,8 @@ parseUnit(class) parseMetadataStar() listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(abstract, Instance of 'Template<(Token) => Message>') @@ -34,8 +34,8 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(;, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(as, Instance of 'Template<(Token) => Message>') @@ -62,8 +62,8 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(;, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(assert, Instance of 'Template<(Token) => Message>') @@ -90,8 +90,8 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(;, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(async, classOrMixinDeclaration) @@ -116,8 +116,8 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(;, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(await, classOrMixinDeclaration) @@ -142,8 +142,8 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(;, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(break, Instance of 'Template<(Token) => Message>') @@ -170,8 +170,8 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(;, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(case, Instance of 'Template<(Token) => Message>') @@ -198,8 +198,8 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(;, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(catch, Instance of 'Template<(Token) => Message>') @@ -226,8 +226,8 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(;, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(class, Instance of 'Template<(Token) => Message>') @@ -254,8 +254,8 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(;, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(const, Instance of 'Template<(Token) => Message>') @@ -282,8 +282,8 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(;, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(continue, Instance of 'Template<(Token) => Message>') @@ -310,8 +310,8 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(;, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(covariant, Instance of 'Template<(Token) => Message>') @@ -338,8 +338,8 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(;, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(default, Instance of 'Template<(Token) => Message>') @@ -366,8 +366,8 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(;, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(deferred, Instance of 'Template<(Token) => Message>') @@ -394,8 +394,8 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(;, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(do, Instance of 'Template<(Token) => Message>') @@ -422,8 +422,8 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(;, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(dynamic, Instance of 'Template<(Token) => Message>') @@ -450,8 +450,8 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(;, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(else, Instance of 'Template<(Token) => Message>') @@ -478,8 +478,8 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(;, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(enum, Instance of 'Template<(Token) => Message>') @@ -506,8 +506,8 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(;, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(export, Instance of 'Template<(Token) => Message>') @@ -534,8 +534,8 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(;, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(extends, Instance of 'Template<(Token) => Message>') @@ -562,8 +562,8 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(;, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(extension, Instance of 'Template<(Token) => Message>') @@ -590,8 +590,8 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(;, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(external, Instance of 'Template<(Token) => Message>') @@ -618,8 +618,8 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(;, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(factory, Instance of 'Template<(Token) => Message>') @@ -646,8 +646,8 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(;, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(false, Instance of 'Template<(Token) => Message>') @@ -674,8 +674,8 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(;, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(final, Instance of 'Template<(Token) => Message>') @@ -702,8 +702,8 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(;, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(finally, Instance of 'Template<(Token) => Message>') @@ -730,8 +730,8 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(;, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(for, Instance of 'Template<(Token) => Message>') @@ -758,8 +758,8 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(;, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(Function, Instance of 'Template<(Token) => Message>') @@ -786,8 +786,8 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(;, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(get, Instance of 'Template<(Token) => Message>') @@ -814,8 +814,8 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(;, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(hide, classOrMixinDeclaration) @@ -840,8 +840,8 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(;, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(if, Instance of 'Template<(Token) => Message>') @@ -868,8 +868,8 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(;, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(implements, Instance of 'Template<(Token) => Message>') @@ -896,8 +896,8 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(;, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(import, Instance of 'Template<(Token) => Message>') @@ -924,8 +924,8 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(;, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(in, Instance of 'Template<(Token) => Message>') @@ -952,8 +952,8 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(;, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(inout, classOrMixinDeclaration) @@ -978,8 +978,8 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(;, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(interface, Instance of 'Template<(Token) => Message>') @@ -1006,8 +1006,8 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(;, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(is, Instance of 'Template<(Token) => Message>') @@ -1034,8 +1034,8 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(;, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(late, Instance of 'Template<(Token) => Message>') @@ -1062,8 +1062,8 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(;, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(library, Instance of 'Template<(Token) => Message>') @@ -1090,8 +1090,8 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(;, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(mixin, Instance of 'Template<(Token) => Message>') @@ -1118,8 +1118,8 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(;, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(native, classOrMixinDeclaration) @@ -1144,8 +1144,8 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(;, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(new, Instance of 'Template<(Token) => Message>') @@ -1172,8 +1172,8 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(;, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(null, Instance of 'Template<(Token) => Message>') @@ -1200,8 +1200,8 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(;, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(of, classOrMixinDeclaration) @@ -1226,8 +1226,8 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(;, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(on, classOrMixinDeclaration) @@ -1252,8 +1252,8 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(;, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(operator, Instance of 'Template<(Token) => Message>') @@ -1280,8 +1280,8 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(;, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(out, classOrMixinDeclaration) @@ -1306,8 +1306,8 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(;, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(part, Instance of 'Template<(Token) => Message>') @@ -1334,8 +1334,8 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(;, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(patch, classOrMixinDeclaration) @@ -1360,8 +1360,8 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(;, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(required, Instance of 'Template<(Token) => Message>') @@ -1388,8 +1388,8 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(;, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(rethrow, Instance of 'Template<(Token) => Message>') @@ -1416,8 +1416,8 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(;, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(return, Instance of 'Template<(Token) => Message>') @@ -1444,8 +1444,8 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(;, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(set, Instance of 'Template<(Token) => Message>') @@ -1472,8 +1472,8 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(;, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(show, classOrMixinDeclaration) @@ -1498,8 +1498,8 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(;, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(source, classOrMixinDeclaration) @@ -1524,8 +1524,8 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(;, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(static, Instance of 'Template<(Token) => Message>') @@ -1552,8 +1552,8 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(;, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(super, Instance of 'Template<(Token) => Message>') @@ -1580,8 +1580,8 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(;, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(switch, Instance of 'Template<(Token) => Message>') @@ -1608,8 +1608,8 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(;, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(sync, classOrMixinDeclaration) @@ -1634,8 +1634,8 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(;, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(this, Instance of 'Template<(Token) => Message>') @@ -1662,8 +1662,8 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(;, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(throw, Instance of 'Template<(Token) => Message>') @@ -1690,8 +1690,8 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(;, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(true, Instance of 'Template<(Token) => Message>') @@ -1718,8 +1718,8 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(;, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(try, Instance of 'Template<(Token) => Message>') @@ -1746,8 +1746,8 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(;, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(typedef, Instance of 'Template<(Token) => Message>') @@ -1774,8 +1774,8 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(;, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(var, Instance of 'Template<(Token) => Message>') @@ -1802,8 +1802,8 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(;, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(void, Instance of 'Template<(Token) => Message>') @@ -1830,8 +1830,8 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(;, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(while, Instance of 'Template<(Token) => Message>') @@ -1858,8 +1858,8 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(;, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(with, Instance of 'Template<(Token) => Message>') @@ -1886,8 +1886,8 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(;, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(yield, classOrMixinDeclaration) diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_46346_prime_2.dart.expect b/pkg/front_end/parser_testcases/error_recovery/issue_46346_prime_2.dart.expect index dccceab84a7..988b27908fb 100644 --- a/pkg/front_end/parser_testcases/error_recovery/issue_46346_prime_2.dart.expect +++ b/pkg/front_end/parser_testcases/error_recovery/issue_46346_prime_2.dart.expect @@ -20,7 +20,7 @@ beginCompilationUnit(class) // WARNING: Reporting at eof for . handleIdentifier(, classOrMixinDeclaration) handleNoTypeVariables() - beginClassDeclaration(class, null, null, null, null, ) + beginClassDeclaration(class, null, null, null, null, null, ) handleNoType() handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_46346_prime_2.dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/issue_46346_prime_2.dart.intertwined.expect index 2a7b79f6d0e..2a5bbeb4dab 100644 --- a/pkg/front_end/parser_testcases/error_recovery/issue_46346_prime_2.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/error_recovery/issue_46346_prime_2.dart.intertwined.expect @@ -6,8 +6,8 @@ parseUnit(class) parseMetadataStar() listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) insertSyntheticIdentifier(class, classOrMixinDeclaration, message: Message[ExpectedIdentifier, Expected an identifier, but got ''., Try inserting an identifier before ''., {lexeme: }], messageOnToken: null) @@ -17,7 +17,7 @@ parseUnit(class) rewriter() listener: handleIdentifier(, classOrMixinDeclaration) listener: handleNoTypeVariables() - listener: beginClassDeclaration(class, null, null, null, null, ) + listener: beginClassDeclaration(class, null, null, null, null, null, ) parseClass(, class, class, ) parseClassHeaderOpt(, class, class) parseClassExtendsOpt() diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_46505.crash_dart.expect b/pkg/front_end/parser_testcases/error_recovery/issue_46505.crash_dart.expect index 84bbba52e12..8e464d3312a 100644 --- a/pkg/front_end/parser_testcases/error_recovery/issue_46505.crash_dart.expect +++ b/pkg/front_end/parser_testcases/error_recovery/issue_46505.crash_dart.expect @@ -30,7 +30,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(A, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, A) + beginClassDeclaration(class, null, null, null, null, null, A) handleNoType(A) handleClassExtends(null, 1) handleClassNoWithClause() @@ -67,7 +67,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(B, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, B) + beginClassDeclaration(class, null, null, null, null, null, B) handleNoType(B) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_46505.crash_dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/issue_46505.crash_dart.intertwined.expect index b949df4ea7d..54c96909298 100644 --- a/pkg/front_end/parser_testcases/error_recovery/issue_46505.crash_dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/error_recovery/issue_46505.crash_dart.intertwined.expect @@ -6,13 +6,13 @@ parseUnit(class) parseMetadataStar() listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(A, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, A) + listener: beginClassDeclaration(class, null, null, null, null, null, A) parseClass(A, class, class, A) parseClassHeaderOpt(A, class, class) parseClassExtendsOpt(A) @@ -72,13 +72,13 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(}, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(B, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, B) + listener: beginClassDeclaration(class, null, null, null, null, null, B) parseClass(B, class, class, B) parseClassHeaderOpt(B, class, class) parseClassExtendsOpt(B) diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_46505_prime_1.crash_dart.expect b/pkg/front_end/parser_testcases/error_recovery/issue_46505_prime_1.crash_dart.expect index a9f4049b7fe..a96cd00aa43 100644 --- a/pkg/front_end/parser_testcases/error_recovery/issue_46505_prime_1.crash_dart.expect +++ b/pkg/front_end/parser_testcases/error_recovery/issue_46505_prime_1.crash_dart.expect @@ -10,7 +10,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(A, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, A) + beginClassDeclaration(class, null, null, null, null, null, A) handleNoType(A) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_46505_prime_1.crash_dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/issue_46505_prime_1.crash_dart.intertwined.expect index 5fe0f649e07..cf9367131fc 100644 --- a/pkg/front_end/parser_testcases/error_recovery/issue_46505_prime_1.crash_dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/error_recovery/issue_46505_prime_1.crash_dart.intertwined.expect @@ -6,13 +6,13 @@ parseUnit(class) parseMetadataStar() listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(A, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, A) + listener: beginClassDeclaration(class, null, null, null, null, null, A) parseClass(A, class, class, A) parseClassHeaderOpt(A, class, class) parseClassExtendsOpt(A) diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_46505_prime_2.crash_dart.expect b/pkg/front_end/parser_testcases/error_recovery/issue_46505_prime_2.crash_dart.expect index 084db8bc732..4ad34f1375a 100644 --- a/pkg/front_end/parser_testcases/error_recovery/issue_46505_prime_2.crash_dart.expect +++ b/pkg/front_end/parser_testcases/error_recovery/issue_46505_prime_2.crash_dart.expect @@ -4,7 +4,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(A, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, A) + beginClassDeclaration(class, null, null, null, null, null, A) handleNoType(A) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_46505_prime_2.crash_dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/issue_46505_prime_2.crash_dart.intertwined.expect index 3b349718d4e..a349fed2630 100644 --- a/pkg/front_end/parser_testcases/error_recovery/issue_46505_prime_2.crash_dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/error_recovery/issue_46505_prime_2.crash_dart.intertwined.expect @@ -6,13 +6,13 @@ parseUnit(class) parseMetadataStar() listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(A, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, A) + listener: beginClassDeclaration(class, null, null, null, null, null, A) parseClass(A, class, class, A) parseClassHeaderOpt(A, class, class) parseClassExtendsOpt(A) diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_46505_prime_3.crash_dart.expect b/pkg/front_end/parser_testcases/error_recovery/issue_46505_prime_3.crash_dart.expect index 6edc0552cb6..9360134f9f1 100644 --- a/pkg/front_end/parser_testcases/error_recovery/issue_46505_prime_3.crash_dart.expect +++ b/pkg/front_end/parser_testcases/error_recovery/issue_46505_prime_3.crash_dart.expect @@ -18,7 +18,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(A, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, A) + beginClassDeclaration(class, null, null, null, null, null, A) handleNoType(A) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_46505_prime_3.crash_dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/issue_46505_prime_3.crash_dart.intertwined.expect index 46140c0216d..f36a7c9dbdc 100644 --- a/pkg/front_end/parser_testcases/error_recovery/issue_46505_prime_3.crash_dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/error_recovery/issue_46505_prime_3.crash_dart.intertwined.expect @@ -6,13 +6,13 @@ parseUnit(class) parseMetadataStar() listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(A, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, A) + listener: beginClassDeclaration(class, null, null, null, null, null, A) parseClass(A, class, class, A) parseClassHeaderOpt(A, class, class) parseClassExtendsOpt(A) diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_46505_prime_4.crash_dart.expect b/pkg/front_end/parser_testcases/error_recovery/issue_46505_prime_4.crash_dart.expect index 4740c6bf64d..337e42d31e3 100644 --- a/pkg/front_end/parser_testcases/error_recovery/issue_46505_prime_4.crash_dart.expect +++ b/pkg/front_end/parser_testcases/error_recovery/issue_46505_prime_4.crash_dart.expect @@ -18,7 +18,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(A, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, A) + beginClassDeclaration(class, null, null, null, null, null, A) handleNoType(A) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_46505_prime_4.crash_dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/issue_46505_prime_4.crash_dart.intertwined.expect index 51235f4ff39..f7d82ee8b70 100644 --- a/pkg/front_end/parser_testcases/error_recovery/issue_46505_prime_4.crash_dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/error_recovery/issue_46505_prime_4.crash_dart.intertwined.expect @@ -6,13 +6,13 @@ parseUnit(class) parseMetadataStar() listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(A, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, A) + listener: beginClassDeclaration(class, null, null, null, null, null, A) parseClass(A, class, class, A) parseClassHeaderOpt(A, class, class) parseClassExtendsOpt(A) diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_46505_prime_5.crash_dart.expect b/pkg/front_end/parser_testcases/error_recovery/issue_46505_prime_5.crash_dart.expect index 68df046f8bb..3505baca231 100644 --- a/pkg/front_end/parser_testcases/error_recovery/issue_46505_prime_5.crash_dart.expect +++ b/pkg/front_end/parser_testcases/error_recovery/issue_46505_prime_5.crash_dart.expect @@ -82,7 +82,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(A, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, A) + beginClassDeclaration(class, null, null, null, null, null, A) handleNoType(A) handleClassExtends(null, 1) handleClassNoWithClause() @@ -127,7 +127,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(B, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, B) + beginClassDeclaration(class, null, null, null, null, null, B) handleNoType(B) handleClassExtends(null, 1) handleClassNoWithClause() @@ -199,7 +199,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, C) handleNoType(C) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_46505_prime_5.crash_dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/issue_46505_prime_5.crash_dart.intertwined.expect index 8b0fa8462e4..3c74b2267d6 100644 --- a/pkg/front_end/parser_testcases/error_recovery/issue_46505_prime_5.crash_dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/error_recovery/issue_46505_prime_5.crash_dart.intertwined.expect @@ -6,13 +6,13 @@ parseUnit(class) parseMetadataStar() listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(A, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, A) + listener: beginClassDeclaration(class, null, null, null, null, null, A) parseClass(A, class, class, A) parseClassHeaderOpt(A, class, class) parseClassExtendsOpt(A) @@ -82,13 +82,13 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(}, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(B, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, B) + listener: beginClassDeclaration(class, null, null, null, null, null, B) parseClass(B, class, class, B) parseClassHeaderOpt(B, class, class) parseClassExtendsOpt(B) @@ -195,13 +195,13 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(}, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, C) parseClass(C, class, class, C) parseClassHeaderOpt(C, class, class) parseClassExtendsOpt(C) diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_46505_prime_6.crash_dart.expect b/pkg/front_end/parser_testcases/error_recovery/issue_46505_prime_6.crash_dart.expect index c823d82c2f9..6e82920b9fc 100644 --- a/pkg/front_end/parser_testcases/error_recovery/issue_46505_prime_6.crash_dart.expect +++ b/pkg/front_end/parser_testcases/error_recovery/issue_46505_prime_6.crash_dart.expect @@ -10,7 +10,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(A, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, A) + beginClassDeclaration(class, null, null, null, null, null, A) handleNoType(A) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_46505_prime_6.crash_dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/issue_46505_prime_6.crash_dart.intertwined.expect index b25a9dbb9c6..d1612d93575 100644 --- a/pkg/front_end/parser_testcases/error_recovery/issue_46505_prime_6.crash_dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/error_recovery/issue_46505_prime_6.crash_dart.intertwined.expect @@ -6,13 +6,13 @@ parseUnit(class) parseMetadataStar() listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(A, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, A) + listener: beginClassDeclaration(class, null, null, null, null, null, A) parseClass(A, class, class, A) parseClassHeaderOpt(A, class, class) parseClassExtendsOpt(A) diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_48371.dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/issue_48371.dart.intertwined.expect index f6aba942ed3..009cf9eb6be 100644 --- a/pkg/front_end/parser_testcases/error_recovery/issue_48371.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/error_recovery/issue_48371.dart.intertwined.expect @@ -6,7 +6,7 @@ parseUnit(enum) parseMetadataStar() listener: beginMetadataStar(enum) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(, enum, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(, enum, null, null, null, Instance of 'DirectiveContext') parseEnum(enum) listener: beginUncategorizedTopLevelDeclaration(enum) ensureIdentifier(enum, enumDeclaration) @@ -42,7 +42,7 @@ parseUnit(enum) parseMetadataStar(}) listener: beginMetadataStar(enum) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(}, enum, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(}, enum, null, null, null, Instance of 'DirectiveContext') parseEnum(enum) listener: beginUncategorizedTopLevelDeclaration(enum) ensureIdentifier(enum, enumDeclaration) @@ -81,7 +81,7 @@ parseUnit(enum) parseMetadataStar(}) listener: beginMetadataStar(enum) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(}, enum, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(}, enum, null, null, null, Instance of 'DirectiveContext') parseEnum(enum) listener: beginUncategorizedTopLevelDeclaration(enum) ensureIdentifier(enum, enumDeclaration) @@ -122,7 +122,7 @@ parseUnit(enum) parseMetadataStar(}) listener: beginMetadataStar(enum) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(}, enum, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(}, enum, null, null, null, Instance of 'DirectiveContext') parseEnum(enum) listener: beginUncategorizedTopLevelDeclaration(enum) ensureIdentifier(enum, enumDeclaration) @@ -168,7 +168,7 @@ parseUnit(enum) parseMetadataStar(}) listener: beginMetadataStar(enum) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(}, enum, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(}, enum, null, null, null, Instance of 'DirectiveContext') parseEnum(enum) listener: beginUncategorizedTopLevelDeclaration(enum) ensureIdentifier(enum, enumDeclaration) @@ -204,7 +204,7 @@ parseUnit(enum) parseMetadataStar(}) listener: beginMetadataStar(enum) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(}, enum, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(}, enum, null, null, null, Instance of 'DirectiveContext') parseEnum(enum) listener: beginUncategorizedTopLevelDeclaration(enum) ensureIdentifier(enum, enumDeclaration) @@ -240,7 +240,7 @@ parseUnit(enum) parseMetadataStar(}) listener: beginMetadataStar(enum) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(}, enum, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(}, enum, null, null, null, Instance of 'DirectiveContext') parseEnum(enum) listener: beginUncategorizedTopLevelDeclaration(enum) ensureIdentifier(enum, enumDeclaration) @@ -281,7 +281,7 @@ parseUnit(enum) parseMetadataStar(}) listener: beginMetadataStar(enum) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(}, enum, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(}, enum, null, null, null, Instance of 'DirectiveContext') parseEnum(enum) listener: beginUncategorizedTopLevelDeclaration(enum) ensureIdentifier(enum, enumDeclaration) @@ -323,7 +323,7 @@ parseUnit(enum) parseMetadataStar(}) listener: beginMetadataStar(enum) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(}, enum, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(}, enum, null, null, null, Instance of 'DirectiveContext') parseEnum(enum) listener: beginUncategorizedTopLevelDeclaration(enum) ensureIdentifier(enum, enumDeclaration) @@ -362,7 +362,7 @@ parseUnit(enum) parseMetadataStar(}) listener: beginMetadataStar(enum) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(}, enum, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(}, enum, null, null, null, Instance of 'DirectiveContext') parseEnum(enum) listener: beginUncategorizedTopLevelDeclaration(enum) ensureIdentifier(enum, enumDeclaration) @@ -404,7 +404,7 @@ parseUnit(enum) parseMetadataStar(}) listener: beginMetadataStar(enum) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(}, enum, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(}, enum, null, null, null, Instance of 'DirectiveContext') parseEnum(enum) listener: beginUncategorizedTopLevelDeclaration(enum) ensureIdentifier(enum, enumDeclaration) @@ -445,7 +445,7 @@ parseUnit(enum) parseMetadataStar(}) listener: beginMetadataStar(enum) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(}, enum, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(}, enum, null, null, null, Instance of 'DirectiveContext') parseEnum(enum) listener: beginUncategorizedTopLevelDeclaration(enum) ensureIdentifier(enum, enumDeclaration) @@ -494,7 +494,7 @@ parseUnit(enum) parseMetadataStar(}) listener: beginMetadataStar(enum) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(}, enum, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(}, enum, null, null, null, Instance of 'DirectiveContext') parseEnum(enum) listener: beginUncategorizedTopLevelDeclaration(enum) ensureIdentifier(enum, enumDeclaration) @@ -543,7 +543,7 @@ parseUnit(enum) parseMetadataStar(}) listener: beginMetadataStar(enum) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(}, enum, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(}, enum, null, null, null, Instance of 'DirectiveContext') parseEnum(enum) listener: beginUncategorizedTopLevelDeclaration(enum) ensureIdentifier(enum, enumDeclaration) @@ -605,7 +605,7 @@ parseUnit(enum) parseMetadataStar(}) listener: beginMetadataStar(enum) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(}, enum, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(}, enum, null, null, null, Instance of 'DirectiveContext') parseEnum(enum) listener: beginUncategorizedTopLevelDeclaration(enum) ensureIdentifier(enum, enumDeclaration) diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_48371_prime1.dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/issue_48371_prime1.dart.intertwined.expect index cb186bfa363..ced48560dfc 100644 --- a/pkg/front_end/parser_testcases/error_recovery/issue_48371_prime1.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/error_recovery/issue_48371_prime1.dart.intertwined.expect @@ -6,7 +6,7 @@ parseUnit(library) parseMetadataStar() listener: beginMetadataStar(library) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(, library, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(, library, null, null, null, Instance of 'DirectiveContext') parseLibraryName(library) listener: beginUncategorizedTopLevelDeclaration(library) listener: beginLibraryName(library) diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_48371_prime2.dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/issue_48371_prime2.dart.intertwined.expect index d51993ca60b..ee5a0b934f1 100644 --- a/pkg/front_end/parser_testcases/error_recovery/issue_48371_prime2.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/error_recovery/issue_48371_prime2.dart.intertwined.expect @@ -6,7 +6,7 @@ parseUnit(import) parseMetadataStar() listener: beginMetadataStar(import) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(, import, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(, import, null, null, null, Instance of 'DirectiveContext') parseImport(import) listener: beginUncategorizedTopLevelDeclaration(import) listener: beginImport(import) diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_48371_prime3.dart.expect b/pkg/front_end/parser_testcases/error_recovery/issue_48371_prime3.dart.expect index b01139f153d..3b987a0faab 100644 --- a/pkg/front_end/parser_testcases/error_recovery/issue_48371_prime3.dart.expect +++ b/pkg/front_end/parser_testcases/error_recovery/issue_48371_prime3.dart.expect @@ -32,7 +32,7 @@ beginCompilationUnit(enum) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(A, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, A) + beginClassDeclaration(class, null, null, null, null, null, A) handleNoType(A) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_48371_prime3.dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/issue_48371_prime3.dart.intertwined.expect index e6123a8c7b5..854e6f48306 100644 --- a/pkg/front_end/parser_testcases/error_recovery/issue_48371_prime3.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/error_recovery/issue_48371_prime3.dart.intertwined.expect @@ -6,7 +6,7 @@ parseUnit(enum) parseMetadataStar() listener: beginMetadataStar(enum) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(, enum, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(, enum, null, null, null, Instance of 'DirectiveContext') parseEnum(enum) listener: beginUncategorizedTopLevelDeclaration(enum) ensureIdentifier(enum, enumDeclaration) @@ -42,13 +42,13 @@ parseUnit(enum) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(}, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(A, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, A) + listener: beginClassDeclaration(class, null, null, null, null, null, A) parseClass(A, class, class, A) parseClassHeaderOpt(A, class, class) parseClassExtendsOpt(A) @@ -157,7 +157,7 @@ parseUnit(enum) parseMetadataStar(}) listener: beginMetadataStar(enum) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(}, enum, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(}, enum, null, null, null, Instance of 'DirectiveContext') parseEnum(enum) listener: beginUncategorizedTopLevelDeclaration(enum) ensureIdentifier(enum, enumDeclaration) diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_48371_prime4.dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/issue_48371_prime4.dart.intertwined.expect index e028caf8fe3..e8f4fc29147 100644 --- a/pkg/front_end/parser_testcases/error_recovery/issue_48371_prime4.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/error_recovery/issue_48371_prime4.dart.intertwined.expect @@ -6,7 +6,7 @@ parseUnit(import) parseMetadataStar() listener: beginMetadataStar(import) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(, import, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(, import, null, null, null, Instance of 'DirectiveContext') parseImport(import) listener: beginUncategorizedTopLevelDeclaration(import) listener: beginImport(import) @@ -38,7 +38,7 @@ parseUnit(import) parseMetadataStar(;) listener: beginMetadataStar(import) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, import, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, import, null, null, null, Instance of 'DirectiveContext') parseImport(import) listener: beginUncategorizedTopLevelDeclaration(import) listener: beginImport(import) @@ -70,7 +70,7 @@ parseUnit(import) parseMetadataStar(;) listener: beginMetadataStar(import) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, import, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, import, null, null, null, Instance of 'DirectiveContext') parseImport(import) listener: beginUncategorizedTopLevelDeclaration(import) listener: beginImport(import) @@ -115,7 +115,7 @@ parseUnit(import) parseMetadataStar(;) listener: beginMetadataStar(import) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, import, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, import, null, null, null, Instance of 'DirectiveContext') parseImport(import) listener: beginUncategorizedTopLevelDeclaration(import) listener: beginImport(import) @@ -184,7 +184,7 @@ parseUnit(import) parseMetadataStar(;) listener: beginMetadataStar(import) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, import, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, import, null, null, null, Instance of 'DirectiveContext') parseImport(import) listener: beginUncategorizedTopLevelDeclaration(import) listener: beginImport(import) @@ -222,7 +222,7 @@ parseUnit(import) parseMetadataStar(;) listener: beginMetadataStar(import) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, import, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, import, null, null, null, Instance of 'DirectiveContext') parseImport(import) listener: beginUncategorizedTopLevelDeclaration(import) listener: beginImport(import) @@ -260,7 +260,7 @@ parseUnit(import) parseMetadataStar(;) listener: beginMetadataStar(import) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, import, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, import, null, null, null, Instance of 'DirectiveContext') parseImport(import) listener: beginUncategorizedTopLevelDeclaration(import) listener: beginImport(import) @@ -317,7 +317,7 @@ parseUnit(import) parseMetadataStar(;) listener: beginMetadataStar(import) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, import, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, import, null, null, null, Instance of 'DirectiveContext') parseImport(import) listener: beginUncategorizedTopLevelDeclaration(import) listener: beginImport(import) diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_48380_1.dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/issue_48380_1.dart.intertwined.expect index bf96c9b9708..30a338db4be 100644 --- a/pkg/front_end/parser_testcases/error_recovery/issue_48380_1.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/error_recovery/issue_48380_1.dart.intertwined.expect @@ -6,7 +6,7 @@ parseUnit(enum) parseMetadataStar() listener: beginMetadataStar(enum) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(, enum, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(, enum, null, null, null, Instance of 'DirectiveContext') parseEnum(enum) listener: beginUncategorizedTopLevelDeclaration(enum) ensureIdentifier(enum, enumDeclaration) diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_48380_1_comma.dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/issue_48380_1_comma.dart.intertwined.expect index f9db1473b79..57ea44fc138 100644 --- a/pkg/front_end/parser_testcases/error_recovery/issue_48380_1_comma.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/error_recovery/issue_48380_1_comma.dart.intertwined.expect @@ -6,7 +6,7 @@ parseUnit(enum) parseMetadataStar() listener: beginMetadataStar(enum) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(, enum, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(, enum, null, null, null, Instance of 'DirectiveContext') parseEnum(enum) listener: beginUncategorizedTopLevelDeclaration(enum) ensureIdentifier(enum, enumDeclaration) diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_48380_1_comma_ok.dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/issue_48380_1_comma_ok.dart.intertwined.expect index ed7214c5734..9b1828eba3e 100644 --- a/pkg/front_end/parser_testcases/error_recovery/issue_48380_1_comma_ok.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/error_recovery/issue_48380_1_comma_ok.dart.intertwined.expect @@ -6,7 +6,7 @@ parseUnit(enum) parseMetadataStar() listener: beginMetadataStar(enum) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(, enum, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(, enum, null, null, null, Instance of 'DirectiveContext') parseEnum(enum) listener: beginUncategorizedTopLevelDeclaration(enum) ensureIdentifier(enum, enumDeclaration) diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_48380_1_ok.dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/issue_48380_1_ok.dart.intertwined.expect index dfff16d7fbe..1d3cdee7652 100644 --- a/pkg/front_end/parser_testcases/error_recovery/issue_48380_1_ok.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/error_recovery/issue_48380_1_ok.dart.intertwined.expect @@ -6,7 +6,7 @@ parseUnit(enum) parseMetadataStar() listener: beginMetadataStar(enum) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(, enum, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(, enum, null, null, null, Instance of 'DirectiveContext') parseEnum(enum) listener: beginUncategorizedTopLevelDeclaration(enum) ensureIdentifier(enum, enumDeclaration) diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_48380_2.dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/issue_48380_2.dart.intertwined.expect index 46c222533c5..9c91509bc21 100644 --- a/pkg/front_end/parser_testcases/error_recovery/issue_48380_2.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/error_recovery/issue_48380_2.dart.intertwined.expect @@ -6,7 +6,7 @@ parseUnit(enum) parseMetadataStar() listener: beginMetadataStar(enum) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(, enum, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(, enum, null, null, null, Instance of 'DirectiveContext') parseEnum(enum) listener: beginUncategorizedTopLevelDeclaration(enum) ensureIdentifier(enum, enumDeclaration) diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_48380_2_comma.dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/issue_48380_2_comma.dart.intertwined.expect index e816559d077..9f194027dba 100644 --- a/pkg/front_end/parser_testcases/error_recovery/issue_48380_2_comma.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/error_recovery/issue_48380_2_comma.dart.intertwined.expect @@ -6,7 +6,7 @@ parseUnit(enum) parseMetadataStar() listener: beginMetadataStar(enum) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(, enum, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(, enum, null, null, null, Instance of 'DirectiveContext') parseEnum(enum) listener: beginUncategorizedTopLevelDeclaration(enum) ensureIdentifier(enum, enumDeclaration) diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_48380_2_comma_ok.dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/issue_48380_2_comma_ok.dart.intertwined.expect index b01f722fe91..87eb862bc14 100644 --- a/pkg/front_end/parser_testcases/error_recovery/issue_48380_2_comma_ok.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/error_recovery/issue_48380_2_comma_ok.dart.intertwined.expect @@ -6,7 +6,7 @@ parseUnit(enum) parseMetadataStar() listener: beginMetadataStar(enum) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(, enum, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(, enum, null, null, null, Instance of 'DirectiveContext') parseEnum(enum) listener: beginUncategorizedTopLevelDeclaration(enum) ensureIdentifier(enum, enumDeclaration) diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_48380_2_ok.dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/issue_48380_2_ok.dart.intertwined.expect index dd3d4817eef..681add68afe 100644 --- a/pkg/front_end/parser_testcases/error_recovery/issue_48380_2_ok.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/error_recovery/issue_48380_2_ok.dart.intertwined.expect @@ -6,7 +6,7 @@ parseUnit(enum) parseMetadataStar() listener: beginMetadataStar(enum) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(, enum, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(, enum, null, null, null, Instance of 'DirectiveContext') parseEnum(enum) listener: beginUncategorizedTopLevelDeclaration(enum) ensureIdentifier(enum, enumDeclaration) diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_48380_3.dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/issue_48380_3.dart.intertwined.expect index 2fed91f55a4..e84de331b9c 100644 --- a/pkg/front_end/parser_testcases/error_recovery/issue_48380_3.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/error_recovery/issue_48380_3.dart.intertwined.expect @@ -6,7 +6,7 @@ parseUnit(enum) parseMetadataStar() listener: beginMetadataStar(enum) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(, enum, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(, enum, null, null, null, Instance of 'DirectiveContext') parseEnum(enum) listener: beginUncategorizedTopLevelDeclaration(enum) ensureIdentifier(enum, enumDeclaration) diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_48380_3_comma.dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/issue_48380_3_comma.dart.intertwined.expect index 6d616e12cb9..1dde50c4a96 100644 --- a/pkg/front_end/parser_testcases/error_recovery/issue_48380_3_comma.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/error_recovery/issue_48380_3_comma.dart.intertwined.expect @@ -6,7 +6,7 @@ parseUnit(enum) parseMetadataStar() listener: beginMetadataStar(enum) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(, enum, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(, enum, null, null, null, Instance of 'DirectiveContext') parseEnum(enum) listener: beginUncategorizedTopLevelDeclaration(enum) ensureIdentifier(enum, enumDeclaration) diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_48380_3_comma_ok.dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/issue_48380_3_comma_ok.dart.intertwined.expect index 798f5ea75e7..3de7be1d50a 100644 --- a/pkg/front_end/parser_testcases/error_recovery/issue_48380_3_comma_ok.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/error_recovery/issue_48380_3_comma_ok.dart.intertwined.expect @@ -6,7 +6,7 @@ parseUnit(enum) parseMetadataStar() listener: beginMetadataStar(enum) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(, enum, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(, enum, null, null, null, Instance of 'DirectiveContext') parseEnum(enum) listener: beginUncategorizedTopLevelDeclaration(enum) ensureIdentifier(enum, enumDeclaration) diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_48380_3_ok.dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/issue_48380_3_ok.dart.intertwined.expect index 0a2b8f06f83..db7b21ee8ed 100644 --- a/pkg/front_end/parser_testcases/error_recovery/issue_48380_3_ok.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/error_recovery/issue_48380_3_ok.dart.intertwined.expect @@ -6,7 +6,7 @@ parseUnit(enum) parseMetadataStar() listener: beginMetadataStar(enum) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(, enum, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(, enum, null, null, null, Instance of 'DirectiveContext') parseEnum(enum) listener: beginUncategorizedTopLevelDeclaration(enum) ensureIdentifier(enum, enumDeclaration) diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_48380_4.dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/issue_48380_4.dart.intertwined.expect index 699b37ad1a5..d8ae31956b2 100644 --- a/pkg/front_end/parser_testcases/error_recovery/issue_48380_4.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/error_recovery/issue_48380_4.dart.intertwined.expect @@ -6,7 +6,7 @@ parseUnit(enum) parseMetadataStar() listener: beginMetadataStar(enum) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(, enum, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(, enum, null, null, null, Instance of 'DirectiveContext') parseEnum(enum) listener: beginUncategorizedTopLevelDeclaration(enum) ensureIdentifier(enum, enumDeclaration) diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_48411.dart.expect b/pkg/front_end/parser_testcases/error_recovery/issue_48411.dart.expect index 7fd1a7ac93d..0b6781e63c9 100644 --- a/pkg/front_end/parser_testcases/error_recovery/issue_48411.dart.expect +++ b/pkg/front_end/parser_testcases/error_recovery/issue_48411.dart.expect @@ -30,7 +30,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(A, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, A) + beginClassDeclaration(class, null, null, null, null, null, A) handleNoType(A) handleClassExtends(null, 1) handleClassNoWithClause() @@ -93,7 +93,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(B, classOrMixinDeclaration) handleNoTypeVariables(extends) - beginClassDeclaration(class, null, null, null, null, B) + beginClassDeclaration(class, null, null, null, null, null, B) handleIdentifier(A, typeReference) handleNoTypeArguments({) handleType(A, null) @@ -157,7 +157,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(B2, classOrMixinDeclaration) handleNoTypeVariables(extends) - beginClassDeclaration(class, null, null, null, null, B2) + beginClassDeclaration(class, null, null, null, null, null, B2) handleIdentifier(A, typeReference) handleNoTypeArguments({) handleType(A, null) @@ -223,7 +223,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(B3, classOrMixinDeclaration) handleNoTypeVariables(extends) - beginClassDeclaration(class, null, null, null, null, B3) + beginClassDeclaration(class, null, null, null, null, null, B3) handleIdentifier(A, typeReference) handleNoTypeArguments({) handleType(A, null) @@ -314,7 +314,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables(extends) - beginClassDeclaration(class, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, C) handleIdentifier(A, typeReference) handleNoTypeArguments({) handleType(A, null) @@ -389,7 +389,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(D, classOrMixinDeclaration) handleNoTypeVariables(extends) - beginClassDeclaration(class, null, null, null, null, D) + beginClassDeclaration(class, null, null, null, null, null, D) handleIdentifier(A, typeReference) handleNoTypeArguments({) handleType(A, null) @@ -456,7 +456,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(E, classOrMixinDeclaration) handleNoTypeVariables(extends) - beginClassDeclaration(class, null, null, null, null, E) + beginClassDeclaration(class, null, null, null, null, null, E) handleIdentifier(A, typeReference) handleNoTypeArguments({) handleType(A, null) diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_48411.dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/issue_48411.dart.intertwined.expect index fb9b36c3fc1..6084d2cee37 100644 --- a/pkg/front_end/parser_testcases/error_recovery/issue_48411.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/error_recovery/issue_48411.dart.intertwined.expect @@ -6,13 +6,13 @@ parseUnit(class) parseMetadataStar() listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(A, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, A) + listener: beginClassDeclaration(class, null, null, null, null, null, A) parseClass(A, class, class, A) parseClassHeaderOpt(A, class, class) parseClassExtendsOpt(A) @@ -121,13 +121,13 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(}, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(B, classOrMixinDeclaration) listener: handleNoTypeVariables(extends) - listener: beginClassDeclaration(class, null, null, null, null, B) + listener: beginClassDeclaration(class, null, null, null, null, null, B) parseClass(B, class, class, B) parseClassHeaderOpt(B, class, class) parseClassExtendsOpt(B) @@ -254,13 +254,13 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(}, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(B2, classOrMixinDeclaration) listener: handleNoTypeVariables(extends) - listener: beginClassDeclaration(class, null, null, null, null, B2) + listener: beginClassDeclaration(class, null, null, null, null, null, B2) parseClass(B2, class, class, B2) parseClassHeaderOpt(B2, class, class) parseClassExtendsOpt(B2) @@ -395,13 +395,13 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(}, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(B3, classOrMixinDeclaration) listener: handleNoTypeVariables(extends) - listener: beginClassDeclaration(class, null, null, null, null, B3) + listener: beginClassDeclaration(class, null, null, null, null, null, B3) parseClass(B3, class, class, B3) parseClassHeaderOpt(B3, class, class) parseClassExtendsOpt(B3) @@ -581,13 +581,13 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(}, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) listener: handleNoTypeVariables(extends) - listener: beginClassDeclaration(class, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, C) parseClass(C, class, class, C) parseClassHeaderOpt(C, class, class) parseClassExtendsOpt(C) @@ -731,13 +731,13 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(}, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(D, classOrMixinDeclaration) listener: handleNoTypeVariables(extends) - listener: beginClassDeclaration(class, null, null, null, null, D) + listener: beginClassDeclaration(class, null, null, null, null, null, D) parseClass(D, class, class, D) parseClassHeaderOpt(D, class, class) parseClassExtendsOpt(D) @@ -867,13 +867,13 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(}, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(E, classOrMixinDeclaration) listener: handleNoTypeVariables(extends) - listener: beginClassDeclaration(class, null, null, null, null, E) + listener: beginClassDeclaration(class, null, null, null, null, null, E) parseClass(E, class, class, E) parseClassHeaderOpt(E, class, class) parseClassExtendsOpt(E) diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_48411_prime.dart.expect b/pkg/front_end/parser_testcases/error_recovery/issue_48411_prime.dart.expect index 26859c3b75b..3954e4d076a 100644 --- a/pkg/front_end/parser_testcases/error_recovery/issue_48411_prime.dart.expect +++ b/pkg/front_end/parser_testcases/error_recovery/issue_48411_prime.dart.expect @@ -4,7 +4,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(A, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, A) + beginClassDeclaration(class, null, null, null, null, null, A) handleNoType(A) handleClassExtends(null, 1) handleClassNoWithClause() @@ -67,7 +67,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(B, classOrMixinDeclaration) handleNoTypeVariables(extends) - beginClassDeclaration(class, null, null, null, null, B) + beginClassDeclaration(class, null, null, null, null, null, B) handleIdentifier(A, typeReference) handleNoTypeArguments({) handleType(A, null) @@ -130,7 +130,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(B2, classOrMixinDeclaration) handleNoTypeVariables(extends) - beginClassDeclaration(class, null, null, null, null, B2) + beginClassDeclaration(class, null, null, null, null, null, B2) handleIdentifier(A, typeReference) handleNoTypeArguments({) handleType(A, null) @@ -195,7 +195,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(B3, classOrMixinDeclaration) handleNoTypeVariables(extends) - beginClassDeclaration(class, null, null, null, null, B3) + beginClassDeclaration(class, null, null, null, null, null, B3) handleIdentifier(A, typeReference) handleNoTypeArguments({) handleType(A, null) @@ -285,7 +285,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables(extends) - beginClassDeclaration(class, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, C) handleIdentifier(A, typeReference) handleNoTypeArguments({) handleType(A, null) @@ -359,7 +359,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(D, classOrMixinDeclaration) handleNoTypeVariables(extends) - beginClassDeclaration(class, null, null, null, null, D) + beginClassDeclaration(class, null, null, null, null, null, D) handleIdentifier(A, typeReference) handleNoTypeArguments({) handleType(A, null) @@ -425,7 +425,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(E, classOrMixinDeclaration) handleNoTypeVariables(extends) - beginClassDeclaration(class, null, null, null, null, E) + beginClassDeclaration(class, null, null, null, null, null, E) handleIdentifier(A, typeReference) handleNoTypeArguments({) handleType(A, null) diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_48411_prime.dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/issue_48411_prime.dart.intertwined.expect index b7a0f69ff97..318dd556159 100644 --- a/pkg/front_end/parser_testcases/error_recovery/issue_48411_prime.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/error_recovery/issue_48411_prime.dart.intertwined.expect @@ -6,13 +6,13 @@ parseUnit(class) parseMetadataStar() listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(A, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, A) + listener: beginClassDeclaration(class, null, null, null, null, null, A) parseClass(A, class, class, A) parseClassHeaderOpt(A, class, class) parseClassExtendsOpt(A) @@ -121,13 +121,13 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(}, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(B, classOrMixinDeclaration) listener: handleNoTypeVariables(extends) - listener: beginClassDeclaration(class, null, null, null, null, B) + listener: beginClassDeclaration(class, null, null, null, null, null, B) parseClass(B, class, class, B) parseClassHeaderOpt(B, class, class) parseClassExtendsOpt(B) @@ -251,13 +251,13 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(}, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(B2, classOrMixinDeclaration) listener: handleNoTypeVariables(extends) - listener: beginClassDeclaration(class, null, null, null, null, B2) + listener: beginClassDeclaration(class, null, null, null, null, null, B2) parseClass(B2, class, class, B2) parseClassHeaderOpt(B2, class, class) parseClassExtendsOpt(B2) @@ -389,13 +389,13 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(}, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(B3, classOrMixinDeclaration) listener: handleNoTypeVariables(extends) - listener: beginClassDeclaration(class, null, null, null, null, B3) + listener: beginClassDeclaration(class, null, null, null, null, null, B3) parseClass(B3, class, class, B3) parseClassHeaderOpt(B3, class, class) parseClassExtendsOpt(B3) @@ -572,13 +572,13 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(}, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) listener: handleNoTypeVariables(extends) - listener: beginClassDeclaration(class, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, C) parseClass(C, class, class, C) parseClassHeaderOpt(C, class, class) parseClassExtendsOpt(C) @@ -719,13 +719,13 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(}, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(D, classOrMixinDeclaration) listener: handleNoTypeVariables(extends) - listener: beginClassDeclaration(class, null, null, null, null, D) + listener: beginClassDeclaration(class, null, null, null, null, null, D) parseClass(D, class, class, D) parseClassHeaderOpt(D, class, class) parseClassExtendsOpt(D) @@ -852,13 +852,13 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(}, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(E, classOrMixinDeclaration) listener: handleNoTypeVariables(extends) - listener: beginClassDeclaration(class, null, null, null, null, E) + listener: beginClassDeclaration(class, null, null, null, null, null, E) parseClass(E, class, class, E) parseClassHeaderOpt(E, class, class) parseClassExtendsOpt(E) diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_48411_prime_1.dart.expect b/pkg/front_end/parser_testcases/error_recovery/issue_48411_prime_1.dart.expect index c040bf50ed4..0c8381fa1b9 100644 --- a/pkg/front_end/parser_testcases/error_recovery/issue_48411_prime_1.dart.expect +++ b/pkg/front_end/parser_testcases/error_recovery/issue_48411_prime_1.dart.expect @@ -74,7 +74,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, C) handleNoType(C) handleClassExtends(null, 1) handleClassNoWithClause() @@ -134,7 +134,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, C) handleNoType(C) handleClassExtends(null, 1) handleClassNoWithClause() @@ -213,7 +213,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, C) handleNoType(C) handleClassExtends(null, 1) handleClassNoWithClause() @@ -248,7 +248,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, C) handleNoType(C) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_48411_prime_1.dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/issue_48411_prime_1.dart.intertwined.expect index 8e7d5fa01eb..83da049bcee 100644 --- a/pkg/front_end/parser_testcases/error_recovery/issue_48411_prime_1.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/error_recovery/issue_48411_prime_1.dart.intertwined.expect @@ -6,13 +6,13 @@ parseUnit(class) parseMetadataStar() listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, C) parseClass(C, class, class, C) parseClassHeaderOpt(C, class, class) parseClassExtendsOpt(C) @@ -127,13 +127,13 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(}, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, C) parseClass(C, class, class, C) parseClassHeaderOpt(C, class, class) parseClassExtendsOpt(C) @@ -306,13 +306,13 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(}, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, C) parseClass(C, class, class, C) parseClassHeaderOpt(C, class, class) parseClassExtendsOpt(C) @@ -382,13 +382,13 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(}, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, C) parseClass(C, class, class, C) parseClassHeaderOpt(C, class, class) parseClassExtendsOpt(C) diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_49116.dart.expect b/pkg/front_end/parser_testcases/error_recovery/issue_49116.dart.expect index 2e391b5c015..0f23a522c8c 100644 --- a/pkg/front_end/parser_testcases/error_recovery/issue_49116.dart.expect +++ b/pkg/front_end/parser_testcases/error_recovery/issue_49116.dart.expect @@ -965,7 +965,7 @@ beginCompilationUnit(Future) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(await, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, await) + beginClassDeclaration(class, null, null, null, null, null, await) handleNoType(await) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/error_recovery/issue_49116.dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/issue_49116.dart.intertwined.expect index 17a10951877..033468acd44 100644 --- a/pkg/front_end/parser_testcases/error_recovery/issue_49116.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/error_recovery/issue_49116.dart.intertwined.expect @@ -2291,13 +2291,13 @@ parseUnit(Future) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(}, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(await, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, await) + listener: beginClassDeclaration(class, null, null, null, null, null, await) parseClass(await, class, class, await) parseClassHeaderOpt(await, class, class) parseClassExtendsOpt(await) diff --git a/pkg/front_end/parser_testcases/error_recovery/keyword_named_class_fields.dart.expect b/pkg/front_end/parser_testcases/error_recovery/keyword_named_class_fields.dart.expect index cb43b874951..67b196b27cc 100644 --- a/pkg/front_end/parser_testcases/error_recovery/keyword_named_class_fields.dart.expect +++ b/pkg/front_end/parser_testcases/error_recovery/keyword_named_class_fields.dart.expect @@ -138,7 +138,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(WrapperClass, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, WrapperClass) + beginClassDeclaration(class, null, null, null, null, null, WrapperClass) handleNoType(WrapperClass) handleClassExtends(null, 1) handleClassNoWithClause() 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 3af2ebd792c..3dd589a13d7 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 @@ -6,13 +6,13 @@ parseUnit(class) parseMetadataStar() listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(WrapperClass, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, WrapperClass) + listener: beginClassDeclaration(class, null, null, null, null, null, WrapperClass) parseClass(WrapperClass, class, class, WrapperClass) parseClassHeaderOpt(WrapperClass, class, class) parseClassExtendsOpt(WrapperClass) diff --git a/pkg/front_end/parser_testcases/error_recovery/keyword_named_class_methods.dart.expect b/pkg/front_end/parser_testcases/error_recovery/keyword_named_class_methods.dart.expect index 3cc4624eb8a..067690e7190 100644 --- a/pkg/front_end/parser_testcases/error_recovery/keyword_named_class_methods.dart.expect +++ b/pkg/front_end/parser_testcases/error_recovery/keyword_named_class_methods.dart.expect @@ -494,7 +494,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(WrapperClass, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, WrapperClass) + beginClassDeclaration(class, null, null, null, null, null, WrapperClass) handleNoType(WrapperClass) handleClassExtends(null, 1) handleClassNoWithClause() 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 4ea2fba32e7..f76c371a799 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 @@ -6,13 +6,13 @@ parseUnit(class) parseMetadataStar() listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(WrapperClass, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, WrapperClass) + listener: beginClassDeclaration(class, null, null, null, null, null, WrapperClass) parseClass(WrapperClass, class, class, WrapperClass) parseClassHeaderOpt(WrapperClass, class, class) parseClassExtendsOpt(WrapperClass) diff --git a/pkg/front_end/parser_testcases/error_recovery/keyword_named_formal_parameter_start_of_next_top_level.dart.expect b/pkg/front_end/parser_testcases/error_recovery/keyword_named_formal_parameter_start_of_next_top_level.dart.expect index 526d76c145a..276a7ab3fe4 100644 --- a/pkg/front_end/parser_testcases/error_recovery/keyword_named_formal_parameter_start_of_next_top_level.dart.expect +++ b/pkg/front_end/parser_testcases/error_recovery/keyword_named_formal_parameter_start_of_next_top_level.dart.expect @@ -35,7 +35,7 @@ beginCompilationUnit(f) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, C) handleNoType(C) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/error_recovery/keyword_named_formal_parameter_start_of_next_top_level.dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/keyword_named_formal_parameter_start_of_next_top_level.dart.intertwined.expect index 5c613858bf9..ca461840117 100644 --- a/pkg/front_end/parser_testcases/error_recovery/keyword_named_formal_parameter_start_of_next_top_level.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/error_recovery/keyword_named_formal_parameter_start_of_next_top_level.dart.intertwined.expect @@ -49,13 +49,13 @@ parseUnit(UnmatchedToken(()) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(}, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, C) parseClass(C, class, class, C) parseClassHeaderOpt(C, class, class) parseClassExtendsOpt(C) diff --git a/pkg/front_end/parser_testcases/error_recovery/keyword_named_typedefs.dart.intertwined.expect b/pkg/front_end/parser_testcases/error_recovery/keyword_named_typedefs.dart.intertwined.expect index 3705b8c99bf..0b8f6c4c8b0 100644 --- a/pkg/front_end/parser_testcases/error_recovery/keyword_named_typedefs.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/error_recovery/keyword_named_typedefs.dart.intertwined.expect @@ -6,7 +6,7 @@ parseUnit(typedef) parseMetadataStar() listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -27,7 +27,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -51,7 +51,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -72,7 +72,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -96,7 +96,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -117,7 +117,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -141,7 +141,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -160,7 +160,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -182,7 +182,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -201,7 +201,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -223,7 +223,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -244,7 +244,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -268,7 +268,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -289,7 +289,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -313,7 +313,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -334,7 +334,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -358,7 +358,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -379,7 +379,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -403,7 +403,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -424,7 +424,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -448,7 +448,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -469,7 +469,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -493,7 +493,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -514,7 +514,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -538,7 +538,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -559,7 +559,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -583,7 +583,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -604,7 +604,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -628,7 +628,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -649,7 +649,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -673,7 +673,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -694,7 +694,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -718,7 +718,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -739,7 +739,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -763,7 +763,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -784,7 +784,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -808,7 +808,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -829,7 +829,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -853,7 +853,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -874,7 +874,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -898,7 +898,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -919,7 +919,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -943,7 +943,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -964,7 +964,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -988,7 +988,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -1009,7 +1009,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -1033,7 +1033,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -1054,7 +1054,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -1078,7 +1078,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -1099,7 +1099,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -1123,7 +1123,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -1144,7 +1144,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -1168,7 +1168,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -1189,7 +1189,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -1213,7 +1213,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -1234,7 +1234,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -1258,7 +1258,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -1279,7 +1279,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -1303,7 +1303,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -1322,7 +1322,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -1344,7 +1344,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -1365,7 +1365,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -1389,7 +1389,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -1410,7 +1410,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -1434,7 +1434,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -1455,7 +1455,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -1479,7 +1479,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -1500,7 +1500,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -1524,7 +1524,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -1543,7 +1543,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -1565,7 +1565,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -1586,7 +1586,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -1610,7 +1610,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -1631,7 +1631,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -1655,7 +1655,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -1676,7 +1676,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -1700,7 +1700,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -1721,7 +1721,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -1745,7 +1745,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -1766,7 +1766,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -1790,7 +1790,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -1809,7 +1809,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -1831,7 +1831,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -1852,7 +1852,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -1876,7 +1876,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -1897,7 +1897,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -1921,7 +1921,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -1940,7 +1940,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -1962,7 +1962,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -1981,7 +1981,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -2003,7 +2003,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -2024,7 +2024,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -2048,7 +2048,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -2067,7 +2067,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -2089,7 +2089,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -2110,7 +2110,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -2134,7 +2134,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -2153,7 +2153,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -2175,7 +2175,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -2196,7 +2196,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -2220,7 +2220,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -2241,7 +2241,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -2265,7 +2265,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -2286,7 +2286,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -2310,7 +2310,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -2331,7 +2331,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -2355,7 +2355,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -2374,7 +2374,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -2396,7 +2396,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -2415,7 +2415,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -2437,7 +2437,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -2458,7 +2458,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -2482,7 +2482,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -2503,7 +2503,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -2527,7 +2527,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -2548,7 +2548,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -2572,7 +2572,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -2591,7 +2591,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -2613,7 +2613,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -2634,7 +2634,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -2658,7 +2658,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -2679,7 +2679,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -2703,7 +2703,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -2724,7 +2724,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -2748,7 +2748,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -2769,7 +2769,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -2793,7 +2793,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -2814,7 +2814,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -2838,7 +2838,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -2859,7 +2859,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -2883,7 +2883,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -2904,7 +2904,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -2971,7 +2971,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -2992,7 +2992,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -3016,7 +3016,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -3037,7 +3037,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -3061,7 +3061,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -3080,7 +3080,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) diff --git a/pkg/front_end/parser_testcases/error_recovery/method_called_with.dart.expect b/pkg/front_end/parser_testcases/error_recovery/method_called_with.dart.expect index 1c06ecc4592..a385e79b7b9 100644 --- a/pkg/front_end/parser_testcases/error_recovery/method_called_with.dart.expect +++ b/pkg/front_end/parser_testcases/error_recovery/method_called_with.dart.expect @@ -30,7 +30,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, C) handleNoType(C) handleClassExtends(null, 1) handleClassNoWithClause() 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 4a795d718b8..124aecd7fb6 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 @@ -6,13 +6,13 @@ parseUnit(class) parseMetadataStar() listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, C) parseClass(C, class, class, C) parseClassHeaderOpt(C, class, class) parseClassExtendsOpt(C) diff --git a/pkg/front_end/parser_testcases/error_recovery/method_called_with_prime.dart.expect b/pkg/front_end/parser_testcases/error_recovery/method_called_with_prime.dart.expect index 4e57e71797e..951214f1e6b 100644 --- a/pkg/front_end/parser_testcases/error_recovery/method_called_with_prime.dart.expect +++ b/pkg/front_end/parser_testcases/error_recovery/method_called_with_prime.dart.expect @@ -4,7 +4,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, C) handleNoType(C) handleClassExtends(null, 1) handleClassNoWithClause() 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 2b4022b4703..8f80716ba40 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 @@ -6,13 +6,13 @@ parseUnit(class) parseMetadataStar() listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, C) parseClass(C, class, class, C) parseClassHeaderOpt(C, class, class) parseClassExtendsOpt(C) diff --git a/pkg/front_end/parser_testcases/error_recovery/method_called_with_prime2.dart.expect b/pkg/front_end/parser_testcases/error_recovery/method_called_with_prime2.dart.expect index f1bf467cd61..5b3efb517fb 100644 --- a/pkg/front_end/parser_testcases/error_recovery/method_called_with_prime2.dart.expect +++ b/pkg/front_end/parser_testcases/error_recovery/method_called_with_prime2.dart.expect @@ -26,7 +26,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(B, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, B) + beginClassDeclaration(class, null, null, null, null, null, B) handleNoType(B) handleClassExtends(null, 1) handleClassNoWithClause() @@ -52,7 +52,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(M1, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, M1) + beginClassDeclaration(class, null, null, null, null, null, M1) handleNoType(M1) handleClassExtends(null, 1) handleClassNoWithClause() 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 498acb50f1f..bb37733f2ad 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 @@ -6,13 +6,13 @@ parseUnit(class) parseMetadataStar() listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(B, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, B) + listener: beginClassDeclaration(class, null, null, null, null, null, B) parseClass(B, class, class, B) parseClassHeaderOpt(B, class, class) parseClassExtendsOpt(B) @@ -56,13 +56,13 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(;, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(M1, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, M1) + listener: beginClassDeclaration(class, null, null, null, null, null, M1) parseClass(M1, class, class, M1) parseClassHeaderOpt(M1, class, class) parseClassExtendsOpt(M1) diff --git a/pkg/front_end/parser_testcases/extension_named_type.dart.expect b/pkg/front_end/parser_testcases/extension_named_type.dart.expect index d279f27ea2e..a67f347e27e 100644 --- a/pkg/front_end/parser_testcases/extension_named_type.dart.expect +++ b/pkg/front_end/parser_testcases/extension_named_type.dart.expect @@ -4,7 +4,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(A, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, A) + beginClassDeclaration(class, null, null, null, null, null, A) handleNoType(A) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/extension_named_type.dart.intertwined.expect b/pkg/front_end/parser_testcases/extension_named_type.dart.intertwined.expect index e890bc79957..3216a1a24fc 100644 --- a/pkg/front_end/parser_testcases/extension_named_type.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/extension_named_type.dart.intertwined.expect @@ -6,13 +6,13 @@ parseUnit(class) parseMetadataStar() listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(A, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, A) + listener: beginClassDeclaration(class, null, null, null, null, null, A) parseClass(A, class, class, A) parseClassHeaderOpt(A, class, class) parseClassExtendsOpt(A) @@ -33,7 +33,7 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(}, extension, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(}, extension, null, null, null, Instance of 'DirectiveContext') parseExtension(extension) listener: beginExtensionDeclarationPrelude(extension) listener: handleNoTypeVariables(on) diff --git a/pkg/front_end/parser_testcases/extension_type.dart.expect b/pkg/front_end/parser_testcases/extension_type.dart.expect index dc22aa77d91..902f4d3266b 100644 --- a/pkg/front_end/parser_testcases/extension_type.dart.expect +++ b/pkg/front_end/parser_testcases/extension_type.dart.expect @@ -4,7 +4,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(A, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, A) + beginClassDeclaration(class, null, null, null, null, null, A) handleNoType(A) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/extension_type.dart.intertwined.expect b/pkg/front_end/parser_testcases/extension_type.dart.intertwined.expect index 58aaafaa39e..4b7c9c8a96f 100644 --- a/pkg/front_end/parser_testcases/extension_type.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/extension_type.dart.intertwined.expect @@ -6,13 +6,13 @@ parseUnit(class) parseMetadataStar() listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(A, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, A) + listener: beginClassDeclaration(class, null, null, null, null, null, A) parseClass(A, class, class, A) parseClassHeaderOpt(A, class, class) parseClassExtendsOpt(A) @@ -33,7 +33,7 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(}, extension, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(}, extension, null, null, null, Instance of 'DirectiveContext') parseExtension(extension) listener: beginExtensionDeclarationPrelude(extension) listener: handleNoTypeVariables(on) diff --git a/pkg/front_end/parser_testcases/extensions/covariant.dart.expect b/pkg/front_end/parser_testcases/extensions/covariant.dart.expect index 8cf49743c63..9493e0248ca 100644 --- a/pkg/front_end/parser_testcases/extensions/covariant.dart.expect +++ b/pkg/front_end/parser_testcases/extensions/covariant.dart.expect @@ -10,7 +10,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(A, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, A) + beginClassDeclaration(class, null, null, null, null, null, A) handleNoType(A) handleClassExtends(null, 1) handleClassNoWithClause() @@ -25,7 +25,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables(extends) - beginClassDeclaration(class, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, C) handleIdentifier(A, typeReference) handleNoTypeArguments({) handleType(A, 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 59c807ed3f7..0befd9a7894 100644 --- a/pkg/front_end/parser_testcases/extensions/covariant.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/extensions/covariant.dart.intertwined.expect @@ -6,13 +6,13 @@ parseUnit(class) parseMetadataStar() listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(A, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, A) + listener: beginClassDeclaration(class, null, null, null, null, null, A) parseClass(A, class, class, A) parseClassHeaderOpt(A, class, class) parseClassExtendsOpt(A) @@ -33,13 +33,13 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(}, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) listener: handleNoTypeVariables(extends) - listener: beginClassDeclaration(class, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, C) parseClass(C, class, class, C) parseClassHeaderOpt(C, class, class) parseClassExtendsOpt(C) @@ -63,7 +63,7 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(}, extension, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(}, extension, null, null, null, Instance of 'DirectiveContext') parseExtension(extension) listener: beginExtensionDeclarationPrelude(extension) listener: handleNoTypeVariables(on) diff --git a/pkg/front_end/parser_testcases/extensions/not_covariant.dart.expect b/pkg/front_end/parser_testcases/extensions/not_covariant.dart.expect index b66cff01a4f..d9a92940ab1 100644 --- a/pkg/front_end/parser_testcases/extensions/not_covariant.dart.expect +++ b/pkg/front_end/parser_testcases/extensions/not_covariant.dart.expect @@ -4,7 +4,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(A, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, A) + beginClassDeclaration(class, null, null, null, null, null, A) handleNoType(A) handleClassExtends(null, 1) handleClassNoWithClause() @@ -19,7 +19,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables(extends) - beginClassDeclaration(class, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, C) handleIdentifier(A, typeReference) handleNoTypeArguments({) handleType(A, null) 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 8c46668ef4d..000ae0c12f8 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 @@ -6,13 +6,13 @@ parseUnit(class) parseMetadataStar() listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(A, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, A) + listener: beginClassDeclaration(class, null, null, null, null, null, A) parseClass(A, class, class, A) parseClassHeaderOpt(A, class, class) parseClassExtendsOpt(A) @@ -33,13 +33,13 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(}, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) listener: handleNoTypeVariables(extends) - listener: beginClassDeclaration(class, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, C) parseClass(C, class, class, C) parseClassHeaderOpt(C, class, class) parseClassExtendsOpt(C) @@ -63,7 +63,7 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(}, extension, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(}, extension, null, null, null, Instance of 'DirectiveContext') parseExtension(extension) listener: beginExtensionDeclarationPrelude(extension) listener: handleNoTypeVariables(on) diff --git a/pkg/front_end/parser_testcases/extensions/static.dart.expect b/pkg/front_end/parser_testcases/extensions/static.dart.expect index c1b4716f77c..e6dbacc2a17 100644 --- a/pkg/front_end/parser_testcases/extensions/static.dart.expect +++ b/pkg/front_end/parser_testcases/extensions/static.dart.expect @@ -4,7 +4,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(A, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, A) + beginClassDeclaration(class, null, null, null, null, null, A) handleNoType(A) handleClassExtends(null, 1) handleClassNoWithClause() @@ -19,7 +19,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables(extends) - beginClassDeclaration(class, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, C) handleIdentifier(A, typeReference) handleNoTypeArguments({) handleType(A, null) 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 6775f6ac91f..63ca86ad4fd 100644 --- a/pkg/front_end/parser_testcases/extensions/static.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/extensions/static.dart.intertwined.expect @@ -6,13 +6,13 @@ parseUnit(class) parseMetadataStar() listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(A, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, A) + listener: beginClassDeclaration(class, null, null, null, null, null, A) parseClass(A, class, class, A) parseClassHeaderOpt(A, class, class) parseClassExtendsOpt(A) @@ -33,13 +33,13 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(}, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) listener: handleNoTypeVariables(extends) - listener: beginClassDeclaration(class, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, C) parseClass(C, class, class, C) parseClassHeaderOpt(C, class, class) parseClassExtendsOpt(C) @@ -63,7 +63,7 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(}, extension, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(}, extension, null, null, null, Instance of 'DirectiveContext') parseExtension(extension) listener: beginExtensionDeclarationPrelude(extension) listener: handleNoTypeVariables(on) diff --git a/pkg/front_end/parser_testcases/extensions/static_covariant.dart.expect b/pkg/front_end/parser_testcases/extensions/static_covariant.dart.expect index 8b2f6377597..90b53bb5ad8 100644 --- a/pkg/front_end/parser_testcases/extensions/static_covariant.dart.expect +++ b/pkg/front_end/parser_testcases/extensions/static_covariant.dart.expect @@ -10,7 +10,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(A, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, A) + beginClassDeclaration(class, null, null, null, null, null, A) handleNoType(A) handleClassExtends(null, 1) handleClassNoWithClause() @@ -25,7 +25,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables(extends) - beginClassDeclaration(class, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, C) handleIdentifier(A, typeReference) handleNoTypeArguments({) handleType(A, null) 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 1ec20df7f30..7c3e910a1f0 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 @@ -6,13 +6,13 @@ parseUnit(class) parseMetadataStar() listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(A, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, A) + listener: beginClassDeclaration(class, null, null, null, null, null, A) parseClass(A, class, class, A) parseClassHeaderOpt(A, class, class) parseClassExtendsOpt(A) @@ -33,13 +33,13 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(}, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) listener: handleNoTypeVariables(extends) - listener: beginClassDeclaration(class, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, C) parseClass(C, class, class, C) parseClassHeaderOpt(C, class, class) parseClassExtendsOpt(C) @@ -63,7 +63,7 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(}, extension, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(}, extension, null, null, null, Instance of 'DirectiveContext') parseExtension(extension) listener: beginExtensionDeclarationPrelude(extension) listener: handleNoTypeVariables(on) diff --git a/pkg/front_end/parser_testcases/general/augment_super.dart.expect b/pkg/front_end/parser_testcases/general/augment_super.dart.expect index 9804f00ceff..51660f2668e 100644 --- a/pkg/front_end/parser_testcases/general/augment_super.dart.expect +++ b/pkg/front_end/parser_testcases/general/augment_super.dart.expect @@ -473,7 +473,7 @@ beginCompilationUnit(augment) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(Class, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, Class) + beginClassDeclaration(class, null, null, null, null, null, Class) handleNoType(Class) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/general/augment_super.dart.intertwined.expect b/pkg/front_end/parser_testcases/general/augment_super.dart.intertwined.expect index 95834f1a09f..8386dfe64e8 100644 --- a/pkg/front_end/parser_testcases/general/augment_super.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/general/augment_super.dart.intertwined.expect @@ -710,13 +710,13 @@ parseUnit(augment) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(;, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(Class, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, Class) + listener: beginClassDeclaration(class, null, null, null, null, null, Class) parseClass(Class, class, class, Class) parseClassHeaderOpt(Class, class, class) parseClassExtendsOpt(Class) diff --git a/pkg/front_end/parser_testcases/general/built_in_identifier_class_fields.dart.expect b/pkg/front_end/parser_testcases/general/built_in_identifier_class_fields.dart.expect index af788a345cc..a1e2126d981 100644 --- a/pkg/front_end/parser_testcases/general/built_in_identifier_class_fields.dart.expect +++ b/pkg/front_end/parser_testcases/general/built_in_identifier_class_fields.dart.expect @@ -4,7 +4,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(WrapperClass, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, WrapperClass) + beginClassDeclaration(class, null, null, null, null, null, WrapperClass) handleNoType(WrapperClass) handleClassExtends(null, 1) handleClassNoWithClause() 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 616ab00dcac..404f233027d 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 @@ -6,13 +6,13 @@ parseUnit(class) parseMetadataStar() listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(WrapperClass, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, WrapperClass) + listener: beginClassDeclaration(class, null, null, null, null, null, WrapperClass) parseClass(WrapperClass, class, class, WrapperClass) parseClassHeaderOpt(WrapperClass, class, class) parseClassExtendsOpt(WrapperClass) diff --git a/pkg/front_end/parser_testcases/general/built_in_identifier_class_methods.dart.expect b/pkg/front_end/parser_testcases/general/built_in_identifier_class_methods.dart.expect index 9a513a0ff1f..487d4d9c7e8 100644 --- a/pkg/front_end/parser_testcases/general/built_in_identifier_class_methods.dart.expect +++ b/pkg/front_end/parser_testcases/general/built_in_identifier_class_methods.dart.expect @@ -4,7 +4,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(WrapperClass, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, WrapperClass) + beginClassDeclaration(class, null, null, null, null, null, WrapperClass) handleNoType(WrapperClass) handleClassExtends(null, 1) handleClassNoWithClause() 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 db912e559d0..7012674a6ed 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 @@ -6,13 +6,13 @@ parseUnit(class) parseMetadataStar() listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(WrapperClass, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, WrapperClass) + listener: beginClassDeclaration(class, null, null, null, null, null, WrapperClass) parseClass(WrapperClass, class, class, WrapperClass) parseClassHeaderOpt(WrapperClass, class, class) parseClassExtendsOpt(WrapperClass) diff --git a/pkg/front_end/parser_testcases/general/generic_function_typedef.dart.intertwined.expect b/pkg/front_end/parser_testcases/general/generic_function_typedef.dart.intertwined.expect index 4bcba6f36a3..02912314048 100644 --- a/pkg/front_end/parser_testcases/general/generic_function_typedef.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/general/generic_function_typedef.dart.intertwined.expect @@ -6,7 +6,7 @@ parseUnit(typedef) parseMetadataStar() listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -36,7 +36,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -70,7 +70,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -110,7 +110,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -154,7 +154,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -198,7 +198,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -242,7 +242,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -272,7 +272,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -306,7 +306,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -346,7 +346,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -390,7 +390,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -434,7 +434,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -478,7 +478,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -520,7 +520,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -566,7 +566,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -628,7 +628,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -694,7 +694,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -750,7 +750,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -806,7 +806,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -852,7 +852,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -902,7 +902,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -958,7 +958,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -1018,7 +1018,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -1078,7 +1078,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) diff --git a/pkg/front_end/parser_testcases/general/issue_41121.dart.expect b/pkg/front_end/parser_testcases/general/issue_41121.dart.expect index 0b408bb0e67..adb5514c467 100644 --- a/pkg/front_end/parser_testcases/general/issue_41121.dart.expect +++ b/pkg/front_end/parser_testcases/general/issue_41121.dart.expect @@ -46,7 +46,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(ConfigurationService, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, ConfigurationService) + beginClassDeclaration(class, null, null, null, null, null, ConfigurationService) handleNoType(ConfigurationService) handleClassExtends(null, 1) handleClassNoWithClause() @@ -275,7 +275,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(Configuration, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, Configuration) + beginClassDeclaration(class, null, null, null, null, null, Configuration) handleNoType(Configuration) handleClassExtends(null, 1) handleClassNoWithClause() 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 891f4264593..d3ec34b8363 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 @@ -6,13 +6,13 @@ parseUnit(class) parseMetadataStar() listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(ConfigurationService, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, ConfigurationService) + listener: beginClassDeclaration(class, null, null, null, null, null, ConfigurationService) parseClass(ConfigurationService, class, class, ConfigurationService) parseClassHeaderOpt(ConfigurationService, class, class) parseClassExtendsOpt(ConfigurationService) @@ -510,13 +510,13 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(}, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(Configuration, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, Configuration) + listener: beginClassDeclaration(class, null, null, null, null, null, Configuration) parseClass(Configuration, class, class, Configuration) parseClassHeaderOpt(Configuration, class, class) parseClassExtendsOpt(Configuration) diff --git a/pkg/front_end/parser_testcases/general/issue_45120.dart.intertwined.expect b/pkg/front_end/parser_testcases/general/issue_45120.dart.intertwined.expect index a2e7794d96f..b4631e2c30e 100644 --- a/pkg/front_end/parser_testcases/general/issue_45120.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/general/issue_45120.dart.intertwined.expect @@ -28,7 +28,7 @@ parseUnit(@) listener: endArguments(1, (, )) listener: endMetadata(@, null, typedef) listener: endMetadataStar(1) - parseTopLevelKeywordDeclaration(), typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(), typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) diff --git a/pkg/front_end/parser_testcases/general/issue_45703.dart.expect b/pkg/front_end/parser_testcases/general/issue_45703.dart.expect index 033c0b41b1d..4b3bf89ce91 100644 --- a/pkg/front_end/parser_testcases/general/issue_45703.dart.expect +++ b/pkg/front_end/parser_testcases/general/issue_45703.dart.expect @@ -39,7 +39,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[BuiltInIdentifierInDeclaration, Can't use 'Function' as a name here., null, {lexeme: Function}], Function, Function) handleIdentifier(Function, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, Function) + beginClassDeclaration(class, null, null, null, null, null, Function) handleNoType(Function) handleClassExtends(null, 1) handleClassNoWithClause() @@ -63,7 +63,7 @@ beginCompilationUnit(class) handleNoType(Function) endTypeVariable(>, 0, null, null) endTypeVariables(<, >) - beginClassDeclaration(class, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, C) handleNoType(>) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/general/issue_45703.dart.intertwined.expect b/pkg/front_end/parser_testcases/general/issue_45703.dart.intertwined.expect index 294b4faa6b7..62d53f60390 100644 --- a/pkg/front_end/parser_testcases/general/issue_45703.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/general/issue_45703.dart.intertwined.expect @@ -6,15 +6,15 @@ parseUnit(class) parseMetadataStar() listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(Function, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[BuiltInIdentifierInDeclaration, Can't use 'Function' as a name here., null, {lexeme: Function}], Function, Function) listener: handleIdentifier(Function, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, Function) + listener: beginClassDeclaration(class, null, null, null, null, null, Function) parseClass(Function, class, class, Function) parseClassHeaderOpt(Function, class, class) parseClassExtendsOpt(Function) @@ -35,8 +35,8 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(}, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) @@ -53,7 +53,7 @@ parseUnit(class) listener: handleNoType(Function) listener: endTypeVariable(>, 0, null, null) listener: endTypeVariables(<, >) - listener: beginClassDeclaration(class, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, C) parseClass(>, class, class, C) parseClassHeaderOpt(>, class, class) parseClassExtendsOpt(>) @@ -74,7 +74,7 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(}, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(}, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -93,7 +93,7 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -122,7 +122,7 @@ parseUnit(class) parseMetadataStar(;) listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, extension, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, extension, null, null, null, Instance of 'DirectiveContext') parseExtension(extension) listener: beginExtensionDeclarationPrelude(extension) reportRecoverableErrorWithToken(Function, Instance of 'Template<(Token) => Message>') @@ -143,7 +143,7 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(}, extension, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(}, extension, null, null, null, Instance of 'DirectiveContext') parseExtension(extension) listener: beginExtensionDeclarationPrelude(extension) listener: beginTypeVariables(<) @@ -179,7 +179,7 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(mixin) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(}, mixin, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(}, mixin, null, null, null, Instance of 'DirectiveContext') parseMixin(null, mixin) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(mixin) ensureIdentifier(mixin, classOrMixinDeclaration) @@ -204,7 +204,7 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(mixin) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(}, mixin, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(}, mixin, null, null, null, Instance of 'DirectiveContext') parseMixin(null, mixin) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(mixin) ensureIdentifier(mixin, classOrMixinDeclaration) diff --git a/pkg/front_end/parser_testcases/general/issue_45848_06.dart.intertwined.expect b/pkg/front_end/parser_testcases/general/issue_45848_06.dart.intertwined.expect index b86a74b3d13..e7e65a4ea07 100644 --- a/pkg/front_end/parser_testcases/general/issue_45848_06.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/general/issue_45848_06.dart.intertwined.expect @@ -347,7 +347,7 @@ parseUnit(void) parseMetadataStar(}) listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(}, extension, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(}, extension, null, null, null, Instance of 'DirectiveContext') parseExtension(extension) listener: beginExtensionDeclarationPrelude(extension) listener: handleNoTypeVariables(on) diff --git a/pkg/front_end/parser_testcases/general/issue_49197.dart.intertwined.expect b/pkg/front_end/parser_testcases/general/issue_49197.dart.intertwined.expect index 3aa438c82d8..8e0f7e8ffb1 100644 --- a/pkg/front_end/parser_testcases/general/issue_49197.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/general/issue_49197.dart.intertwined.expect @@ -6,7 +6,7 @@ parseUnit(import) parseMetadataStar() listener: beginMetadataStar(import) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(, import, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(, import, null, null, null, Instance of 'DirectiveContext') parseImport(import) listener: beginUncategorizedTopLevelDeclaration(import) listener: beginImport(import) diff --git a/pkg/front_end/parser_testcases/general/metadata.dart.expect b/pkg/front_end/parser_testcases/general/metadata.dart.expect index 32da46eacd6..f40ab9291c0 100644 --- a/pkg/front_end/parser_testcases/general/metadata.dart.expect +++ b/pkg/front_end/parser_testcases/general/metadata.dart.expect @@ -107,7 +107,7 @@ beginCompilationUnit(@) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(X, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, X) + beginClassDeclaration(class, null, null, null, null, null, X) handleNoType(X) handleClassExtends(null, 1) handleClassNoWithClause() @@ -939,7 +939,7 @@ beginCompilationUnit(@) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(Y, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, Y) + beginClassDeclaration(class, null, null, null, null, null, Y) handleNoType(Y) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/general/metadata.dart.intertwined.expect b/pkg/front_end/parser_testcases/general/metadata.dart.intertwined.expect index 15e4a7a5d4a..240f084c054 100644 --- a/pkg/front_end/parser_testcases/general/metadata.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/general/metadata.dart.intertwined.expect @@ -228,13 +228,13 @@ parseUnit(@) listener: endArguments(1, (, )) listener: endMetadata(@, ., class) listener: endMetadataStar(10) - parseTopLevelKeywordDeclaration(), class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(), class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(X, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, X) + listener: beginClassDeclaration(class, null, null, null, null, null, X) parseClass(X, class, class, X) parseClassHeaderOpt(X, class, class) parseClassExtendsOpt(X) @@ -255,7 +255,7 @@ parseUnit(@) parseMetadataStar(}) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(}, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(}, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -341,7 +341,7 @@ parseUnit(@) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -439,7 +439,7 @@ parseUnit(@) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -543,7 +543,7 @@ parseUnit(@) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -659,7 +659,7 @@ parseUnit(@) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -790,7 +790,7 @@ parseUnit(@) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -927,7 +927,7 @@ parseUnit(@) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -1055,7 +1055,7 @@ parseUnit(@) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -1192,7 +1192,7 @@ parseUnit(@) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -1332,7 +1332,7 @@ parseUnit(@) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -1702,13 +1702,13 @@ parseUnit(@) listener: endArguments(1, (, )) listener: endMetadata(@, ., class) listener: endMetadataStar(9) - parseTopLevelKeywordDeclaration(), class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(), class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(Y, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, Y) + listener: beginClassDeclaration(class, null, null, null, null, null, Y) parseClass(Y, class, class, Y) parseClassHeaderOpt(Y, class, class) parseClassExtendsOpt(Y) diff --git a/pkg/front_end/parser_testcases/general/new_as_identifier.dart.expect b/pkg/front_end/parser_testcases/general/new_as_identifier.dart.expect index 3ffb8516cbd..e1efb1151bd 100644 --- a/pkg/front_end/parser_testcases/general/new_as_identifier.dart.expect +++ b/pkg/front_end/parser_testcases/general/new_as_identifier.dart.expect @@ -46,7 +46,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, C) handleNoType(C) handleClassExtends(null, 1) handleClassNoWithClause() @@ -147,7 +147,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(D, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, D) + beginClassDeclaration(class, null, null, null, null, null, D) handleNoType(D) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/general/new_as_identifier.dart.intertwined.expect b/pkg/front_end/parser_testcases/general/new_as_identifier.dart.intertwined.expect index 300a237ea01..4054f62cfce 100644 --- a/pkg/front_end/parser_testcases/general/new_as_identifier.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/general/new_as_identifier.dart.intertwined.expect @@ -6,13 +6,13 @@ parseUnit(class) parseMetadataStar() listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, C) parseClass(C, class, class, C) parseClassHeaderOpt(C, class, class) parseClassExtendsOpt(C) @@ -232,13 +232,13 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(}, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(D, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, D) + listener: beginClassDeclaration(class, null, null, null, null, null, D) parseClass(D, class, class, D) parseClassHeaderOpt(D, class, class) parseClassExtendsOpt(D) diff --git a/pkg/front_end/parser_testcases/general/operator_01.dart.expect b/pkg/front_end/parser_testcases/general/operator_01.dart.expect index 691f38133ad..69dabc72786 100644 --- a/pkg/front_end/parser_testcases/general/operator_01.dart.expect +++ b/pkg/front_end/parser_testcases/general/operator_01.dart.expect @@ -4,7 +4,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(Foo, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, Foo) + beginClassDeclaration(class, null, null, null, null, null, Foo) handleNoType(Foo) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/general/operator_01.dart.intertwined.expect b/pkg/front_end/parser_testcases/general/operator_01.dart.intertwined.expect index 36dd2e2b379..c5f6575cff9 100644 --- a/pkg/front_end/parser_testcases/general/operator_01.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/general/operator_01.dart.intertwined.expect @@ -6,13 +6,13 @@ parseUnit(class) parseMetadataStar() listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(Foo, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, Foo) + listener: beginClassDeclaration(class, null, null, null, null, null, Foo) parseClass(Foo, class, class, Foo) parseClassHeaderOpt(Foo, class, class) parseClassExtendsOpt(Foo) diff --git a/pkg/front_end/parser_testcases/general/operator_hat_class.crash_dart.expect b/pkg/front_end/parser_testcases/general/operator_hat_class.crash_dart.expect index 65a30f04f6c..07332fee612 100644 --- a/pkg/front_end/parser_testcases/general/operator_hat_class.crash_dart.expect +++ b/pkg/front_end/parser_testcases/general/operator_hat_class.crash_dart.expect @@ -11,7 +11,7 @@ beginCompilationUnit(class) handleRecoverableError(Message[BuiltInIdentifierInDeclaration, Can't use 'operator' as a name here., null, {lexeme: operator}], operator, operator) handleIdentifier(operator, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, operator) + beginClassDeclaration(class, null, null, null, null, null, operator) handleNoType(operator) handleClassExtends(null, 1) handleClassNoWithClause() 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 8152c0844d5..6a175e3d61a 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 @@ -6,15 +6,15 @@ parseUnit(class) parseMetadataStar() listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) reportRecoverableErrorWithToken(operator, Instance of 'Template<(Token) => Message>') listener: handleRecoverableError(Message[BuiltInIdentifierInDeclaration, Can't use 'operator' as a name here., null, {lexeme: operator}], operator, operator) listener: handleIdentifier(operator, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, operator) + listener: beginClassDeclaration(class, null, null, null, null, null, operator) parseClass(operator, class, class, operator) parseClassHeaderOpt(operator, class, class) parseClassExtendsOpt(operator) diff --git a/pkg/front_end/parser_testcases/macros/augment_class.dart.expect b/pkg/front_end/parser_testcases/macros/augment_class.dart.expect index 80746876c53..21be7571169 100644 --- a/pkg/front_end/parser_testcases/macros/augment_class.dart.expect +++ b/pkg/front_end/parser_testcases/macros/augment_class.dart.expect @@ -57,7 +57,7 @@ beginCompilationUnit(augment) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(Class, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, Class) + beginClassDeclaration(class, null, null, null, null, null, Class) handleNoType(Class) handleClassExtends(null, 1) handleClassNoWithClause() @@ -84,7 +84,7 @@ beginCompilationUnit(augment) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(Class, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, Class) + beginClassDeclaration(class, null, null, null, null, null, Class) handleNoType(Class) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/macros/augment_class.dart.intertwined.expect b/pkg/front_end/parser_testcases/macros/augment_class.dart.intertwined.expect index b1dc080884d..0318b0642ff 100644 --- a/pkg/front_end/parser_testcases/macros/augment_class.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/macros/augment_class.dart.intertwined.expect @@ -29,13 +29,13 @@ parseUnit(augment) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(;, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(Class, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, Class) + listener: beginClassDeclaration(class, null, null, null, null, null, Class) parseClass(Class, class, class, Class) parseClassHeaderOpt(Class, class, class) parseClassExtendsOpt(Class) @@ -81,13 +81,13 @@ parseUnit(augment) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(;, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(Class, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, Class) + listener: beginClassDeclaration(class, null, null, null, null, null, Class) parseClass(Class, class, class, Class) parseClassHeaderOpt(Class, class, class) parseClassExtendsOpt(Class) @@ -131,8 +131,8 @@ parseUnit(augment) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(;, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(Class, classOrMixinDeclaration) @@ -182,8 +182,8 @@ parseUnit(augment) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(;, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(Class, classOrMixinDeclaration) diff --git a/pkg/front_end/parser_testcases/macros/macro_class.dart.expect b/pkg/front_end/parser_testcases/macros/macro_class.dart.expect index 741a7d669ce..d41b304cf5d 100644 --- a/pkg/front_end/parser_testcases/macros/macro_class.dart.expect +++ b/pkg/front_end/parser_testcases/macros/macro_class.dart.expect @@ -4,7 +4,7 @@ beginCompilationUnit(macro) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(Class, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, macro, null, null, Class) + beginClassDeclaration(class, null, macro, null, null, null, Class) handleNoType(Class) handleClassExtends(null, 1) handleClassNoWithClause() @@ -19,7 +19,7 @@ beginCompilationUnit(macro) beginClassOrMixinOrNamedMixinApplicationPrelude(abstract) handleIdentifier(Class, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(abstract, abstract, macro, null, null, Class) + beginClassDeclaration(abstract, abstract, macro, null, null, null, Class) handleNoType(Class) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/macros/macro_class.dart.intertwined.expect b/pkg/front_end/parser_testcases/macros/macro_class.dart.intertwined.expect index 44cc7baf7e5..1407db49d40 100644 --- a/pkg/front_end/parser_testcases/macros/macro_class.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/macros/macro_class.dart.intertwined.expect @@ -6,13 +6,13 @@ parseUnit(macro) parseMetadataStar() listener: beginMetadataStar(macro) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(, class, macro, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, macro, null, null, class) + parseTopLevelKeywordDeclaration(, class, macro, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, macro, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(Class, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, macro, null, null, Class) + listener: beginClassDeclaration(class, null, macro, null, null, null, Class) parseClass(Class, class, class, Class) parseClassHeaderOpt(Class, class, class) parseClassExtendsOpt(Class) @@ -33,13 +33,13 @@ parseUnit(macro) parseMetadataStar(}) listener: beginMetadataStar(abstract) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(}, class, macro, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(abstract, macro, null, null, class) + parseTopLevelKeywordDeclaration(}, class, macro, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(abstract, macro, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(abstract) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(Class, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(abstract, abstract, macro, null, null, Class) + listener: beginClassDeclaration(abstract, abstract, macro, null, null, null, Class) parseClass(Class, abstract, class, Class) parseClassHeaderOpt(Class, abstract, class) parseClassExtendsOpt(Class) @@ -60,8 +60,8 @@ parseUnit(macro) parseMetadataStar(}) listener: beginMetadataStar(macro) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(}, class, macro, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, macro, null, null, class) + parseTopLevelKeywordDeclaration(}, class, macro, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, macro, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(Class, classOrMixinDeclaration) @@ -86,8 +86,8 @@ parseUnit(macro) parseMetadataStar(;) listener: beginMetadataStar(abstract) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, class, macro, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(abstract, macro, null, null, class) + parseTopLevelKeywordDeclaration(;, class, macro, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(abstract, macro, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(abstract) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(Class, classOrMixinDeclaration) diff --git a/pkg/front_end/parser_testcases/nnbd/error_recovery/abstract_placement.dart.expect b/pkg/front_end/parser_testcases/nnbd/error_recovery/abstract_placement.dart.expect index eb97e2ad70c..fd31dfa221e 100644 --- a/pkg/front_end/parser_testcases/nnbd/error_recovery/abstract_placement.dart.expect +++ b/pkg/front_end/parser_testcases/nnbd/error_recovery/abstract_placement.dart.expect @@ -58,7 +58,7 @@ beginCompilationUnit(abstract) beginClassOrMixinOrNamedMixinApplicationPrelude(abstract) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(abstract, abstract, null, null, null, C) + beginClassDeclaration(abstract, abstract, null, null, null, null, C) handleNoType(C) handleClassExtends(null, 1) handleClassNoWithClause() @@ -170,7 +170,7 @@ beginCompilationUnit(abstract) beginClassOrMixinOrNamedMixinApplicationPrelude(abstract) handleIdentifier(Bar, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(abstract, abstract, null, null, null, Bar) + beginClassDeclaration(abstract, abstract, null, null, null, null, Bar) handleNoType(Bar) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/nnbd/error_recovery/abstract_placement.dart.intertwined.expect b/pkg/front_end/parser_testcases/nnbd/error_recovery/abstract_placement.dart.intertwined.expect index d2389e44c98..9a8dd4a6da9 100644 --- a/pkg/front_end/parser_testcases/nnbd/error_recovery/abstract_placement.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/nnbd/error_recovery/abstract_placement.dart.intertwined.expect @@ -6,13 +6,13 @@ parseUnit(abstract) parseMetadataStar() listener: beginMetadataStar(abstract) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(abstract, null, null, null, class) + parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(abstract, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(abstract) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(abstract, abstract, null, null, null, C) + listener: beginClassDeclaration(abstract, abstract, null, null, null, null, C) parseClass(C, abstract, class, C) parseClassHeaderOpt(C, abstract, class) parseClassExtendsOpt(C) @@ -197,13 +197,13 @@ parseUnit(abstract) parseMetadataStar(;) listener: beginMetadataStar(abstract) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(abstract, null, null, null, class) + parseTopLevelKeywordDeclaration(;, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(abstract, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(abstract) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(Bar, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(abstract, abstract, null, null, null, Bar) + listener: beginClassDeclaration(abstract, abstract, null, null, null, null, Bar) parseClass(Bar, abstract, class, Bar) parseClassHeaderOpt(Bar, abstract, class) parseClassExtendsOpt(Bar) diff --git a/pkg/front_end/parser_testcases/nnbd/error_recovery/external_placement.dart.expect b/pkg/front_end/parser_testcases/nnbd/error_recovery/external_placement.dart.expect index 430ad4dd321..55d6f795e0c 100644 --- a/pkg/front_end/parser_testcases/nnbd/error_recovery/external_placement.dart.expect +++ b/pkg/front_end/parser_testcases/nnbd/error_recovery/external_placement.dart.expect @@ -64,7 +64,7 @@ beginCompilationUnit(final) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, C) handleNoType(C) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/nnbd/error_recovery/external_placement.dart.intertwined.expect b/pkg/front_end/parser_testcases/nnbd/error_recovery/external_placement.dart.intertwined.expect index c4461331c35..059bb775dbf 100644 --- a/pkg/front_end/parser_testcases/nnbd/error_recovery/external_placement.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/nnbd/error_recovery/external_placement.dart.intertwined.expect @@ -42,13 +42,13 @@ parseUnit(final) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(;, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, C) parseClass(C, class, class, C) parseClassHeaderOpt(C, class, class) parseClassExtendsOpt(C) diff --git a/pkg/front_end/parser_testcases/nnbd/error_recovery/late_without_var_etc.dart.expect b/pkg/front_end/parser_testcases/nnbd/error_recovery/late_without_var_etc.dart.expect index 249f283bc5c..28c9201639a 100644 --- a/pkg/front_end/parser_testcases/nnbd/error_recovery/late_without_var_etc.dart.expect +++ b/pkg/front_end/parser_testcases/nnbd/error_recovery/late_without_var_etc.dart.expect @@ -60,7 +60,7 @@ beginCompilationUnit(void) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(Foo, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, Foo) + beginClassDeclaration(class, null, null, null, null, null, Foo) handleNoType(Foo) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/nnbd/error_recovery/late_without_var_etc.dart.intertwined.expect b/pkg/front_end/parser_testcases/nnbd/error_recovery/late_without_var_etc.dart.intertwined.expect index f882814dc82..dc08aae9fbb 100644 --- a/pkg/front_end/parser_testcases/nnbd/error_recovery/late_without_var_etc.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/nnbd/error_recovery/late_without_var_etc.dart.intertwined.expect @@ -73,13 +73,13 @@ parseUnit(void) parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(;, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(Foo, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, Foo) + listener: beginClassDeclaration(class, null, null, null, null, null, Foo) parseClass(Foo, class, class, Foo) parseClassHeaderOpt(Foo, class, class) parseClassExtendsOpt(Foo) diff --git a/pkg/front_end/parser_testcases/nnbd/issue_39723.dart.expect b/pkg/front_end/parser_testcases/nnbd/issue_39723.dart.expect index 7c22f1d00fe..71e3995e7f4 100644 --- a/pkg/front_end/parser_testcases/nnbd/issue_39723.dart.expect +++ b/pkg/front_end/parser_testcases/nnbd/issue_39723.dart.expect @@ -4,7 +4,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(A, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, A) + beginClassDeclaration(class, null, null, null, null, null, A) handleNoType(A) handleClassExtends(null, 1) handleClassNoWithClause() 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 6b88a4efcb2..fb7c53efe95 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 @@ -6,13 +6,13 @@ parseUnit(class) parseMetadataStar() listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(A, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, A) + listener: beginClassDeclaration(class, null, null, null, null, null, A) parseClass(A, class, class, A) parseClassHeaderOpt(A, class, class) parseClassExtendsOpt(A) diff --git a/pkg/front_end/parser_testcases/nnbd/issue_39723_prime.dart.expect b/pkg/front_end/parser_testcases/nnbd/issue_39723_prime.dart.expect index 67427cb94a2..0d2d8666cef 100644 --- a/pkg/front_end/parser_testcases/nnbd/issue_39723_prime.dart.expect +++ b/pkg/front_end/parser_testcases/nnbd/issue_39723_prime.dart.expect @@ -4,7 +4,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(A, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, A) + beginClassDeclaration(class, null, null, null, null, null, A) handleNoType(A) handleClassExtends(null, 1) handleClassNoWithClause() 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 ba03cd352ef..7de025f50c0 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 @@ -6,13 +6,13 @@ parseUnit(class) parseMetadataStar() listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(A, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, A) + listener: beginClassDeclaration(class, null, null, null, null, null, A) parseClass(A, class, class, A) parseClassHeaderOpt(A, class, class) parseClassExtendsOpt(A) diff --git a/pkg/front_end/parser_testcases/nnbd/issue_39858.dart.expect b/pkg/front_end/parser_testcases/nnbd/issue_39858.dart.expect index be9ccfd09d3..0eaf5d94858 100644 --- a/pkg/front_end/parser_testcases/nnbd/issue_39858.dart.expect +++ b/pkg/front_end/parser_testcases/nnbd/issue_39858.dart.expect @@ -30,7 +30,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(X, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, X) + beginClassDeclaration(class, null, null, null, null, null, X) handleNoType(X) handleClassExtends(null, 1) handleClassNoWithClause() 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 cf136e4e5b2..413d8e0aa28 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 @@ -6,13 +6,13 @@ parseUnit(class) parseMetadataStar() listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(X, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, X) + listener: beginClassDeclaration(class, null, null, null, null, null, X) parseClass(X, class, class, X) parseClassHeaderOpt(X, class, class) parseClassExtendsOpt(X) diff --git a/pkg/front_end/parser_testcases/nnbd/issue_39858_prime1.dart.expect b/pkg/front_end/parser_testcases/nnbd/issue_39858_prime1.dart.expect index 224f11067c1..ce1c0117971 100644 --- a/pkg/front_end/parser_testcases/nnbd/issue_39858_prime1.dart.expect +++ b/pkg/front_end/parser_testcases/nnbd/issue_39858_prime1.dart.expect @@ -4,7 +4,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(X, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, X) + beginClassDeclaration(class, null, null, null, null, null, X) handleNoType(X) handleClassExtends(null, 1) handleClassNoWithClause() 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 145103fa36d..0d8ca1be7d6 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 @@ -6,13 +6,13 @@ parseUnit(class) parseMetadataStar() listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(X, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, X) + listener: beginClassDeclaration(class, null, null, null, null, null, X) parseClass(X, class, class, X) parseClassHeaderOpt(X, class, class) parseClassExtendsOpt(X) diff --git a/pkg/front_end/parser_testcases/nnbd/issue_40805_01.dart.expect b/pkg/front_end/parser_testcases/nnbd/issue_40805_01.dart.expect index 7c410018304..46e7d6c83d9 100644 --- a/pkg/front_end/parser_testcases/nnbd/issue_40805_01.dart.expect +++ b/pkg/front_end/parser_testcases/nnbd/issue_40805_01.dart.expect @@ -4,7 +4,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, C) handleNoType(C) handleClassExtends(null, 1) handleClassNoWithClause() 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 a04d5afca2e..218954e7700 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 @@ -6,13 +6,13 @@ parseUnit(class) parseMetadataStar() listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, C) parseClass(C, class, class, C) parseClassHeaderOpt(C, class, class) parseClassExtendsOpt(C) diff --git a/pkg/front_end/parser_testcases/nnbd/issue_40805_02.dart.expect b/pkg/front_end/parser_testcases/nnbd/issue_40805_02.dart.expect index e037ded62d3..7fa99293583 100644 --- a/pkg/front_end/parser_testcases/nnbd/issue_40805_02.dart.expect +++ b/pkg/front_end/parser_testcases/nnbd/issue_40805_02.dart.expect @@ -10,7 +10,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, C) handleNoType(C) handleClassExtends(null, 1) handleClassNoWithClause() 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 f8821080fb7..33975114802 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 @@ -6,13 +6,13 @@ parseUnit(class) parseMetadataStar() listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, C) parseClass(C, class, class, C) parseClassHeaderOpt(C, class, class) parseClassExtendsOpt(C) diff --git a/pkg/front_end/parser_testcases/nnbd/issue_40805_03.dart.expect b/pkg/front_end/parser_testcases/nnbd/issue_40805_03.dart.expect index ce9b8fc6505..694bb8ebb07 100644 --- a/pkg/front_end/parser_testcases/nnbd/issue_40805_03.dart.expect +++ b/pkg/front_end/parser_testcases/nnbd/issue_40805_03.dart.expect @@ -10,7 +10,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, C) handleNoType(C) handleClassExtends(null, 1) handleClassNoWithClause() 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 6d711c5c3cc..aaf7ef0d051 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 @@ -6,13 +6,13 @@ parseUnit(class) parseMetadataStar() listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, C) parseClass(C, class, class, C) parseClassHeaderOpt(C, class, class) parseClassExtendsOpt(C) diff --git a/pkg/front_end/parser_testcases/nnbd/issue_40834_01.dart.expect b/pkg/front_end/parser_testcases/nnbd/issue_40834_01.dart.expect index d7c3eb0d270..d8fdb2c014a 100644 --- a/pkg/front_end/parser_testcases/nnbd/issue_40834_01.dart.expect +++ b/pkg/front_end/parser_testcases/nnbd/issue_40834_01.dart.expect @@ -4,7 +4,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(Foo, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, Foo) + beginClassDeclaration(class, null, null, null, null, null, Foo) handleNoType(Foo) handleClassExtends(null, 1) handleClassNoWithClause() 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 4dda12c0bc4..76c7c1357ef 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 @@ -6,13 +6,13 @@ parseUnit(class) parseMetadataStar() listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(Foo, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, Foo) + listener: beginClassDeclaration(class, null, null, null, null, null, Foo) parseClass(Foo, class, class, Foo) parseClassHeaderOpt(Foo, class, class) parseClassExtendsOpt(Foo) diff --git a/pkg/front_end/parser_testcases/nnbd/issue_40834_02.dart.expect b/pkg/front_end/parser_testcases/nnbd/issue_40834_02.dart.expect index b7b5f96758a..b2d98d6e567 100644 --- a/pkg/front_end/parser_testcases/nnbd/issue_40834_02.dart.expect +++ b/pkg/front_end/parser_testcases/nnbd/issue_40834_02.dart.expect @@ -4,7 +4,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(Foo, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, Foo) + beginClassDeclaration(class, null, null, null, null, null, Foo) handleNoType(Foo) handleClassExtends(null, 1) handleClassNoWithClause() 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 c195502e462..f83443672c9 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 @@ -6,13 +6,13 @@ parseUnit(class) parseMetadataStar() listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(Foo, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, Foo) + listener: beginClassDeclaration(class, null, null, null, null, null, Foo) parseClass(Foo, class, class, Foo) parseClassHeaderOpt(Foo, class, class) parseClassExtendsOpt(Foo) diff --git a/pkg/front_end/parser_testcases/nnbd/issue_40834_03.dart.expect b/pkg/front_end/parser_testcases/nnbd/issue_40834_03.dart.expect index d9f7554b1ac..d4c081efa6c 100644 --- a/pkg/front_end/parser_testcases/nnbd/issue_40834_03.dart.expect +++ b/pkg/front_end/parser_testcases/nnbd/issue_40834_03.dart.expect @@ -4,7 +4,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(Foo, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, Foo) + beginClassDeclaration(class, null, null, null, null, null, Foo) handleNoType(Foo) handleClassExtends(null, 1) handleClassNoWithClause() 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 f2b2e9f78b1..527f0f79923 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 @@ -6,13 +6,13 @@ parseUnit(class) parseMetadataStar() listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(Foo, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, Foo) + listener: beginClassDeclaration(class, null, null, null, null, null, Foo) parseClass(Foo, class, class, Foo) parseClassHeaderOpt(Foo, class, class) parseClassExtendsOpt(Foo) diff --git a/pkg/front_end/parser_testcases/nnbd/issue_41597.dart.expect b/pkg/front_end/parser_testcases/nnbd/issue_41597.dart.expect index 54c30bde03b..01a40f21b29 100644 --- a/pkg/front_end/parser_testcases/nnbd/issue_41597.dart.expect +++ b/pkg/front_end/parser_testcases/nnbd/issue_41597.dart.expect @@ -72,7 +72,7 @@ beginCompilationUnit(bool) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, C) handleNoType(C) handleClassExtends(null, 1) handleClassNoWithClause() 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 0495e061e2e..10add1ed08f 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 @@ -186,13 +186,13 @@ parseUnit(bool) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(}, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, C) parseClass(C, class, class, C) parseClassHeaderOpt(C, class, class) parseClassExtendsOpt(C) diff --git a/pkg/front_end/parser_testcases/nnbd/issue_42621.dart.expect b/pkg/front_end/parser_testcases/nnbd/issue_42621.dart.expect index 79a3e17cee2..26a042c06d1 100644 --- a/pkg/front_end/parser_testcases/nnbd/issue_42621.dart.expect +++ b/pkg/front_end/parser_testcases/nnbd/issue_42621.dart.expect @@ -309,7 +309,7 @@ beginCompilationUnit(Order) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(Order, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, Order) + beginClassDeclaration(class, null, null, null, null, null, Order) handleNoType(Order) handleClassExtends(null, 1) handleClassNoWithClause() 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 1bb886cf825..751302f6866 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 @@ -633,13 +633,13 @@ parseUnit(Order) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(}, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(Order, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, Order) + listener: beginClassDeclaration(class, null, null, null, null, null, Order) parseClass(Order, class, class, Order) parseClassHeaderOpt(Order, class, class) parseClassExtendsOpt(Order) diff --git a/pkg/front_end/parser_testcases/nnbd/issue_49132.dart.expect b/pkg/front_end/parser_testcases/nnbd/issue_49132.dart.expect index 501cc5e9dd4..e361ab1b345 100644 --- a/pkg/front_end/parser_testcases/nnbd/issue_49132.dart.expect +++ b/pkg/front_end/parser_testcases/nnbd/issue_49132.dart.expect @@ -4,7 +4,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(Foo, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, Foo) + beginClassDeclaration(class, null, null, null, null, null, Foo) handleNoType(Foo) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/nnbd/issue_49132.dart.intertwined.expect b/pkg/front_end/parser_testcases/nnbd/issue_49132.dart.intertwined.expect index f94e2827a30..699f7db1a6f 100644 --- a/pkg/front_end/parser_testcases/nnbd/issue_49132.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/nnbd/issue_49132.dart.intertwined.expect @@ -6,13 +6,13 @@ parseUnit(class) parseMetadataStar() listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(Foo, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, Foo) + listener: beginClassDeclaration(class, null, null, null, null, null, Foo) parseClass(Foo, class, class, Foo) parseClassHeaderOpt(Foo, class, class) parseClassExtendsOpt(Foo) diff --git a/pkg/front_end/parser_testcases/nnbd/issue_49132_not_nullable.dart.expect b/pkg/front_end/parser_testcases/nnbd/issue_49132_not_nullable.dart.expect index a031c900196..a43819127b3 100644 --- a/pkg/front_end/parser_testcases/nnbd/issue_49132_not_nullable.dart.expect +++ b/pkg/front_end/parser_testcases/nnbd/issue_49132_not_nullable.dart.expect @@ -4,7 +4,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(Foo, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, Foo) + beginClassDeclaration(class, null, null, null, null, null, Foo) handleNoType(Foo) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/nnbd/issue_49132_not_nullable.dart.intertwined.expect b/pkg/front_end/parser_testcases/nnbd/issue_49132_not_nullable.dart.intertwined.expect index ae004962aea..50422b9622b 100644 --- a/pkg/front_end/parser_testcases/nnbd/issue_49132_not_nullable.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/nnbd/issue_49132_not_nullable.dart.intertwined.expect @@ -6,13 +6,13 @@ parseUnit(class) parseMetadataStar() listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(Foo, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, Foo) + listener: beginClassDeclaration(class, null, null, null, null, null, Foo) parseClass(Foo, class, class, Foo) parseClassHeaderOpt(Foo, class, class) parseClassExtendsOpt(Foo) diff --git a/pkg/front_end/parser_testcases/nnbd/issue_49132_prime.dart.expect b/pkg/front_end/parser_testcases/nnbd/issue_49132_prime.dart.expect index d32e73ecaef..9bcbe7eef11 100644 --- a/pkg/front_end/parser_testcases/nnbd/issue_49132_prime.dart.expect +++ b/pkg/front_end/parser_testcases/nnbd/issue_49132_prime.dart.expect @@ -4,7 +4,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(Foo, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, Foo) + beginClassDeclaration(class, null, null, null, null, null, Foo) handleNoType(Foo) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/nnbd/issue_49132_prime.dart.intertwined.expect b/pkg/front_end/parser_testcases/nnbd/issue_49132_prime.dart.intertwined.expect index 4ea00eb0bce..a35d404dbdd 100644 --- a/pkg/front_end/parser_testcases/nnbd/issue_49132_prime.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/nnbd/issue_49132_prime.dart.intertwined.expect @@ -6,13 +6,13 @@ parseUnit(class) parseMetadataStar() listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(Foo, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, Foo) + listener: beginClassDeclaration(class, null, null, null, null, null, Foo) parseClass(Foo, class, class, Foo) parseClassHeaderOpt(Foo, class, class) parseClassExtendsOpt(Foo) diff --git a/pkg/front_end/parser_testcases/nnbd/late_member.dart.expect b/pkg/front_end/parser_testcases/nnbd/late_member.dart.expect index 83d1afa89c4..64b49630b35 100644 --- a/pkg/front_end/parser_testcases/nnbd/late_member.dart.expect +++ b/pkg/front_end/parser_testcases/nnbd/late_member.dart.expect @@ -123,7 +123,7 @@ beginCompilationUnit(main) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(X, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, X) + beginClassDeclaration(class, null, null, null, null, null, X) handleNoType(X) handleClassExtends(null, 1) handleClassNoWithClause() @@ -161,7 +161,7 @@ beginCompilationUnit(main) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(Y, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, Y) + beginClassDeclaration(class, null, null, null, null, null, Y) handleNoType(Y) handleClassExtends(null, 1) handleClassNoWithClause() 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 6fe279239ce..bb5c18d456d 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 @@ -325,13 +325,13 @@ parseUnit(main) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(}, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(X, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, X) + listener: beginClassDeclaration(class, null, null, null, null, null, X) parseClass(X, class, class, X) parseClassHeaderOpt(X, class, class) parseClassExtendsOpt(X) @@ -416,13 +416,13 @@ parseUnit(main) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(}, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(Y, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, Y) + listener: beginClassDeclaration(class, null, null, null, null, null, Y) parseClass(Y, class, class, Y) parseClassHeaderOpt(Y, class, class) parseClassExtendsOpt(Y) diff --git a/pkg/front_end/parser_testcases/nnbd/late_modifier.dart.expect b/pkg/front_end/parser_testcases/nnbd/late_modifier.dart.expect index 66f652d9b90..6c8397acddc 100644 --- a/pkg/front_end/parser_testcases/nnbd/late_modifier.dart.expect +++ b/pkg/front_end/parser_testcases/nnbd/late_modifier.dart.expect @@ -141,7 +141,7 @@ beginCompilationUnit(main) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(X, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, X) + beginClassDeclaration(class, null, null, null, null, null, X) handleNoType(X) handleClassExtends(null, 1) handleClassNoWithClause() @@ -179,7 +179,7 @@ beginCompilationUnit(main) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(Y, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, Y) + beginClassDeclaration(class, null, null, null, null, null, Y) handleNoType(Y) handleClassExtends(null, 1) handleClassNoWithClause() 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 c878b536d34..193c9c2059b 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 @@ -374,13 +374,13 @@ parseUnit(main) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(}, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(X, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, X) + listener: beginClassDeclaration(class, null, null, null, null, null, X) parseClass(X, class, class, X) parseClassHeaderOpt(X, class, class) parseClassExtendsOpt(X) @@ -465,13 +465,13 @@ parseUnit(main) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(}, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(Y, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, Y) + listener: beginClassDeclaration(class, null, null, null, null, null, Y) parseClass(Y, class, class, Y) parseClassHeaderOpt(Y, class, class) parseClassExtendsOpt(Y) diff --git a/pkg/front_end/parser_testcases/nnbd/null_shorting_index.dart.expect b/pkg/front_end/parser_testcases/nnbd/null_shorting_index.dart.expect index 8c43e436d7b..990f55d620a 100644 --- a/pkg/front_end/parser_testcases/nnbd/null_shorting_index.dart.expect +++ b/pkg/front_end/parser_testcases/nnbd/null_shorting_index.dart.expect @@ -4,7 +4,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(Class1, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, Class1) + beginClassDeclaration(class, null, null, null, null, null, Class1) handleNoType(Class1) handleClassExtends(null, 1) handleClassNoWithClause() 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 74826d141a2..8f2b227e2be 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 @@ -6,13 +6,13 @@ parseUnit(class) parseMetadataStar() listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(Class1, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, Class1) + listener: beginClassDeclaration(class, null, null, null, null, null, Class1) parseClass(Class1, class, class, Class1) parseClassHeaderOpt(Class1, class, class) parseClassExtendsOpt(Class1) diff --git a/pkg/front_end/parser_testcases/nnbd/required_member.dart.expect b/pkg/front_end/parser_testcases/nnbd/required_member.dart.expect index 53f2e1b6b0f..583b0e8613c 100644 --- a/pkg/front_end/parser_testcases/nnbd/required_member.dart.expect +++ b/pkg/front_end/parser_testcases/nnbd/required_member.dart.expect @@ -123,7 +123,7 @@ beginCompilationUnit(main) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(X, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, X) + beginClassDeclaration(class, null, null, null, null, null, X) handleNoType(X) handleClassExtends(null, 1) handleClassNoWithClause() @@ -161,7 +161,7 @@ beginCompilationUnit(main) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(Y, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, Y) + beginClassDeclaration(class, null, null, null, null, null, Y) handleNoType(Y) handleClassExtends(null, 1) handleClassNoWithClause() 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 4b687d5841c..92444e6ca11 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 @@ -325,13 +325,13 @@ parseUnit(main) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(}, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(X, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, X) + listener: beginClassDeclaration(class, null, null, null, null, null, X) parseClass(X, class, class, X) parseClassHeaderOpt(X, class, class) parseClassExtendsOpt(X) @@ -416,13 +416,13 @@ parseUnit(main) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(}, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(Y, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, Y) + listener: beginClassDeclaration(class, null, null, null, null, null, Y) parseClass(Y, class, class, Y) parseClassHeaderOpt(Y, class, class) parseClassExtendsOpt(Y) diff --git a/pkg/front_end/parser_testcases/nnbd/required_modifier.dart.expect b/pkg/front_end/parser_testcases/nnbd/required_modifier.dart.expect index 32cacce8a04..6de6fcae5c5 100644 --- a/pkg/front_end/parser_testcases/nnbd/required_modifier.dart.expect +++ b/pkg/front_end/parser_testcases/nnbd/required_modifier.dart.expect @@ -134,7 +134,7 @@ beginCompilationUnit(main) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(X, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, X) + beginClassDeclaration(class, null, null, null, null, null, X) handleNoType(X) handleClassExtends(null, 1) handleClassNoWithClause() @@ -172,7 +172,7 @@ beginCompilationUnit(main) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(Y, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, Y) + beginClassDeclaration(class, null, null, null, null, null, Y) handleNoType(Y) handleClassExtends(null, 1) handleClassNoWithClause() 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 1c934490ee5..dfb3b6151a9 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 @@ -341,13 +341,13 @@ parseUnit(main) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(}, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(X, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, X) + listener: beginClassDeclaration(class, null, null, null, null, null, X) parseClass(X, class, class, X) parseClassHeaderOpt(X, class, class) parseClassExtendsOpt(X) @@ -432,13 +432,13 @@ parseUnit(main) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(}, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(Y, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, Y) + listener: beginClassDeclaration(class, null, null, null, null, null, Y) parseClass(Y, class, class, Y) parseClassHeaderOpt(Y, class, class) parseClassExtendsOpt(Y) diff --git a/pkg/front_end/parser_testcases/no-triple-shift/define_triple_shift_method.dart.expect b/pkg/front_end/parser_testcases/no-triple-shift/define_triple_shift_method.dart.expect index 55ce5d1ec1c..23075e0cb9c 100644 --- a/pkg/front_end/parser_testcases/no-triple-shift/define_triple_shift_method.dart.expect +++ b/pkg/front_end/parser_testcases/no-triple-shift/define_triple_shift_method.dart.expect @@ -26,7 +26,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(Foo, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, Foo) + beginClassDeclaration(class, null, null, null, null, null, Foo) handleNoType(Foo) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/no-triple-shift/define_triple_shift_method.dart.intertwined.expect b/pkg/front_end/parser_testcases/no-triple-shift/define_triple_shift_method.dart.intertwined.expect index 0ab94eefac3..532b3df2ec7 100644 --- a/pkg/front_end/parser_testcases/no-triple-shift/define_triple_shift_method.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/no-triple-shift/define_triple_shift_method.dart.intertwined.expect @@ -6,13 +6,13 @@ parseUnit(class) parseMetadataStar() listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(Foo, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, Foo) + listener: beginClassDeclaration(class, null, null, null, null, null, Foo) parseClass(Foo, class, class, Foo) parseClassHeaderOpt(Foo, class, class) parseClassExtendsOpt(Foo) diff --git a/pkg/front_end/parser_testcases/no-triple-shift/define_triple_shift_method_prime.dart.expect b/pkg/front_end/parser_testcases/no-triple-shift/define_triple_shift_method_prime.dart.expect index 9bd803b370f..4aafec4622b 100644 --- a/pkg/front_end/parser_testcases/no-triple-shift/define_triple_shift_method_prime.dart.expect +++ b/pkg/front_end/parser_testcases/no-triple-shift/define_triple_shift_method_prime.dart.expect @@ -4,7 +4,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(Foo, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, Foo) + beginClassDeclaration(class, null, null, null, null, null, Foo) handleNoType(Foo) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/no-triple-shift/define_triple_shift_method_prime.dart.intertwined.expect b/pkg/front_end/parser_testcases/no-triple-shift/define_triple_shift_method_prime.dart.intertwined.expect index 09c9be9914c..13d5b32bea2 100644 --- a/pkg/front_end/parser_testcases/no-triple-shift/define_triple_shift_method_prime.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/no-triple-shift/define_triple_shift_method_prime.dart.intertwined.expect @@ -6,13 +6,13 @@ parseUnit(class) parseMetadataStar() listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(Foo, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, Foo) + listener: beginClassDeclaration(class, null, null, null, null, null, Foo) parseClass(Foo, class, class, Foo) parseClassHeaderOpt(Foo, class, class) parseClassExtendsOpt(Foo) diff --git a/pkg/front_end/parser_testcases/no-triple-shift/triple_shift_not_triple_shift.dart.expect b/pkg/front_end/parser_testcases/no-triple-shift/triple_shift_not_triple_shift.dart.expect index d0b2f54eff0..36b6afef5f6 100644 --- a/pkg/front_end/parser_testcases/no-triple-shift/triple_shift_not_triple_shift.dart.expect +++ b/pkg/front_end/parser_testcases/no-triple-shift/triple_shift_not_triple_shift.dart.expect @@ -95,7 +95,7 @@ beginCompilationUnit(extension) beginClassOrMixinOrNamedMixinApplicationPrelude(abstract) handleIdentifier(Foo, classOrMixinDeclaration) handleNoTypeVariables(extends) - beginClassDeclaration(abstract, abstract, null, null, null, Foo) + beginClassDeclaration(abstract, abstract, null, null, null, null, Foo) handleIdentifier(List, typeReference) beginTypeArguments(<) handleIdentifier(List, typeReference) diff --git a/pkg/front_end/parser_testcases/no-triple-shift/triple_shift_not_triple_shift.dart.intertwined.expect b/pkg/front_end/parser_testcases/no-triple-shift/triple_shift_not_triple_shift.dart.intertwined.expect index 078f30fc6ab..4f7f7762e22 100644 --- a/pkg/front_end/parser_testcases/no-triple-shift/triple_shift_not_triple_shift.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/no-triple-shift/triple_shift_not_triple_shift.dart.intertwined.expect @@ -6,7 +6,7 @@ parseUnit(extension) parseMetadataStar() listener: beginMetadataStar(extension) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(, extension, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(, extension, null, null, null, Instance of 'DirectiveContext') parseExtension(extension) listener: beginExtensionDeclarationPrelude(extension) listener: handleNoTypeVariables(on) @@ -204,13 +204,13 @@ parseUnit(extension) parseMetadataStar(}) listener: beginMetadataStar(abstract) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(}, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(abstract, null, null, null, class) + parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(abstract, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(abstract) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(Foo, classOrMixinDeclaration) listener: handleNoTypeVariables(extends) - listener: beginClassDeclaration(abstract, abstract, null, null, null, Foo) + listener: beginClassDeclaration(abstract, abstract, null, null, null, null, Foo) parseClass(Foo, abstract, class, Foo) parseClassHeaderOpt(Foo, abstract, class) parseClassExtendsOpt(Foo) diff --git a/pkg/front_end/parser_testcases/non-nnbd/issue_40288.dart.expect b/pkg/front_end/parser_testcases/non-nnbd/issue_40288.dart.expect index 3a972142a71..131c7a333e6 100644 --- a/pkg/front_end/parser_testcases/non-nnbd/issue_40288.dart.expect +++ b/pkg/front_end/parser_testcases/non-nnbd/issue_40288.dart.expect @@ -4,7 +4,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(late, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, late) + beginClassDeclaration(class, null, null, null, null, null, late) handleNoType(late) handleClassExtends(null, 1) handleClassNoWithClause() @@ -35,7 +35,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(required, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, required) + beginClassDeclaration(class, null, null, null, null, null, required) handleNoType(required) handleClassExtends(null, 1) handleClassNoWithClause() @@ -66,7 +66,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, C) handleNoType(C) handleClassExtends(null, 1) handleClassNoWithClause() 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 8b339526f0d..34a8f60f8a3 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 @@ -6,13 +6,13 @@ parseUnit(class) parseMetadataStar() listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(late, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, late) + listener: beginClassDeclaration(class, null, null, null, null, null, late) parseClass(late, class, class, late) parseClassHeaderOpt(late, class, class) parseClassExtendsOpt(late) @@ -70,13 +70,13 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(}, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(required, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, required) + listener: beginClassDeclaration(class, null, null, null, null, null, required) parseClass(required, class, class, required) parseClassHeaderOpt(required, class, class) parseClassExtendsOpt(required) @@ -134,13 +134,13 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(}, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, C) parseClass(C, class, class, C) parseClassHeaderOpt(C, class, class) parseClassExtendsOpt(C) diff --git a/pkg/front_end/parser_testcases/non-nnbd/issue_40288_prime.dart.expect b/pkg/front_end/parser_testcases/non-nnbd/issue_40288_prime.dart.expect index 081fb2f5ad2..2edf6353125 100644 --- a/pkg/front_end/parser_testcases/non-nnbd/issue_40288_prime.dart.expect +++ b/pkg/front_end/parser_testcases/non-nnbd/issue_40288_prime.dart.expect @@ -4,7 +4,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(Xlate, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, Xlate) + beginClassDeclaration(class, null, null, null, null, null, Xlate) handleNoType(Xlate) handleClassExtends(null, 1) handleClassNoWithClause() @@ -35,7 +35,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(Xrequired, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, Xrequired) + beginClassDeclaration(class, null, null, null, null, null, Xrequired) handleNoType(Xrequired) handleClassExtends(null, 1) handleClassNoWithClause() @@ -66,7 +66,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, C) handleNoType(C) handleClassExtends(null, 1) handleClassNoWithClause() 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 7cb1f38a0de..a70d4abdbdc 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 @@ -6,13 +6,13 @@ parseUnit(class) parseMetadataStar() listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(Xlate, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, Xlate) + listener: beginClassDeclaration(class, null, null, null, null, null, Xlate) parseClass(Xlate, class, class, Xlate) parseClassHeaderOpt(Xlate, class, class) parseClassExtendsOpt(Xlate) @@ -70,13 +70,13 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(}, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(Xrequired, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, Xrequired) + listener: beginClassDeclaration(class, null, null, null, null, null, Xrequired) parseClass(Xrequired, class, class, Xrequired) parseClassHeaderOpt(Xrequired, class, class) parseClassExtendsOpt(Xrequired) @@ -134,13 +134,13 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(}, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, C) parseClass(C, class, class, C) parseClassHeaderOpt(C, class, class) parseClassExtendsOpt(C) diff --git a/pkg/front_end/parser_testcases/non-nnbd/nullable_type_argument.dart.expect b/pkg/front_end/parser_testcases/non-nnbd/nullable_type_argument.dart.expect index 7ec58d5714f..9aa9206ddc5 100644 --- a/pkg/front_end/parser_testcases/non-nnbd/nullable_type_argument.dart.expect +++ b/pkg/front_end/parser_testcases/non-nnbd/nullable_type_argument.dart.expect @@ -12,7 +12,7 @@ beginCompilationUnit(class) handleNoType(T) endTypeVariable(>, 0, null, null) endTypeVariables(<, >) - beginClassDeclaration(class, null, null, null, null, A) + beginClassDeclaration(class, null, null, null, null, null, A) handleNoType(>) handleClassExtends(null, 1) handleClassNoWithClause() @@ -27,7 +27,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(B, classOrMixinDeclaration) handleNoTypeVariables(implements) - beginClassDeclaration(class, null, null, null, null, B) + beginClassDeclaration(class, null, null, null, null, null, B) handleNoType(B) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/non-nnbd/nullable_type_argument.dart.intertwined.expect b/pkg/front_end/parser_testcases/non-nnbd/nullable_type_argument.dart.intertwined.expect index f849a187967..4f3a14198bd 100644 --- a/pkg/front_end/parser_testcases/non-nnbd/nullable_type_argument.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/non-nnbd/nullable_type_argument.dart.intertwined.expect @@ -6,8 +6,8 @@ parseUnit(class) parseMetadataStar() listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(A, classOrMixinDeclaration) @@ -20,7 +20,7 @@ parseUnit(class) listener: handleNoType(T) listener: endTypeVariable(>, 0, null, null) listener: endTypeVariables(<, >) - listener: beginClassDeclaration(class, null, null, null, null, A) + listener: beginClassDeclaration(class, null, null, null, null, null, A) parseClass(>, class, class, A) parseClassHeaderOpt(>, class, class) parseClassExtendsOpt(>) @@ -41,13 +41,13 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(}, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(B, classOrMixinDeclaration) listener: handleNoTypeVariables(implements) - listener: beginClassDeclaration(class, null, null, null, null, B) + listener: beginClassDeclaration(class, null, null, null, null, null, B) parseClass(B, class, class, B) parseClassHeaderOpt(B, class, class) parseClassExtendsOpt(B) diff --git a/pkg/front_end/parser_testcases/non-nnbd/use_late_in_non_nnbd.dart.expect b/pkg/front_end/parser_testcases/non-nnbd/use_late_in_non_nnbd.dart.expect index 27c0fb6ce8f..6e362aa98f6 100644 --- a/pkg/front_end/parser_testcases/non-nnbd/use_late_in_non_nnbd.dart.expect +++ b/pkg/front_end/parser_testcases/non-nnbd/use_late_in_non_nnbd.dart.expect @@ -246,7 +246,7 @@ beginCompilationUnit(int) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(Foo, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, Foo) + beginClassDeclaration(class, null, null, null, null, null, Foo) handleNoType(Foo) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/non-nnbd/use_late_in_non_nnbd.dart.intertwined.expect b/pkg/front_end/parser_testcases/non-nnbd/use_late_in_non_nnbd.dart.intertwined.expect index 1bea44e538a..b9ed1d36e89 100644 --- a/pkg/front_end/parser_testcases/non-nnbd/use_late_in_non_nnbd.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/non-nnbd/use_late_in_non_nnbd.dart.intertwined.expect @@ -335,13 +335,13 @@ parseUnit(int) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(}, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(Foo, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, Foo) + listener: beginClassDeclaration(class, null, null, null, null, null, Foo) parseClass(Foo, class, class, Foo) parseClassHeaderOpt(Foo, class, class) parseClassExtendsOpt(Foo) diff --git a/pkg/front_end/parser_testcases/non-nnbd/use_required_in_non_nnbd.dart.expect b/pkg/front_end/parser_testcases/non-nnbd/use_required_in_non_nnbd.dart.expect index 0319782922f..40e45c477b2 100644 --- a/pkg/front_end/parser_testcases/non-nnbd/use_required_in_non_nnbd.dart.expect +++ b/pkg/front_end/parser_testcases/non-nnbd/use_required_in_non_nnbd.dart.expect @@ -125,7 +125,7 @@ beginCompilationUnit(void) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(Foo, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, Foo) + beginClassDeclaration(class, null, null, null, null, null, Foo) handleNoType(Foo) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/non-nnbd/use_required_in_non_nnbd.dart.intertwined.expect b/pkg/front_end/parser_testcases/non-nnbd/use_required_in_non_nnbd.dart.intertwined.expect index 9dbf8c94c9d..9297c293077 100644 --- a/pkg/front_end/parser_testcases/non-nnbd/use_required_in_non_nnbd.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/non-nnbd/use_required_in_non_nnbd.dart.intertwined.expect @@ -253,13 +253,13 @@ parseUnit(void) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(}, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(Foo, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, Foo) + listener: beginClassDeclaration(class, null, null, null, null, null, Foo) parseClass(Foo, class, class, Foo) parseClassHeaderOpt(Foo, class, class) parseClassExtendsOpt(Foo) diff --git a/pkg/front_end/parser_testcases/patterns/cast_inside_extractor_pattern.dart.expect b/pkg/front_end/parser_testcases/patterns/cast_inside_extractor_pattern.dart.expect index e8d91387c33..a0c327e1a08 100644 --- a/pkg/front_end/parser_testcases/patterns/cast_inside_extractor_pattern.dart.expect +++ b/pkg/front_end/parser_testcases/patterns/cast_inside_extractor_pattern.dart.expect @@ -4,7 +4,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, C) handleNoType(C) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/patterns/cast_inside_extractor_pattern.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/cast_inside_extractor_pattern.dart.intertwined.expect index 4ac32a793ad..30826493788 100644 --- a/pkg/front_end/parser_testcases/patterns/cast_inside_extractor_pattern.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/patterns/cast_inside_extractor_pattern.dart.intertwined.expect @@ -6,13 +6,13 @@ parseUnit(class) parseMetadataStar() listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, C) parseClass(C, class, class, C) parseClassHeaderOpt(C, class, class) parseClassExtendsOpt(C) diff --git a/pkg/front_end/parser_testcases/patterns/cast_inside_extractor_pattern_implicitly_named.dart.expect b/pkg/front_end/parser_testcases/patterns/cast_inside_extractor_pattern_implicitly_named.dart.expect index ea38c899145..243f5d8e999 100644 --- a/pkg/front_end/parser_testcases/patterns/cast_inside_extractor_pattern_implicitly_named.dart.expect +++ b/pkg/front_end/parser_testcases/patterns/cast_inside_extractor_pattern_implicitly_named.dart.expect @@ -4,7 +4,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, C) handleNoType(C) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/patterns/cast_inside_extractor_pattern_implicitly_named.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/cast_inside_extractor_pattern_implicitly_named.dart.intertwined.expect index ae281208b42..45ea09313fd 100644 --- a/pkg/front_end/parser_testcases/patterns/cast_inside_extractor_pattern_implicitly_named.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/patterns/cast_inside_extractor_pattern_implicitly_named.dart.intertwined.expect @@ -6,13 +6,13 @@ parseUnit(class) parseMetadataStar() listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, C) parseClass(C, class, class, C) parseClassHeaderOpt(C, class, class) parseClassExtendsOpt(C) diff --git a/pkg/front_end/parser_testcases/patterns/extractor_pattern_inside_cast.dart.expect b/pkg/front_end/parser_testcases/patterns/extractor_pattern_inside_cast.dart.expect index 80c28c1212b..073d7016675 100644 --- a/pkg/front_end/parser_testcases/patterns/extractor_pattern_inside_cast.dart.expect +++ b/pkg/front_end/parser_testcases/patterns/extractor_pattern_inside_cast.dart.expect @@ -4,7 +4,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, C) handleNoType(C) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/patterns/extractor_pattern_inside_cast.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/extractor_pattern_inside_cast.dart.intertwined.expect index 1cf5f92bec4..46a13b6503d 100644 --- a/pkg/front_end/parser_testcases/patterns/extractor_pattern_inside_cast.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/patterns/extractor_pattern_inside_cast.dart.intertwined.expect @@ -6,13 +6,13 @@ parseUnit(class) parseMetadataStar() listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, C) parseClass(C, class, class, C) parseClassHeaderOpt(C, class, class) parseClassExtendsOpt(C) diff --git a/pkg/front_end/parser_testcases/patterns/extractor_pattern_inside_null_assert.dart.expect b/pkg/front_end/parser_testcases/patterns/extractor_pattern_inside_null_assert.dart.expect index 869b25b3893..9e8be2f7775 100644 --- a/pkg/front_end/parser_testcases/patterns/extractor_pattern_inside_null_assert.dart.expect +++ b/pkg/front_end/parser_testcases/patterns/extractor_pattern_inside_null_assert.dart.expect @@ -4,7 +4,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, C) handleNoType(C) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/patterns/extractor_pattern_inside_null_assert.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/extractor_pattern_inside_null_assert.dart.intertwined.expect index 6edb3c7f3f1..dda0f22cb09 100644 --- a/pkg/front_end/parser_testcases/patterns/extractor_pattern_inside_null_assert.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/patterns/extractor_pattern_inside_null_assert.dart.intertwined.expect @@ -6,13 +6,13 @@ parseUnit(class) parseMetadataStar() listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, C) parseClass(C, class, class, C) parseClassHeaderOpt(C, class, class) parseClassExtendsOpt(C) diff --git a/pkg/front_end/parser_testcases/patterns/extractor_pattern_inside_null_check.dart.expect b/pkg/front_end/parser_testcases/patterns/extractor_pattern_inside_null_check.dart.expect index 48a6738fe9f..40fc6e1a66c 100644 --- a/pkg/front_end/parser_testcases/patterns/extractor_pattern_inside_null_check.dart.expect +++ b/pkg/front_end/parser_testcases/patterns/extractor_pattern_inside_null_check.dart.expect @@ -4,7 +4,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, C) handleNoType(C) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/patterns/extractor_pattern_inside_null_check.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/extractor_pattern_inside_null_check.dart.intertwined.expect index 2410ab42ec0..82878a2e80c 100644 --- a/pkg/front_end/parser_testcases/patterns/extractor_pattern_inside_null_check.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/patterns/extractor_pattern_inside_null_check.dart.intertwined.expect @@ -6,13 +6,13 @@ parseUnit(class) parseMetadataStar() listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, C) parseClass(C, class, class, C) parseClassHeaderOpt(C, class, class) parseClassExtendsOpt(C) diff --git a/pkg/front_end/parser_testcases/patterns/extractor_pattern_with_type_args.dart.expect b/pkg/front_end/parser_testcases/patterns/extractor_pattern_with_type_args.dart.expect index 67db2f18ede..2cbb9d4cd9e 100644 --- a/pkg/front_end/parser_testcases/patterns/extractor_pattern_with_type_args.dart.expect +++ b/pkg/front_end/parser_testcases/patterns/extractor_pattern_with_type_args.dart.expect @@ -12,7 +12,7 @@ beginCompilationUnit(class) handleNoType(T) endTypeVariable(>, 0, null, null) endTypeVariables(<, >) - beginClassDeclaration(class, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, C) handleNoType(>) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/patterns/extractor_pattern_with_type_args.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/extractor_pattern_with_type_args.dart.intertwined.expect index 0f0fd8f0eb2..2054eb1bea2 100644 --- a/pkg/front_end/parser_testcases/patterns/extractor_pattern_with_type_args.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/patterns/extractor_pattern_with_type_args.dart.intertwined.expect @@ -6,8 +6,8 @@ parseUnit(class) parseMetadataStar() listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) @@ -20,7 +20,7 @@ parseUnit(class) listener: handleNoType(T) listener: endTypeVariable(>, 0, null, null) listener: endTypeVariables(<, >) - listener: beginClassDeclaration(class, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, C) parseClass(>, class, class, C) parseClassHeaderOpt(>, class, class) parseClassExtendsOpt(>) diff --git a/pkg/front_end/parser_testcases/patterns/extractor_pattern_with_type_args_inside_null_assert.dart.expect b/pkg/front_end/parser_testcases/patterns/extractor_pattern_with_type_args_inside_null_assert.dart.expect index 2098ddf11c1..28f14304824 100644 --- a/pkg/front_end/parser_testcases/patterns/extractor_pattern_with_type_args_inside_null_assert.dart.expect +++ b/pkg/front_end/parser_testcases/patterns/extractor_pattern_with_type_args_inside_null_assert.dart.expect @@ -12,7 +12,7 @@ beginCompilationUnit(class) handleNoType(T) endTypeVariable(>, 0, null, null) endTypeVariables(<, >) - beginClassDeclaration(class, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, C) handleNoType(>) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/patterns/extractor_pattern_with_type_args_inside_null_assert.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/extractor_pattern_with_type_args_inside_null_assert.dart.intertwined.expect index 540a068dbdb..20dfe6edf2e 100644 --- a/pkg/front_end/parser_testcases/patterns/extractor_pattern_with_type_args_inside_null_assert.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/patterns/extractor_pattern_with_type_args_inside_null_assert.dart.intertwined.expect @@ -6,8 +6,8 @@ parseUnit(class) parseMetadataStar() listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) @@ -20,7 +20,7 @@ parseUnit(class) listener: handleNoType(T) listener: endTypeVariable(>, 0, null, null) listener: endTypeVariables(<, >) - listener: beginClassDeclaration(class, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, C) parseClass(>, class, class, C) parseClassHeaderOpt(>, class, class) parseClassExtendsOpt(>) diff --git a/pkg/front_end/parser_testcases/patterns/null_assert_inside_extractor_pattern.dart.expect b/pkg/front_end/parser_testcases/patterns/null_assert_inside_extractor_pattern.dart.expect index de02234bdce..63e93868d53 100644 --- a/pkg/front_end/parser_testcases/patterns/null_assert_inside_extractor_pattern.dart.expect +++ b/pkg/front_end/parser_testcases/patterns/null_assert_inside_extractor_pattern.dart.expect @@ -4,7 +4,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, C) handleNoType(C) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/patterns/null_assert_inside_extractor_pattern.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/null_assert_inside_extractor_pattern.dart.intertwined.expect index 20fd6f761b4..a44f5f6a4db 100644 --- a/pkg/front_end/parser_testcases/patterns/null_assert_inside_extractor_pattern.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/patterns/null_assert_inside_extractor_pattern.dart.intertwined.expect @@ -6,13 +6,13 @@ parseUnit(class) parseMetadataStar() listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, C) parseClass(C, class, class, C) parseClassHeaderOpt(C, class, class) parseClassExtendsOpt(C) diff --git a/pkg/front_end/parser_testcases/patterns/null_assert_inside_extractor_pattern_implicitly_named.dart.expect b/pkg/front_end/parser_testcases/patterns/null_assert_inside_extractor_pattern_implicitly_named.dart.expect index e07c53653ee..6b41b1593a6 100644 --- a/pkg/front_end/parser_testcases/patterns/null_assert_inside_extractor_pattern_implicitly_named.dart.expect +++ b/pkg/front_end/parser_testcases/patterns/null_assert_inside_extractor_pattern_implicitly_named.dart.expect @@ -4,7 +4,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, C) handleNoType(C) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/patterns/null_assert_inside_extractor_pattern_implicitly_named.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/null_assert_inside_extractor_pattern_implicitly_named.dart.intertwined.expect index c2390ead924..7eda2ab74d6 100644 --- a/pkg/front_end/parser_testcases/patterns/null_assert_inside_extractor_pattern_implicitly_named.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/patterns/null_assert_inside_extractor_pattern_implicitly_named.dart.intertwined.expect @@ -6,13 +6,13 @@ parseUnit(class) parseMetadataStar() listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, C) parseClass(C, class, class, C) parseClassHeaderOpt(C, class, class) parseClassExtendsOpt(C) diff --git a/pkg/front_end/parser_testcases/patterns/null_check_inside_extractor_pattern.dart.expect b/pkg/front_end/parser_testcases/patterns/null_check_inside_extractor_pattern.dart.expect index 756ba31b719..f55278dfdb0 100644 --- a/pkg/front_end/parser_testcases/patterns/null_check_inside_extractor_pattern.dart.expect +++ b/pkg/front_end/parser_testcases/patterns/null_check_inside_extractor_pattern.dart.expect @@ -4,7 +4,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, C) handleNoType(C) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/patterns/null_check_inside_extractor_pattern.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/null_check_inside_extractor_pattern.dart.intertwined.expect index 48b3ceb55be..d211e594701 100644 --- a/pkg/front_end/parser_testcases/patterns/null_check_inside_extractor_pattern.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/patterns/null_check_inside_extractor_pattern.dart.intertwined.expect @@ -6,13 +6,13 @@ parseUnit(class) parseMetadataStar() listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, C) parseClass(C, class, class, C) parseClassHeaderOpt(C, class, class) parseClassExtendsOpt(C) diff --git a/pkg/front_end/parser_testcases/patterns/null_check_inside_extractor_pattern_implicitly_named.dart.expect b/pkg/front_end/parser_testcases/patterns/null_check_inside_extractor_pattern_implicitly_named.dart.expect index c571ad0eb6e..c6f45838fcc 100644 --- a/pkg/front_end/parser_testcases/patterns/null_check_inside_extractor_pattern_implicitly_named.dart.expect +++ b/pkg/front_end/parser_testcases/patterns/null_check_inside_extractor_pattern_implicitly_named.dart.expect @@ -4,7 +4,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, C) handleNoType(C) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/patterns/null_check_inside_extractor_pattern_implicitly_named.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/null_check_inside_extractor_pattern_implicitly_named.dart.intertwined.expect index e978276839e..374eb1b015a 100644 --- a/pkg/front_end/parser_testcases/patterns/null_check_inside_extractor_pattern_implicitly_named.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/patterns/null_check_inside_extractor_pattern_implicitly_named.dart.intertwined.expect @@ -6,13 +6,13 @@ parseUnit(class) parseMetadataStar() listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, C) parseClass(C, class, class, C) parseClassHeaderOpt(C, class, class) parseClassExtendsOpt(C) diff --git a/pkg/front_end/parser_testcases/patterns/prefixed_extractor_pattern_with_type_args.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/prefixed_extractor_pattern_with_type_args.dart.intertwined.expect index 9a4a6ced810..a7f6a9f2d80 100644 --- a/pkg/front_end/parser_testcases/patterns/prefixed_extractor_pattern_with_type_args.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/patterns/prefixed_extractor_pattern_with_type_args.dart.intertwined.expect @@ -6,7 +6,7 @@ parseUnit(import) parseMetadataStar() listener: beginMetadataStar(import) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(, import, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(, import, null, null, null, Instance of 'DirectiveContext') parseImport(import) listener: beginUncategorizedTopLevelDeclaration(import) listener: beginImport(import) diff --git a/pkg/front_end/parser_testcases/patterns/prefixed_extractor_pattern_with_type_args_inside_cast.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/prefixed_extractor_pattern_with_type_args_inside_cast.dart.intertwined.expect index 4d8a61777f9..fca1fe025a1 100644 --- a/pkg/front_end/parser_testcases/patterns/prefixed_extractor_pattern_with_type_args_inside_cast.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/patterns/prefixed_extractor_pattern_with_type_args_inside_cast.dart.intertwined.expect @@ -6,7 +6,7 @@ parseUnit(import) parseMetadataStar() listener: beginMetadataStar(import) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(, import, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(, import, null, null, null, Instance of 'DirectiveContext') parseImport(import) listener: beginUncategorizedTopLevelDeclaration(import) listener: beginImport(import) diff --git a/pkg/front_end/parser_testcases/patterns/prefixed_extractor_pattern_with_type_args_inside_null_assert.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/prefixed_extractor_pattern_with_type_args_inside_null_assert.dart.intertwined.expect index acf9e2c4504..4802b86f708 100644 --- a/pkg/front_end/parser_testcases/patterns/prefixed_extractor_pattern_with_type_args_inside_null_assert.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/patterns/prefixed_extractor_pattern_with_type_args_inside_null_assert.dart.intertwined.expect @@ -6,7 +6,7 @@ parseUnit(import) parseMetadataStar() listener: beginMetadataStar(import) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(, import, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(, import, null, null, null, Instance of 'DirectiveContext') parseImport(import) listener: beginUncategorizedTopLevelDeclaration(import) listener: beginImport(import) diff --git a/pkg/front_end/parser_testcases/patterns/prefixed_extractor_pattern_with_type_args_inside_null_check.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/prefixed_extractor_pattern_with_type_args_inside_null_check.dart.intertwined.expect index d643d488e71..80ba0d79d48 100644 --- a/pkg/front_end/parser_testcases/patterns/prefixed_extractor_pattern_with_type_args_inside_null_check.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/patterns/prefixed_extractor_pattern_with_type_args_inside_null_check.dart.intertwined.expect @@ -6,7 +6,7 @@ parseUnit(import) parseMetadataStar() listener: beginMetadataStar(import) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(, import, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(, import, null, null, null, Instance of 'DirectiveContext') parseImport(import) listener: beginUncategorizedTopLevelDeclaration(import) listener: beginImport(import) diff --git a/pkg/front_end/parser_testcases/patterns/relational_inside_extractor_pattern.dart.expect b/pkg/front_end/parser_testcases/patterns/relational_inside_extractor_pattern.dart.expect index 7e63144d673..d0601543ef3 100644 --- a/pkg/front_end/parser_testcases/patterns/relational_inside_extractor_pattern.dart.expect +++ b/pkg/front_end/parser_testcases/patterns/relational_inside_extractor_pattern.dart.expect @@ -4,7 +4,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, C) handleNoType(C) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/patterns/relational_inside_extractor_pattern.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/relational_inside_extractor_pattern.dart.intertwined.expect index 5ade245afa7..d876757ed9d 100644 --- a/pkg/front_end/parser_testcases/patterns/relational_inside_extractor_pattern.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/patterns/relational_inside_extractor_pattern.dart.intertwined.expect @@ -6,13 +6,13 @@ parseUnit(class) parseMetadataStar() listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, C) parseClass(C, class, class, C) parseClassHeaderOpt(C, class, class) parseClassExtendsOpt(C) diff --git a/pkg/front_end/parser_testcases/patterns/typed_variable_named_as_inside_extractor_pattern.dart.expect b/pkg/front_end/parser_testcases/patterns/typed_variable_named_as_inside_extractor_pattern.dart.expect index 55f5b9b2ef1..1ac4c5b7177 100644 --- a/pkg/front_end/parser_testcases/patterns/typed_variable_named_as_inside_extractor_pattern.dart.expect +++ b/pkg/front_end/parser_testcases/patterns/typed_variable_named_as_inside_extractor_pattern.dart.expect @@ -4,7 +4,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, C) handleNoType(C) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/patterns/typed_variable_named_as_inside_extractor_pattern.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/typed_variable_named_as_inside_extractor_pattern.dart.intertwined.expect index 19347b52fc9..7112a0eb43f 100644 --- a/pkg/front_end/parser_testcases/patterns/typed_variable_named_as_inside_extractor_pattern.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/patterns/typed_variable_named_as_inside_extractor_pattern.dart.intertwined.expect @@ -6,13 +6,13 @@ parseUnit(class) parseMetadataStar() listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, C) parseClass(C, class, class, C) parseClassHeaderOpt(C, class, class) parseClassExtendsOpt(C) diff --git a/pkg/front_end/parser_testcases/patterns/typed_variable_named_as_inside_extractor_pattern_implicitly_named.dart.expect b/pkg/front_end/parser_testcases/patterns/typed_variable_named_as_inside_extractor_pattern_implicitly_named.dart.expect index 54ea9189ecd..09a79b56ac6 100644 --- a/pkg/front_end/parser_testcases/patterns/typed_variable_named_as_inside_extractor_pattern_implicitly_named.dart.expect +++ b/pkg/front_end/parser_testcases/patterns/typed_variable_named_as_inside_extractor_pattern_implicitly_named.dart.expect @@ -4,7 +4,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, C) handleNoType(C) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/patterns/typed_variable_named_as_inside_extractor_pattern_implicitly_named.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/typed_variable_named_as_inside_extractor_pattern_implicitly_named.dart.intertwined.expect index 5e4562403e5..9a8c294c272 100644 --- a/pkg/front_end/parser_testcases/patterns/typed_variable_named_as_inside_extractor_pattern_implicitly_named.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/patterns/typed_variable_named_as_inside_extractor_pattern_implicitly_named.dart.intertwined.expect @@ -6,13 +6,13 @@ parseUnit(class) parseMetadataStar() listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, C) parseClass(C, class, class, C) parseClassHeaderOpt(C, class, class) parseClassExtendsOpt(C) diff --git a/pkg/front_end/parser_testcases/record/field_formal_parameter_with_explicit_record_type.dart.expect b/pkg/front_end/parser_testcases/record/field_formal_parameter_with_explicit_record_type.dart.expect index abe15556469..ea37b48b0ac 100644 --- a/pkg/front_end/parser_testcases/record/field_formal_parameter_with_explicit_record_type.dart.expect +++ b/pkg/front_end/parser_testcases/record/field_formal_parameter_with_explicit_record_type.dart.expect @@ -4,7 +4,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(C, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, C) + beginClassDeclaration(class, null, null, null, null, null, C) handleNoType(C) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/record/field_formal_parameter_with_explicit_record_type.dart.intertwined.expect b/pkg/front_end/parser_testcases/record/field_formal_parameter_with_explicit_record_type.dart.intertwined.expect index a964c52ceeb..b2c47580977 100644 --- a/pkg/front_end/parser_testcases/record/field_formal_parameter_with_explicit_record_type.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/record/field_formal_parameter_with_explicit_record_type.dart.intertwined.expect @@ -6,13 +6,13 @@ parseUnit(class) parseMetadataStar() listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(C, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, C) + listener: beginClassDeclaration(class, null, null, null, null, null, C) parseClass(C, class, class, C) parseClassHeaderOpt(C, class, class) parseClassExtendsOpt(C) diff --git a/pkg/front_end/parser_testcases/record/modifier_before_type_question.dart.expect b/pkg/front_end/parser_testcases/record/modifier_before_type_question.dart.expect index ad41c422d61..e1054d33682 100644 --- a/pkg/front_end/parser_testcases/record/modifier_before_type_question.dart.expect +++ b/pkg/front_end/parser_testcases/record/modifier_before_type_question.dart.expect @@ -4,7 +4,7 @@ beginCompilationUnit(abstract) beginClassOrMixinOrNamedMixinApplicationPrelude(abstract) handleIdentifier(Foo, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(abstract, abstract, null, null, null, Foo) + beginClassDeclaration(abstract, abstract, null, null, null, null, Foo) handleNoType(Foo) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/record/modifier_before_type_question.dart.intertwined.expect b/pkg/front_end/parser_testcases/record/modifier_before_type_question.dart.intertwined.expect index 0213531def6..fadbff87211 100644 --- a/pkg/front_end/parser_testcases/record/modifier_before_type_question.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/record/modifier_before_type_question.dart.intertwined.expect @@ -6,13 +6,13 @@ parseUnit(abstract) parseMetadataStar() listener: beginMetadataStar(abstract) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(abstract, null, null, null, class) + parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(abstract, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(abstract) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(Foo, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(abstract, abstract, null, null, null, Foo) + listener: beginClassDeclaration(abstract, abstract, null, null, null, null, Foo) parseClass(Foo, abstract, class, Foo) parseClassHeaderOpt(Foo, abstract, class) parseClassExtendsOpt(Foo) diff --git a/pkg/front_end/parser_testcases/record/operator_returning_record.dart.expect b/pkg/front_end/parser_testcases/record/operator_returning_record.dart.expect index 15562abe330..86521d7da53 100644 --- a/pkg/front_end/parser_testcases/record/operator_returning_record.dart.expect +++ b/pkg/front_end/parser_testcases/record/operator_returning_record.dart.expect @@ -4,7 +4,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(Foo, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, Foo) + beginClassDeclaration(class, null, null, null, null, null, Foo) handleNoType(Foo) handleClassExtends(null, 1) handleClassNoWithClause() @@ -66,7 +66,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(Bar, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, Bar) + beginClassDeclaration(class, null, null, null, null, null, Bar) handleNoType(Bar) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/record/operator_returning_record.dart.intertwined.expect b/pkg/front_end/parser_testcases/record/operator_returning_record.dart.intertwined.expect index 007bafb0320..3f607d73f86 100644 --- a/pkg/front_end/parser_testcases/record/operator_returning_record.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/record/operator_returning_record.dart.intertwined.expect @@ -6,13 +6,13 @@ parseUnit(class) parseMetadataStar() listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(Foo, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, Foo) + listener: beginClassDeclaration(class, null, null, null, null, null, Foo) parseClass(Foo, class, class, Foo) parseClassHeaderOpt(Foo, class, class) parseClassExtendsOpt(Foo) @@ -126,13 +126,13 @@ parseUnit(class) parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(}, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(Bar, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, Bar) + listener: beginClassDeclaration(class, null, null, null, null, null, Bar) parseClass(Bar, class, class, Bar) parseClassHeaderOpt(Bar, class, class) parseClassExtendsOpt(Bar) diff --git a/pkg/front_end/parser_testcases/record/record_type_03.dart.expect b/pkg/front_end/parser_testcases/record/record_type_03.dart.expect index 36d2ed4ca04..1eaeebf1146 100644 --- a/pkg/front_end/parser_testcases/record/record_type_03.dart.expect +++ b/pkg/front_end/parser_testcases/record/record_type_03.dart.expect @@ -179,7 +179,7 @@ beginCompilationUnit(() beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(Baz, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, Baz) + beginClassDeclaration(class, null, null, null, null, null, Baz) handleNoType(Baz) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/record/record_type_03.dart.intertwined.expect b/pkg/front_end/parser_testcases/record/record_type_03.dart.intertwined.expect index fbda830050b..991e2d6e66f 100644 --- a/pkg/front_end/parser_testcases/record/record_type_03.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/record/record_type_03.dart.intertwined.expect @@ -376,13 +376,13 @@ parseUnit(() parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(}, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(Baz, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, Baz) + listener: beginClassDeclaration(class, null, null, null, null, null, Baz) parseClass(Baz, class, class, Baz) parseClassHeaderOpt(Baz, class, class) parseClassExtendsOpt(Baz) diff --git a/pkg/front_end/parser_testcases/record/record_type_getter.dart.expect b/pkg/front_end/parser_testcases/record/record_type_getter.dart.expect index 6da1a2b0a5f..769fe445997 100644 --- a/pkg/front_end/parser_testcases/record/record_type_getter.dart.expect +++ b/pkg/front_end/parser_testcases/record/record_type_getter.dart.expect @@ -897,7 +897,7 @@ beginCompilationUnit(() beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(Foo, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, Foo) + beginClassDeclaration(class, null, null, null, null, null, Foo) handleNoType(Foo) handleClassExtends(null, 1) handleClassNoWithClause() @@ -1834,7 +1834,7 @@ beginCompilationUnit(() beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(Bar, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, Bar) + beginClassDeclaration(class, null, null, null, null, null, Bar) handleNoType(Bar) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/record/record_type_getter.dart.intertwined.expect b/pkg/front_end/parser_testcases/record/record_type_getter.dart.intertwined.expect index 8d7c62a8e44..070b633324b 100644 --- a/pkg/front_end/parser_testcases/record/record_type_getter.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/record/record_type_getter.dart.intertwined.expect @@ -1737,13 +1737,13 @@ parseUnit(() parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(}, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(Foo, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, Foo) + listener: beginClassDeclaration(class, null, null, null, null, null, Foo) parseClass(Foo, class, class, Foo) parseClassHeaderOpt(Foo, class, class) parseClassExtendsOpt(Foo) @@ -3598,13 +3598,13 @@ parseUnit(() parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(}, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(Bar, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, Bar) + listener: beginClassDeclaration(class, null, null, null, null, null, Bar) parseClass(Bar, class, class, Bar) parseClassHeaderOpt(Bar, class, class) parseClassExtendsOpt(Bar) diff --git a/pkg/front_end/parser_testcases/record/record_type_setter.dart.expect b/pkg/front_end/parser_testcases/record/record_type_setter.dart.expect index 125fa390fca..e1a2e4374e8 100644 --- a/pkg/front_end/parser_testcases/record/record_type_setter.dart.expect +++ b/pkg/front_end/parser_testcases/record/record_type_setter.dart.expect @@ -166,7 +166,7 @@ beginCompilationUnit(() beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(Foo, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, Foo) + beginClassDeclaration(class, null, null, null, null, null, Foo) handleNoType(Foo) handleClassExtends(null, 1) handleClassNoWithClause() @@ -347,7 +347,7 @@ beginCompilationUnit(() beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(Bar, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, Bar) + beginClassDeclaration(class, null, null, null, null, null, Bar) handleNoType(Bar) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/record/record_type_setter.dart.intertwined.expect b/pkg/front_end/parser_testcases/record/record_type_setter.dart.intertwined.expect index 96b4bf055ce..eb3f615acf9 100644 --- a/pkg/front_end/parser_testcases/record/record_type_setter.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/record/record_type_setter.dart.intertwined.expect @@ -335,13 +335,13 @@ parseUnit(() parseMetadataStar(;) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(;, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(Foo, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, Foo) + listener: beginClassDeclaration(class, null, null, null, null, null, Foo) parseClass(Foo, class, class, Foo) parseClassHeaderOpt(Foo, class, class) parseClassExtendsOpt(Foo) @@ -708,13 +708,13 @@ parseUnit(() parseMetadataStar(}) listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(}, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(}, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(Bar, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, Bar) + listener: beginClassDeclaration(class, null, null, null, null, null, Bar) parseClass(Bar, class, class, Bar) parseClassHeaderOpt(Bar, class, class) parseClassExtendsOpt(Bar) diff --git a/pkg/front_end/parser_testcases/record/record_type_with_modifiers.dart.expect b/pkg/front_end/parser_testcases/record/record_type_with_modifiers.dart.expect index 94e9197c036..358b3e4bb6a 100644 --- a/pkg/front_end/parser_testcases/record/record_type_with_modifiers.dart.expect +++ b/pkg/front_end/parser_testcases/record/record_type_with_modifiers.dart.expect @@ -4,7 +4,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(Foo, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, null, null, Foo) + beginClassDeclaration(class, null, null, null, null, null, Foo) handleNoType(Foo) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/record/record_type_with_modifiers.dart.intertwined.expect b/pkg/front_end/parser_testcases/record/record_type_with_modifiers.dart.intertwined.expect index e9118536f29..840f9b7bf21 100644 --- a/pkg/front_end/parser_testcases/record/record_type_with_modifiers.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/record/record_type_with_modifiers.dart.intertwined.expect @@ -6,13 +6,13 @@ parseUnit(class) parseMetadataStar() listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(Foo, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, null, null, Foo) + listener: beginClassDeclaration(class, null, null, null, null, null, Foo) parseClass(Foo, class, class, Foo) parseClassHeaderOpt(Foo, class, class) parseClassExtendsOpt(Foo) diff --git a/pkg/front_end/parser_testcases/record/record_typedef.dart.intertwined.expect b/pkg/front_end/parser_testcases/record/record_typedef.dart.intertwined.expect index e1480defcf7..bb4dbd90b0e 100644 --- a/pkg/front_end/parser_testcases/record/record_typedef.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/record/record_typedef.dart.intertwined.expect @@ -6,7 +6,7 @@ parseUnit(typedef) parseMetadataStar() listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -47,7 +47,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -83,7 +83,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -124,7 +124,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -160,7 +160,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -217,7 +217,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -279,7 +279,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -346,7 +346,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -418,7 +418,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) @@ -495,7 +495,7 @@ parseUnit(typedef) parseMetadataStar(;) listener: beginMetadataStar(typedef) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(;, typedef, null, null, Instance of 'DirectiveContext') + parseTopLevelKeywordDeclaration(;, typedef, null, null, null, Instance of 'DirectiveContext') parseTypedef(typedef) listener: beginUncategorizedTopLevelDeclaration(typedef) listener: beginTypedef(typedef) diff --git a/pkg/front_end/parser_testcases/record/super_parameters_record_type.dart.expect b/pkg/front_end/parser_testcases/record/super_parameters_record_type.dart.expect index 4f34c45c87d..0d89b240ba5 100644 --- a/pkg/front_end/parser_testcases/record/super_parameters_record_type.dart.expect +++ b/pkg/front_end/parser_testcases/record/super_parameters_record_type.dart.expect @@ -4,7 +4,7 @@ beginCompilationUnit(class) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(Foo, classOrMixinDeclaration) handleNoTypeVariables(extends) - beginClassDeclaration(class, null, null, null, null, Foo) + beginClassDeclaration(class, null, null, null, null, null, Foo) handleIdentifier(Bar, typeReference) handleNoTypeArguments({) handleType(Bar, null) diff --git a/pkg/front_end/parser_testcases/record/super_parameters_record_type.dart.intertwined.expect b/pkg/front_end/parser_testcases/record/super_parameters_record_type.dart.intertwined.expect index 7a2419ee615..9eb0c6ed403 100644 --- a/pkg/front_end/parser_testcases/record/super_parameters_record_type.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/record/super_parameters_record_type.dart.intertwined.expect @@ -6,13 +6,13 @@ parseUnit(class) parseMetadataStar() listener: beginMetadataStar(class) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(, class, null, null, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, null, null, class) + parseTopLevelKeywordDeclaration(, class, null, null, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(Foo, classOrMixinDeclaration) listener: handleNoTypeVariables(extends) - listener: beginClassDeclaration(class, null, null, null, null, Foo) + listener: beginClassDeclaration(class, null, null, null, null, null, Foo) parseClass(Foo, class, class, Foo) parseClassHeaderOpt(Foo, class, class) parseClassExtendsOpt(Foo) diff --git a/pkg/front_end/parser_testcases/sealed_class/sealed_class.dart b/pkg/front_end/parser_testcases/sealed_class/sealed_class.dart new file mode 100644 index 00000000000..45635b0e5f6 --- /dev/null +++ b/pkg/front_end/parser_testcases/sealed_class/sealed_class.dart @@ -0,0 +1 @@ +sealed class Class {} \ No newline at end of file diff --git a/pkg/front_end/parser_testcases/sealed_class/sealed_class.dart.expect b/pkg/front_end/parser_testcases/sealed_class/sealed_class.dart.expect new file mode 100644 index 00000000000..1bdf7474eff --- /dev/null +++ b/pkg/front_end/parser_testcases/sealed_class/sealed_class.dart.expect @@ -0,0 +1,17 @@ +beginCompilationUnit(sealed) + beginMetadataStar(sealed) + endMetadataStar(0) + beginClassOrMixinOrNamedMixinApplicationPrelude(class) + handleIdentifier(Class, classOrMixinDeclaration) + handleNoTypeVariables({) + beginClassDeclaration(class, null, null, null, sealed, null, Class) + handleNoType(Class) + handleClassExtends(null, 1) + handleClassNoWithClause() + handleImplements(null, 0) + handleClassHeader(class, class, null) + beginClassOrMixinOrExtensionBody(DeclarationKind.Class, {) + endClassOrMixinOrExtensionBody(DeclarationKind.Class, 0, {, }) + endClassDeclaration(class, }) + endTopLevelDeclaration() +endCompilationUnit(1, ) diff --git a/pkg/front_end/parser_testcases/sealed_class/sealed_class.dart.intertwined.expect b/pkg/front_end/parser_testcases/sealed_class/sealed_class.dart.intertwined.expect new file mode 100644 index 00000000000..ab324db6cc4 --- /dev/null +++ b/pkg/front_end/parser_testcases/sealed_class/sealed_class.dart.intertwined.expect @@ -0,0 +1,33 @@ +parseUnit(sealed) + skipErrorTokens(sealed) + listener: beginCompilationUnit(sealed) + syntheticPreviousToken(sealed) + parseTopLevelDeclarationImpl(, Instance of 'DirectiveContext') + parseMetadataStar() + listener: beginMetadataStar(sealed) + listener: endMetadataStar(0) + parseTopLevelKeywordDeclaration(, class, null, null, sealed, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, null, sealed, null, class) + listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) + ensureIdentifier(class, classOrMixinDeclaration) + listener: handleIdentifier(Class, classOrMixinDeclaration) + listener: handleNoTypeVariables({) + listener: beginClassDeclaration(class, null, null, null, sealed, null, Class) + parseClass(Class, class, class, Class) + parseClassHeaderOpt(Class, class, class) + parseClassExtendsOpt(Class) + listener: handleNoType(Class) + listener: handleClassExtends(null, 1) + parseClassWithClauseOpt(Class) + listener: handleClassNoWithClause() + parseClassOrMixinOrEnumImplementsOpt(Class) + listener: handleImplements(null, 0) + listener: handleClassHeader(class, class, null) + parseClassOrMixinOrExtensionBody(Class, DeclarationKind.Class, Class) + listener: beginClassOrMixinOrExtensionBody(DeclarationKind.Class, {) + notEofOrValue(}, }) + listener: endClassOrMixinOrExtensionBody(DeclarationKind.Class, 0, {, }) + listener: endClassDeclaration(class, }) + listener: endTopLevelDeclaration() + reportAllErrorTokens(sealed) + listener: endCompilationUnit(1, ) diff --git a/pkg/front_end/parser_testcases/sealed_class/sealed_class.dart.parser.expect b/pkg/front_end/parser_testcases/sealed_class/sealed_class.dart.parser.expect new file mode 100644 index 00000000000..ed69d747051 --- /dev/null +++ b/pkg/front_end/parser_testcases/sealed_class/sealed_class.dart.parser.expect @@ -0,0 +1,3 @@ +sealed class Class {} + +sealed[StringToken] class[KeywordToken] Class[StringToken] {[BeginToken]}[SimpleToken][SimpleToken] diff --git a/pkg/front_end/parser_testcases/sealed_class/sealed_class.dart.scanner.expect b/pkg/front_end/parser_testcases/sealed_class/sealed_class.dart.scanner.expect new file mode 100644 index 00000000000..ed69d747051 --- /dev/null +++ b/pkg/front_end/parser_testcases/sealed_class/sealed_class.dart.scanner.expect @@ -0,0 +1,3 @@ +sealed class Class {} + +sealed[StringToken] class[KeywordToken] Class[StringToken] {[BeginToken]}[SimpleToken][SimpleToken] diff --git a/pkg/front_end/parser_testcases/views/view_class.dart.expect b/pkg/front_end/parser_testcases/views/view_class.dart.expect index f4442cc0d56..9c962052137 100644 --- a/pkg/front_end/parser_testcases/views/view_class.dart.expect +++ b/pkg/front_end/parser_testcases/views/view_class.dart.expect @@ -4,7 +4,7 @@ beginCompilationUnit(view) beginClassOrMixinOrNamedMixinApplicationPrelude(class) handleIdentifier(Class, classOrMixinDeclaration) handleNoTypeVariables({) - beginClassDeclaration(class, null, null, view, null, Class) + beginClassDeclaration(class, null, null, view, null, null, Class) handleNoType(Class) handleClassExtends(null, 1) handleClassNoWithClause() diff --git a/pkg/front_end/parser_testcases/views/view_class.dart.intertwined.expect b/pkg/front_end/parser_testcases/views/view_class.dart.intertwined.expect index fa027eb4d28..16d7b0d5c00 100644 --- a/pkg/front_end/parser_testcases/views/view_class.dart.intertwined.expect +++ b/pkg/front_end/parser_testcases/views/view_class.dart.intertwined.expect @@ -6,13 +6,13 @@ parseUnit(view) parseMetadataStar() listener: beginMetadataStar(view) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(, class, null, view, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, view, null, class) + parseTopLevelKeywordDeclaration(, class, null, view, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, view, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(Class, classOrMixinDeclaration) listener: handleNoTypeVariables({) - listener: beginClassDeclaration(class, null, null, view, null, Class) + listener: beginClassDeclaration(class, null, null, view, null, null, Class) parseClass(Class, class, class, Class) parseClassHeaderOpt(Class, class, class) parseClassExtendsOpt(Class) @@ -33,8 +33,8 @@ parseUnit(view) parseMetadataStar(}) listener: beginMetadataStar(view) listener: endMetadataStar(0) - parseTopLevelKeywordDeclaration(}, class, null, view, Instance of 'DirectiveContext') - parseClassOrNamedMixinApplication(null, null, view, null, class) + parseTopLevelKeywordDeclaration(}, class, null, view, null, Instance of 'DirectiveContext') + parseClassOrNamedMixinApplication(null, null, view, null, null, class) listener: beginClassOrMixinOrNamedMixinApplicationPrelude(class) ensureIdentifier(class, classOrMixinDeclaration) listener: handleIdentifier(Class, classOrMixinDeclaration) diff --git a/pkg/front_end/test/parser_test_listener.dart b/pkg/front_end/test/parser_test_listener.dart index e631535f79f..a15ed722e06 100644 --- a/pkg/front_end/test/parser_test_listener.dart +++ b/pkg/front_end/test/parser_test_listener.dart @@ -212,12 +212,19 @@ class ParserTestListener implements Listener { } @override - void beginClassDeclaration(Token begin, Token? abstractToken, - Token? macroToken, Token? viewToken, Token? augmentToken, Token name) { + void beginClassDeclaration( + Token begin, + Token? abstractToken, + Token? macroToken, + Token? viewToken, + Token? sealedToken, + Token? augmentToken, + Token name) { seen(begin); seen(abstractToken); seen(macroToken); seen(viewToken); + seen(sealedToken); seen(augmentToken); seen(name); doPrint('beginClassDeclaration(' @@ -225,6 +232,7 @@ class ParserTestListener implements Listener { '$abstractToken, ' '$macroToken, ' '$viewToken, ' + '$sealedToken, ' '$augmentToken, ' '$name)'); indent++; diff --git a/pkg/front_end/test/parser_test_listener_creator.dart b/pkg/front_end/test/parser_test_listener_creator.dart index 7d1b87babf7..9a70c54b3cf 100644 --- a/pkg/front_end/test/parser_test_listener_creator.dart +++ b/pkg/front_end/test/parser_test_listener_creator.dart @@ -126,8 +126,14 @@ class ParserCreatorListener extends Listener { ParserCreatorListener(this.out); @override - void beginClassDeclaration(Token begin, Token? abstractToken, - Token? macroToken, Token? viewToken, Token? augmentToken, Token name) { + void beginClassDeclaration( + Token begin, + Token? abstractToken, + Token? macroToken, + Token? viewToken, + Token? sealedToken, + Token? augmentToken, + Token name) { if (name.lexeme == "Listener") insideListenerClass = true; } diff --git a/pkg/front_end/test/parser_test_parser.dart b/pkg/front_end/test/parser_test_parser.dart index 43ba5ee802d..cfe58eab30c 100644 --- a/pkg/front_end/test/parser_test_parser.dart +++ b/pkg/front_end/test/parser_test_parser.dart @@ -165,17 +165,23 @@ class TestParser extends Parser { } @override - Token parseTopLevelKeywordDeclaration(Token start, Token keyword, - Token? macroToken, Token? viewToken, DirectiveContext? directiveState) { + Token parseTopLevelKeywordDeclaration( + Token start, + Token keyword, + Token? macroToken, + Token? viewToken, + Token? sealedToken, + DirectiveContext? directiveState) { doPrint('parseTopLevelKeywordDeclaration(' '$start, ' '$keyword, ' '$macroToken, ' '$viewToken, ' + '$sealedToken, ' '$directiveState)'); indent++; var result = super.parseTopLevelKeywordDeclaration( - start, keyword, macroToken, viewToken, directiveState); + start, keyword, macroToken, viewToken, sealedToken, directiveState); indent--; return result; } @@ -634,17 +640,19 @@ class TestParser extends Parser { Token? abstractToken, Token? macroToken, Token? viewToken, + Token? sealedToken, Token? augmentToken, Token classKeyword) { doPrint('parseClassOrNamedMixinApplication(' '$abstractToken, ' '$macroToken, ' '$viewToken, ' + '$sealedToken, ' '$augmentToken, ' '$classKeyword)'); indent++; - var result = super.parseClassOrNamedMixinApplication( - abstractToken, macroToken, viewToken, augmentToken, classKeyword); + var result = super.parseClassOrNamedMixinApplication(abstractToken, + macroToken, viewToken, sealedToken, augmentToken, classKeyword); indent--; return result; } diff --git a/pkg/front_end/test/parser_test_parser_creator.dart b/pkg/front_end/test/parser_test_parser_creator.dart index 1d6f9f38ad1..38daf10a53e 100644 --- a/pkg/front_end/test/parser_test_parser_creator.dart +++ b/pkg/front_end/test/parser_test_parser_creator.dart @@ -113,8 +113,14 @@ class ParserCreatorListener extends Listener { ParserCreatorListener(this.out); @override - void beginClassDeclaration(Token begin, Token? abstractToken, - Token? macroToken, Token? viewToken, Token? augmentToken, Token name) { + void beginClassDeclaration( + Token begin, + Token? abstractToken, + Token? macroToken, + Token? viewToken, + Token? sealedToken, + Token? augmentToken, + Token name) { if (name.lexeme == "Parser") insideParserClass = true; } diff --git a/pkg/front_end/testcases/general/sealed_class_declaration.dart b/pkg/front_end/testcases/general/sealed_class_declaration.dart new file mode 100644 index 00000000000..f39fbe211ae --- /dev/null +++ b/pkg/front_end/testcases/general/sealed_class_declaration.dart @@ -0,0 +1,7 @@ +// Copyright (c) 2022, the Dart project authors. Please see the AUTHORS file +// for details. All rights reserved. Use of this source code is governed by a +// BSD-style license that can be found in the LICENSE file. + +// @dart=2.18 + +sealed class A {} \ No newline at end of file diff --git a/pkg/front_end/testcases/general/sealed_class_declaration.dart.textual_outline.expect b/pkg/front_end/testcases/general/sealed_class_declaration.dart.textual_outline.expect new file mode 100644 index 00000000000..76613fe2e9f --- /dev/null +++ b/pkg/front_end/testcases/general/sealed_class_declaration.dart.textual_outline.expect @@ -0,0 +1,3 @@ +// @dart = 2.18 +sealed +class A {} diff --git a/pkg/front_end/testcases/general/sealed_class_declaration.dart.weak.expect b/pkg/front_end/testcases/general/sealed_class_declaration.dart.weak.expect new file mode 100644 index 00000000000..8249e23a87a --- /dev/null +++ b/pkg/front_end/testcases/general/sealed_class_declaration.dart.weak.expect @@ -0,0 +1,17 @@ +library /*isNonNullableByDefault*/; +// +// Problems in library: +// +// pkg/front_end/testcases/general/sealed_class_declaration.dart:7:1: Error: This requires the experimental 'sealed-class' language feature to be enabled. +// Try passing the '--enable-experiment=sealed-class' command line option. +// sealed class A {} +// ^^^^^^ +// +import self as self; +import "dart:core" as core; + +class A extends core::Object { + synthetic constructor •() → self::A + : super core::Object::•() + ; +} diff --git a/pkg/front_end/testcases/general/sealed_class_declaration.dart.weak.modular.expect b/pkg/front_end/testcases/general/sealed_class_declaration.dart.weak.modular.expect new file mode 100644 index 00000000000..8249e23a87a --- /dev/null +++ b/pkg/front_end/testcases/general/sealed_class_declaration.dart.weak.modular.expect @@ -0,0 +1,17 @@ +library /*isNonNullableByDefault*/; +// +// Problems in library: +// +// pkg/front_end/testcases/general/sealed_class_declaration.dart:7:1: Error: This requires the experimental 'sealed-class' language feature to be enabled. +// Try passing the '--enable-experiment=sealed-class' command line option. +// sealed class A {} +// ^^^^^^ +// +import self as self; +import "dart:core" as core; + +class A extends core::Object { + synthetic constructor •() → self::A + : super core::Object::•() + ; +} diff --git a/pkg/front_end/testcases/general/sealed_class_declaration.dart.weak.outline.expect b/pkg/front_end/testcases/general/sealed_class_declaration.dart.weak.outline.expect new file mode 100644 index 00000000000..a18070c2650 --- /dev/null +++ b/pkg/front_end/testcases/general/sealed_class_declaration.dart.weak.outline.expect @@ -0,0 +1,16 @@ +library /*isNonNullableByDefault*/; +// +// Problems in library: +// +// pkg/front_end/testcases/general/sealed_class_declaration.dart:7:1: Error: This requires the experimental 'sealed-class' language feature to be enabled. +// Try passing the '--enable-experiment=sealed-class' command line option. +// sealed class A {} +// ^^^^^^ +// +import self as self; +import "dart:core" as core; + +class A extends core::Object { + synthetic constructor •() → self::A + ; +} diff --git a/pkg/front_end/testcases/general/sealed_class_declaration.dart.weak.transformed.expect b/pkg/front_end/testcases/general/sealed_class_declaration.dart.weak.transformed.expect new file mode 100644 index 00000000000..8249e23a87a --- /dev/null +++ b/pkg/front_end/testcases/general/sealed_class_declaration.dart.weak.transformed.expect @@ -0,0 +1,17 @@ +library /*isNonNullableByDefault*/; +// +// Problems in library: +// +// pkg/front_end/testcases/general/sealed_class_declaration.dart:7:1: Error: This requires the experimental 'sealed-class' language feature to be enabled. +// Try passing the '--enable-experiment=sealed-class' command line option. +// sealed class A {} +// ^^^^^^ +// +import self as self; +import "dart:core" as core; + +class A extends core::Object { + synthetic constructor •() → self::A + : super core::Object::•() + ; +} diff --git a/pkg/front_end/testcases/sealed_class/folder.options b/pkg/front_end/testcases/sealed_class/folder.options new file mode 100644 index 00000000000..cd0d34f2de7 --- /dev/null +++ b/pkg/front_end/testcases/sealed_class/folder.options @@ -0,0 +1 @@ +--enable-experiment=sealed-class \ No newline at end of file diff --git a/pkg/front_end/testcases/sealed_class/sealed_class_declaration.dart b/pkg/front_end/testcases/sealed_class/sealed_class_declaration.dart new file mode 100644 index 00000000000..6cd2d35a1de --- /dev/null +++ b/pkg/front_end/testcases/sealed_class/sealed_class_declaration.dart @@ -0,0 +1,5 @@ +// Copyright (c) 2022, the Dart project authors. Please see the AUTHORS file +// for details. All rights reserved. Use of this source code is governed by a +// BSD-style license that can be found in the LICENSE file. + +sealed class A {} \ No newline at end of file diff --git a/pkg/front_end/testcases/sealed_class/sealed_class_declaration.dart.strong.expect b/pkg/front_end/testcases/sealed_class/sealed_class_declaration.dart.strong.expect new file mode 100644 index 00000000000..bd6ccccb48c --- /dev/null +++ b/pkg/front_end/testcases/sealed_class/sealed_class_declaration.dart.strong.expect @@ -0,0 +1,9 @@ +library /*isNonNullableByDefault*/; +import self as self; +import "dart:core" as core; + +class A extends core::Object { + synthetic constructor •() → self::A + : super core::Object::•() + ; +} diff --git a/pkg/front_end/testcases/sealed_class/sealed_class_declaration.dart.strong.transformed.expect b/pkg/front_end/testcases/sealed_class/sealed_class_declaration.dart.strong.transformed.expect new file mode 100644 index 00000000000..bd6ccccb48c --- /dev/null +++ b/pkg/front_end/testcases/sealed_class/sealed_class_declaration.dart.strong.transformed.expect @@ -0,0 +1,9 @@ +library /*isNonNullableByDefault*/; +import self as self; +import "dart:core" as core; + +class A extends core::Object { + synthetic constructor •() → self::A + : super core::Object::•() + ; +} diff --git a/pkg/front_end/testcases/sealed_class/sealed_class_declaration.dart.textual_outline.expect b/pkg/front_end/testcases/sealed_class/sealed_class_declaration.dart.textual_outline.expect new file mode 100644 index 00000000000..dd591a4d403 --- /dev/null +++ b/pkg/front_end/testcases/sealed_class/sealed_class_declaration.dart.textual_outline.expect @@ -0,0 +1,2 @@ +sealed +class A {} diff --git a/pkg/front_end/testcases/sealed_class/sealed_class_declaration.dart.weak.expect b/pkg/front_end/testcases/sealed_class/sealed_class_declaration.dart.weak.expect new file mode 100644 index 00000000000..bd6ccccb48c --- /dev/null +++ b/pkg/front_end/testcases/sealed_class/sealed_class_declaration.dart.weak.expect @@ -0,0 +1,9 @@ +library /*isNonNullableByDefault*/; +import self as self; +import "dart:core" as core; + +class A extends core::Object { + synthetic constructor •() → self::A + : super core::Object::•() + ; +} diff --git a/pkg/front_end/testcases/sealed_class/sealed_class_declaration.dart.weak.modular.expect b/pkg/front_end/testcases/sealed_class/sealed_class_declaration.dart.weak.modular.expect new file mode 100644 index 00000000000..bd6ccccb48c --- /dev/null +++ b/pkg/front_end/testcases/sealed_class/sealed_class_declaration.dart.weak.modular.expect @@ -0,0 +1,9 @@ +library /*isNonNullableByDefault*/; +import self as self; +import "dart:core" as core; + +class A extends core::Object { + synthetic constructor •() → self::A + : super core::Object::•() + ; +} diff --git a/pkg/front_end/testcases/sealed_class/sealed_class_declaration.dart.weak.outline.expect b/pkg/front_end/testcases/sealed_class/sealed_class_declaration.dart.weak.outline.expect new file mode 100644 index 00000000000..e9907904e81 --- /dev/null +++ b/pkg/front_end/testcases/sealed_class/sealed_class_declaration.dart.weak.outline.expect @@ -0,0 +1,8 @@ +library /*isNonNullableByDefault*/; +import self as self; +import "dart:core" as core; + +class A extends core::Object { + synthetic constructor •() → self::A + ; +} diff --git a/pkg/front_end/testcases/sealed_class/sealed_class_declaration.dart.weak.transformed.expect b/pkg/front_end/testcases/sealed_class/sealed_class_declaration.dart.weak.transformed.expect new file mode 100644 index 00000000000..bd6ccccb48c --- /dev/null +++ b/pkg/front_end/testcases/sealed_class/sealed_class_declaration.dart.weak.transformed.expect @@ -0,0 +1,9 @@ +library /*isNonNullableByDefault*/; +import self as self; +import "dart:core" as core; + +class A extends core::Object { + synthetic constructor •() → self::A + : super core::Object::•() + ; +} diff --git a/pkg/front_end/testcases/textual_outline.status b/pkg/front_end/testcases/textual_outline.status index 5a51721f053..a4ebf7eefaa 100644 --- a/pkg/front_end/testcases/textual_outline.status +++ b/pkg/front_end/testcases/textual_outline.status @@ -109,6 +109,7 @@ general/null_safety_invalid_experiment: FormatterCrash general/null_safety_invalid_experiment_and_language_version: FormatterCrash general/records: FormatterCrash general/records_opt_out: FormatterCrash +general/sealed_class_declaration: FormatterCrash general/type_parameters_on_void: FormatterCrash general/type_variable_in_static_context: FormatterCrash general/var_as_type_name: FormatterCrash @@ -187,6 +188,7 @@ regress/issue_37285: FormatterCrash regress/issue_39091_1: FormatterCrash regress/issue_41265.crash: Crash regress/issue_41265.crash: FormatterCrash +sealed_class/sealed_class_declaration: FormatterCrash super_parameters/issue47741: FormatterCrash super_parameters/issue47922: FormatterCrash super_parameters/issue48714: FormatterCrash diff --git a/pkg/front_end/tool/_fasta/parser_ast_helper_creator.dart b/pkg/front_end/tool/_fasta/parser_ast_helper_creator.dart index bdc2d485c4b..9cb19444ccb 100644 --- a/pkg/front_end/tool/_fasta/parser_ast_helper_creator.dart +++ b/pkg/front_end/tool/_fasta/parser_ast_helper_creator.dart @@ -103,8 +103,14 @@ class ParserCreatorListener extends Listener { ParserCreatorListener(this.out); @override - void beginClassDeclaration(Token begin, Token? abstractToken, - Token? macroToken, Token? viewToken, Token? augmentToken, Token name) { + void beginClassDeclaration( + Token begin, + Token? abstractToken, + Token? macroToken, + Token? viewToken, + Token? sealedToken, + Token? augmentToken, + Token name) { if (name.lexeme == "Listener") insideListenerClass = true; } diff --git a/tests/language/sealed_class/sealed_class_syntax_disabled_error_test.dart b/tests/language/sealed_class/sealed_class_syntax_disabled_error_test.dart new file mode 100644 index 00000000000..3605a216ed8 --- /dev/null +++ b/tests/language/sealed_class/sealed_class_syntax_disabled_error_test.dart @@ -0,0 +1,43 @@ +// Copyright (c) 2022, the Dart project authors. Please see the AUTHORS file +// for details. All rights reserved. Use of this source code is governed by a +// BSD-style license that can be found in the LICENSE file. + +// Make sure errors are emitted when trying to use sealed classes without +// the `sealed` experiment enabled. + +sealed class SealedClass { +// [error column 1, length 6] +// [analyzer] SYNTACTIC_ERROR.EXPERIMENT_NOT_ENABLED +// [cfe] This requires the experimental 'sealed-class' language feature to be enabled. +// ^ +// [cfe] The non-abstract class 'SealedClass' is missing implementations for these members: + int nonAbstractFoo = 0; + abstract int foo; +//^^^^^^^^^^^^^^^^^ +// [analyzer] COMPILE_TIME_ERROR.CONCRETE_CLASS_WITH_ABSTRACT_MEMBER + int nonAbstractBar(int value) => value + 100; + int bar(int value); +//^^^^^^^^^^^^^^^^^^^ +// [analyzer] COMPILE_TIME_ERROR.CONCRETE_CLASS_WITH_ABSTRACT_MEMBER +} + +abstract class A extends SealedClass {} + +class AImpl extends A { + @override + int foo = 1; + + @override + int bar(int value) => value + 1; +} + +class B extends SealedClass { + @override + int nonAbstractFoo = 100; + + @override + int foo = 2; + + @override + int bar(int value) => value; +} diff --git a/tests/language/sealed_class/sealed_class_syntax_error_test.dart b/tests/language/sealed_class/sealed_class_syntax_error_test.dart index 5584ba15b5b..a76b444b76a 100644 --- a/tests/language/sealed_class/sealed_class_syntax_error_test.dart +++ b/tests/language/sealed_class/sealed_class_syntax_error_test.dart @@ -9,38 +9,56 @@ abstract class SealedMembers { sealed int foo; - // ^ - // [analyzer] unspecified - // [cfe] unspecified +//^^^^^^ +// [analyzer] COMPILE_TIME_ERROR.IMPLICIT_THIS_REFERENCE_IN_INITIALIZER +// [analyzer] COMPILE_TIME_ERROR.NOT_A_TYPE +// [cfe] 'sealed' isn't a type. + // ^^^ + // [analyzer] SYNTACTIC_ERROR.EXPECTED_TOKEN + // [cfe] Expected ';' after this. + // ^^^ + // [analyzer] SYNTACTIC_ERROR.MISSING_CONST_FINAL_VAR_OR_TYPE + // [cfe] Variables must be declared using the keywords 'const', 'final', 'var' or a type name. int bar(sealed int x); - // ^ - // [analyzer] unspecified - // [cfe] unspecified +//^^^ +// [analyzer] COMPILE_TIME_ERROR.NOT_A_TYPE +// [cfe] 'int' isn't a type. + // ^^^^^^ + // [analyzer] COMPILE_TIME_ERROR.NOT_A_TYPE + // [cfe] 'sealed' isn't a type. + // ^ + // [analyzer] SYNTACTIC_ERROR.EXPECTED_TOKEN + // [cfe] Expected ')' before this. sealed void bar2(); - // ^ - // [analyzer] unspecified - // [cfe] unspecified +//^^^^^^ +// [analyzer] SYNTACTIC_ERROR.EXPECTED_TOKEN +// [analyzer] SYNTACTIC_ERROR.MISSING_CONST_FINAL_VAR_OR_TYPE +// [cfe] Expected ';' after this. +// [cfe] Variables must be declared using the keywords 'const', 'final', 'var' or a type name. } sealed abstract class SealedAndAbstractClass {} -// ^ -// [analyzer] unspecified -// [cfe] unspecified +// [error column 1, length 6] +// [analyzer] COMPILE_TIME_ERROR.UNDEFINED_CLASS +// [cfe] 'sealed' isn't a type. +// [cfe] Type 'sealed' not found. +// ^^^^^^^^ +// [analyzer] SYNTACTIC_ERROR.EXPECTED_TOKEN +// [cfe] Expected ';' after this. abstract sealed class SealedAndAbstractClass2 {} -// ^ -// [analyzer] unspecified -// [cfe] unspecified class SealedVariable { int foo() { sealed var x = 2; - // ^ - // [analyzer] unspecified - // [cfe] unspecified +// ^^^^^^ +// [analyzer] COMPILE_TIME_ERROR.UNDEFINED_IDENTIFIER +// [analyzer] SYNTACTIC_ERROR.EXPECTED_TOKEN +// [cfe] Expected ';' after this. +// [cfe] The getter 'sealed' isn't defined for the class 'SealedVariable'. return x; } } \ No newline at end of file